Merge "Increase battery app list maximum size to 20"
diff --git a/Android.mk b/Android.mk
index 6b0d077..ca2ad4a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,7 +32,6 @@
com.google.android.material_material \
LOCAL_JAVA_LIBRARIES := \
- bouncycastle \
telephony-common \
ims-common
@@ -41,6 +40,8 @@
androidx.lifecycle_lifecycle-extensions \
guava \
jsr305 \
+ settings-contextual-card-protos-lite \
+ contextualcards \
settings-logtags \
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
@@ -57,7 +58,14 @@
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
+endif
\ No newline at end of file
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e2e89bd..efa57de 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -59,6 +59,7 @@
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.STATUS_BAR" />
<uses-permission android:name="android.permission.MANAGE_USB" />
+ <uses-permission android:name="android.permission.MANAGE_DEBUGGING" />
<uses-permission android:name="android.permission.SET_POINTER_SPEED" />
<uses-permission android:name="android.permission.SET_KEYBOARD_LAYOUT" />
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
@@ -80,6 +81,8 @@
<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" />
<uses-permission android:name="android.permission.USER_ACTIVITY" />
<uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />
<uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
@@ -94,10 +97,10 @@
<uses-permission android:name="android.permission.TEST_BLACKLISTED_PASSWORD" />
<uses-permission android:name="android.permission.USE_RESERVED_DISK" />
<uses-permission android:name="android.permission.MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS" />
+ <uses-permission android:name="android.permission.CAMERA" />
<application android:label="@string/settings_label"
android:icon="@drawable/ic_launcher_settings"
- android:taskAffinity=""
android:theme="@style/Theme.Settings"
android:hardwareAccelerated="true"
android:requiredForAllUsers="true"
@@ -111,31 +114,37 @@
<uses-library android:name="org.apache.http.legacy" />
<!-- Settings -->
- <activity android:name="Settings"
- android:taskAffinity="com.android.settings.root"
+ <activity android:name="SettingsActivity"
android:label="@string/settings_label_launcher"
android:launchMode="singleTask">
+ <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+ android:value="true" />
+ </activity>
+
+ <activity android:name=".homepage.SettingsHomepageActivity"
+ android:label="@string/settings_label_launcher"
+ android:theme="@style/Theme.Settings.Home"
+ android:launchMode="singleTask">
<intent-filter android:priority="1">
<action android:name="android.settings.SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
- android:value="true" />
+ android:value="true" />
</activity>
- <activity android:name=".SettingsHomepageActivity"
- android:taskAffinity="com.android.settings.root"
- android:label="@string/settings_label_launcher"
+ <activity android:name=".network.telephony.MobileNetworkActivity"
+ android:label="@string/network_settings_title"
android:theme="@style/Theme.Settings.Home"
android:launchMode="singleTask">
+ <!-- TODO(b/114749736): add intent filter here and disable the one in telephony -->
</activity>
<!-- Alias for launcher activity only, as this belongs to each profile. -->
<activity-alias android:name="Settings"
- android:taskAffinity="com.android.settings.root"
android:label="@string/settings_label_launcher"
android:launchMode="singleTask"
- android:targetActivity=".SettingsHomepageActivity">
+ android:targetActivity=".homepage.SettingsHomepageActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
@@ -152,7 +161,6 @@
</receiver>
<activity android:name=".SubSettings"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings" />
<activity android:name=".Settings$CreateShortcutActivity"
@@ -171,8 +179,7 @@
android:name=".Settings$NetworkDashboardActivity"
android:label="@string/network_dashboard_title"
android:icon="@drawable/ic_homepage_network"
- android:parentActivityName="Settings"
- android:taskAffinity="com.android.settings">
+ android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.WIRELESS_SETTINGS" />
<action android:name="android.settings.AIRPLANE_MODE_SETTINGS" />
@@ -183,11 +190,6 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
- <intent-filter android:priority="11">
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.network.NetworkDashboardFragment"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -198,23 +200,13 @@
android:name=".Settings$ConnectedDeviceDashboardActivity"
android:label="@string/connected_devices_dashboard_title"
android:icon="@drawable/ic_homepage_connected_device"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
- <action android:name="android.settings.NFC_SETTINGS" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- <intent-filter android:priority="1">
<action android:name="android.settings.BLUETOOTH_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="10">
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"/>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
@@ -245,7 +237,6 @@
android:label="@string/wifi_settings"
android:icon="@drawable/ic_settings_wireless"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.WIFI_SETTINGS" />
@@ -263,7 +254,6 @@
<activity
android:name=".wifi.WifiPickerActivity"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
@@ -278,7 +268,6 @@
android:label="@string/wifi_configure_settings_preference_title"
android:icon="@drawable/ic_settings_wireless"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.WIFI_IP_SETTINGS" />
@@ -300,7 +289,6 @@
android:label="@string/wifi_saved_access_points_label"
android:icon="@drawable/ic_settings_wireless"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.WIFI_SAVED_NETWORK_SETTINGS" />
@@ -353,7 +341,6 @@
android:excludeFromRecents="true"
android:exported="true"
android:permission="android.permission.CONNECTIVITY_INTERNAL"
- android:taskAffinity=""
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
<intent-filter>
<action android:name="android.net.conn.PROMPT_UNVALIDATED" />
@@ -371,7 +358,6 @@
<activity android:name="Settings$ApnSettingsActivity"
android:label="@string/apn_settings"
android:launchMode="singleTask"
- android:taskAffinity="com.android.settings"
android:configChanges="orientation|keyboardHidden|screenSize"
android:parentActivityName="Settings$NetworkDashboardActivity"
android:process="com.android.phone">
@@ -465,7 +451,6 @@
android:name="Settings$TetherSettingsActivity"
android:label="@string/tether_settings_title_all"
android:icon="@drawable/ic_settings_wireless"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -505,7 +490,6 @@
</activity-alias>
<activity android:name="Settings$WifiP2pSettingsActivity"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -520,7 +504,6 @@
android:name="Settings$VpnSettingsActivity"
android:label="@string/vpn_settings_title"
android:icon="@drawable/ic_settings_wireless"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.VPN_SETTINGS" />
@@ -541,7 +524,6 @@
android:name="Settings$DateTimeSettingsActivity"
android:label="@string/date_and_time"
android:icon="@drawable/ic_settings_date_time"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.DATE_SETTINGS" />
@@ -553,11 +535,12 @@
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="240">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" />
+ <meta-data android:name="com.android.settings.order" android:value="-240"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.DateTimeSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -568,7 +551,6 @@
android:name="Settings$LocalePickerActivity"
android:label="@string/language_picker_title"
android:icon="@drawable/ic_settings_language"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$LanguageAndInputSettingsActivity">
<intent-filter android:priority="1">
<action android:name="android.settings.LOCALE_SETTINGS" />
@@ -595,16 +577,16 @@
android:name=".Settings$LanguageAndInputSettingsActivity"
android:label="@string/language_settings"
android:icon="@drawable/ic_settings_language"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="260">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-260"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -628,7 +610,6 @@
<activity
android:name="Settings$ManageAssistActivity"
android:label="@string/assist_and_voice_input_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.VOICE_INPUT_SETTINGS" />
@@ -670,7 +651,6 @@
<activity
android:name="Settings$SpellCheckersSettingsActivity"
android:label="@string/spellcheckers_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -700,7 +680,6 @@
<activity
android:name="Settings$UserDictionarySettingsActivity"
android:label="@string/user_dict_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
@@ -784,7 +763,6 @@
android:icon="@drawable/ic_notifications"
android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
android:exported="true"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_ONBOARDING" />
@@ -796,7 +774,6 @@
android:label="@string/zen_mode_automation_settings_title"
android:icon="@drawable/ic_notifications"
android:exported="true"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$ZenModeSettingsActivity">
<intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_AUTOMATION_SETTINGS" />
@@ -843,7 +820,6 @@
<activity
android:name="Settings$ZenModeScheduleRuleSettingsActivity"
android:exported="true"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$ZenModeAutomationSettingsActivity">
<intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_SCHEDULE_RULE_SETTINGS" />
@@ -862,7 +838,6 @@
<activity
android:name="Settings$ZenModeEventRuleSettingsActivity"
android:exported="true"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$ZenModeAutomationSettingsActivity">
<intent-filter android:priority="1">
<action android:name="android.settings.ZEN_MODE_EVENT_RULE_SETTINGS" />
@@ -878,7 +853,6 @@
android:name="Settings$DisplaySettingsActivity"
android:label="@string/display_settings"
android:icon="@drawable/ic_homepage_display"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -889,17 +863,10 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="7">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.DisplaySettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/display_dashboard_summary"/>
</activity>
<activity
@@ -945,7 +912,6 @@
<activity android:name=".Settings$MyDeviceInfoActivity"
android:label="@string/about_settings"
android:icon="@drawable/ic_settings_about"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.DEVICE_INFO_SETTINGS" />
@@ -956,9 +922,10 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="270">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-270"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.title"
@@ -973,7 +940,6 @@
android:name="SettingsLicenseActivity"
android:label="@string/settings_license_activity_title"
android:configChanges="orientation|screenSize"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.LICENSE" />
@@ -986,7 +952,6 @@
<activity
android:name="Settings$ManageApplicationsActivity"
android:label="@string/applications_settings"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -1016,7 +981,6 @@
<activity
android:name="Settings$ManageDomainUrlsActivity"
android:label="@string/domain_urls_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.settings.MANAGE_DOMAIN_URLS" />
@@ -1040,7 +1004,6 @@
<activity
android:name="Settings$HighPowerApplicationsActivity"
android:label="@string/high_power_apps"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
@@ -1125,12 +1088,12 @@
</intent-filter>
</activity-alias>
- <activity android:name=".applications.InstalledAppOpenByDefaultPage"
+ <activity android:name=".applications.InstalledAppOpenByDefaultActivity"
android:label="@string/application_info_label"
- android:permission="android.permission.OPEN_APPLICATION_DETAILS_OPEN_BY_DEFAULT_PAGE"
+ android:permission="android.permission.OPEN_APP_OPEN_BY_DEFAULT_SETTINGS"
android:exported="true">
<intent-filter android:priority="1">
- <action android:name="android.settings.APPLICATION_DETAILS_SETTINGS_OPEN_BY_DEFAULT_PAGE" />
+ <action android:name="com.android.settings.APP_OPEN_BY_DEFAULT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="package" />
</intent-filter>
@@ -1139,7 +1102,6 @@
<!-- Provide direct entry into manage apps showing running services. -->
<activity android:name="Settings$RunningServicesActivity"
android:label="@string/runningservices_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1157,7 +1119,6 @@
<activity
android:name="Settings$StorageUseActivity"
android:label="@string/storageuse_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
@@ -1178,7 +1139,6 @@
<activity
android:name="Settings$NotificationStationActivity"
android:label="@string/notification_log_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="22">
<action android:name="android.intent.action.MAIN" />
@@ -1201,9 +1161,8 @@
<activity
android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title"
- android:icon="@drawable/ic_settings_location"
+ android:icon="@drawable/ic_homepage_location"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
@@ -1221,9 +1180,8 @@
<activity
android:name="Settings$ScanningSettingsActivity"
android:label="@string/location_scanning_screen_title"
- android:icon="@drawable/ic_settings_location"
+ android:icon="@drawable/ic_homepage_location"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.LOCATION_SCANNING_SETTINGS" />
@@ -1240,7 +1198,6 @@
android:label="@string/security_settings_title"
android:icon="@drawable/ic_homepage_security"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.SECURITY_SETTINGS" />
@@ -1252,11 +1209,6 @@
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
</intent-filter>
- <intent-filter android:priority="4">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.security.SecuritySettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1266,8 +1218,7 @@
<activity android:name="MonitoringCertInfoActivity"
android:label=""
android:theme="@style/Transparent"
- android:excludeFromRecents="true"
- android:taskAffinity="">
+ android:excludeFromRecents="true">
<intent-filter android:priority="1">
<action android:name="com.android.settings.MONITORING_CERT_INFO" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1278,7 +1229,6 @@
android:name="Settings$TrustedCredentialsSettingsActivity"
android:label="@string/trusted_credentials"
android:icon="@drawable/ic_settings_security"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="com.android.settings.TRUSTED_CREDENTIALS" />
@@ -1295,7 +1245,6 @@
android:label="@string/privacy_settings_title"
android:icon="@drawable/ic_settings_backup"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1327,7 +1276,6 @@
<activity
android:name="Settings$DeviceAdminSettingsActivity"
android:label="@string/device_admin_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1368,7 +1316,6 @@
<activity
android:name="Settings$UsageAccessSettingsActivity"
android:label="@string/usage_access_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.USAGE_ACCESS_SETTINGS" />
@@ -1378,6 +1325,20 @@
android:value="com.android.settings.applications.manageapplications.ManageApplications" />
</activity>
+ <activity
+ android:name="Settings$AppUsageAccessSettingsActivity"
+ android:label="@string/usage_access_title"
+ android:parentActivityName="Settings">
+ <intent-filter>
+ <action android:name="android.settings.USAGE_ACCESS_SETTINGS"/>
+ <category android:name="android.intent.category.DEFAULT"/>
+ <data android:scheme="package"/>
+ </intent-filter>
+ <meta-data
+ android:name="com.android.settings.FRAGMENT_CLASS"
+ android:value="com.android.settings.applications.UsageAccessDetails"/>
+ </activity>
+
<activity android:name="Settings$IccLockSettingsActivity"
android:label="@string/sim_lock_settings"
android:process="com.android.phone">
@@ -1395,7 +1356,6 @@
android:label="@string/accessibility_settings"
android:icon="@drawable/ic_homepage_accessibility"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
@@ -1405,24 +1365,16 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="2">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.accessibility.AccessibilitySettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/accessibility_settings_summary" />
</activity>
<activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
android:icon="@drawable/ic_accessibility_suggestion"
android:label="@string/vision_settings_title"
- android:theme="@style/SetupWizardAccessibilityTheme"
- android:taskAffinity="com.android.wizard" >
+ android:theme="@style/SetupWizardAccessibilityTheme">
<intent-filter android:priority="1">
<action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
<category android:name="android.intent.category.DEFAULT" />
@@ -1444,7 +1396,6 @@
<activity
android:name="Settings$AccessibilityDaltonizerSettingsActivity"
android:label="@string/accessibility_display_daltonizer_preference_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="com.android.settings.ACCESSIBILITY_COLOR_SPACE_SETTINGS" />
@@ -1463,7 +1414,6 @@
<activity
android:name="Settings$CaptioningSettingsActivity"
android:label="@string/accessibility_captioning_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.CAPTIONING_SETTINGS" />
@@ -1478,7 +1428,6 @@
<activity
android:name="Settings$TextToSpeechSettingsActivity"
android:label="@string/tts_settings"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="com.android.settings.TTS_SETTINGS" />
@@ -1493,7 +1442,6 @@
<activity
android:name="Settings$EnterprisePrivacySettingsActivity"
android:label="@string/enterprise_privacy_settings"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.settings.ENTERPRISE_PRIVACY_SETTINGS" />
@@ -1506,7 +1454,7 @@
<!-- Lock screen settings -->
<activity android:name=".password.ConfirmDeviceCredentialActivity"
android:exported="true"
- android:theme="@android:style/Theme.NoDisplay">
+ android:theme="@android:style/Theme.Translucent.NoTitleBar">
<intent-filter android:priority="1">
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
<action android:name="android.app.action.CONFIRM_FRP_CREDENTIAL" />
@@ -1533,8 +1481,7 @@
<activity android:name=".SetupRedactionInterstitial"
android:enabled="false"
android:exported="true"
- android:taskAffinity="com.android.wizard"
- android:theme="@style/SuwThemeGlif.Light"
+ android:theme="@style/SuwThemeGlif.DayNight"
android:label="@string/lock_screen_notifications_interstitial_title"
android:icon="@drawable/ic_suggested_notifications">
<intent-filter>
@@ -1568,9 +1515,26 @@
android:windowSoftInputMode="stateHidden|adjustResize"
android:theme="@style/GlifTheme.Light"/>
- <activity android:name=".biometrics.face.FaceEnrollIntroduction" android:exported="false" />
- <activity android:name=".biometrics.face.FaceEnrollEnrolling" android:exported="false" />
- <activity android:name=".biometrics.face.FaceEnrollFinish" android:exported="false" />
+ <activity android:name=".biometrics.face.FaceEnrollIntroduction"
+ android:exported="false"
+ android:screenOrientation="portrait"/>
+
+ <activity android:name=".biometrics.face.FaceEnrollEnrolling"
+ android:exported="false"
+ android:screenOrientation="portrait"/>
+
+ <activity android:name=".biometrics.face.FaceEnrollFinish"
+ android:exported="false"
+ android:screenOrientation="portrait"/>
+
+ <activity android:name=".biometrics.BiometricEnrollActivity"
+ android:exported="true"
+ android:theme="@style/GlifTheme.Light">
+ <intent-filter>
+ <action android:name="android.settings.BIOMETRIC_ENROLL" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
<activity android:name=".biometrics.fingerprint.FingerprintSettings" android:exported="false"/>
<activity android:name=".biometrics.fingerprint.FingerprintEnrollFindSensor" android:exported="false"/>
@@ -1634,7 +1598,6 @@
android:theme="@style/GlifTheme.Light"/>
<activity android:name=".password.SetupChooseLockGeneric"
- android:taskAffinity="com.android.wizard"
android:theme="@style/GlifTheme.Light"
android:label="@string/lock_settings_picker_title">
<intent-filter android:priority="1">
@@ -1697,7 +1660,6 @@
<activity android:name=".password.SetupChooseLockPattern"
android:exported="false"
- android:taskAffinity="com.android.wizard"
android:theme="@style/GlifTheme.Light" />
<activity android:name=".password.ChooseLockPattern"
@@ -1706,7 +1668,6 @@
<activity android:name=".password.SetupChooseLockPassword"
android:exported="false"
- android:taskAffinity="com.android.wizard"
android:theme="@style/GlifTheme.Light"
android:windowSoftInputMode="stateVisible|adjustResize" />
@@ -1717,7 +1678,6 @@
<activity android:name=".SetupEncryptionInterstitial"
android:label="@string/encryption_interstitial_header"
- android:taskAffinity="com.android.wizard"
android:theme="@style/GlifTheme.Light"/>
<activity android:name=".EncryptionInterstitial"
@@ -1727,7 +1687,6 @@
android:name=".Settings$StorageDashboardActivity"
android:label="@string/storage_settings"
android:icon="@drawable/ic_homepage_storage"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
@@ -1738,13 +1697,6 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="5">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage" />
- <meta-data android:name="com.android.settings.title"
- android:resource="@string/storage_usb_settings" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.deviceinfo.StorageSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -1761,7 +1713,6 @@
<activity
android:name="Settings$PublicVolumeSettingsActivity"
android:label="@string/storage_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.provider.action.DOCUMENT_ROOT_SETTINGS" />
@@ -1787,39 +1738,31 @@
<!-- Exported for SystemUI to launch into -->
<activity android:name=".deviceinfo.StorageWizardInit"
android:theme="@style/GlifV3Theme.Light"
- android:taskAffinity="com.android.settings.storage_wizard"
android:exported="true"
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<activity android:name=".deviceinfo.StorageWizardFormatProgress"
android:theme="@style/GlifV3Theme.Light"
- android:taskAffinity="com.android.settings.storage_wizard"
android:exported="false" />
<activity android:name=".deviceinfo.StorageWizardFormatSlow"
android:theme="@style/GlifV3Theme.Light"
- android:taskAffinity="com.android.settings.storage_wizard"
android:exported="false" />
<activity android:name=".deviceinfo.StorageWizardMigrateConfirm"
android:theme="@style/GlifV3Theme.Light"
- android:taskAffinity="com.android.settings.storage_wizard"
android:exported="false" />
<activity android:name=".deviceinfo.StorageWizardMigrateProgress"
android:theme="@style/GlifV3Theme.Light"
- android:taskAffinity="com.android.settings.storage_wizard"
android:exported="true"
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<activity android:name=".deviceinfo.StorageWizardReady"
android:theme="@style/GlifV3Theme.Light"
- android:taskAffinity="com.android.settings.storage_wizard"
android:exported="true"
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
<activity android:name=".deviceinfo.StorageWizardMoveConfirm"
android:theme="@style/GlifV3Theme.Light"
- android:taskAffinity="com.android.settings.storage_wizard"
android:exported="false" />
<activity android:name=".deviceinfo.StorageWizardMoveProgress"
android:theme="@style/GlifV3Theme.Light"
- android:taskAffinity="com.android.settings.storage_wizard"
android:exported="true"
android:permission="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
@@ -1851,7 +1794,6 @@
android:name="Settings$DevelopmentSettingsDashboardActivity"
android:label="@string/development_settings_title"
android:icon="@drawable/ic_settings_development"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"
android:enabled="false">
<intent-filter android:priority="1">
@@ -1859,9 +1801,10 @@
<action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="40">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-40"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.summary"
@@ -1878,7 +1821,8 @@
android:name=".development.DevelopmentSettingsDisabledActivity"
android:icon="@drawable/ic_settings_development"
android:label="@string/development_settings_title"
- android:theme="@android:style/Theme.NoDisplay">
+ android:excludeFromRecents="true"
+ android:theme="@style/Transparent">
<intent-filter android:priority="-1">
<action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
<action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -1890,7 +1834,6 @@
android:name="Settings$PrintSettingsActivity"
android:label="@string/print_settings"
android:icon="@drawable/ic_settings_print"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.ACTION_PRINT_SETTINGS" />
@@ -1907,7 +1850,6 @@
<activity android:name="Settings$PrintJobSettingsActivity"
android:label="@string/print_print_job"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$PrintSettingsActivity">
<intent-filter android:priority="1">
<action android:name="android.settings.ACTION_PRINT_SETTINGS" />
@@ -2024,7 +1966,6 @@
<activity
android:name="Settings$AndroidBeamSettingsActivity"
android:label="@string/android_beam_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.NFCSHARING_SETTINGS" />
@@ -2040,15 +1981,15 @@
android:name="Settings$WifiDisplaySettingsActivity"
android:label="@string/wifi_display_settings_title"
android:icon="@drawable/ic_cast_24dp"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.CAST_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="6">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-6"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.device" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -2111,7 +2052,6 @@
<activity android:name="UsageStatsActivity"
android:label="@string/usage_stats_label"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -2123,7 +2063,6 @@
android:name="Settings$PowerUsageSummaryActivity"
android:label="@string/power_usage_summary_title"
android:icon="@drawable/ic_homepage_battery"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
@@ -2133,11 +2072,6 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="8">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.fuelgauge.PowerUsageSummary" />
</activity>
@@ -2146,7 +2080,6 @@
android:name="Settings$BatterySaverSettingsActivity"
android:label="@string/battery_saver"
android:icon="@drawable/ic_settings_battery"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.BATTERY_SAVER_SETTINGS" />
@@ -2172,7 +2105,6 @@
<activity
android:name="Settings$AccountSyncSettingsActivity"
android:label="@string/account_sync_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -2186,7 +2118,6 @@
<activity
android:name="Settings$ManagedProfileSettingsActivity"
android:label="@string/managed_profile_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"
android:permission="android.permission.MANAGE_USERS">
<intent-filter android:priority="1">
@@ -2202,7 +2133,6 @@
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/header_add_an_account"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
@@ -2276,7 +2206,6 @@
android:name="Settings$DataUsageSummaryActivity"
android:label="@string/data_usage_summary_title"
android:icon="@drawable/ic_settings_data_usage"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.DATA_USAGE_SETTINGS" />
@@ -2286,9 +2215,10 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="10">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-6"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.wireless" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -2297,7 +2227,6 @@
<activity
android:name="Settings$MobileDataUsageListActivity"
android:label="@string/cellular_data_usage"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.MOBILE_DATA_USAGE" />
@@ -2311,7 +2240,6 @@
android:name="Settings$DreamSettingsActivity"
android:label="@string/screensaver_settings_title"
android:icon="@drawable/ic_settings_display"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.DREAM_SETTINGS" />
@@ -2327,15 +2255,15 @@
android:name="Settings$UserSettingsActivity"
android:label="@string/user_settings_title"
android:icon="@drawable/ic_settings_multiuser"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.USER_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="45">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-45"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.system" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -2348,7 +2276,6 @@
android:name="Settings$PaymentSettingsActivity"
android:label="@string/nfc_payment_settings_title"
android:icon="@drawable/ic_settings_nfc_payment"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
@@ -2395,7 +2322,6 @@
<activity
android:name="Settings$NotificationAccessSettingsActivity"
android:label="@string/manage_notification_access_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" />
@@ -2408,7 +2334,6 @@
<activity
android:name="Settings$VrListenersSettingsActivity"
android:label="@string/vr_listeners_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.VR_LISTENER_SETTINGS" />
@@ -2421,7 +2346,6 @@
<activity
android:name="Settings$PictureInPictureSettingsActivity"
android:label="@string/picture_in_picture_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.PICTURE_IN_PICTURE_SETTINGS" />
@@ -2438,7 +2362,6 @@
<activity
android:name="Settings$AppPictureInPictureSettingsActivity"
android:label="@string/picture_in_picture_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.settings.PICTURE_IN_PICTURE_SETTINGS" />
@@ -2474,9 +2397,10 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="160">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-160"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.apps"/>
<meta-data android:name="com.android.settings.summary"
@@ -2492,7 +2416,6 @@
android:label="@string/sound_settings"
android:icon="@drawable/ic_homepage_sound"
android:exported="true"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="com.android.settings.SOUND_SETTINGS" />
@@ -2504,25 +2427,17 @@
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <intent-filter android:priority="6">
- <action android:name="com.android.settings.action.SETTINGS" />
- </intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage" />
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.notification.SoundSettings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/sound_dashboard_summary"/>
</activity>
<!-- Show apps for which application-level notification settings are applicable -->
<activity android:name="Settings$NotificationAppListActivity"
android:label="@string/app_notifications_title"
android:icon="@drawable/ic_notifications"
- android:exported="true"
- android:taskAffinity="">
+ android:exported="true">
<intent-filter android:priority="1">
<action android:name="android.settings.ALL_APPS_NOTIFICATION_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2565,7 +2480,6 @@
<activity
android:name="ManualDisplayActivity"
android:label="@string/manual"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"
android:enabled="@bool/config_show_manual">
<intent-filter>
@@ -2580,7 +2494,6 @@
<activity
android:name="RegulatoryInfoDisplayActivity"
android:label="@string/regulatory_labels"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"
android:enabled="@bool/config_show_regulatory_info">
<intent-filter>
@@ -2595,23 +2508,6 @@
<activity android:name=".notification.NotificationAccessConfirmationActivity"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />
- <receiver android:name=".widget.SettingsAppWidgetProvider"
- android:label="@string/gadget_title"
- android:exported="false"
- android:enabled="@bool/has_powercontrol_widget">
- <intent-filter>
- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
- <action android:name="android.appwidget.action.APPWIDGET_ENABLED" />
- <action android:name="android.appwidget.action.APPWIDGET_DISABLED" />
- <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
- <action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" />
- <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
- <action android:name="android.location.MODE_CHANGED" />
- <action android:name="com.android.sync.SYNC_CONN_STATUS_CHANGED" />
- </intent-filter>
- <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
- </receiver>
-
<receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver">
<intent-filter>
<action android:name="android.bluetooth.intent.DISCOVERABLE_TIMEOUT" />
@@ -2627,7 +2523,7 @@
<receiver android:name=".sim.SimSelectNotification">
<intent-filter>
- <action android:name="android.intent.action.SIM_STATE_CHANGED"></action>
+ <action android:name="android.intent.action.SIM_STATE_CHANGED"/>
</intent-filter>
</receiver>
@@ -2645,15 +2541,15 @@
android:name="Settings$SimSettingsActivity"
android:label="@string/sim_settings_title"
android:icon="@drawable/ic_settings_sim"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="com.android.settings.sim.SIM_SUB_INFO_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="2">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS" />
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-2"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.wireless" />
<meta-data android:name="com.android.settings.summary"
@@ -2703,9 +2599,7 @@
<activity
android:name="Settings$WifiCallingSettingsActivity"
- android:label="@string/wifi_calling_settings_title"
- android:taskAffinity="com.android.settings"
- android:parentActivityName="Settings">
+ android:label="@string/wifi_calling_settings_title">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.WIFI_CALLING_SETTINGS" />
@@ -2759,7 +2653,6 @@
<activity
android:name="Settings$OverlaySettingsActivity"
android:label="@string/draw_overlay"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.action.MANAGE_OVERLAY_PERMISSION" />
@@ -2785,7 +2678,6 @@
<activity
android:name="Settings$WriteSettingsActivity"
android:label="@string/write_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.action.MANAGE_WRITE_SETTINGS" />
@@ -2798,7 +2690,6 @@
<activity
android:name="Settings$AppWriteSettingsActivity"
android:label="@string/write_settings_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.action.MANAGE_WRITE_SETTINGS" />
@@ -2812,7 +2703,6 @@
<activity
android:name="Settings$ManageExternalSourcesActivity"
android:label="@string/install_other_apps"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.MANAGE_UNKNOWN_APP_SOURCES" />
@@ -2823,8 +2713,7 @@
</activity>
<activity android:name="Settings$ManageAppExternalSourcesActivity"
- android:label="@string/install_other_apps"
- android:taskAffinity="">
+ android:label="@string/install_other_apps">
<intent-filter android:priority="1">
<action android:name="android.settings.MANAGE_UNKNOWN_APP_SOURCES" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2848,16 +2737,16 @@
android:name="Settings$AdvancedAppsActivity"
android:exported="true"
android:label="@string/app_default_dashboard_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />
<action android:name="android.settings.HOME_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <intent-filter android:priority="120">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
+ <meta-data android:name="com.android.settings.order" android:value="-120"/>
<meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.apps"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -2887,7 +2776,6 @@
<activity android:name=".backup.BackupSettingsActivity"
android:label="@string/privacy_settings_title"
android:icon="@drawable/ic_settings_backup"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.PRIVACY_SETTINGS" />
@@ -2909,7 +2797,6 @@
android:name="Settings$AutomaticStorageManagerSettingsActivity"
android:exported="@bool/config_storage_manager_settings_enabled"
android:label="@string/automatic_storage_manager_settings"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter android:priority="1">
<action android:name="android.settings.STORAGE_MANAGER_SETTINGS" />
@@ -2923,28 +2810,19 @@
android:name=".Settings$AppAndNotificationDashboardActivity"
android:label="@string/app_and_notification_dashboard_title"
android:icon="@drawable/ic_homepage_apps"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
- <intent-filter android:priority="9">
+ <intent-filter>
<action android:name="com.android.settings.action.SETTINGS"/>
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.applications.AppAndNotificationDashboardFragment"/>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage"/>
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/app_and_notification_dashboard_summary"/>
</activity>
<activity
android:name=".Settings$AccountDashboardActivity"
android:label="@string/account_dashboard_title"
android:icon="@drawable/ic_homepage_accounts"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
- <intent-filter android:priority="3">
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
<intent-filter android:priority="1">
<action android:name="android.settings.SYNC_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -2955,8 +2833,6 @@
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.accounts.AccountDashboardFragment"/>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity>
@@ -2965,21 +2841,13 @@
android:name=".Settings$SystemDashboardActivity"
android:label="@string/header_category_system"
android:icon="@drawable/ic_homepage_system_dashboard"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
- <intent-filter android:priority="-1">
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
<intent-filter android:priority="70">
<action android:name="android.intent.action.MAIN" />
<category android:name="com.android.settings.SHORTCUT" />
</intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.system.SystemDashboardFragment"/>
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/system_dashboard_summary"/>
</activity>
<activity android:name=".support.SupportDashboardActivity"
@@ -2987,17 +2855,10 @@
android:icon="@drawable/ic_homepage_support"
android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
android:enabled="@bool/config_support_enabled">
- <intent-filter android:priority="-2">
- <action android:name="com.android.settings.action.SETTINGS"/>
- </intent-filter>
<intent-filter>
<action android:name="com.android.settings.action.SUPPORT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
- <meta-data android:name="com.android.settings.category"
- android:value="com.android.settings.category.ia.homepage"/>
- <meta-data android:name="com.android.settings.summary"
- android:resource="@string/support_summary"/>
</activity>
<service
@@ -3005,9 +2866,6 @@
android:exported="true"
android:permission="android.permission.DUMP" />
- <service android:name=".search.DeviceIndexUpdateJobService"
- android:permission="android.permission.BIND_JOB_SERVICE" />
-
<!-- Quick Settings tiles for Developer Options -->
<service
android:name=".development.qstile.DevelopmentTiles$ShowLayout"
@@ -3049,6 +2907,7 @@
<action android:name="android.service.quicksettings.action.QS_TILE" />
</intent-filter>
</service>
+
<service
android:name=".development.qstile.DevelopmentTiles$WinscopeTrace"
android:label="@string/winscope_trace_quick_settings_title"
@@ -3060,10 +2919,12 @@
</intent-filter>
</service>
- <activity android:name=".HelpTrampoline"
+ <activity
+ android:name=".HelpTrampoline"
android:exported="true"
- android:theme="@android:style/Theme.NoDisplay"
+ android:theme="@style/Transparent"
android:permission="android.permission.DUMP"
+ android:excludeFromRecents="true"
android:enabled="@bool/config_has_help" />
<activity android:name=".applications.autofill.AutofillPickerActivity"
@@ -3086,9 +2947,12 @@
<activity android:name="Settings$AdvancedConnectedDeviceActivity"
android:label="@string/connected_device_connections_title"
- android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$ConnectedDeviceDashboardActivity">
<intent-filter android:priority="1">
+ <action android:name="android.settings.NFC_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <intent-filter android:priority="1">
<action android:name="com.android.settings.ADVANCED_CONNECTED_DEVICE_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
@@ -3099,8 +2963,7 @@
</activity>
<activity android:name="Settings$DirectoryAccessSettingsActivity"
- android:label="@string/directory_access"
- android:taskAffinity="">
+ android:label="@string/directory_access">
<intent-filter>
<action android:name="android.settings.STORAGE_VOLUME_ACCESS_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
@@ -3124,11 +2987,13 @@
</provider>
<receiver
- android:name=".slices.SliceBroadcastReceiver" >
- <intent-filter>
- <action android:name="com.android.settings.slice.action.WIFI_CHANGED"/>
- </intent-filter>
- </receiver>
+ android:name=".slices.SliceBroadcastReceiver"
+ android:exported="false" />
+
+ <receiver
+ android:name=".slices.SliceRelayReceiver"
+ android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"
+ android:exported="true" />
<!-- Couldn't be triggered from outside of settings. Statsd can trigger it because we send
PendingIntent to it-->
@@ -3151,6 +3016,21 @@
<service android:name=".fuelgauge.batterytip.AnomalyDetectionJobService"
android:permission="android.permission.BIND_JOB_SERVICE" />
+ <provider
+ android:name=".homepage.contextualcards.CardContentProvider"
+ android:authorities="com.android.settings.homepage.CardContentProvider"
+ android:exported="true"
+ android:permission="android.permission.WRITE_SETTINGS_HOMEPAGE_DATA" />
+
+ <provider
+ android:name=".homepage.contextualcards.SettingsContextualCardProvider"
+ android:authorities="com.android.settings.homepage.contextualcards"
+ android:permission="android.permission.WRITE_SETTINGS_HOMEPAGE_DATA"
+ android:exported="true">
+ <intent-filter>
+ <action android:name="android.content.action.SETTINGS_HOMEPAGE_DATA"/>
+ </intent-filter>
+ </provider>
<!-- This is the longest AndroidManifest.xml ever. -->
</application>
</manifest>
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index c2b8ed5..d28f2d1 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -2,6 +2,18 @@
<issues format="4">
<issue
+ id="LintError"
+ severity="Error"
+ message="No `.class` files were found in project ".", so none of the classfile based checks could be run. Does the project need to be built first?"
+ category="Lint"
+ priority="10"
+ summary="Lint Failure"
+ explanation="This issue type represents a problem running lint itself. Examples include failure to find bytecode for source files (which means certain detectors could not be run), parsing errors in lint configuration files, etc.
These errors are not errors in your own code, but they are shown to make it clear that some checks were not completed.">
+ <location
+ file="."/>
+ </issue>
+
+ <issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
@@ -25,22 +37,6 @@
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
- errorLine1=" app:barPredictionColor="@color/material_empty_color_light""
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="res/layout/battery_history_chart.xml"
- line="38"
- column="9"/>
- </issue>
-
- <issue
- id="HardCodedColor"
- severity="Error"
- message="Avoid using hardcoded color"
- category="Correctness"
- priority="4"
- summary="Using hardcoded color"
- explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:textColor="@color/bluetooth_dialog_text_color" />"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
@@ -1225,11 +1221,27 @@
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" <color name="homepage_location_background">#1A73E8</color>"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="128"
+ column="5"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" <color name="battery_good_color_light">#43a047</color> <!-- Material Green 600 -->"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="132"
+ line="133"
column="5"/>
</issue>
@@ -1245,7 +1257,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="133"
+ line="134"
column="5"/>
</issue>
@@ -1261,7 +1273,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="134"
+ line="135"
column="5"/>
</issue>
@@ -1277,7 +1289,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="135"
+ line="136"
column="5"/>
</issue>
@@ -1293,7 +1305,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="136"
+ line="137"
column="5"/>
</issue>
@@ -1309,7 +1321,87 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/colors.xml"
- line="137"
+ line="138"
+ column="5"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" <color name="face_anim_particle_color_1">#ff00bcd4</color> <!-- Material Cyan 500 -->"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="141"
+ column="5"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" <color name="face_anim_particle_color_2">#ffef6c00</color> <!-- Material Orange 800 -->"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="142"
+ column="5"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" <color name="face_anim_particle_color_3">#ff4caf50</color> <!-- Material Green 500 -->"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="143"
+ column="5"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" <color name="face_anim_particle_color_4">#fffdd835</color> <!-- Material Yellow 600 -->"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="144"
+ column="5"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" <color name="face_anim_particle_error">#ff9e9e9e</color> <!-- Material Gray 500 -->"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/values/colors.xml"
+ line="145"
column="5"/>
</issue>
@@ -1433,22 +1525,6 @@
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
- errorLine1=" settings:fillColorSecondary="#ff80cbc4""
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="res/layout/data_usage_chart.xml"
- line="47"
- column="9"/>
- </issue>
-
- <issue
- id="HardCodedColor"
- severity="Error"
- message="Avoid using hardcoded color"
- category="Correctness"
- priority="4"
- summary="Using hardcoded color"
- explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:background="#80000000""
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
@@ -1801,6 +1877,38 @@
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" android:color="@color/homepage_location_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_homepage_location.xml"
+ line="23"
+ column="17"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" android:color="@color/homepage_location_background" />"
+ errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+ <location
+ file="res/drawable/ic_preference_location.xml"
+ line="23"
+ column="17"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:color="@color/homepage_support_background" />"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
@@ -2333,7 +2441,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rXC/strings.xml"
- line="2559"
+ line="2524"
column="168"/>
</issue>
@@ -2349,7 +2457,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rAU/strings.xml"
- line="2560"
+ line="2525"
column="64"/>
</issue>
@@ -2365,7 +2473,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rCA/strings.xml"
- line="2560"
+ line="2525"
column="64"/>
</issue>
@@ -2381,7 +2489,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rGB/strings.xml"
- line="2560"
+ line="2525"
column="64"/>
</issue>
@@ -2397,7 +2505,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values-en-rIN/strings.xml"
- line="2560"
+ line="2525"
column="64"/>
</issue>
@@ -2413,7 +2521,7 @@
errorLine2=" ~~~~~~~~~~~~~~~~~~~">
<location
file="res/values/strings.xml"
- line="5902"
+ line="5865"
column="36"/>
</issue>
@@ -2557,7 +2665,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="147"
+ line="151"
column="45"/>
</issue>
@@ -2573,7 +2681,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="148"
+ line="152"
column="49"/>
</issue>
@@ -2589,7 +2697,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="156"
+ line="160"
column="45"/>
</issue>
@@ -2605,7 +2713,7 @@
errorLine2=" ^">
<location
file="res/values/themes.xml"
- line="157"
+ line="161"
column="49"/>
</issue>
@@ -2617,6 +2725,22 @@
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+ errorLine1=" <item name="android:navigationBarDividerColor">#1f000000</item>"
+ errorLine2=" ^">
+ <location
+ file="res/values/themes.xml"
+ line="175"
+ column="56"/>
+ </issue>
+
+ <issue
+ id="HardCodedColor"
+ severity="Error"
+ message="Avoid using hardcoded color"
+ category="Correctness"
+ priority="4"
+ summary="Using hardcoded color"
+ explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.
This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" <item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>"
errorLine2=" ^">
<location
diff --git a/libs/contextualcards.aar b/libs/contextualcards.aar
new file mode 100755
index 0000000..5e855fa
--- /dev/null
+++ b/libs/contextualcards.aar
Binary files differ
diff --git a/proguard.flags b/proguard.flags
index 298058d..b66a786 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -56,3 +56,13 @@
public static ** SUMMARY_PROVIDER_FACTORY;
}
-keep class androidx.core.app.CoreComponentFactory
+
+# Keep classes that implements CustomSliceable, which are used by reflection.
+-keepclasseswithmembers class * implements com.android.settings.slices.CustomSliceable {
+ public <init>(android.content.Context);
+}
+
+# Keep classes that extends SliceBackgroundWorker, which are used by reflection.
+-keepclasseswithmembers class * extends com.android.settings.slices.SliceBackgroundWorker {
+ public <init>(android.content.Context, android.net.Uri);
+}
diff --git a/protos/Android.bp b/protos/Android.bp
new file mode 100644
index 0000000..533dbca
--- /dev/null
+++ b/protos/Android.bp
@@ -0,0 +1,8 @@
+java_library_static {
+ name: "settings-contextual-card-protos-lite",
+ host_supported: true,
+ proto: {
+ type: "lite",
+ },
+ srcs: ["contextual_card_list.proto"],
+}
\ No newline at end of file
diff --git a/protos/contextual_card_list.proto b/protos/contextual_card_list.proto
new file mode 100644
index 0000000..89e6c13
--- /dev/null
+++ b/protos/contextual_card_list.proto
@@ -0,0 +1,19 @@
+syntax = "proto2";
+
+package com.android.settings.intelligence;
+option java_outer_classname = "ContextualCardProto";
+
+message ContextualCardList {
+ repeated ContextualCard card = 1;
+}
+
+message ContextualCard {
+ // Slice uri of the contextual card
+ optional string sliceUri = 1;
+
+ // {@link ContextualCardCategory}.
+ optional int32 category = 2;
+
+ // Name of the card. It should be identical in every app
+ optional string cardName = 3;
+}
\ No newline at end of file
diff --git a/res/anim/confirm_credential_biometric_transition_enter.xml b/res/anim/confirm_credential_biometric_transition_enter.xml
new file mode 100644
index 0000000..56f3593
--- /dev/null
+++ b/res/anim/confirm_credential_biometric_transition_enter.xml
@@ -0,0 +1,24 @@
+<?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
+ -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shareInterpolator="false"
+ android:zAdjustment="top">
+ <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+ android:interpolator="@android:interpolator/linear_out_slow_in"
+ android:duration="350"/>
+</set>
\ No newline at end of file
diff --git a/res/anim/confirm_credential_biometric_transition_exit.xml b/res/anim/confirm_credential_biometric_transition_exit.xml
new file mode 100644
index 0000000..debdce2
--- /dev/null
+++ b/res/anim/confirm_credential_biometric_transition_exit.xml
@@ -0,0 +1,24 @@
+<?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
+ -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shareInterpolator="false"
+ android:zAdjustment="top">
+ <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+ android:interpolator="@android:interpolator/linear_out_slow_in"
+ android:duration="350" />
+</set>
\ No newline at end of file
diff --git a/res/anim/item_animation_fall_down.xml b/res/anim/item_animation_fall_down.xml
new file mode 100644
index 0000000..df2451c
--- /dev/null
+++ b/res/anim/item_animation_fall_down.xml
@@ -0,0 +1,42 @@
+<?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.
+ -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+ android:duration="500">
+
+ <!-- Move up the view by 20% of it’s own height, and let it fall down to its final position -->
+ <translate
+ android:fromYDelta="-20%"
+ android:toYDelta="0"
+ android:interpolator="@android:anim/decelerate_interpolator"/>
+
+ <!-- Fade in: alpha from 0 to 100% -->
+ <alpha
+ android:fromAlpha="0"
+ android:toAlpha="1"
+ android:interpolator="@android:anim/decelerate_interpolator"/>
+
+ <!-- Shrink from 105% to 100% -->
+ <scale
+ android:fromXScale="105%"
+ android:fromYScale="105%"
+ android:toXScale="100%"
+ android:toYScale="100%"
+ android:pivotX="50%"
+ android:pivotY="50%"
+ android:interpolator="@android:anim/decelerate_interpolator"/>
+</set>
\ No newline at end of file
diff --git a/res/layout/search_icon_view.xml b/res/anim/layout_animation_fall_down.xml
similarity index 62%
rename from res/layout/search_icon_view.xml
rename to res/anim/layout_animation_fall_down.xml
index aa0bf02..f39735c 100644
--- a/res/layout/search_icon_view.xml
+++ b/res/anim/layout_animation_fall_down.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright (C) 2017 The Android Open Source Project
+ 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.
@@ -15,11 +15,8 @@
limitations under the License.
-->
-<ImageView
+<layoutAnimation
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/icon"
- android:layout_width="@dimen/dashboard_tile_foreground_image_size"
- android:layout_height="match_parent"
- android:scaleType="centerInside"
- android:layout_marginStart="@dimen/dashboard_tile_image_margin"
- android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
+ android:animation="@anim/item_animation_fall_down"
+ android:delay="15%"
+ android:animationOrder="normal"/>
\ No newline at end of file
diff --git a/res/layout/dashboard_spacer.xml b/res/color/bottom_navigation_colors.xml
similarity index 63%
copy from res/layout/dashboard_spacer.xml
copy to res/color/bottom_navigation_colors.xml
index 3ebcb09..659ef50 100644
--- a/res/layout/dashboard_spacer.xml
+++ b/res/color/bottom_navigation_colors.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!--
+ 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.
@@ -14,8 +15,11 @@
limitations under the License.
-->
-<View
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="8dp"
- android:background="?android:attr/colorSecondary"/>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:state_checked="true"
+ android:color="?android:attr/colorAccent" />
+ <item
+ android:state_checked="false"
+ android:color="?android:attr/textColorPrimary" />
+</selector>
\ No newline at end of file
diff --git a/res/drawable-hdpi/appwidget_bg_holo.9.png b/res/drawable-hdpi/appwidget_bg_holo.9.png
deleted file mode 100644
index 9dc01d7..0000000
--- a/res/drawable-hdpi/appwidget_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-hdpi/appwidget_inner_focused_c_holo.9.png
deleted file mode 100644
index 47f7af0..0000000
--- a/res/drawable-hdpi/appwidget_inner_focused_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-hdpi/appwidget_inner_focused_l_holo.9.png
deleted file mode 100644
index 4eae69c..0000000
--- a/res/drawable-hdpi/appwidget_inner_focused_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-hdpi/appwidget_inner_focused_r_holo.9.png
deleted file mode 100644
index 598ae03..0000000
--- a/res/drawable-hdpi/appwidget_inner_focused_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
deleted file mode 100644
index 056ee4a..0000000
--- a/res/drawable-hdpi/appwidget_inner_pressed_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
deleted file mode 100644
index 2cb3a54..0000000
--- a/res/drawable-hdpi/appwidget_inner_pressed_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
deleted file mode 100644
index 034b994..0000000
--- a/res/drawable-hdpi/appwidget_inner_pressed_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_divider_holo.9.png b/res/drawable-hdpi/appwidget_settings_divider_holo.9.png
deleted file mode 100644
index cfe0f3b..0000000
--- a/res/drawable-hdpi/appwidget_settings_divider_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png
deleted file mode 100644
index 60c0da4..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png
deleted file mode 100644
index 7cedcd5..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png
deleted file mode 100644
index 19f08b4..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_mid_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png
deleted file mode 100644
index d4d4688..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_off_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png
deleted file mode 100644
index d06dc98..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_off_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png
deleted file mode 100644
index d287c8e..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_off_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
deleted file mode 100644
index d37af4e..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_on_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
deleted file mode 100644
index 60dac8b..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_on_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
deleted file mode 100644
index d68a538..0000000
--- a/res/drawable-hdpi/appwidget_settings_ind_on_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-hdpi/ic_accessibility_generic.png b/res/drawable-hdpi/ic_accessibility_generic.png
similarity index 100%
rename from res/mipmap-hdpi/ic_accessibility_generic.png
rename to res/drawable-hdpi/ic_accessibility_generic.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png
deleted file mode 100644
index 1dd1a931..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png
deleted file mode 100644
index 86d5fa0..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_bluetooth_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png
deleted file mode 100644
index 5f4a87a..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_auto_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png
deleted file mode 100644
index abbe883..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_full_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_half_holo.png
deleted file mode 100644
index 6217e55..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_half_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_brightness_off_holo.png
deleted file mode 100644
index 877454d..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_brightness_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_location_off_holo.png
deleted file mode 100644
index 58fd997..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_location_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_location_on_holo.png
deleted file mode 100644
index b1ce371..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_location_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_location_saving_holo.png b/res/drawable-hdpi/ic_appwidget_settings_location_saving_holo.png
deleted file mode 100644
index e1fe786..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_location_saving_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_sync_off_holo.png
deleted file mode 100644
index c31ef00..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_sync_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png
deleted file mode 100644
index 2f47235..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_sync_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_off_holo.png
deleted file mode 100644
index aa6cf26..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_wifi_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png
deleted file mode 100644
index 64c3992..0000000
--- a/res/drawable-hdpi/ic_appwidget_settings_wifi_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_grayedout_printer.png b/res/drawable-hdpi/ic_grayedout_printer.png
deleted file mode 100644
index 5e54970..0000000
--- a/res/drawable-hdpi/ic_grayedout_printer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-ldrtl-hdpi/ic_appwidget_settings_brightness_half_holo.png
deleted file mode 100644
index 9d8b24a..0000000
--- a/res/drawable-ldrtl-hdpi/ic_appwidget_settings_brightness_half_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-ldrtl-mdpi/ic_appwidget_settings_brightness_half_holo.png
deleted file mode 100644
index 90941e4..0000000
--- a/res/drawable-ldrtl-mdpi/ic_appwidget_settings_brightness_half_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-ldrtl-xhdpi/ic_appwidget_settings_brightness_half_holo.png
deleted file mode 100644
index b06324e..0000000
--- a/res/drawable-ldrtl-xhdpi/ic_appwidget_settings_brightness_half_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_bg_holo.9.png b/res/drawable-mdpi/appwidget_bg_holo.9.png
deleted file mode 100644
index cdfa203..0000000
--- a/res/drawable-mdpi/appwidget_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-mdpi/appwidget_inner_focused_c_holo.9.png
deleted file mode 100644
index 45332bd..0000000
--- a/res/drawable-mdpi/appwidget_inner_focused_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-mdpi/appwidget_inner_focused_l_holo.9.png
deleted file mode 100644
index 36605a6..0000000
--- a/res/drawable-mdpi/appwidget_inner_focused_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-mdpi/appwidget_inner_focused_r_holo.9.png
deleted file mode 100644
index 70fd6bd..0000000
--- a/res/drawable-mdpi/appwidget_inner_focused_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
deleted file mode 100644
index b717279..0000000
--- a/res/drawable-mdpi/appwidget_inner_pressed_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
deleted file mode 100644
index 45a0175..0000000
--- a/res/drawable-mdpi/appwidget_inner_pressed_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
deleted file mode 100644
index f06d3c3..0000000
--- a/res/drawable-mdpi/appwidget_inner_pressed_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_divider_holo.9.png b/res/drawable-mdpi/appwidget_settings_divider_holo.9.png
deleted file mode 100644
index 27e35a3..0000000
--- a/res/drawable-mdpi/appwidget_settings_divider_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png
deleted file mode 100644
index 22aedaa..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png
deleted file mode 100644
index f71c3c3..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png
deleted file mode 100644
index 3621791..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_mid_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png
deleted file mode 100644
index 80b3d3c..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_off_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png
deleted file mode 100644
index 30c05d9..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_off_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png
deleted file mode 100644
index 7253365..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_off_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
deleted file mode 100644
index c9d9f7e..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_on_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
deleted file mode 100644
index 5c0a157..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_on_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
deleted file mode 100644
index 48bf90d..0000000
--- a/res/drawable-mdpi/appwidget_settings_ind_on_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-mdpi/ic_accessibility_generic.png b/res/drawable-mdpi/ic_accessibility_generic.png
similarity index 100%
rename from res/mipmap-mdpi/ic_accessibility_generic.png
rename to res/drawable-mdpi/ic_accessibility_generic.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png
deleted file mode 100644
index 8f30b90..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png
deleted file mode 100644
index f921eb9..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_bluetooth_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png
deleted file mode 100644
index b726c17..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_auto_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png
deleted file mode 100644
index 82b0101..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_full_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_half_holo.png
deleted file mode 100644
index ad6f15e..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_half_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_brightness_off_holo.png
deleted file mode 100644
index 20a6fcf..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_brightness_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_location_off_holo.png
deleted file mode 100644
index 15bb918..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_location_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_location_on_holo.png
deleted file mode 100644
index a7bca04..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_location_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_location_saving_holo.png b/res/drawable-mdpi/ic_appwidget_settings_location_saving_holo.png
deleted file mode 100644
index dec6059..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_location_saving_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_sync_off_holo.png
deleted file mode 100644
index 4fe5573..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_sync_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png
deleted file mode 100644
index fa37c63..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_sync_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_off_holo.png
deleted file mode 100644
index b10cd36..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_wifi_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png
deleted file mode 100644
index 7a56cf2..0000000
--- a/res/drawable-mdpi/ic_appwidget_settings_wifi_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_grayedout_printer.png b/res/drawable-mdpi/ic_grayedout_printer.png
deleted file mode 100644
index 5e54970..0000000
--- a/res/drawable-mdpi/ic_grayedout_printer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-nodpi/gesture_ambient_wake_lock_screen b/res/drawable-nodpi/gesture_ambient_wake_lock_screen
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/drawable-nodpi/gesture_ambient_wake_lock_screen
diff --git a/res/drawable-nodpi/gesture_ambient_wake_screen b/res/drawable-nodpi/gesture_ambient_wake_screen
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/drawable-nodpi/gesture_ambient_wake_screen
diff --git a/res/drawable-nodpi/preview.png b/res/drawable-nodpi/preview.png
deleted file mode 100644
index 0ffb700..0000000
--- a/res/drawable-nodpi/preview.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_bg_holo.9.png b/res/drawable-xhdpi/appwidget_bg_holo.9.png
deleted file mode 100644
index 454e84a..0000000
--- a/res/drawable-xhdpi/appwidget_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-xhdpi/appwidget_inner_focused_c_holo.9.png
deleted file mode 100644
index 5aafacd..0000000
--- a/res/drawable-xhdpi/appwidget_inner_focused_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-xhdpi/appwidget_inner_focused_l_holo.9.png
deleted file mode 100644
index 3161a7a..0000000
--- a/res/drawable-xhdpi/appwidget_inner_focused_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-xhdpi/appwidget_inner_focused_r_holo.9.png
deleted file mode 100644
index 5e7968a..0000000
--- a/res/drawable-xhdpi/appwidget_inner_focused_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
deleted file mode 100644
index de40bd0..0000000
--- a/res/drawable-xhdpi/appwidget_inner_pressed_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
deleted file mode 100644
index 1802d9a..0000000
--- a/res/drawable-xhdpi/appwidget_inner_pressed_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
deleted file mode 100644
index d5971c2..0000000
--- a/res/drawable-xhdpi/appwidget_inner_pressed_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_divider_holo.9.png b/res/drawable-xhdpi/appwidget_settings_divider_holo.9.png
deleted file mode 100644
index 940c1ed..0000000
--- a/res/drawable-xhdpi/appwidget_settings_divider_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png
deleted file mode 100644
index 12fbb33..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_mid_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png
deleted file mode 100644
index 76677ee..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_mid_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png
deleted file mode 100644
index 3a32944..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_mid_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png
deleted file mode 100644
index ed8f93e..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_off_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png
deleted file mode 100644
index 706af0b..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_off_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png
deleted file mode 100644
index 5f24769..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_off_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
deleted file mode 100644
index 94f1068..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_on_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
deleted file mode 100644
index e9b5749..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_on_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
deleted file mode 100644
index be6b9ff..0000000
--- a/res/drawable-xhdpi/appwidget_settings_ind_on_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_accessibility_generic.png b/res/drawable-xhdpi/ic_accessibility_generic.png
similarity index 100%
rename from res/mipmap-xhdpi/ic_accessibility_generic.png
rename to res/drawable-xhdpi/ic_accessibility_generic.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png
deleted file mode 100644
index 4c1fa33..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png
deleted file mode 100644
index 7e2ac3a..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_bluetooth_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png
deleted file mode 100644
index eab788f..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_brightness_auto_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png
deleted file mode 100644
index 9b60097..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_brightness_full_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_half_holo.png
deleted file mode 100644
index 39f069b..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_brightness_half_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_brightness_off_holo.png
deleted file mode 100644
index a941265..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_brightness_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_location_off_holo.png
deleted file mode 100644
index e1a600c..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_location_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_location_on_holo.png
deleted file mode 100644
index 982573a..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_location_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_location_saving_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_location_saving_holo.png
deleted file mode 100644
index c62edce..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_location_saving_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_sync_off_holo.png
deleted file mode 100644
index 18c7d3a..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_sync_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png
deleted file mode 100644
index c9f3878..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_sync_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_wifi_off_holo.png
deleted file mode 100644
index ab7bc0a..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_wifi_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png
deleted file mode 100644
index 596ce06..0000000
--- a/res/drawable-xhdpi/ic_appwidget_settings_wifi_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_grayedout_printer.png b/res/drawable-xhdpi/ic_grayedout_printer.png
deleted file mode 100644
index 5e54970..0000000
--- a/res/drawable-xhdpi/ic_grayedout_printer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_bg_holo.9.png b/res/drawable-xxhdpi/appwidget_bg_holo.9.png
deleted file mode 100644
index 3fb2598..0000000
--- a/res/drawable-xxhdpi/appwidget_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-xxhdpi/appwidget_inner_focused_c_holo.9.png
deleted file mode 100644
index 7f64682..0000000
--- a/res/drawable-xxhdpi/appwidget_inner_focused_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-xxhdpi/appwidget_inner_focused_l_holo.9.png
deleted file mode 100644
index 0606b4d..0000000
--- a/res/drawable-xxhdpi/appwidget_inner_focused_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-xxhdpi/appwidget_inner_focused_r_holo.9.png
deleted file mode 100644
index cb27941..0000000
--- a/res/drawable-xxhdpi/appwidget_inner_focused_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-xxhdpi/appwidget_inner_pressed_c_holo.9.png
deleted file mode 100644
index 7b37e25..0000000
--- a/res/drawable-xxhdpi/appwidget_inner_pressed_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-xxhdpi/appwidget_inner_pressed_l_holo.9.png
deleted file mode 100644
index ab37d2d..0000000
--- a/res/drawable-xxhdpi/appwidget_inner_pressed_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-xxhdpi/appwidget_inner_pressed_r_holo.9.png
deleted file mode 100644
index 820d2b0..0000000
--- a/res/drawable-xxhdpi/appwidget_inner_pressed_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_divider_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_divider_holo.9.png
deleted file mode 100644
index 0b46314..0000000
--- a/res/drawable-xxhdpi/appwidget_settings_divider_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_mid_c_holo.9.png
deleted file mode 100644
index a55d364..0000000
--- a/res/drawable-xxhdpi/appwidget_settings_ind_mid_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_mid_l_holo.9.png
deleted file mode 100644
index e7d8c3b..0000000
--- a/res/drawable-xxhdpi/appwidget_settings_ind_mid_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_mid_r_holo.9.png
deleted file mode 100644
index cabc30a..0000000
--- a/res/drawable-xxhdpi/appwidget_settings_ind_mid_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_off_c_holo.9.png
deleted file mode 100644
index a6a0e30..0000000
--- a/res/drawable-xxhdpi/appwidget_settings_ind_off_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_off_l_holo.9.png
deleted file mode 100644
index 8a20e01..0000000
--- a/res/drawable-xxhdpi/appwidget_settings_ind_off_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_off_r_holo.9.png
deleted file mode 100644
index 2388b27..0000000
--- a/res/drawable-xxhdpi/appwidget_settings_ind_off_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_on_c_holo.9.png
deleted file mode 100644
index 3663f0a..0000000
--- a/res/drawable-xxhdpi/appwidget_settings_ind_on_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_on_l_holo.9.png
deleted file mode 100644
index 745f198..0000000
--- a/res/drawable-xxhdpi/appwidget_settings_ind_on_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-xxhdpi/appwidget_settings_ind_on_r_holo.9.png
deleted file mode 100644
index 5b2c64e..0000000
--- a/res/drawable-xxhdpi/appwidget_settings_ind_on_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_accessibility_generic.png b/res/drawable-xxhdpi/ic_accessibility_generic.png
similarity index 100%
rename from res/mipmap-xxhdpi/ic_accessibility_generic.png
rename to res/drawable-xxhdpi/ic_accessibility_generic.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_bluetooth_off_holo.png
deleted file mode 100644
index e77786f..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_bluetooth_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_bluetooth_on_holo.png
deleted file mode 100644
index e56ed35..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_bluetooth_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_brightness_auto_holo.png
deleted file mode 100644
index 9cce06f..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_brightness_auto_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_brightness_full_holo.png
deleted file mode 100644
index 0a709a9..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_brightness_full_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_brightness_half_holo.png
deleted file mode 100644
index ddd8108..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_brightness_half_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_brightness_off_holo.png
deleted file mode 100644
index 02ed6e7..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_brightness_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_location_off_holo.png
deleted file mode 100644
index ce1797c..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_location_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_location_on_holo.png
deleted file mode 100644
index ab45286..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_location_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_location_saving_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_location_saving_holo.png
deleted file mode 100644
index 6268610..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_location_saving_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_sync_off_holo.png
deleted file mode 100644
index 88e0871..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_sync_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_sync_on_holo.png
deleted file mode 100644
index 56ebba1..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_sync_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_wifi_off_holo.png
deleted file mode 100644
index 1fb8019..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_wifi_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-xxhdpi/ic_appwidget_settings_wifi_on_holo.png
deleted file mode 100644
index 128c561..0000000
--- a/res/drawable-xxhdpi/ic_appwidget_settings_wifi_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_bg_holo.9.png b/res/drawable-xxxhdpi/appwidget_bg_holo.9.png
deleted file mode 100644
index 39b88d9..0000000
--- a/res/drawable-xxxhdpi/appwidget_bg_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_inner_focused_c_holo.9.png b/res/drawable-xxxhdpi/appwidget_inner_focused_c_holo.9.png
deleted file mode 100644
index 4eee026..0000000
--- a/res/drawable-xxxhdpi/appwidget_inner_focused_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_inner_focused_l_holo.9.png b/res/drawable-xxxhdpi/appwidget_inner_focused_l_holo.9.png
deleted file mode 100644
index 6af3bff..0000000
--- a/res/drawable-xxxhdpi/appwidget_inner_focused_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_inner_focused_r_holo.9.png b/res/drawable-xxxhdpi/appwidget_inner_focused_r_holo.9.png
deleted file mode 100644
index ac337c7..0000000
--- a/res/drawable-xxxhdpi/appwidget_inner_focused_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_inner_pressed_c_holo.9.png b/res/drawable-xxxhdpi/appwidget_inner_pressed_c_holo.9.png
deleted file mode 100644
index 10289ea..0000000
--- a/res/drawable-xxxhdpi/appwidget_inner_pressed_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_inner_pressed_l_holo.9.png b/res/drawable-xxxhdpi/appwidget_inner_pressed_l_holo.9.png
deleted file mode 100644
index 00da8e9..0000000
--- a/res/drawable-xxxhdpi/appwidget_inner_pressed_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_inner_pressed_r_holo.9.png b/res/drawable-xxxhdpi/appwidget_inner_pressed_r_holo.9.png
deleted file mode 100644
index 7c94a7c..0000000
--- a/res/drawable-xxxhdpi/appwidget_inner_pressed_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_settings_divider_holo.9.png b/res/drawable-xxxhdpi/appwidget_settings_divider_holo.9.png
deleted file mode 100644
index f7ad910..0000000
--- a/res/drawable-xxxhdpi/appwidget_settings_divider_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_settings_ind_mid_c_holo.9.png b/res/drawable-xxxhdpi/appwidget_settings_ind_mid_c_holo.9.png
deleted file mode 100644
index 08b1faf..0000000
--- a/res/drawable-xxxhdpi/appwidget_settings_ind_mid_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_settings_ind_mid_l_holo.9.png b/res/drawable-xxxhdpi/appwidget_settings_ind_mid_l_holo.9.png
deleted file mode 100644
index 25d80b2..0000000
--- a/res/drawable-xxxhdpi/appwidget_settings_ind_mid_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_settings_ind_mid_r_holo.9.png b/res/drawable-xxxhdpi/appwidget_settings_ind_mid_r_holo.9.png
deleted file mode 100644
index 83aa90d..0000000
--- a/res/drawable-xxxhdpi/appwidget_settings_ind_mid_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_settings_ind_off_c_holo.9.png b/res/drawable-xxxhdpi/appwidget_settings_ind_off_c_holo.9.png
deleted file mode 100644
index 928ab68..0000000
--- a/res/drawable-xxxhdpi/appwidget_settings_ind_off_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_settings_ind_off_l_holo.9.png b/res/drawable-xxxhdpi/appwidget_settings_ind_off_l_holo.9.png
deleted file mode 100644
index 77e3ef6..0000000
--- a/res/drawable-xxxhdpi/appwidget_settings_ind_off_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_settings_ind_off_r_holo.9.png b/res/drawable-xxxhdpi/appwidget_settings_ind_off_r_holo.9.png
deleted file mode 100644
index 52ac956..0000000
--- a/res/drawable-xxxhdpi/appwidget_settings_ind_off_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_settings_ind_on_c_holo.9.png b/res/drawable-xxxhdpi/appwidget_settings_ind_on_c_holo.9.png
deleted file mode 100644
index 4747a89..0000000
--- a/res/drawable-xxxhdpi/appwidget_settings_ind_on_c_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_settings_ind_on_l_holo.9.png b/res/drawable-xxxhdpi/appwidget_settings_ind_on_l_holo.9.png
deleted file mode 100644
index a0de1b0..0000000
--- a/res/drawable-xxxhdpi/appwidget_settings_ind_on_l_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/appwidget_settings_ind_on_r_holo.9.png b/res/drawable-xxxhdpi/appwidget_settings_ind_on_r_holo.9.png
deleted file mode 100644
index 04a616b..0000000
--- a/res/drawable-xxxhdpi/appwidget_settings_ind_on_r_holo.9.png
+++ /dev/null
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_accessibility_generic.png b/res/drawable-xxxhdpi/ic_accessibility_generic.png
similarity index 100%
rename from res/mipmap-xxxhdpi/ic_accessibility_generic.png
rename to res/drawable-xxxhdpi/ic_accessibility_generic.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_bluetooth_off_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_bluetooth_off_holo.png
deleted file mode 100644
index bed7f49..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_bluetooth_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_bluetooth_on_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_bluetooth_on_holo.png
deleted file mode 100644
index fd15e3c..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_bluetooth_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_auto_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_auto_holo.png
deleted file mode 100644
index fa2fb13..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_auto_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_full_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_full_holo.png
deleted file mode 100644
index d176c2e..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_full_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_half_holo.png
deleted file mode 100644
index 0f24645..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_half_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_off_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_off_holo.png
deleted file mode 100644
index ed34dd3..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_brightness_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_location_off_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_location_off_holo.png
deleted file mode 100644
index e7d7560..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_location_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_location_on_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_location_on_holo.png
deleted file mode 100644
index 9e1222b..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_location_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_location_saving_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_location_saving_holo.png
deleted file mode 100644
index 309bde4..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_location_saving_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_sync_off_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_sync_off_holo.png
deleted file mode 100644
index 5c45bb5..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_sync_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_sync_on_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_sync_on_holo.png
deleted file mode 100644
index 07fd56f..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_sync_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_wifi_off_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_wifi_off_holo.png
deleted file mode 100644
index 392aaf4..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_wifi_off_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_appwidget_settings_wifi_on_holo.png b/res/drawable-xxxhdpi/ic_appwidget_settings_wifi_on_holo.png
deleted file mode 100644
index a8b4772..0000000
--- a/res/drawable-xxxhdpi/ic_appwidget_settings_wifi_on_holo.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/appwidget_button_center.xml b/res/drawable/appwidget_button_center.xml
deleted file mode 100644
index 3af32e5..0000000
--- a/res/drawable/appwidget_button_center.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_pressed="true"
- android:drawable="@drawable/appwidget_inner_pressed_c_holo" />
-
- <item android:state_focused="true" android:state_enabled="true"
- android:state_window_focused="true"
- android:drawable="@drawable/appwidget_inner_focused_c_holo" />
-
- <item
- android:drawable="@android:color/transparent" />
-</selector>
diff --git a/res/drawable/appwidget_button_left.xml b/res/drawable/appwidget_button_left.xml
deleted file mode 100644
index e13cf99..0000000
--- a/res/drawable/appwidget_button_left.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_pressed="true"
- android:drawable="@drawable/appwidget_inner_pressed_l_holo" />
-
- <item android:state_focused="true" android:state_enabled="true"
- android:state_window_focused="true"
- android:drawable="@drawable/appwidget_inner_focused_l_holo" />
-
- <item
- android:drawable="@android:color/transparent" />
-</selector>
diff --git a/res/drawable/appwidget_button_right.xml b/res/drawable/appwidget_button_right.xml
deleted file mode 100644
index e29c2fe..0000000
--- a/res/drawable/appwidget_button_right.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
- <item android:state_pressed="true"
- android:drawable="@drawable/appwidget_inner_pressed_r_holo" />
-
- <item android:state_focused="true" android:state_enabled="true"
- android:state_window_focused="true"
- android:drawable="@drawable/appwidget_inner_focused_r_holo" />
-
- <item
- android:drawable="@android:color/transparent" />
-</selector>
diff --git a/res/drawable/drag_handle.xml b/res/drawable/drag_handle.xml
index 835ac5b..1e3efeb 100644
--- a/res/drawable/drag_handle.xml
+++ b/res/drawable/drag_handle.xml
@@ -15,13 +15,13 @@
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
android:width="24dp"
- android:viewportHeight="48"
- android:viewportWidth="48"
- android:tint="@color/material_grey_600">
-
- <path android:fillColor="@android:color/white"
- android:pathData="M6,30h36v-4L6,26v4zM6,38h36v-4L6,34v4zM6,22h36L42,18L6,18v4zM6,10v4h36L42,10L6,10z" />
-
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z"/>
</vector>
+
diff --git a/res/drawable/ic_account_circle_24dp.xml b/res/drawable/ic_account_circle_24dp.xml
new file mode 100644
index 0000000..8445adc
--- /dev/null
+++ b/res/drawable/ic_account_circle_24dp.xml
@@ -0,0 +1,27 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="#ff4285f4"
+ android:pathData="M12,2C6.48,2 2,6.48 2,12c0,5.52 4.48,10 10,10c5.52,0 10,-4.48 10,-10C22,6.48 17.52,2 12,2zM7.07,18.28c0.43,-0.9 3.05,-1.78 4.93,-1.78s4.51,0.88 4.93,1.78C15.57,19.36 13.86,20 12,20S8.43,19.36 7.07,18.28zM18.36,16.83c-1.43,-1.74 -4.9,-2.33 -6.36,-2.33s-4.93,0.59 -6.36,2.33C4.62,15.49 4,13.82 4,12c0,-4.41 3.59,-8 8,-8c4.41,0 8,3.59 8,8C20,13.82 19.38,15.49 18.36,16.83z"/>
+ <path
+ android:fillColor="#ff4285f4"
+ android:pathData="M12,6c-1.94,0 -3.5,1.56 -3.5,3.5S10.06,13 12,13c1.94,0 3.5,-1.56 3.5,-3.5S13.94,6 12,6zM12,11c-0.83,0 -1.5,-0.67 -1.5,-1.5C10.5,8.67 11.17,8 12,8c0.83,0 1.5,0.67 1.5,1.5C13.5,10.33 12.83,11 12,11z"/>
+</vector>
diff --git a/res/drawable/ic_add.xml b/res/drawable/ic_add.xml
deleted file mode 100644
index e4ced7d..0000000
--- a/res/drawable/ic_add.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="48.0"
- android:viewportHeight="48.0">
- <path
- android:fillColor="?android:attr/colorControlNormal"
- android:pathData="M38.0,26.0L26.0,26.0l0.0,12.0l-4.0,0.0L22.0,26.0L10.0,26.0l0.0,-4.0l12.0,0.0L22.0,10.0l4.0,0.0l0.0,12.0l12.0,0.0l0.0,4.0z"/>
-</vector>
diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml
index f87a882..7196981 100644
--- a/res/drawable/ic_add_24dp.xml
+++ b/res/drawable/ic_add_24dp.xml
@@ -21,5 +21,6 @@
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
- android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+ android:pathData="M20,13h-7v7h-2v-7H4v-2h7V4h2v7h7V13z"/>
</vector>
+
diff --git a/res/drawable/ic_airplane.xml b/res/drawable/ic_airplane.xml
deleted file mode 100644
index b3e0ba0..0000000
--- a/res/drawable/ic_airplane.xml
+++ /dev/null
@@ -1,57 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:name="root"
- android:alpha="1.0"
- android:height="48dp"
- android:width="48dp"
- android:viewportHeight="48"
- android:viewportWidth="48" >
- <group
- android:name="ic_signal_airplane"
- android:translateX="21.9995"
- android:translateY="25.73401" >
- <group
- android:name="ic_signal_airplane_pivot"
- android:translateX="-23.21545"
- android:translateY="-18.86649" >
- <clip-path
- android:name="mask"
- android:pathData="M 37.8337860107,-40.4599914551 c 0.0,0.0 -35.8077850342,31.5523681641 -35.8077850342,31.5523681641 c 0.0,0.0 9.55097961426,9.55285644531 9.55097961426,9.55285644531 c 0.0,0.0 -2.61698913574,2.09387207031 -2.61698913574,2.09387207031 c 0.0,0.0 -9.75096130371,-9.56428527832 -9.75096130371,-9.56428527832 c 0.0,0.0 -34.6200408936,25.4699249268 -34.6200408936,25.4699249268 c 0.0,0.0 55.9664764404,69.742401123 55.9664764404,69.742401123 c 0.0,0.0 73.2448120117,-59.1047973633 73.2448120117,-59.1047973633 c 0.0,0.0 -55.9664916992,-69.7423400879 -55.9664916992,-69.7423400879 Z" />
- <group
- android:name="cross" >
- <path
- android:name="cross_1"
- android:pathData="M 7.54049682617,3.9430847168 c 0.0,0.0 0.324981689453,0.399978637695 0.324981689453,0.399978637695 "
- android:strokeColor="#FFFFFFFF"
- android:strokeAlpha="0"
- android:strokeWidth="3.5"
- android:fillColor="#00000000" />
- </group>
- <group
- android:name="plane"
- android:translateX="23.481"
- android:translateY="18.71151" >
- <path
- android:name="plane_1"
- android:pathData="M 18.9439849854,7.98849487305 c 0.0,0.0 0.0,-4.0 0.0,-4.0 c 0.0,0.0 -16.0,-10.0 -16.0,-10.0 c 0.0,0.0 0.0,-11.0 0.0,-11.0 c 0.0,-1.70001220703 -1.30000305176,-3.0 -3.0,-3.0 c -1.69999694824,0.0 -3.0,1.29998779297 -3.0,3.0 c 0.0,0.0 0.0,11.0 0.0,11.0 c 0.0,0.0 -16.0,10.0 -16.0,10.0 c 0.0,0.0 0.0,4.0 0.0,4.0 c 0.0,0.0 16.0,-5.0 16.0,-5.0 c 0.0,0.0 0.0,11.0 0.0,11.0 c 0.0,0.0 -4.0,3.0 -4.0,3.0 c 0.0,0.0 0.0,3.0 0.0,3.0 c 0.0,0.0 7.0,-2.0 7.0,-2.0 c 0.0,0.0 7.0,2.0 7.0,2.0 c 0.0,0.0 0.0,-3.0 0.0,-3.0 c 0.0,0.0 -4.0,-3.0 -4.0,-3.0 c 0.0,0.0 0.0,-11.0 0.0,-11.0 c 0.0,0.0 16.0,5.0 16.0,5.0 Z"
- android:fillColor="#FFFFFFFF"
- android:fillAlpha="1" />
- </group>
- </group>
- </group>
-</vector>
diff --git a/res/drawable/ic_apps_filter_settings_24dp.xml b/res/drawable/ic_apps_filter_settings_24dp.xml
new file mode 100644
index 0000000..01a53a7
--- /dev/null
+++ b/res/drawable/ic_apps_filter_settings_24dp.xml
@@ -0,0 +1,28 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:pathData="M13.85,22.25h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.53c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.9 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73c0.26,-0.17 0.52,-0.32 0.78,-0.46l0.27,-1.91c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.71 14.59,22.25 13.85,22.25zM13.32,20.72c0,0.01 0,0.01 0,0.02L13.32,20.72zM10.68,20.7l0,0.02C10.69,20.72 10.69,20.71 10.68,20.7zM10.62,20.25h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96l-0.45,-0.35c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.7 8.84,6.95 8.38,7.3L7.93,7.63L5.55,6.68L4.16,9.07l2.03,1.58l-0.07,0.56C6.09,11.47 6.06,11.74 6.06,12c0,0.26 0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.25zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.71l0.01,0.02C5.78,17.72 5.77,17.71 5.77,17.71zM3.93,9.47L3.93,9.47C3.93,9.47 3.93,9.47 3.93,9.47zM18.22,6.27c0,0.01 0.01,0.02 0.01,0.02L18.22,6.27zM5.79,6.25L5.78,6.27C5.78,6.27 5.79,6.26 5.79,6.25zM13.31,3.28c0,0.01 0,0.01 0,0.02L13.31,3.28zM10.69,3.26l0,0.02C10.69,3.27 10.69,3.27 10.69,3.26z"/>
+ <path
+ android:fillColor="?android:attr/colorAccent"
+ android:pathData="M12,12m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"/>
+</vector>
diff --git a/res/drawable/ic_arrow_down_24dp.xml b/res/drawable/ic_arrow_down_24dp.xml
deleted file mode 100644
index f334902..0000000
--- a/res/drawable/ic_arrow_down_24dp.xml
+++ /dev/null
@@ -1,27 +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.
--->
-
-<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/colorAccent">
- <path
- android:fillColor="#FF000000"
- android:pathData="M8.12 9.29L12 13.17l3.88-3.88a.996 .996 0 1 1 1.41 1.41l-4.59 4.59a.996 .996 0 0
-1-1.41 0L6.7 10.7a.996 .996 0 0 1 0-1.41c.39-.38 1.03-.39 1.42 0z"/>
-</vector>
diff --git a/res/drawable/ic_cellular_off.xml b/res/drawable/ic_cellular_off.xml
index 4f767cf..76dbed5 100644
--- a/res/drawable/ic_cellular_off.xml
+++ b/res/drawable/ic_cellular_off.xml
@@ -14,15 +14,19 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
android:autoMirrored="true"
- android:width="17dp"
- android:height="17dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:tint="?android:attr/colorAccent">
<path
android:fillColor="#FF000000"
- android:pathData="M22.32,16.05l-1.45,1.45l1.45,1.45c0.38,0.38 0.38,0.99 0,1.37c-0.38,0.38 -0.99,0.38 -1.37,0l-1.44,-1.44l-1.45,1.45c-0.38,0.38 -0.99,0.38 -1.37,0l-0.01,-0.01c-0.38,-0.38 -0.38,-0.99 0,-1.37c0,0 0,0 0,0l1.45,-1.45l-1.45,-1.45c-0.38,-0.38 -0.38,-0.99 0,-1.37c0,0 0,0 0,0l0.01,-0.01c0.38,-0.38 0.99,-0.38 1.37,0l1.45,1.45l1.44,-1.44c0.38,-0.38 0.99,-0.38 1.37,0C22.7,15.06 22.7,15.67 22.32,16.05z"/>
+ android:pathData="M21.19,21.19l-2.69,-2.69l-1.41,-1.41l-1.09,-1.09l-2,-2l-4,-4l-2,-2l-5.19,-5.19l-1.42,1.41l6.61,6.61l0,2.17l2.17,0l3.83,3.83l0,1.34l-2.59,-2.58l-1.41,1.41l5,5l2.09,-2.09l2.69,2.7z"/>
<path
android:fillColor="#FF000000"
- android:pathData="M22,12V3.8c0,-0.71 -0.87,-1.08 -1.38,-0.57L3.24,20.62C2.73,21.13 3.09,22 3.8,22H14V12H22z"/>
+ android:pathData="M14,11.17l2,2l0,-2.17l-2,0z"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M10,5.83l2.59,2.58l1.41,-1.41l-5,-5l-2.09,2.09l3.09,3.08z"/>
</vector>
diff --git a/res/drawable/ic_content_copy_grey600_24dp.xml b/res/drawable/ic_content_copy_grey600_24dp.xml
new file mode 100644
index 0000000..827c66e
--- /dev/null
+++ b/res/drawable/ic_content_copy_grey600_24dp.xml
@@ -0,0 +1,9 @@
+<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="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"
+ android:fillColor="#757575"/>
+</vector>
diff --git a/res/drawable/ic_data_saver.xml b/res/drawable/ic_data_saver.xml
index d2d55a9..aefcd84 100644
--- a/res/drawable/ic_data_saver.xml
+++ b/res/drawable/ic_data_saver.xml
@@ -14,12 +14,20 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
+ android:width="24dp"
+ android:height="24dp"
+ android:autoMirrored="true"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M18.32,16.75l1.32,0.76c0.26,0.15 0.34,0.51 0.15,0.74 -2.09,2.6 -5.44,4.14 -9.14,3.65 -4.4,-0.58 -7.96,-4.12 -8.56,-8.52C1.34,7.8 5.21,2.95 10.43,2.12c0.3,-0.05 0.57,0.2 0.57,0.5v1.53c0,0.24 -0.18,0.44 -0.41,0.49 -3.6,0.69 -6.29,3.95 -6.07,7.79 0.21,3.82 3.43,6.95 7.25,7.07 2.37,0.08 4.51,-0.96 5.93,-2.63a0.48,0.48 0,0 1,0.62 -0.12zM19.5,12c0,0.83 -0.14,1.63 -0.39,2.38 -0.08,0.23 0.01,0.47 0.21,0.59l1.33,0.77c0.26,0.15 0.61,0.04 0.72,-0.24 0.4,-1.09 0.63,-2.27 0.63,-3.5 0,-4.99 -3.65,-9.12 -8.43,-9.88 -0.3,-0.04 -0.57,0.2 -0.57,0.5v1.53c0,0.24 0.18,0.44 0.41,0.48 3.46,0.68 6.09,3.72 6.09,7.37z" />
+ android:pathData="M11,8l0,3l-3,0l0,2l3,0l0,3l2,0l0,-3l3,0l0,-2l-3,0l0,-3z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M13,2.05v3.03c3.39,0.49 6,3.39 6,6.92c0,0.9 -0.18,1.75 -0.48,2.54l2.6,1.53C21.68,14.83 22,13.45 22,12C22,6.82 18.05,2.55 13,2.05z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12,19c-3.87,0 -7,-3.13 -7,-7c0,-3.53 2.61,-6.43 6,-6.92V2.05C5.94,2.55 2,6.81 2,12c0,5.52 4.47,10 9.99,10c3.31,0 6.24,-1.61 8.06,-4.09l-2.6,-1.53C16.17,17.98 14.21,19 12,19z"/>
</vector>
+
diff --git a/res/drawable/ic_delete_accent.xml b/res/drawable/ic_delete_accent.xml
new file mode 100644
index 0000000..86a9cca
--- /dev/null
+++ b/res/drawable/ic_delete_accent.xml
@@ -0,0 +1,31 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorAccent">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M9,8h2v9h-2z"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M13,8h2v9h-2z"/>
+</vector>
diff --git a/res/drawable/ic_devices_other.xml b/res/drawable/ic_devices_other.xml
index b40aceb..c7b6cf2 100644
--- a/res/drawable/ic_devices_other.xml
+++ b/res/drawable/ic_devices_other.xml
@@ -16,16 +16,11 @@
<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:autoMirrored="true"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
<path
- android:fillColor="#FFFFFFFF"
- android:pathData="M3,6h17c0.55,0,1-0.45,1-1v0c0-0.55-0.45-1-1-1H3C1.9,4,1,4.9,1,6v12c0,1.1,0.9,2,2,2h3c0.55,0,1-0.45,1-1v0
- c0-0.55-0.45-1-1-1H3V6z
- M13,12H9v1.78C8.39,14.33,8,15.11,8,16c0,0.89,0.39,1.67,1,2.22V20h4v-1.78c0.61-0.55,1-1.34,1-2.22
- s-0.39-1.67-1-2.22V12z
- M11,17.5c-0.83,0-1.5-0.67-1.5-1.5s0.67-1.5,1.5-1.5s1.5,0.67,1.5,1.5S11.83,17.5,11,17.5z
- M22,8h-6
- c-0.5,0-1,0.5-1,1v10c0,0.5,0.5,1,1,1h6c0.5,0,1-0.5,1-1V9C23,8.5,22.5,8,22,8z
- M21,18h-4v-8h4V18z" />
+ android:fillColor="@android:color/white"
+ android:pathData="M3,6h18V4H3C1.9,4 1,4.9 1,6v12c0,1.1 0.9,2 2,2h4v-2H3V6zM13,12H9v1.78C8.39,14.33 8,15.11 8,16c0,0.89 0.39,1.67 1,2.22V20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22V12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S11.83,17.5 11,17.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1V9C23,8.5 22.5,8 22,8zM21,18h-4v-8h4V18z"/>
</vector>
+
diff --git a/res/drawable/ic_devices_other_black.xml b/res/drawable/ic_devices_other_black.xml
index babcc63..926f02c 100644
--- a/res/drawable/ic_devices_other_black.xml
+++ b/res/drawable/ic_devices_other_black.xml
@@ -19,12 +19,7 @@
android:width="24dp"
android:height="24dp"
android:tint="?android:attr/colorControlNormal">
- <path android:fillColor="#FF000000"
- android:pathData="M3 6h18V4H3C1.9 4 1 4.9 1 6v12c0 1.10.9 2 2 2h4v-2H3V6z M13 12H9
- v1.78C8.39 14.33 8 15.11 8 16c0 0.89 0.39 1.67 1 2.22 V20h4v-1.78c0.61-0.55 1-1.34
- 1-2.22s-0.39-1.67-1-2.22V12z M11 17.5c-0.83 0-1.5-0.67-1.5-1.5s0.67-1.5 1.5-1.5s1.5
- 0.67 1.5 1.5 S11.83 17.5 11 17.5z M22 8h-6c-0.5 0-1 0.5-1 1v10c0 0.5 0.5 1 1
- 1h6c0.5 0 1-0.5 1-1V9C23 8.5 22.5 8 22 8z M21 18h-4v-8h4V18z" />
- <path android:fillColor="#00000000"
- android:pathData="M0 0h24v24H0V0z"/>
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M3,6h18V4H3C1.9,4 1,4.9 1,6v12c0,1.1 0.9,2 2,2h4v-2H3V6zM13,12H9v1.78C8.39,14.33 8,15.11 8,16c0,0.89 0.39,1.67 1,2.22V20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22V12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5S11.83,17.5 11,17.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1V9C23,8.5 22.5,8 22,8zM21,18h-4v-8h4V18z"/>
</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_fingerprint_error.xml b/res/drawable/ic_fingerprint_error.xml
deleted file mode 100644
index c9363bc..0000000
--- a/res/drawable/ic_fingerprint_error.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
- ~ 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
- -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="32dp"
- android:height="32dp"
- android:viewportWidth="32.0"
- android:viewportHeight="32.0">
- <path
- android:fillColor="?android:attr/colorError"
- android:pathData="M15.99,2.5C8.53,2.5 2.5,8.54 2.5,16.0s6.03,13.5 13.49,13.5S29.5,23.46 29.5,16.0S23.45,2.5 15.99,2.5zM16.0,26.8c-5.97,0.0 -10.8,-4.83 -10.8,-10.8S10.03,5.2 16.0,5.2S26.8,10.03 26.8,16.0S21.97,26.8 16.0,26.8z"/>
- <path
- android:fillColor="?android:attr/colorError"
- android:pathData="M14.65,20.05l2.7,0.0l0.0,2.7l-2.7,0.0z"/>
- <path
- android:fillColor="?android:attr/colorError"
- android:pathData="M14.65,9.25l2.7,0.0l0.0,8.1l-2.7,0.0z"/>
-</vector>
diff --git a/res/drawable/ic_homepage_location.xml b/res/drawable/ic_homepage_location.xml
new file mode 100644
index 0000000..413801b
--- /dev/null
+++ b/res/drawable/ic_homepage_location.xml
@@ -0,0 +1,36 @@
+<?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.
+ -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item>
+ <shape android:shape="oval">
+ <solid
+ android:color="@color/homepage_location_background"/>
+ <size
+ android:width="@dimen/dashboard_tile_image_size"
+ android:height="@dimen/dashboard_tile_image_size"/>
+ </shape>
+ </item>
+
+ <item
+ android:width="@dimen/dashboard_tile_foreground_image_size"
+ android:height="@dimen/dashboard_tile_foreground_image_size"
+ android:start="@dimen/dashboard_tile_foreground_image_inset"
+ android:top="@dimen/dashboard_tile_foreground_image_inset"
+ android:drawable="@drawable/ic_settings_location"/>
+</layer-list>
diff --git a/res/drawable/ic_info_outline_24dp.xml b/res/drawable/ic_info_outline_24dp.xml
index 3d8b89f..634d797 100644
--- a/res/drawable/ic_info_outline_24dp.xml
+++ b/res/drawable/ic_info_outline_24dp.xml
@@ -17,8 +17,8 @@
<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:viewportHeight="24"
+ android:viewportWidth="24"
android:tint="?android:attr/textColorSecondary">
<path
android:fillColor="#FF000000"
diff --git a/res/drawable/ic_list_24dp.xml b/res/drawable/ic_list_24dp.xml
deleted file mode 100644
index 03f4af0..0000000
--- a/res/drawable/ic_list_24dp.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:fillColor="?android:attr/colorAccent"
- android:pathData="M4,13L4,13c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1h0c-0.55,0 -1,0.45 -1,1v0C3,12.55 3.45,13 4,13zM4,17L4,17c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1h0c-0.55,0 -1,0.45 -1,1v0C3,16.55 3.45,17 4,17zM4,9L4,9c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1h0C3.45,7 3,7.45 3,8v0C3,8.55 3.45,9 4,9zM7,13h14v-2H7V13zM7,17h14v-2H7V17zM7,7v2h14V7H7z"/>
-</vector>
diff --git a/res/drawable/ic_local_phone_24_lib.xml b/res/drawable/ic_local_phone_24_lib.xml
index 4574802..094e0bd 100644
--- a/res/drawable/ic_local_phone_24_lib.xml
+++ b/res/drawable/ic_local_phone_24_lib.xml
@@ -16,13 +16,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
- android:viewportWidth="24"
+ android:tint="?android:attr/colorControlNormal"
android:viewportHeight="24"
- android:tint="?android:attr/colorControlNormal">
+ android:viewportWidth="24">
<path
android:fillColor="#000000"
- android:pathData="M16.01,14.48l-2.62,2.62c-2.75-1.49-5.01-3.75-6.5-6.5l2.62-2.62c0.24-0.24,0.34-0.58,0.27-0.9L9.13,3.82 c-0.09-0.47-0.5-0.8-0.98-0.8L4,3.01c-0.56,0-1.03,0.47-1,1.03c0.17,2.91,1.04,5.63,2.43,8.01c1.57,2.69,3.81,4.93,6.5,6.5 c2.38,1.39,5.1,2.26,8.01,2.43c0.56,0.03,1.03-0.44,1.03-1l0-4.15c0-0.48-0.34-0.89-0.8-0.98l-3.26-0.65 C16.58,14.14,16.24,14.24,16.01,14.48z" />
- <path
- android:pathData="M0,0h24v24H0V0z" />
+ android:pathData="M16.01,14.46l-2.62,2.62c-2.75,-1.49 -5.01,-3.75 -6.5,-6.5l2.62,-2.62c0.24,-0.24 0.34,-0.58 0.27,-0.9L9.13,3.8C9.04,3.34 8.63,3 8.15,3L4,3C3.44,3 2.97,3.47 3,4.03c0.17,2.91 1.04,5.63 2.43,8.01c1.57,2.69 3.81,4.93 6.5,6.5c2.38,1.39 5.1,2.26 8.01,2.43c0.56,0.03 1.03,-0.44 1.03,-1l0,-4.15c0,-0.48 -0.34,-0.89 -0.8,-0.98l-3.26,-0.65C16.58,14.12 16.24,14.23 16.01,14.46z"/>
</vector>
diff --git a/res/drawable/ic_preference_location.xml b/res/drawable/ic_preference_location.xml
new file mode 100644
index 0000000..e37d629
--- /dev/null
+++ b/res/drawable/ic_preference_location.xml
@@ -0,0 +1,36 @@
+<?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.
+ -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item>
+ <shape android:shape="oval">
+ <solid
+ android:color="@color/homepage_location_background"/>
+ <size
+ android:width="@android:dimen/app_icon_size"
+ android:height="@android:dimen/app_icon_size"/>
+ </shape>
+ </item>
+
+ <item
+ android:width="@dimen/dashboard_tile_foreground_image_size"
+ android:height="@dimen/dashboard_tile_foreground_image_size"
+ android:start="@dimen/preference_icon_foreground_image_inset"
+ android:top="@dimen/preference_icon_foreground_image_inset"
+ android:drawable="@drawable/ic_settings_location"/>
+</layer-list>
diff --git a/res/drawable/ic_search_24dp.xml b/res/drawable/ic_search_24dp.xml
deleted file mode 100644
index 8f14e88..0000000
--- a/res/drawable/ic_search_24dp.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<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="#000000"
- android:pathData="M15.5,14h-0.79l-0.28-0.27c1.2-1.4,1.82-3.31,1.48-5.34c-0.47-2.78-2.79-5-5.59-5.34c-4.23-0.52-7.79,3.04-7.27,7.27
-c0.34,2.8,2.56,5.12,5.34,5.59c2.03,0.34,3.94-0.28,5.34-1.48L14,14.71v0.79l5.2,5.19c0.41,0.41,1.07,0.41,1.48,0l0.01-0.01
-c0.41-0.41,0.41-1.07,0-1.48L15.5,14z M9.5,14C7.01,14,5,11.99,5,9.5S7.01,5,9.5,5S14,7.01,14,9.5S11.99,14,9.5,14z" />
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_all.xml b/res/drawable/ic_settings_all.xml
new file mode 100644
index 0000000..03958ab
--- /dev/null
+++ b/res/drawable/ic_settings_all.xml
@@ -0,0 +1,26 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M3,12L3,3h9,9v9,9L12,21 3,21ZM19,12L19,5L12,5 5,5v7,7h7,7zM7,16c0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1zM11,16c0,-0.55 1.35,-1 3,-1 1.65,0 3,0.45 3,1 0,0.55 -1.35,1 -3,1 -1.65,0 -3,-0.45 -3,-1zM7,12c0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1zM11,12c0,-0.55 1.35,-1 3,-1 1.65,0 3,0.45 3,1 0,0.55 -1.35,1 -3,1 -1.65,0 -3,-0.45 -3,-1zM7,8C7,7.45 7.45,7 8,7 8.55,7 9,7.45 9,8 9,8.55 8.55,9 8,9 7.45,9 7,8.55 7,8ZM11,8c0,-0.55 1.35,-1 3,-1 1.65,0 3,0.45 3,1 0,0.55 -1.35,1 -3,1 -1.65,0 -3,-0.45 -3,-1z"
+ android:fillColor="#000000"/>
+</vector>
+
diff --git a/res/drawable/ic_settings_location.xml b/res/drawable/ic_settings_location.xml
index 34bd4f0..b7cfd6f 100644
--- a/res/drawable/ic_settings_location.xml
+++ b/res/drawable/ic_settings_location.xml
@@ -17,8 +17,7 @@
android:width="24.0dp"
android:height="24.0dp"
android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:tint="?android:attr/colorControlNormal">
+ android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13C19,5.13 15.87,2 12,2zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9z"/>
diff --git a/res/drawable/ic_settings_night_display.xml b/res/drawable/ic_settings_night_display.xml
index 178b131..3292ed4 100644
--- a/res/drawable/ic_settings_night_display.xml
+++ b/res/drawable/ic_settings_night_display.xml
@@ -14,12 +14,12 @@
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">
+ android:width="24dp"
+ android:height="24dp"
+ android:tint="?android:attr/colorControlNormal"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
<path
- android:fillColor="#FFF"
- android:pathData="M13,12c0,-3.57 2.2,-6.62 5.31,-7.87 0.89,-0.36 0.75,-1.69 -0.19,-1.9 -1.1,-0.24 -2.27,-0.3 -3.48,-0.14 -4.51,0.6 -8.12,4.31 -8.59,8.83C5.43,16.93 10.12,22 16,22c0.73,0 1.43,-0.08 2.12,-0.23 0.95,-0.21 1.1,-1.53 0.2,-1.9A8.471,8.471 0,0 1,13 12z" />
-</vector>
\ No newline at end of file
+ android:fillColor="#FF000000"
+ android:pathData="M15.5,22c1.05,0 2.05,-0.16 3,-0.46c-4.06,-1.27 -7,-5.06 -7,-9.54s2.94,-8.27 7,-9.54C17.55,2.16 16.55,2 15.5,2c-5.52,0 -10,4.48 -10,10S9.98,22 15.5,22L15.5,22z"/>
+</vector>
diff --git a/res/drawable/ic_settings_personal.xml b/res/drawable/ic_settings_personal.xml
new file mode 100644
index 0000000..5139405
--- /dev/null
+++ b/res/drawable/ic_settings_personal.xml
@@ -0,0 +1,28 @@
+<!--
+ Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M13.85,22.24h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.52c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.89 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73C7.91,5.2 8.17,5.05 8.43,4.91L8.7,3.01c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.7 14.59,22.24 13.85,22.24zM13.32,20.72c0,0.01 0,0.01 0,0.02V20.72zM10.68,20.69v0.02C10.69,20.72 10.69,20.7 10.68,20.69zM10.62,20.24h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96L15.6,7.28c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.69 8.84,6.94 8.38,7.3L7.93,7.62L5.55,6.67L4.16,9.06l2.03,1.58L6.12,11.2c-0.03,0.26 -0.06,0.53 -0.06,0.79s0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.24zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.7l0.01,0.02C5.78,17.72 5.77,17.7 5.77,17.7zM3.93,9.47L3.93,9.47L3.93,9.47zM18.22,6.26c0,0.01 0.01,0.02 0.01,0.02L18.22,6.26zM5.79,6.24L5.78,6.26C5.78,6.26 5.79,6.26 5.79,6.24zM13.31,3.27c0,0.01 0,0.01 0,0.02V3.27zM10.69,3.25v0.02C10.69,3.26 10.69,3.26 10.69,3.25z"/>
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M13.56,10.44l-1.56,-3.44l-1.56,3.44l-3.44,1.56l3.44,1.56l1.56,3.44l1.56,-3.44l3.44,-1.56z"/>
+</vector>
diff --git a/res/drawable/ic_settings_security.xml b/res/drawable/ic_settings_security.xml
index 055babc..6065dd9 100644
--- a/res/drawable/ic_settings_security.xml
+++ b/res/drawable/ic_settings_security.xml
@@ -14,12 +14,15 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H9V6zM18,20H6V10h12V20zM12,17c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2C10,16.1 10.9,17 12,17z"/>
-</vector>
+ android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v0h2v0c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM18,20H6V10h12V20z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_settings_security_white.xml b/res/drawable/ic_settings_security_white.xml
index 544ebef..1779402 100644
--- a/res/drawable/ic_settings_security_white.xml
+++ b/res/drawable/ic_settings_security_white.xml
@@ -14,11 +14,15 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0">
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM9,6c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H9V6zM18,20H6V10h12V20zM12,17c1.1,0 2,-0.9 2,-2c0,-1.1 -0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2C10,16.1 10.9,17 12,17z"/>
+ android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v0h2v0c0,-1.66 1.34,-3 3,-3s3,1.34 3,3v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10C20,8.9 19.1,8 18,8zM18,20H6V10h12V20z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12,15m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
</vector>
+
diff --git a/res/drawable/ic_settings_wireless.xml b/res/drawable/ic_settings_wireless.xml
index 0c894eb..f9b4bbc 100644
--- a/res/drawable/ic_settings_wireless.xml
+++ b/res/drawable/ic_settings_wireless.xml
@@ -21,5 +21,5 @@
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M23.66,8.11c0.39,-0.48 0.29,-1.19 -0.22,-1.54C21.67,5.36 17.55,3 12,3 6.44,3 2.33,5.36 0.56,6.57c-0.51,0.35 -0.61,1.06 -0.23,1.54L11.16,21.6c0.42,0.53 1.23,0.53 1.66,0L23.66,8.11z"/>
+ android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3l3,-3C13.35,15.34 10.66,15.34 9,17zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
</vector>
diff --git a/res/drawable/ic_settings_wireless_white.xml b/res/drawable/ic_settings_wireless_white.xml
index 8dedb0d..3271b8b 100644
--- a/res/drawable/ic_settings_wireless_white.xml
+++ b/res/drawable/ic_settings_wireless_white.xml
@@ -20,5 +20,5 @@
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
- android:pathData="M23.66,8.11c0.39,-0.48 0.29,-1.19 -0.22,-1.54C21.67,5.36 17.55,3 12,3 6.44,3 2.33,5.36 0.56,6.57c-0.51,0.35 -0.61,1.06 -0.23,1.54L11.16,21.6c0.42,0.53 1.23,0.53 1.66,0L23.66,8.11z"/>
+ android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3l3,-3C13.35,15.34 10.66,15.34 9,17zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
</vector>
diff --git a/res/drawable/ic_signal_strength_4g.xml b/res/drawable/ic_signal_strength_4g.xml
new file mode 100644
index 0000000..9062096
--- /dev/null
+++ b/res/drawable/ic_signal_strength_4g.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT 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="9.208dp"
+ android:height="17dp"
+ android:viewportWidth="13.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M4.600000,7.800000l0.700000,0.000000l0.000000,1.300000L4.600000,9.100000L4.600000,11.000000L3.000000,11.000000L3.000000,9.200000L0.100000,9.200000L0.000000,8.100000L3.000000,2.500000l1.700000,0.000000L4.700000,7.800000zM1.600000,7.800000L3.000000,7.800000l0.000000,-3.000000L2.900000,5.000000L1.600000,7.800000z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M11.900000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S6.100000,9.000000 6.100000,7.900000L6.100000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000S8.100000,2.400000 9.000000,2.400000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000s0.700000,1.200000 0.700000,2.100000l-1.600000,0.000000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000S9.500000,3.700000 9.000000,3.700000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S7.700000,5.000000 7.700000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L10.099999,7.800000L9.000000,7.800000L9.000000,6.600000l2.900000,0.000000L11.900000,9.900000z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_sync.xml b/res/drawable/ic_sync.xml
index 45a2dbd..ed16b03 100644
--- a/res/drawable/ic_sync.xml
+++ b/res/drawable/ic_sync.xml
@@ -16,10 +16,13 @@
<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:viewportWidth="24"
+ android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path
- android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"
- android:fillColor="#FFFFFFFF"/>
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M17.26,6H19V4h-6v0.07V10h2V6.81c1.79,1.04 3,2.97 3,5.19c0,2.97 -2.17,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93C20,9.6 18.93,7.46 17.26,6z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M4,12c0,2.4 1.07,4.54 2.74,6H5v2h6v-0.07V14H9v3.19C7.21,16.15 6,14.22 6,12c0,-2.97 2.17,-5.43 5,-5.91V4.07C7.05,4.56 4,7.92 4,12z"/>
</vector>
diff --git a/res/drawable/ic_wallpaper.xml b/res/drawable/ic_wallpaper.xml
index 20da9c3..d0fc6be 100644
--- a/res/drawable/ic_wallpaper.xml
+++ b/res/drawable/ic_wallpaper.xml
@@ -14,12 +14,12 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24.0dp"
- android:height="24.0dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path
android:fillColor="#FF000000"
- android:pathData="M4.0,4.0l7.0,0.0L11.0,2.0L4.0,2.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,7.0l2.0,0.0L4.0,4.0zm6.0,9.0l-4.0,5.0l12.0,0.0l-3.0,-4.0 -2.03,2.71L10.0,13.0zm7.0,-4.5c0.0,-0.83 -0.67,-1.5 -1.5,-1.5S14.0,7.67 14.0,8.5s0.67,1.5 1.5,1.5S17.0,9.33 17.0,8.5zM20.0,2.0l-7.0,0.0l0.0,2.0l7.0,0.0l0.0,7.0l2.0,0.0L22.0,4.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm0.0,18.0l-7.0,0.0l0.0,2.0l7.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0l0.0,-7.0l-2.0,0.0l0.0,7.0zM4.0,13.0L2.0,13.0l0.0,7.0c0.0,1.0 0.9,2.0 2.0,2.0l7.0,0.0l0.0,-2.0L4.0,20.0l0.0,-7.0z"/>
+ android:pathData="M9,12.71l2.14,2.58l3,-3.87L18,16.57H6L9,12.71zM5,5h6V3H5C3.9,3 3,3.9 3,5v6h2V5zM19,19h-6v2h6c1.1,0 2,-0.9 2,-2v-6h-2V19zM5,19v-6H3v6c0,1.1 0.9,2 2,2h6v-2H5zM19,5v6h2V5c0,-1.1 -0.9,-2 -2,-2h-6v2H19zM16,9c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1c-0.55,0 -1,0.45 -1,1S15.45,9 16,9z"/>
</vector>
diff --git a/res/drawable/signal_strength_1x.xml b/res/drawable/signal_strength_1x.xml
new file mode 100644
index 0000000..d69b0dc
--- /dev/null
+++ b/res/drawable/signal_strength_1x.xml
@@ -0,0 +1,29 @@
+<?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.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="8.5dp"
+ android:height="17dp"
+ android:viewportWidth="12.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M3.500000,11.000000L1.800000,11.000000L1.800000,4.400000L0.200000,5.100000L0.200000,3.700000l3.100000,-1.300000l0.200000,0.000000L3.500000,11.000000z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M8.600000,5.500000l1.200000,-3.000000l1.900000,0.000000L9.700000,6.700000l2.200000,4.300000L9.900000,11.000000L8.700000,7.900000L7.400000,11.000000L5.500000,11.000000l2.100000,-4.300000L5.600000,2.500000l1.900000,0.000000L8.600000,5.500000z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/signal_strength_3g.xml b/res/drawable/signal_strength_3g.xml
new file mode 100644
index 0000000..9b5e4a6
--- /dev/null
+++ b/res/drawable/signal_strength_3g.xml
@@ -0,0 +1,29 @@
+<?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.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="9.208dp"
+ android:height="17dp"
+ android:viewportWidth="13.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M2.000000,6.000000l0.800000,0.000000c0.300000,0.000000 0.500000,-0.100000 0.700000,-0.300000s0.200000,-0.500000 0.200000,-0.900000c0.000000,-0.300000 -0.100000,-0.600000 -0.200000,-0.800000S3.200000,3.700000 2.900000,3.700000C2.700000,3.700000 2.500000,3.800000 2.300000,4.000000S2.100000,4.400000 2.100000,4.700000L0.500000,4.700000C0.500000,4.000000 0.700000,3.400000 1.100000,3.000000s1.000000,-0.600000 1.700000,-0.600000c0.800000,0.000000 1.400000,0.200000 1.900000,0.600000s0.700000,1.000000 0.700000,1.800000c0.000000,0.400000 -0.100000,0.700000 -0.300000,1.100000S4.600000,6.500000 4.300000,6.600000C4.700000,6.800000 5.000000,7.100000 5.200000,7.400000s0.300000,0.700000 0.300000,1.200000c0.000000,0.800000 -0.200000,1.400000 -0.700000,1.800000s-1.100000,0.700000 -1.900000,0.700000c-0.700000,0.000000 -1.300000,-0.200000 -1.800000,-0.600000s-0.700000,-1.000000 -0.700000,-1.800000L2.000000,8.700000C2.000000,9.000000 2.100000,9.300000 2.300000,9.500000s0.400000,0.300000 0.600000,0.300000c0.300000,0.000000 0.500000,-0.100000 0.700000,-0.300000S3.900000,9.000000 3.900000,8.600000c0.000000,-0.500000 -0.100000,-0.800000 -0.300000,-1.000000S3.200000,7.300000 2.800000,7.300000L2.000000,7.300000L2.000000,6.000000z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12.500000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S6.700000,9.000000 6.700000,7.900000L6.700000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000s1.200000,-0.800000 2.100000,-0.800000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000s0.700000,1.200000 0.700000,2.100000l-1.600000,0.000000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000s-0.500000,-0.300000 -0.900000,-0.300000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S8.400000,5.000000 8.400000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L10.799999,7.800000L9.600000,7.800000L9.600000,6.600000l2.900000,0.000000L12.500000,9.900000z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/signal_strength_g.xml b/res/drawable/signal_strength_g.xml
new file mode 100644
index 0000000..6f6e21b
--- /dev/null
+++ b/res/drawable/signal_strength_g.xml
@@ -0,0 +1,26 @@
+<?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.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="4.958dp"
+ android:height="17dp"
+ android:viewportWidth="7.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M6.500000,9.900000c-0.200000,0.400000 -0.600000,0.700000 -1.000000,0.900000s-1.000000,0.400000 -1.800000,0.400000c-0.900000,0.000000 -1.700000,-0.300000 -2.200000,-0.800000S0.700000,9.000000 0.700000,7.900000L0.700000,5.600000c0.000000,-1.100000 0.300000,-1.900000 0.800000,-2.400000s1.200000,-0.800000 2.100000,-0.800000c1.000000,0.000000 1.700000,0.200000 2.100000,0.700000s0.700000,1.200000 0.700000,2.100000L4.700000,5.200000c0.000000,-0.500000 -0.100000,-0.900000 -0.200000,-1.100000S4.000000,3.700000 3.600000,3.700000c-0.400000,0.000000 -0.700000,0.200000 -0.900000,0.500000S2.300000,5.000000 2.300000,5.600000l0.000000,2.300000c0.000000,0.700000 0.100000,1.100000 0.300000,1.400000s0.600000,0.500000 1.000000,0.500000c0.300000,0.000000 0.600000,0.000000 0.700000,-0.100000s0.300000,-0.200000 0.400000,-0.300000L4.700000,7.800000L3.500000,7.800000L3.500000,6.600000l2.900000,0.000000L6.400000,9.900000z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/signal_strength_lte.xml b/res/drawable/signal_strength_lte.xml
new file mode 100644
index 0000000..998999f
--- /dev/null
+++ b/res/drawable/signal_strength_lte.xml
@@ -0,0 +1,32 @@
+<?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.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="9.208dp"
+ android:height="17dp"
+ android:viewportWidth="13.0"
+ android:viewportHeight="24.0"
+ android:tint="?android:attr/colorControlNormal">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M2.000000,9.700000l2.000000,0.000000L4.000000,11.000000L0.300000,11.000000L0.300000,2.500000L2.000000,2.500000L2.000000,9.700000z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M8.300000,3.800000L7.000000,3.800000L7.000000,11.000000L5.300000,11.000000L5.300000,3.800000L4.000000,3.800000L4.000000,2.500000l4.300000,0.000000L8.300000,3.800000z"/>
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M12.400000,7.300000l-1.700000,0.000000l0.000000,2.400000l2.100000,0.000000L12.799999,11.000000L9.000000,11.000000L9.000000,2.500000l3.700000,0.000000l0.000000,1.300000l-2.100000,0.000000l0.000000,2.100000l1.700000,0.000000L12.300000,7.300000z"/>
+</vector>
\ No newline at end of file
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 218192c..a6a85d3 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -87,14 +87,6 @@
</LinearLayout>
- <ImageView
- android:id="@+id/fingerprintIcon"
- android:layout_gravity="end|bottom"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="28dp"
- android:layout_marginEnd="20dp"
- android:visibility="gone"/>
</FrameLayout>
</LinearLayout>
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 81f257e..b0a0a96 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -108,14 +108,6 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"/>
-
- <ImageView
- android:id="@+id/fingerprintIcon"
- android:layout_gravity="center_vertical"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:visibility="gone"/>
</LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout-land/confirm_lock_pattern_normal.xml b/res/layout-land/confirm_lock_pattern_normal.xml
index 9c90d6f..158d343 100644
--- a/res/layout-land/confirm_lock_pattern_normal.xml
+++ b/res/layout-land/confirm_lock_pattern_normal.xml
@@ -85,14 +85,6 @@
android:layout_marginEnd="?attr/suwMarginSides"
android:layout_marginBottom="24dp"
android:gravity="center_vertical"/>
-
- <ImageView
- android:id="@+id/fingerprintIcon"
- android:layout_gravity="center_horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:contentDescription="@string/confirm_fingerprint_icon_content_description"
- android:visibility="gone"/>
</LinearLayout>
</ScrollView>
diff --git a/res/layout/admin_support_details_dialog.xml b/res/layout/admin_support_details_dialog.xml
index 7de91d0..8c33b1a 100644
--- a/res/layout/admin_support_details_dialog.xml
+++ b/res/layout/admin_support_details_dialog.xml
@@ -27,7 +27,8 @@
<ImageView android:id="@+id/admin_support_icon"
android:layout_width="@dimen/admin_details_dialog_icon_size"
android:layout_height="@dimen/admin_details_dialog_icon_size"
- android:src="@drawable/ic_info"
+ android:tint="?android:attr/colorAccent"
+ android:src="@*android:drawable/ic_info"
android:scaleType="fitCenter"
android:contentDescription="@null" />
<TextView android:id="@+id/admin_support_dialog_title"
diff --git a/res/layout/apps_filter_spinner.xml b/res/layout/apps_filter_spinner.xml
index e468a4b..c9b1e07 100644
--- a/res/layout/apps_filter_spinner.xml
+++ b/res/layout/apps_filter_spinner.xml
@@ -15,31 +15,30 @@
limitations under the License.
-->
-<LinearLayout
+<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="?android:attr/actionBarSize"
- android:background="?android:attr/colorAccent"
- android:gravity="center_vertical"
- android:orientation="horizontal">
+ android:layout_height="wrap_content">
- <Spinner
+ <com.android.settingslib.widget.settingsspinner.SettingsSpinner
android:id="@+id/filter_spinner"
android:layout_height="wrap_content"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:paddingStart="64dp"
- android:background="@drawable/app_filter_spinner_background"/>
+ android:layout_width="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="24dp"
+ android:layout_marginBottom="16dp"/>
<ImageView
android:id="@+id/filter_settings"
style="?android:attr/borderlessButtonStyle"
android:layout_width="56dp"
android:layout_height="56dp"
+ android:layout_marginTop="12dp"
+ android:layout_toRightOf="@id/filter_spinner"
android:contentDescription="@string/configure"
android:scaleType="center"
- android:src="@drawable/ic_settings_24dp"
- android:visibility="gone" />
+ android:src="@drawable/ic_apps_filter_settings_24dp"
+ android:visibility="gone"/>
-</LinearLayout>
+</RelativeLayout>
diff --git a/res/layout/battery_history_chart.xml b/res/layout/battery_history_chart.xml
deleted file mode 100644
index c0c37f1..0000000
--- a/res/layout/battery_history_chart.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
- <com.android.settings.fuelgauge.BatteryHistoryChart
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res/com.android.settings"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:id="@+id/battery_history_chart"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorPrimary"
- app:headerAppearance="?android:attr/textAppearanceMedium"
- android:shadowRadius="4"
- android:shadowColor="?android:attr/colorBackground"
- android:shadowDx="2"
- android:shadowDy="2"
- app:barPrimaryColor="?android:attr/colorControlActivated"
- app:barPredictionColor="@color/material_empty_color_light"
- app:chartMinHeight="@dimen/battery_history_chart_height">
- </com.android.settings.fuelgauge.BatteryHistoryChart>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/condition_container.xml b/res/layout/condition_container.xml
deleted file mode 100644
index 877b17a..0000000
--- a/res/layout/condition_container.xml
+++ /dev/null
@@ -1,44 +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.
--->
-
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- style="@style/SuggestionConditionStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="16dp"
- android:paddingStart="14dp"
- android:paddingEnd="14dp"
- android:paddingBottom="@dimen/dashboard_padding_bottom">
-
- <androidx.cardview.widget.CardView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:cardUseCompatPadding="true"
- app:cardElevation="2dp"
- app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/data"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scrollbars="none"/>
-
- </androidx.cardview.widget.CardView>
-
-</FrameLayout>
diff --git a/res/layout/condition_footer.xml b/res/layout/condition_footer.xml
deleted file mode 100644
index 5de9d55..0000000
--- a/res/layout/condition_footer.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/SuggestionConditionStyle"
- android:layout_width="match_parent"
- android:layout_height="44dp"
- android:contentDescription="@string/dashboard_suggestion_condition_footer_content_description"
- android:gravity="end"
- android:orientation="horizontal"
- android:paddingTop="10dp"
- android:paddingEnd="10dp">
-
- <ImageView
- android:id="@+id/collapse_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_expand_less" />
-
-</LinearLayout>
diff --git a/res/layout/condition_header.xml b/res/layout/condition_header.xml
deleted file mode 100644
index f214319..0000000
--- a/res/layout/condition_header.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/SuggestionConditionStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="10dp"
- android:paddingBottom="10dp"
- android:orientation="vertical">
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="36dp"
- android:layout_centerHorizontal="true">
-
- <FrameLayout
- android:id="@android:id/icon_frame"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="24dp"
- android:layout_centerVertical="true">
-
- <include layout="@layout/condition_header_icon" />
-
- </FrameLayout>
-
- <ImageView
- android:id="@+id/expand_indicator"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_alignParentEnd="true"
- android:paddingTop="4dp"
- android:paddingStart="16dp"
- android:paddingEnd="16dp"
- android:src="@drawable/ic_expand_more"/>
-
- <TextView
- android:id="@android:id/summary"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:layout_toStartOf="@id/expand_indicator"
- android:layout_centerVertical="true"
- android:gravity="end"
- android:textAppearance="@style/TextAppearance.SuggestionTitle"
- android:textColor="?android:attr/colorAccent" />
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toEndOf="@android:id/icon_frame"
- android:layout_toStartOf="@android:id/summary"
- android:layout_centerVertical="true"
- android:singleLine="true"
- android:ellipsize="end"
- android:textAppearance="@style/TextAppearance.SuggestionTitle"
- android:textColor="?android:attr/textColorPrimary" />
-
- <LinearLayout
- android:id="@+id/additional_icons"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_toStartOf="@android:id/summary"
- android:layout_toEndOf="@android:id/icon_frame"
- android:orientation="horizontal"
- android:gravity="center_vertical"/>
-
- </RelativeLayout>
-
-</LinearLayout>
diff --git a/res/layout/condition_header_icon.xml b/res/layout/condition_header_icon.xml
deleted file mode 100644
index 79fe54e..0000000
--- a/res/layout/condition_header_icon.xml
+++ /dev/null
@@ -1,24 +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.
--->
-
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/icon"
- android:layout_width="@dimen/suggestion_card_icon_size"
- android:layout_height="@dimen/suggestion_card_icon_size"
- android:layout_marginStart="0dp"
- android:layout_marginEnd="24dp"
- android:tint="?android:attr/colorAccent" />
diff --git a/res/layout/condition_tile.xml b/res/layout/condition_tile.xml
deleted file mode 100644
index 9fe83dc..0000000
--- a/res/layout/condition_tile.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/content"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="36dp"
- android:background="?android:attr/selectableItemBackground"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/suggestion_card_icon_size"
- android:layout_height="@dimen/suggestion_card_icon_size"
- android:layout_marginTop="12dp"
- android:layout_marginStart="14dp"
- android:layout_marginEnd="24dp"
- android:tint="?android:attr/colorAccent" />
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="14dp"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorPrimary" />
-
- </LinearLayout>
-
- <TextView
- android:id="@android:id/summary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="62dp"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:paddingBottom="8dp"
- android:textAppearance="?android:attr/textAppearanceListItemSecondary"
- android:alpha=".7"
- android:textColor="?android:attr/textColorPrimary" />
-
- <androidx.appcompat.widget.ButtonBarLayout
- android:id="@+id/buttonBar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="62dp"
- android:paddingBottom="1dp"
- style="?android:attr/buttonBarStyle"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
- <Button
- android:id="@+id/first_action"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:paddingStart="0dp"
- android:alpha=".8"
- android:textAlignment="viewStart"
- android:textColor="?android:attr/textColorPrimary"
- style="?android:attr/buttonBarButtonStyle" />
-
- <Button
- android:id="@+id/second_action"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:alpha=".8"
- android:textAlignment="viewStart"
- android:textColor="?android:attr/textColorPrimary"
- style="?android:attr/buttonBarButtonStyle" />
-
- </androidx.appcompat.widget.ButtonBarLayout>
-
- <include layout="@layout/horizontal_divider" />
-
-</LinearLayout>
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index 05e90d2..1e42fbe 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -89,19 +89,5 @@
</LinearLayout>
- <View android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1"/>
-
- <ImageView
- android:id="@+id/fingerprintIcon"
- android:layout_gravity="center_horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="24dp"
- android:contentDescription="@string/confirm_fingerprint_icon_content_description"
- android:visibility="gone"/>
-
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
</FrameLayout>
diff --git a/res/layout/confirm_lock_password_normal.xml b/res/layout/confirm_lock_password_normal.xml
index 05bd4a0..0b516ca 100644
--- a/res/layout/confirm_lock_password_normal.xml
+++ b/res/layout/confirm_lock_password_normal.xml
@@ -70,16 +70,6 @@
android:layout_height="0dp"
android:layout_weight="1" />
- <ImageView
- android:id="@+id/fingerprintIcon"
- android:layout_gravity="center_horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="24dp"
- android:contentDescription="@string/confirm_fingerprint_icon_content_description"
- android:visibility="gone"/>
-
<Button
android:id="@+id/cancelButton"
style="@style/SuwGlifButton.Secondary"
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index e6b7887..f841391 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -97,15 +97,6 @@
android:layout_marginEnd="12dp"
android:gravity="center_vertical"/>
- <ImageView
- android:id="@+id/fingerprintIcon"
- android:layout_gravity="center_horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_marginBottom="24dp"
- android:contentDescription="@string/confirm_fingerprint_icon_content_description"
- android:visibility="gone"/>
</LinearLayout>
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
diff --git a/res/layout/confirm_lock_pattern_normal_base.xml b/res/layout/confirm_lock_pattern_normal_base.xml
index 6773ec0..bfabf99 100644
--- a/res/layout/confirm_lock_pattern_normal_base.xml
+++ b/res/layout/confirm_lock_pattern_normal_base.xml
@@ -90,16 +90,6 @@
android:layout_marginTop="12dp"
android:gravity="center_vertical"/>
- <ImageView
- android:id="@+id/fingerprintIcon"
- android:layout_gravity="center_horizontal"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="?attr/suwMarginSides"
- android:layout_marginBottom="24dp"
- android:contentDescription="@string/confirm_fingerprint_icon_content_description"
- android:visibility="gone"/>
-
<Button
android:id="@+id/cancelButton"
style="@style/SuwGlifButton.Secondary"
diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml
deleted file mode 100644
index 536c00a..0000000
--- a/res/layout/dashboard.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT 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.dashboard.conditional.FocusRecyclerView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/dashboard_container"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:clipChildren="false"
- android:clipToPadding="false"
- android:focusable="false"
- android:paddingStart="@dimen/dashboard_padding_start"
- android:paddingEnd="@dimen/dashboard_padding_end"
- android:paddingTop="@dimen/dashboard_padding_top"
- android:paddingBottom="@dimen/dashboard_padding_bottom"
- android:scrollbars="vertical"/>
-
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
deleted file mode 100644
index e35dbff..0000000
--- a/res/layout/dashboard_tile.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT 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:id="@+id/dashboard_tile"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center_vertical"
- android:minHeight="@dimen/dashboard_tile_minimum_height"
- android:clickable="true"
- android:focusable="true">
-
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/dashboard_tile_image_size"
- android:layout_height="@dimen/dashboard_tile_image_size"
- android:scaleType="centerInside"
- android:layout_marginStart="@dimen/dashboard_tile_image_margin"
- android:layout_marginEnd="@dimen/dashboard_tile_image_margin" />
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <TextView android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textAppearance="@style/TextAppearance.TileTitle"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal" />
-
- <TextView android:id="@android:id/summary"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.Small"
- android:textColor="?android:attr/textColorSecondary"
- android:maxLines="1"
- android:ellipsize="end"
- android:paddingEnd="@dimen/dashboard_tile_image_margin" />
-
- </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
deleted file mode 100644
index 4aa0aa8..0000000
--- a/res/layout/data_usage_chart.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<!-- NOTE: this explicitly uses right/left padding, since the
- graph isn't swapped in RTL languages -->
-<com.android.settings.widget.ChartDataUsageView
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
- android:id="@+id/chart"
- android:layout_width="match_parent"
- android:layout_height="@dimen/data_usage_chart_height"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:paddingTop="16dp"
- android:paddingBottom="24dp">
-
- <com.android.settings.widget.ChartGridView
- android:id="@+id/grid"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="start|bottom"
- android:paddingBottom="24dp"
- android:textColor="?android:attr/textColorPrimary"
- android:textAppearance="@android:style/TextAppearance.Material.Caption"
- settings:borderDrawable="@drawable/data_grid_border" />
-
- <com.android.settings.widget.ChartNetworkSeriesView
- android:id="@+id/series"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="start|bottom"
- settings:strokeColor="#00000000"
- settings:fillColor="?android:attr/colorAccent"
- settings:fillColorSecondary="#ff80cbc4"
- settings:safeRegion="3dp" />
-
- <com.android.settings.widget.ChartNetworkSeriesView
- android:id="@+id/detail_series"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="start|bottom"
- settings:strokeColor="#00000000"
- settings:fillColor="?android:attr/colorAccent"
- settings:fillColorSecondary="?android:attr/colorAccent"
- settings:safeRegion="3dp" />
-
- <com.android.settings.widget.ChartSweepView
- android:id="@+id/sweep_warning"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:nextFocusUp="@+id/sweep_limit"
- settings:sweepDrawable="@drawable/data_sweep_warning"
- settings:followAxis="vertical"
- settings:neighborMargin="5dip"
- settings:labelSize="60dip"
- settings:labelTemplate="@string/data_usage_sweep_warning"
- settings:labelColor="?android:attr/textColorSecondary"
- settings:safeRegion="4dp" />
-
- <com.android.settings.widget.ChartSweepView
- android:id="@+id/sweep_limit"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:nextFocusDown="@+id/sweep_warning"
- settings:sweepDrawable="@drawable/data_sweep_limit"
- settings:followAxis="vertical"
- settings:neighborMargin="5dip"
- settings:labelSize="60dip"
- settings:labelTemplate="@string/data_usage_sweep_limit"
- settings:labelColor="?android:attr/colorError"
- settings:safeRegion="4dp" />
-
-</com.android.settings.widget.ChartDataUsageView>
diff --git a/res/layout/data_usage_cycle_item.xml b/res/layout/data_usage_cycle_item.xml
deleted file mode 100644
index 015608d..0000000
--- a/res/layout/data_usage_cycle_item.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/text1"
- style="?android:attr/spinnerItemStyle"
- android:singleLine="true"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="0dp"
- android:ellipsize="marquee"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary"
- android:textAlignment="inherit" />
diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml
index 9c6cc31..05c38e0 100644
--- a/res/layout/data_usage_cycles.xml
+++ b/res/layout/data_usage_cycles.xml
@@ -14,21 +14,17 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:orientation="horizontal">
+ android:minHeight="?android:attr/listPreferredItemHeight">
- <Spinner
+ <com.android.settingslib.widget.settingsspinner.SettingsSpinner
android:id="@+id/cycles_spinner"
- android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingLeft="0dp"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorPrimary" />
+ android:layout_width="wrap_content"
+ android:layout_centerInParent="true"/>
-</LinearLayout>
+</RelativeLayout>
+
diff --git a/res/layout/empty_print_state.xml b/res/layout/empty_print_state.xml
index 361bf3c..43312c8 100644
--- a/res/layout/empty_print_state.xml
+++ b/res/layout/empty_print_state.xml
@@ -14,48 +14,40 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/empty_print_state"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:visibility="gone">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
+ android:gravity="center"
+ android:orientation="vertical">
- <LinearLayout
+ <ImageView
+ android:layout_width="120dp"
+ android:layout_height="110dp"
+ android:layout_marginBottom="12dp"
+ android:src="@*android:drawable/ic_print"
+ android:scaleType="fitEnd"
+ android:alpha="0.1"
+ android:tint="?android:colorForeground"
+ android:importantForAccessibility="no" />
+
+ <TextView
+ android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
+ android:layout_marginBottom="16dp"
android:gravity="center"
- android:orientation="vertical">
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="?android:attr/textColorSecondary" />
- <ImageView
- android:id="@+id/icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="12dip"
- android:src="@drawable/ic_grayedout_printer"
- android:contentDescription="@null">
- </ImageView>
+ <Button
+ android:id="@+id/add_new_service"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="?android:attr/borderlessButtonStyle"
+ android:textColor="?android:attr/textColorSecondary"
+ android:text="@string/print_menu_item_add_service"
+ android:visibility="gone" />
- <TextView
- android:id="@+id/message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="?android:attr/textColorSecondary">
- </TextView>
-
- <Button android:id="@+id/add_new_service"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:gravity="center"
- android:visibility="gone"
- style="?android:attr/buttonBarButtonStyle"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:text="@string/print_menu_item_add_service"
- android:textAllCaps="true"
- />
-
- </LinearLayout>
-
-</FrameLayout>
+</LinearLayout>
diff --git a/res/layout/empty_printers_list_service_enabled.xml b/res/layout/empty_printers_list_service_enabled.xml
index 8cc8db4..481f9c0 100644
--- a/res/layout/empty_printers_list_service_enabled.xml
+++ b/res/layout/empty_printers_list_service_enabled.xml
@@ -14,45 +14,38 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/empty_printers_list_service_enabled"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:visibility="gone">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
+ android:gravity="center"
+ android:orientation="vertical">
- <LinearLayout
+ <ImageView
+ android:layout_width="120dp"
+ android:layout_height="110dp"
+ android:layout_marginBottom="12dp"
+ android:src="@*android:drawable/ic_print"
+ android:scaleType="fitEnd"
+ android:alpha="0.1"
+ android:tint="?android:colorForeground"
+ android:importantForAccessibility="no"/>
+
+ <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
+ android:layout_marginBottom="16dp"
android:gravity="center"
- android:orientation="vertical">
+ android:textAppearance="?android:attr/textAppearanceLarge"
+ android:textColor="?android:attr/textColorSecondary"
+ android:text="@string/print_searching_for_printers"/>
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="12dip"
- android:src="@drawable/ic_grayedout_printer"
- android:importantForAccessibility="no">
- </ImageView>
+ <ProgressBar
+ android:layout_width="300dp"
+ android:layout_height="wrap_content"
+ android:indeterminate="true"
+ android:importantForAccessibility="no"
+ style="?android:attr/progressBarStyleHorizontal"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginLeft="32dip"
- android:layout_marginRight="32dip"
- android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceLarge"
- android:textColor="?android:attr/textColorSecondary"
- android:text="@string/print_searching_for_printers">
- </TextView>
-
- <ProgressBar
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:indeterminate="true"
- style="?android:attr/progressBarStyleHorizontal">
- </ProgressBar>
-
- </LinearLayout>
-
-</FrameLayout>
+</LinearLayout>
diff --git a/res/layout/face_enroll_enrolling.xml b/res/layout/face_enroll_enrolling.xml
index 6ced80f..2208cc2 100644
--- a/res/layout/face_enroll_enrolling.xml
+++ b/res/layout/face_enroll_enrolling.xml
@@ -39,20 +39,23 @@
android:gravity="center"
android:orientation="vertical">
- <com.android.setupwizardlib.view.FillContentLayout
+ <com.android.settings.biometrics.face.FaceSquareFrameLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_weight="1">
- <!-- TODO: replace this with actual content-->
- <ImageView
- style="@style/SuwContentIllustration"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:contentDescription="@null"
- android:src="@drawable/face_enroll_introduction" />
+ <com.android.settings.biometrics.face.FaceSquareTextureView
+ android:id="@+id/texture_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:contentDescription="@null" />
- </com.android.setupwizardlib.view.FillContentLayout>
+ <ImageView
+ android:id="@+id/circle_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" />
+
+ </com.android.settings.biometrics.face.FaceSquareFrameLayout>
<TextView
style="@style/TextAppearance.FaceErrorText"
diff --git a/res/layout/fingerprint_rename_dialog.xml b/res/layout/fingerprint_rename_dialog.xml
index 99cfa71..2da84ca 100644
--- a/res/layout/fingerprint_rename_dialog.xml
+++ b/res/layout/fingerprint_rename_dialog.xml
@@ -35,7 +35,7 @@
android:clipChildren="false"
android:clipToPadding="false" />
- <EditText
+ <com.android.settings.widget.ImeAwareEditText
android:id="@+id/fingerprint_rename_field"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/layout/headerless_preference_category.xml b/res/layout/headerless_preference_category.xml
deleted file mode 100644
index cddc445..0000000
--- a/res/layout/headerless_preference_category.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- Style for a preference category without a header title.
- Based on tall_preference_category, but invisible and with some 0dp attributes. -->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@android:id/title"
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_marginBottom="0dip"
- android:textAppearance="@android:style/TextAppearance.Material.Body2"
- android:textColor="?android:attr/colorAccent"
- android:paddingBottom="8dp"
- android:paddingTop="16dip"
- android:visible="false" />
diff --git a/res/layout/homepage_condition_tile.xml b/res/layout/homepage_condition_tile.xml
new file mode 100644
index 0000000..ed76094
--- /dev/null
+++ b/res/layout/homepage_condition_tile.xml
@@ -0,0 +1,97 @@
+<!--
+ 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.
+-->
+
+<androidx.cardview.widget.CardView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/ContextualCardStyle">
+
+ <LinearLayout
+ android:id="@+id/content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/condition_header_height"
+ android:background="?android:attr/selectableItemBackground"
+ android:orientation="horizontal">
+
+ <ImageView
+ android:id="@android:id/icon"
+ android:layout_width="@dimen/suggestion_card_icon_size"
+ android:layout_height="@dimen/suggestion_card_icon_size"
+ android:layout_marginTop="12dp"
+ android:layout_marginStart="14dp"
+ android:layout_marginEnd="24dp"
+ android:tint="?android:attr/colorAccent"/>
+
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="14dp"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ android:textColor="?android:attr/textColorPrimary"/>
+
+ </LinearLayout>
+
+ <TextView
+ android:id="@android:id/summary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="62dp"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:paddingBottom="8dp"
+ android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+ android:alpha=".7"
+ android:textColor="?android:attr/textColorPrimary"/>
+
+ <androidx.appcompat.widget.ButtonBarLayout
+ android:id="@+id/buttonBar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="62dp"
+ android:paddingBottom="1dp"
+ style="?android:attr/buttonBarStyle"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+ <Button
+ android:id="@+id/first_action"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:paddingStart="0dp"
+ android:alpha=".8"
+ android:textAlignment="viewStart"
+ android:textColor="?android:attr/textColorPrimary"
+ style="?android:attr/buttonBarButtonStyle"/>
+
+ <Space
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+
+ </androidx.appcompat.widget.ButtonBarLayout>
+
+ <include layout="@layout/horizontal_divider"/>
+
+ </LinearLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/res/layout/suggestion_container.xml b/res/layout/homepage_slice_tile.xml
similarity index 66%
rename from res/layout/suggestion_container.xml
rename to res/layout/homepage_slice_tile.xml
index 3f57c33..28cdfb1 100644
--- a/res/layout/suggestion_container.xml
+++ b/res/layout/homepage_slice_tile.xml
@@ -15,19 +15,19 @@
limitations under the License.
-->
-<LinearLayout
+<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
- style="@style/SuggestionConditionStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingTop="2dp"
- android:orientation="vertical">
+ style="@style/ContextualCardStyle">
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/suggestion_list"
+ <androidx.slice.widget.SliceView
+ android:id="@+id/slice_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingBottom="16dp"
- android:scrollbars="none"/>
+ android:layout_marginBottom="@dimen/homepage_card_vertical_margin"
+ android:layout_marginTop="@dimen/homepage_card_vertical_margin"
+ android:paddingStart="@dimen/homepage_card_padding_start"
+ android:paddingEnd="@dimen/homepage_card_padding_end"/>
-</LinearLayout>
+</androidx.cardview.widget.CardView>
diff --git a/res/layout/horizontal_divider.xml b/res/layout/horizontal_divider.xml
index e4a277d..a134423 100644
--- a/res/layout/horizontal_divider.xml
+++ b/res/layout/horizontal_divider.xml
@@ -19,5 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/divider"
android:layout_width="match_parent"
- android:layout_height=".75dp"
- android:background="?android:attr/dividerHorizontal" />
\ No newline at end of file
+ android:layout_height="@dimen/horizontal_divider_height"
+ android:layout_marginTop="@dimen/horizontal_divider_margin_top"
+ android:layout_marginBottom="@dimen/horizontal_divider_margin_bottom"
+ android:background="?android:attr/dividerHorizontal"/>
\ No newline at end of file
diff --git a/res/layout/lockscreen_remote_input.xml b/res/layout/lockscreen_remote_input.xml
index 1c565a3..4fa44ce 100644
--- a/res/layout/lockscreen_remote_input.xml
+++ b/res/layout/lockscreen_remote_input.xml
@@ -36,10 +36,11 @@
<ImageView
android:id="@+id/restricted_lock_icon_remote_input"
- android:layout_width="@dimen/restricted_icon_size"
- android:layout_height="@dimen/restricted_icon_size"
- android:src="@drawable/ic_info"
+ android:layout_width="@*android:dimen/config_restrictedIconSize"
+ android:layout_height="@*android:dimen/config_restrictedIconSize"
+ android:tint="?android:attr/colorAccent"
+ android:src="@*android:drawable/ic_info"
android:layout_marginEnd="?android:attr/dialogPreferredPadding"
android:layout_gravity="center_vertical"
android:scaleType="centerInside" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index 9f89961..8d4d623 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -14,122 +14,125 @@
limitations under the License.
-->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.setupwizardlib.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:theme="@style/SuwThemeGlifV3.DayNight"
+ android:icon="@drawable/ic_delete_accent"
+ app:suwHeaderText="@string/master_clear_title">
<ScrollView
- android:id="@+id/master_clear_scrollview"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_marginStart="@dimen/preference_no_icon_padding_start"
- android:layout_marginEnd="12dp"
- android:layout_marginTop="12dp"
- android:layout_weight="1">
+ android:id="@+id/master_clear_scrollview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/reset_master_clear_margin_start"
+ android:layout_marginEnd="@dimen/reset_master_clear_margin_end">
+
<LinearLayout
android:id="@+id/master_clear_container"
+ style="@style/SuwContentFrame"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
+
<TextView
+ style="@style/TextAppearance.SuwGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/master_clear_item_label"
- android:includeFontPadding="false"
- android:text="@string/master_clear_desc" />
- <TextView android:id="@+id/also_erases_external"
+ android:text="@string/master_clear_desc"/>
+ <TextView
+ android:id="@+id/also_erases_external"
+ style="@style/TextAppearance.SuwGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/master_clear_item_label"
- android:includeFontPadding="false"
android:visibility="gone"
- android:text="@string/master_clear_desc_also_erases_external" />
- <TextView android:id="@+id/also_erases_esim"
+ android:text="@string/master_clear_desc_also_erases_external"/>
+ <TextView
+ android:id="@+id/also_erases_esim"
+ style="@style/TextAppearance.SuwGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/master_clear_item_label"
- android:includeFontPadding="false"
android:visibility="gone"
- android:text="@string/master_clear_desc_also_erases_esim" />
- <TextView android:id="@+id/accounts_label"
+ android:text="@string/master_clear_desc_also_erases_esim"/>
+ <TextView
+ android:id="@+id/accounts_label"
+ style="@style/TextAppearance.SuwGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- style="@style/master_clear_item_label"
android:visibility="gone"
- android:text="@string/master_clear_accounts" />
- <LinearLayout android:id="@+id/accounts"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:visibility="gone">
+ android:text="@string/master_clear_accounts"/>
+ <LinearLayout
+ android:id="@+id/accounts"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:visibility="gone">
<!-- Do not add any children here as they will be removed in the MasterClear.java
code. A list of accounts will be inserted programmatically. -->
</LinearLayout>
- <TextView android:id="@+id/other_users_present"
+ <TextView
+ android:id="@+id/other_users_present"
+ style="@style/TextAppearance.SuwGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
- android:textSize="18sp"
- android:text="@string/master_clear_other_users_present" />
- <TextView android:id="@+id/no_cancel_mobile_plan"
+ android:text="@string/master_clear_other_users_present"/>
+ <TextView
+ android:id="@+id/no_cancel_mobile_plan"
+ style="@style/TextAppearance.SuwGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
- android:textSize="18sp"
- android:text="@string/master_clear_desc_no_cancel_mobile_plan" />
- <TextView android:id="@+id/erase_external_option_text"
+ android:text="@string/master_clear_desc_no_cancel_mobile_plan"/>
+ <TextView
+ android:id="@+id/erase_external_option_text"
+ style="@style/TextAppearance.SuwGlifItemSummary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textSize="18sp"
- android:text="@string/master_clear_desc_erase_external_storage" />
- <LinearLayout android:id="@+id/erase_external_container"
+ android:text="@string/master_clear_desc_erase_external_storage"/>
+ <LinearLayout
+ android:id="@+id/erase_external_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:focusable="true"
+ android:clickable="true">
+ <CheckBox
+ android:id="@+id/erase_external"
+ style="@style/SuwCheckBox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:focusable="false"
+ android:clickable="false"
+ android:duplicateParentState="true"/>
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:focusable="true"
- android:clickable="true">
- <CheckBox android:id="@+id/erase_external"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:paddingEnd="@dimen/reset_checkbox_padding_end"
- android:focusable="false"
- android:clickable="false"
- android:duplicateParentState="true" />
- <LinearLayout android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:orientation="vertical">
+ android:layout_gravity="center_vertical"
+ android:orientation="vertical">
<TextView
+ style="@style/TextAppearance.SuwGlifItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="@dimen/reset_checkbox_title_padding_top"
- android:textSize="@dimen/reset_checkbox_title_text_size"
- android:text="@string/erase_external_storage" />
+ android:text="@string/erase_external_storage"/>
<TextView
+ style="@style/TextAppearance.SuwGlifItemSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="@dimen/reset_checkbox_summary_padding_top"
- android:textSize="@dimen/reset_checkbox_summary_text_size"
- android:text="@string/erase_external_storage_description" />
+ android:text="@string/erase_external_storage_description"/>
</LinearLayout>
</LinearLayout>
- <include layout="@layout/reset_esim_checkbox"
- android:layout_marginTop="40dp"
- android:id="@+id/erase_esim_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
+ <include
+ layout="@layout/reset_esim_checkbox"
+ android:layout_marginTop="40dp"
+ android:id="@+id/erase_esim_container"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
</LinearLayout>
</ScrollView>
- <Button
- android:id="@+id/initiate_master_clear"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="20dip"
- android:layout_marginBottom="12dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/master_clear_button_text"
- android:gravity="center" />
-
-</LinearLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/master_clear_account.xml b/res/layout/master_clear_account.xml
index 4a0552d..0b522f2 100644
--- a/res/layout/master_clear_account.xml
+++ b/res/layout/master_clear_account.xml
@@ -20,8 +20,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
- android:paddingStart="16dp"
- android:paddingEnd="16dp">
+ style="@style/SuwDescription.Glif" >
<ImageView
android:id="@android:id/icon"
android:layout_width="56dp"
@@ -31,6 +30,6 @@
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textSize="18sp"/>
+ style="@style/TextAppearance.SuwGlifItemSummary"/>
</LinearLayout>
diff --git a/res/layout/master_clear_confirm.xml b/res/layout/master_clear_confirm.xml
index 4ab3a0f..d513dbb 100644
--- a/res/layout/master_clear_confirm.xml
+++ b/res/layout/master_clear_confirm.xml
@@ -4,37 +4,37 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT 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"
+<com.android.setupwizardlib.GlifLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- >
+ android:theme="@style/SuwThemeGlifV3.DayNight"
+ android:id="@+id/setup_wizard_layout"
+ android:icon="@drawable/ic_delete_accent"
+ app:suwHeaderText="@string/master_clear_confirm_title">
- <TextView
- android:id="@+id/master_clear_confirm"
- android:layout_width="wrap_content"
+ <LinearLayout
+ style="@style/SuwContentFrame"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
- android:layout_marginTop="12dp"
- android:textSize="20sp"
- android:text="@string/master_clear_final_desc" />
+ android:orientation="vertical">
- <Button android:id="@+id/execute_master_clear"
- android:layout_gravity="center_horizontal"
- android:layout_marginTop="40dip"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/master_clear_final_button_text"
- android:gravity="center" />
-
-</LinearLayout>
+ <TextView
+ android:id="@+id/master_clear_confirm"
+ style="@style/SuwItemTitle.GlifDescription"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/master_clear_final_desc"/>
+ </LinearLayout>
+</com.android.setupwizardlib.GlifLayout>
diff --git a/res/layout/mobile_network_settings_container.xml b/res/layout/mobile_network_settings_container.xml
new file mode 100644
index 0000000..c88b512
--- /dev/null
+++ b/res/layout/mobile_network_settings_container.xml
@@ -0,0 +1,50 @@
+<?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"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <Toolbar
+ android:id="@+id/mobile_action_bar"
+ style="?android:attr/actionBarStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:navigationContentDescription="@*android:string/action_bar_up_description"
+ android:theme="?android:attr/actionBarTheme"/>
+
+ <FrameLayout
+ android:id="@+id/main_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"/>
+
+ <com.google.android.material.bottomnavigation.BottomNavigationView
+ android:id="@+id/bottom_nav"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_marginEnd="0dp"
+ android:layout_marginStart="0dp"
+ android:background="?android:attr/windowBackground"
+ app:itemIconTint="@color/bottom_navigation_colors"
+ app:itemTextColor="@color/bottom_navigation_colors"
+ app:menu="@menu/home_bottom_navigation"/>
+</LinearLayout>
diff --git a/res/layout/network_request_dialog_title.xml b/res/layout/network_request_dialog_title.xml
new file mode 100644
index 0000000..fa01085
--- /dev/null
+++ b/res/layout/network_request_dialog_title.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingEnd="?android:attr/dialogPreferredPadding"
+ android:orientation="horizontal"
+ android:background="?android:attr/selectableItemBackground"
+ android:minHeight="?android:attr/listPreferredItemHeightSmall">
+
+ <TextView
+ android:id="@+id/network_request_title_text"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:paddingLeft="16dip"
+ android:layout_weight="1"
+ android:textSize="18sp"
+ android:gravity="center_vertical"
+ style="@style/info_label"/>
+
+ <ProgressBar
+ android:id="@+id/network_request_title_progress"
+ style="?android:attr/progressBarStyleSmallTitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
+ android:layout_marginStart="16dip"
+ android:minWidth="32dp"
+ android:text="@string/progress_scanning"/>
+</LinearLayout>
diff --git a/res/layout/preference_app.xml b/res/layout/preference_app.xml
deleted file mode 100644
index 6ec3db9..0000000
--- a/res/layout/preference_app.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT 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"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center_vertical"
- android:minHeight="?android:attr/listPreferredItemHeightSmall"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
- <LinearLayout
- android:id="@+id/icon_frame"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="start|center_vertical"
- android:minWidth="56dp"
- android:orientation="horizontal"
- android:paddingEnd="8dp"
- android:paddingTop="4dp"
- android:paddingBottom="4dp">
- <androidx.preference.internal.PreferenceImageView
- android:id="@android:id/icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- settings:maxWidth="@dimen/secondary_app_icon_size"
- settings:maxHeight="@dimen/secondary_app_icon_size" />
- </LinearLayout>
-
- <LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical"
- android:paddingTop="16dp"
- android:paddingBottom="16dp">
-
- <TextView android:id="@android:id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textAppearance="@style/TextAppearance.TileTitle"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal" />
-
- <LinearLayout
- android:id="@+id/summary_container"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone">
- <TextView android:id="@android:id/summary"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textAppearance="@style/TextAppearance.Small"
- android:textAlignment="viewStart"
- android:textColor="?android:attr/textColorSecondary" />
-
- <TextView android:id="@+id/appendix"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:textAppearance="@style/TextAppearance.Small"
- android:textAlignment="viewEnd"
- android:textColor="?android:attr/textColorSecondary"
- android:maxLines="1"
- android:ellipsize="end" />
- </LinearLayout>
- <ProgressBar
- android:id="@android:id/progress"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="4dp"
- android:max="100"
- android:visibility="gone" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@android:id/widget_frame"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center"
- android:minWidth="64dp"
- android:orientation="vertical" />
-
-</LinearLayout>
diff --git a/res/layout/preference_volume_slider.xml b/res/layout/preference_volume_slider.xml
index 5e5d595..da3a028 100644
--- a/res/layout/preference_volume_slider.xml
+++ b/res/layout/preference_volume_slider.xml
@@ -45,8 +45,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:layout_marginTop="16dip"
- android:layout_marginBottom="16dip">
+ android:layout_marginTop="8dp"
+ android:layout_marginBottom="8dp">
<LinearLayout
android:layout_width="match_parent"
@@ -75,15 +75,14 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_marginTop="6dp">
+ android:orientation="vertical">
<SeekBar
android:id="@*android:id/seekbar"
android:layout_gravity="center_vertical"
android:paddingStart="12dp"
android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
+ android:layout_height="48dp"/>
<TextView
android:id="@+id/suppression_text"
diff --git a/res/layout/printer_dropdown_item.xml b/res/layout/printer_dropdown_item.xml
index 1036e24..fd581bb 100644
--- a/res/layout/printer_dropdown_item.xml
+++ b/res/layout/printer_dropdown_item.xml
@@ -77,7 +77,7 @@
android:layout_gravity="center_vertical"
android:paddingLeft="16dip"
android:contentDescription="@string/printer_info_desc"
- android:src="@drawable/ic_info"
+ android:src="@*android:drawable/ic_info"
android:tint="?android:attr/colorControlNormal"
android:tintMode="src_in" />
diff --git a/res/layout/reset_esim_checkbox.xml b/res/layout/reset_esim_checkbox.xml
index fb15fe6..e2ae4bb 100644
--- a/res/layout/reset_esim_checkbox.xml
+++ b/res/layout/reset_esim_checkbox.xml
@@ -15,6 +15,7 @@
-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
+ style="@style/SuwDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
@@ -24,14 +25,14 @@
<CheckBox
android:id="@+id/erase_esim"
+ style="@style/SuwCheckBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingEnd="@dimen/reset_checkbox_padding_end"
android:focusable="false"
android:clickable="false"
android:checked="true"
- android:duplicateParentState="true" />
+ android:duplicateParentState="true"/>
<LinearLayout
android:layout_width="match_parent"
@@ -41,16 +42,14 @@
<TextView
android:id="@+id/erase_esim_title"
+ style="@style/TextAppearance.SuwGlifItemTitle"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="@dimen/reset_checkbox_title_padding_top"
- android:textSize="@dimen/reset_checkbox_title_text_size" />
+ android:layout_height="wrap_content"/>
<TextView
+ style="@style/TextAppearance.SuwGlifItemSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingTop="@dimen/reset_checkbox_summary_padding_top"
- android:textSize="@dimen/reset_checkbox_summary_text_size"
- android:text="@string/reset_esim_desc" />
+ android:text="@string/reset_esim_desc"/>
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
index 1850bb2..7eb5d2a 100644
--- a/res/layout/reset_network.xml
+++ b/res/layout/reset_network.xml
@@ -23,8 +23,8 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dip"
- android:layout_marginStart="@dimen/preference_no_icon_padding_start"
- android:layout_marginEnd="12dp"
+ android:layout_marginStart="@dimen/reset_network_margin_start"
+ android:layout_marginEnd="@dimen/reset_network_margin_end"
android:layout_marginTop="12dp"
android:layout_weight="1">
diff --git a/res/layout/restricted_dialog_singlechoice.xml b/res/layout/restricted_dialog_singlechoice.xml
index 3daedc7..a9984a8 100644
--- a/res/layout/restricted_dialog_singlechoice.xml
+++ b/res/layout/restricted_dialog_singlechoice.xml
@@ -37,11 +37,12 @@
android:ellipsize="marquee" />
<ImageView
android:id="@+id/restricted_lock_icon"
- android:layout_width="@dimen/restricted_icon_size"
- android:layout_height="@dimen/restricted_icon_size"
- android:src="@drawable/ic_info"
+ android:layout_width="@*android:dimen/config_restrictedIconSize"
+ android:layout_height="@*android:dimen/config_restrictedIconSize"
+ android:tint="?android:attr/colorAccent"
+ android:src="@*android:drawable/ic_info"
android:layout_marginLeft="@dimen/restricted_icon_padding"
android:baselineAlignBottom="true"
android:scaleType="centerInside"
android:visibility="gone" />
-</com.android.settings.CheckableLinearLayout>
\ No newline at end of file
+</com.android.settings.CheckableLinearLayout>
diff --git a/res/layout/restricted_popup_menu_item.xml b/res/layout/restricted_popup_menu_item.xml
index 78a09ef..636e3f9 100644
--- a/res/layout/restricted_popup_menu_item.xml
+++ b/res/layout/restricted_popup_menu_item.xml
@@ -34,10 +34,11 @@
android:layout_alignParentLeft="true" />
<ImageView
android:id="@+id/restricted_icon"
- android:layout_width="@dimen/restricted_icon_size"
- android:layout_height="@dimen/restricted_icon_size"
+ android:layout_width="@*android:dimen/config_restrictedIconSize"
+ android:layout_height="@*android:dimen/config_restrictedIconSize"
android:scaleType="centerInside"
- android:src="@drawable/ic_info"
+ android:tint="?android:attr/colorAccent"
+ android:src="@*android:drawable/ic_info"
android:layout_alignParentRight="true"
android:visibility="gone" />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/res/layout/restricted_radio_with_summary.xml b/res/layout/restricted_radio_with_summary.xml
index 55f158c..5e7fcd8 100644
--- a/res/layout/restricted_radio_with_summary.xml
+++ b/res/layout/restricted_radio_with_summary.xml
@@ -41,10 +41,11 @@
android:ellipsize="marquee" />
<ImageView
android:id="@+id/restricted_icon"
- android:layout_width="@dimen/restricted_icon_size"
+ android:layout_width="@*android:dimen/config_restrictedIconSize"
android:layout_height="match_parent"
android:scaleType="centerInside"
- android:src="@drawable/ic_info"
+ android:tint="?android:attr/colorAccent"
+ android:src="@*android:drawable/ic_info"
android:layout_marginLeft="@dimen/restricted_icon_padding"
android:visibility="gone" />
</com.android.settings.CheckableLinearLayout>
@@ -59,4 +60,4 @@
android:textColor="?android:attr/textColorSecondary"
android:maxLines="10" />
-</com.android.settings.CheckableLinearLayout>
\ No newline at end of file
+</com.android.settings.CheckableLinearLayout>
diff --git a/res/layout/screen_pinning_instructions.xml b/res/layout/screen_pinning_instructions.xml
index 80fec3c..fea5ed8 100644
--- a/res/layout/screen_pinning_instructions.xml
+++ b/res/layout/screen_pinning_instructions.xml
@@ -31,8 +31,8 @@
android:paddingTop="@dimen/screen_pinning_textview_padding"
android:text="@string/screen_pinning_description"
android:textAppearance="@style/TextAppearance.Medium"
- android:paddingStart="@dimen/screen_margin_sides"
- android:paddingEnd="@dimen/screen_margin_sides"
+ android:paddingStart="@dimen/screen_pinning_padding_start"
+ android:paddingEnd="@dimen/screen_pinning_padding_end"
/>
</ScrollView>
diff --git a/res/layout/search_bar.xml b/res/layout/search_bar.xml
index 9e64db7..1ba64ad 100644
--- a/res/layout/search_bar.xml
+++ b/res/layout/search_bar.xml
@@ -45,5 +45,12 @@
android:layout_height="wrap_content"
android:text="@string/search_menu"/>
</Toolbar>
+ <ImageView
+ android:id="@+id/account_avatar"
+ android:layout_marginStart="@dimen/search_bar_avatar_start_margin"
+ android:layout_marginEnd="@dimen/search_bar_avatar_end_margin"
+ android:layout_width="@dimen/search_bar_avatar_size"
+ android:layout_height="@dimen/search_bar_avatar_size"
+ android:layout_gravity="end|center_vertical"/>
</androidx.cardview.widget.CardView>
</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/search_main.xml b/res/layout/search_main.xml
deleted file mode 100644
index 6de344d..0000000
--- a/res/layout/search_main.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-* Copyright 2016, The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/main_content"
- android:layout_height="match_parent"
- android:layout_width="match_parent"/>
diff --git a/res/layout/search_slice_item.xml b/res/layout/search_slice_item.xml
deleted file mode 100644
index 1607209..0000000
--- a/res/layout/search_slice_item.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingTop="16dp"
- android:paddingBottom="16dp"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:background="?android:attr/selectableItemBackground"
- android:clipToPadding="false">
-
- <include layout="@layout/search_icon_view"/>
-
- <android.app.slice.widget.SliceView
- android:id="@android:id/content"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/settings_data_plan_summary_preference.xml b/res/layout/settings_data_plan_summary_preference.xml
deleted file mode 100644
index e887474..0000000
--- a/res/layout/settings_data_plan_summary_preference.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at"+
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:paddingStart="@dimen/preference_no_icon_padding_start"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:orientation="horizontal">
-
- <!-- Shows the data plan usage in chart -->
- <com.android.settings.widget.DonutView
- android:id="@+id/donut"
- android:layout_width="72dp"
- android:layout_height="72dp"
- android:layout_marginEnd="8dp"
- android:layout_gravity="center"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
- android:gravity="end|center_vertical"
- settings:applyColorAccent="false"
- settings:showPercentString="false"
- settings:thickness="6dp"/>
-
- <LinearLayout
- android:id="@+id/data_plan_row"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="2dp"
- android:orientation="vertical">
-
- <!-- Shows the data plan usage -->
- <TextView
- android:id="@android:id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="0dp"
- android:paddingTop="0dp"
- android:fontFamily="@*android:string/config_headlineFontFamily"
- android:textAppearance="@android:style/TextAppearance.Material.Title"/>
-
- <!-- Shows the data plan name -->
- <TextView
- android:id="@android:id/text1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="5dp"
- android:maxLines="3"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorSecondary"/>
-
- <!-- Shows the data plan description -->
- <TextView
- android:id="@android:id/text2"
- android:textStyle="italic"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxLines="5"
- android:textAppearance="@android:style/TextAppearance.Material.Subhead"
- android:textColor="?android:attr/textColorSecondary"/>
- </LinearLayout>
-</LinearLayout>
diff --git a/res/layout/settings_homepage.xml b/res/layout/settings_homepage.xml
index fb00c7d..0140ced 100644
--- a/res/layout/settings_homepage.xml
+++ b/res/layout/settings_homepage.xml
@@ -15,61 +15,17 @@
limitations under the License.
-->
-<androidx.coordinatorlayout.widget.CoordinatorLayout
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
- <FrameLayout
- android:id="@id/main_content"
- android:layout_height="match_parent"
- android:layout_width="match_parent" />
- <RelativeLayout
- android:id="@+id/bottom_sheet"
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/card_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="?android:attr/windowBackground"
- android:minHeight="@dimen/homepage_bottomsheet_height"
- app:layout_behavior="@string/bottom_sheet_behavior"
- app:behavior_peekHeight="@dimen/homepage_bottomsheet_height">
+ android:layoutAnimation="@anim/layout_animation_fall_down"/>
- <androidx.coordinatorlayout.widget.CoordinatorLayout
- android:id="@+id/bottom_area"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <com.google.android.material.floatingactionbutton.FloatingActionButton
- android:id="@+id/search_fab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_search_floating_24dp"
- app:backgroundTint="@android:color/white"
- app:layout_anchor="@id/bar" />
-
- <com.google.android.material.bottomappbar.BottomAppBar
- android:id="@+id/bar"
- android:layout_width="match_parent"
- android:layout_height="@dimen/homepage_bottombar_height"
- android:layout_alignParentTop="true"
- android:layout_marginTop="@dimen/homepage_bottombar_top_margin"
- android:clickable="true"
- app:fabAttached="true"
- app:fabAlignmentMode="end"
- app:fabCradleDiameter="@dimen/homepage_bottombar_fab_cradle"
- app:navigationIcon="@drawable/ic_list_24dp"
- style="@style/Widget.MaterialComponents.BottomAppBar" />
- </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
- <include layout="@layout/search_bar"
- android:visibility="invisible" />
-
- <FrameLayout
- android:id="@+id/bottom_sheet_fragment"
- android:layout_below="@id/bottom_area"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
- </RelativeLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+ <include layout="@layout/horizontal_divider"/>
+</LinearLayout>
diff --git a/res/layout/settings_homepage_container.xml b/res/layout/settings_homepage_container.xml
new file mode 100644
index 0000000..5e0adec
--- /dev/null
+++ b/res/layout/settings_homepage_container.xml
@@ -0,0 +1,42 @@
+<?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.
+-->
+
+<androidx.core.widget.NestedScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:descendantFocusability="blocksDescendants">
+
+ <include layout="@layout/search_bar"/>
+
+ <FrameLayout
+ android:id="@+id/contextual_cards_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+ <FrameLayout
+ android:id="@+id/main_content"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+ </LinearLayout>
+</androidx.core.widget.NestedScrollView>
diff --git a/res/layout/spinner_dropdown_restricted_item.xml b/res/layout/spinner_dropdown_restricted_item.xml
index 823b430..d95e4be 100644
--- a/res/layout/spinner_dropdown_restricted_item.xml
+++ b/res/layout/spinner_dropdown_restricted_item.xml
@@ -26,11 +26,12 @@
android:layout_height="?android:attr/listPreferredItemHeightSmall"
android:ellipsize="marquee" />
<ImageView android:id="@+id/restricted_icon"
- android:layout_width="@dimen/restricted_icon_size"
- android:layout_height="@dimen/restricted_icon_size"
- android:src="@drawable/ic_info"
+ android:layout_width="@*android:dimen/config_restrictedIconSize"
+ android:layout_height="@*android:dimen/config_restrictedIconSize"
+ android:tint="?android:attr/colorAccent"
+ android:src="@*android:drawable/ic_info"
android:baselineAlignBottom="true"
android:layout_marginEnd="@dimen/restricted_icon_padding"
android:gravity="end|center_vertical"
android:visibility="gone" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/suggestion_tile.xml b/res/layout/suggestion_tile.xml
deleted file mode 100644
index 09431a8..0000000
--- a/res/layout/suggestion_tile.xml
+++ /dev/null
@@ -1,93 +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.
--->
-
-<androidx.cardview.widget.CardView
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/suggestion_card"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:layout_marginEnd="16dp"
- app:cardPreventCornerOverlap="false"
- app:cardUseCompatPadding="true"
- app:cardElevation="2dp"
- app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="112dp"
- android:paddingBottom="8dp"
- android:orientation="vertical">
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/suggestion_card_icon_size"
- android:layout_height="@dimen/suggestion_card_icon_size"
- style="@style/SuggestionCardIcon"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="6dp" />
-
-
- <FrameLayout
- android:id="@+id/close_button"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentEnd="true"
- android:paddingTop="8dp"
- android:paddingEnd="8dp"
- android:orientation="horizontal"
- android:contentDescription="@string/dlg_close">
- <ImageView
- android:layout_width="18dp"
- android:layout_height="18dp"
- android:layout_gravity="end|top"
- android:alpha="0.54"
- android:src="@drawable/ic_suggestion_close_button"/>
- </FrameLayout>
-
- </RelativeLayout>
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/SuggestionCardText"
- android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
- android:singleLine="true"
- android:textAppearance="@style/TextAppearance.SuggestionTitle"
- android:fadingEdge="horizontal" />
-
- <TextView
- android:id="@android:id/summary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/SuggestionCardText"
- android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
- android:singleLine="true"
- android:textAppearance="@style/TextAppearance.SuggestionSummary" />
-
- </LinearLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/res/layout/suggestion_tile_two_cards.xml b/res/layout/suggestion_tile_two_cards.xml
deleted file mode 100644
index c75458b..0000000
--- a/res/layout/suggestion_tile_two_cards.xml
+++ /dev/null
@@ -1,84 +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.
--->
-
-<androidx.cardview.widget.CardView
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/suggestion_card"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:cardPreventCornerOverlap="false"
- app:cardUseCompatPadding="true"
- app:cardElevation="2dp"
- app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="112dp"
- android:orientation="vertical">
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/suggestion_card_icon_size"
- android:layout_height="@dimen/suggestion_card_icon_size"
- style="@style/SuggestionCardIcon"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="8dp" />
-
- <FrameLayout
- android:id="@+id/close_button"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentEnd="true"
- android:gravity="end|top"
- android:paddingTop="8dp"
- android:paddingEnd="8dp"
- android:orientation="horizontal"
- android:contentDescription="@string/dlg_close">
- <ImageView
- android:layout_width="18dp"
- android:layout_height="18dp"
- android:layout_gravity="end|top"
- android:alpha="0.54"
- android:src="@drawable/ic_suggestion_close_button"/>
- </FrameLayout>
-
- </RelativeLayout>
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- style="@style/SuggestionCardText"
- android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
- android:layout_marginBottom="16dp"
- android:gravity="center_vertical"
- android:textAppearance="@style/TextAppearance.SuggestionTitle"
- android:maxLines="3"
- android:ellipsize="end"
- android:fadingEdge="horizontal" />
-
- </LinearLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/res/layout/suggestion_tile_with_button.xml b/res/layout/suggestion_tile_with_button.xml
deleted file mode 100644
index 7d59dd9..0000000
--- a/res/layout/suggestion_tile_with_button.xml
+++ /dev/null
@@ -1,104 +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.
--->
-
-<androidx.cardview.widget.CardView
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:id="@+id/suggestion_card"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:layout_marginEnd="16dp"
- app:cardPreventCornerOverlap="false"
- app:cardUseCompatPadding="true"
- app:cardElevation="2dp"
- app:cardCornerRadius="@dimen/suggestion_card_corner_radius">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="160dp"
- android:orientation="vertical">
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@android:id/icon"
- android:layout_width="@dimen/suggestion_card_icon_size"
- android:layout_height="@dimen/suggestion_card_icon_size"
- style="@style/SuggestionCardIcon"
- android:layout_marginTop="16dp"
- android:layout_marginBottom="6dp" />
-
- <FrameLayout
- android:id="@+id/close_button"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentEnd="true"
- android:paddingTop="8dp"
- android:paddingEnd="8dp"
- android:orientation="horizontal"
- android:contentDescription="@string/dlg_close">
- <ImageView
- android:layout_width="18dp"
- android:layout_height="18dp"
- android:layout_gravity="end|top"
- android:alpha="0.54"
- android:src="@drawable/ic_suggestion_close_button"/>
- </FrameLayout>
-
- </RelativeLayout>
-
- <TextView
- android:id="@android:id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/SuggestionCardText"
- android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
- android:singleLine="true"
- android:textAppearance="@style/TextAppearance.SuggestionTitle"
- android:fadingEdge="horizontal" />
-
- <TextView
- android:id="@android:id/summary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- style="@style/SuggestionCardText"
- android:layout_marginStart="12dp"
- android:layout_marginEnd="12dp"
- android:singleLine="true"
- android:textAppearance="@style/TextAppearance.SuggestionSummary" />
-
- <FrameLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- style="@style/SuggestionCardButton">
- <Button
- android:id="@android:id/primary"
- style="@style/ActionPrimaryButton"
- android:layout_gravity="center"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/suggestion_button_text" />
- </FrameLayout>
-
- </LinearLayout>
-
-</androidx.cardview.widget.CardView>
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index a172051..8cb6f51 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -29,13 +29,13 @@
android:ellipsize="end"
android:textAppearance="@style/TextAppearance.Switch"
android:textColor="?android:attr/textColorPrimary"
- android:textAlignment="viewStart" />
+ android:textAlignment="viewStart"/>
<ImageView
android:id="@+id/restricted_icon"
android:layout_width="@dimen/restricted_icon_size"
android:layout_height="@dimen/restricted_icon_size"
- android:src="@drawable/ic_info"
+ android:tint="?android:attr/colorAccent"
android:theme="@android:style/Theme.Material"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/restricted_icon_margin_end"
@@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:theme="@style/Widget.SwitchBar.Switch" />
+ android:theme="@style/Widget.SwitchBar.Switch"/>
</merge>
diff --git a/res/layout/system_info_list_item.xml b/res/layout/system_info_list_item.xml
deleted file mode 100644
index 37806bd..0000000
--- a/res/layout/system_info_list_item.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:orientation="vertical"
- android:paddingStart="?android:attr/dialogPreferredPadding"
- android:paddingEnd="?android:attr/dialogPreferredPadding"
- android:paddingTop="8dp"
- android:paddingBottom="8dp">
- <TextView
- android:id="@+id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"/>
- <TextView
- android:id="@+id/summary"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/title"
- android:layout_alignStart="@id/title"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorSecondary"
- android:maxLines="4"/>
-</LinearLayout>
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
deleted file mode 100644
index a125d80..0000000
--- a/res/layout/widget.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT 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:id="@+id/main"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:background="@drawable/appwidget_bg_holo" >
-
- <LinearLayout
- android:id="@+id/btn_wifi"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="match_parent"
- android:paddingTop="12dp"
- android:background="@drawable/appwidget_button_left"
- android:clickable="true"
- android:focusable="true"
- android:orientation="vertical">
-
- <ImageView
- android:id="@+id/img_wifi"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:scaleType="center"
- android:contentDescription="@null"
- />
-
- <ImageView
- android:id="@+id/ind_wifi"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scaleType="fitXY"
- android:contentDescription="@null"
- />
- </LinearLayout>
-
- <ImageView
- android:layout_width="1dip"
- android:layout_height="match_parent"
- android:background="@drawable/appwidget_settings_divider_holo"
- android:contentDescription="@null"
- />
-
- <LinearLayout
- android:id="@+id/btn_bluetooth"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="match_parent"
- android:paddingTop="12dp"
- android:background="@drawable/appwidget_button_center"
- android:clickable="true"
- android:focusable="true"
- android:orientation="vertical">
-
- <ImageView
- android:id="@+id/img_bluetooth"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:scaleType="center"
- android:contentDescription="@null"
- />
-
- <ImageView
- android:id="@+id/ind_bluetooth"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scaleType="fitXY"
- android:contentDescription="@null"
- />
-
- </LinearLayout>
-
- <ImageView
- android:layout_width="1dip"
- android:layout_height="match_parent"
- android:background="@drawable/appwidget_settings_divider_holo"
- android:contentDescription="@null"
- />
-
- <LinearLayout
- android:id="@+id/btn_location"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="match_parent"
- android:paddingTop="12dp"
- android:background="@drawable/appwidget_button_center"
- android:clickable="true"
- android:focusable="true"
- android:orientation="vertical">
-
- <ImageView
- android:id="@+id/img_location"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:scaleType="center"
- android:contentDescription="@null"
- />
-
- <ImageView
- android:id="@+id/ind_location"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scaleType="fitXY"
- android:contentDescription="@null"
- />
- </LinearLayout>
-
- <ImageView
- android:layout_width="1dip"
- android:layout_height="match_parent"
- android:background="@drawable/appwidget_settings_divider_holo"
- android:contentDescription="@null"
- />
-
- <LinearLayout
- android:id="@+id/btn_sync"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="match_parent"
- android:paddingTop="12dp"
- android:background="@drawable/appwidget_button_center"
- android:clickable="true"
- android:focusable="true"
- android:orientation="vertical">
-
- <ImageView
- android:id="@+id/img_sync"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:scaleType="center"
- android:contentDescription="@null"
- />
-
- <ImageView
- android:id="@+id/ind_sync"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scaleType="fitXY"
- android:contentDescription="@null"
- />
- </LinearLayout>
-
- <ImageView
- android:layout_width="1dip"
- android:layout_height="match_parent"
- android:background="@drawable/appwidget_settings_divider_holo"
- android:contentDescription="@null"
- />
-
- <LinearLayout
- android:id="@+id/btn_brightness"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="match_parent"
- android:paddingTop="12dp"
- android:background="@drawable/appwidget_button_right"
- android:clickable="true"
- android:focusable="true"
- android:orientation="vertical">
-
- <ImageView
- android:id="@+id/img_brightness"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:scaleType="center"
- android:contentDescription="@null"
- />
-
- <ImageView
- android:id="@+id/ind_brightness"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:scaleType="fitXY"
- android:contentDescription="@null"
- />
- </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/wifi_add_network_view.xml b/res/layout/wifi_add_network_view.xml
new file mode 100644
index 0000000..9185c97
--- /dev/null
+++ b/res/layout/wifi_add_network_view.xml
@@ -0,0 +1,37 @@
+<?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.
+-->
+
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <include
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@id/add_network_button_bar"
+ android:layout_alignParentTop="true"
+ layout="@layout/wifi_dialog"/>
+
+ <include
+ android:id="@+id/add_network_button_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ layout="@*android:layout/alert_dialog_button_bar_material"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 2330727..72eb011 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -483,6 +483,27 @@
</LinearLayout>
+ <LinearLayout android:id="@+id/privacy_settings_fields"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item"
+ android:visibility="gone">
+
+ <TextView android:id="@+id/privacy_settings_title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_label"
+ android:text="@string/wifi_privacy_settings" />
+
+ <Spinner android:id="@+id/privacy_settings"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/wifi_item_spinner"
+ android:prompt="@string/wifi_privacy_settings"
+ android:entries="@array/wifi_privacy_entries"/>
+
+ </LinearLayout>
+
<LinearLayout android:id="@+id/staticip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/res/menu/home_bottom_navigation.xml b/res/menu/home_bottom_navigation.xml
new file mode 100644
index 0000000..c58efd7
--- /dev/null
+++ b/res/menu/home_bottom_navigation.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:id="@+id/homepage_personal_settings"
+ android:icon="@drawable/ic_settings_personal"
+ android:title="@string/homepage_personal_settings" />
+ <item
+ android:id="@+id/homepage_all_settings"
+ android:icon="@drawable/ic_settings_all"
+ android:title="@string/homepage_all_settings" />
+</menu>
diff --git a/res/menu/time_zone_base_search_menu.xml b/res/menu/time_zone_base_search_menu.xml
index 92241af..6df42c4 100644
--- a/res/menu/time_zone_base_search_menu.xml
+++ b/res/menu/time_zone_base_search_menu.xml
@@ -19,7 +19,7 @@
<item
android:id="@+id/time_zone_search_menu"
android:title="@string/search_settings"
- android:icon="@*android:drawable/ic_search_api_material"
+ android:icon="@drawable/ic_search_24dp"
android:showAsAction="always|collapseActionView"
android:actionViewClass="android.widget.SearchView" />
diff --git a/res/raw/gesture_ambient_wake_lock_screen.mp4 b/res/raw/gesture_ambient_wake_lock_screen.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_ambient_wake_lock_screen.mp4
diff --git a/res/raw/gesture_ambient_wake_screen.mp4 b/res/raw/gesture_ambient_wake_screen.mp4
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/res/raw/gesture_ambient_wake_screen.mp4
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 9e22efa..02369ae 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Hanteer as beperk"</item>
<item msgid="2266114985518865625">"Hanteer as onbeperk"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Verstek (gebruik ewekansige MAC)"</item>
+ <item msgid="5398461510512959597">"Vertroud"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nee"</item>
<item msgid="3863157480502955888">"Ja"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Altyd aan"</item>
<item msgid="6385301106124765323">"Altyd af"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Af"</item>
+ <item msgid="2182686878828390312">"Ontfout"</item>
+ <item msgid="5286514712714822064">"Woordryk"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Net tuis"</item>
+ <item msgid="5034813753274486448">"Outomaties"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA verkies"</item>
+ <item msgid="807926878589867564">"Net GSM"</item>
+ <item msgid="488474605709912156">"Net WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA outomaties"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo outomaties"</item>
+ <item msgid="370391313511477301">"CDMA sonder EvDo"</item>
+ <item msgid="4678789463133969294">"Net EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globaal"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Net TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globaal"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index a9f65e2..1804793 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Skep"</string>
<string name="allow" msgid="3349662621170855910">"Laat toe"</string>
<string name="deny" msgid="6947806159746484865">"Weier"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Maak toe"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Skakel oor"</string>
<string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Nog net <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> stappe oor voordat jy \'n ontwikkelaar is.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Toemaar, jy is reeds \'n ontwikkelaar."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Aktiveer asseblief eers ontwikkelaaropsies."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Draadloos en netwerke"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Skakelpunte"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Toestel"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Persoonlik"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Verkry toegang"</string>
<string name="header_category_system" msgid="2816866961183068977">"Stelsel"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Aktiveer dataverbinding"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Deaktiveer dataverbinding"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Toestel se Bluetooth-adres: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ontkoppel <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitsaai"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Onbenoemde Bluetooth-toestel"</string>
<string name="progress_scanning" msgid="192587958424295789">"Soek"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Geen Bluetooth-toestelle is naby gevind nie."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"\'n Program wil Bluetooth aanskakel en jou foon vir ander toestelle sigbaar maak. Jy kan dit later in Bluetooth-instellings verander."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Skakel tans Bluetooth af…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Skakel tans Bluetooth af…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Outokoppel"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-verbindingsversoek"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tik om aan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" te koppel."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Wil jy koppel aan \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Beskikbare oproeptoestelle"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Tans gekoppel"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Gestoorde toestelle"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Voeg toestel by"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth sal aangeskakel word om saam te bind"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Verbindingvoorkeure"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Toestelle wat vroeër gekoppel was"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Voorheen gekoppel"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth is aangeskakel"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Sien alles"</string>
<string name="date_and_time" msgid="9062980487860757694">"Datum en tyd"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Kies tydsone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Slaan oor"</string>
<string name="next_label" msgid="4693520878012668114">"Volgende"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Tale"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Taalvoorkeure"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Verwyder"</string>
<string name="add_a_language" msgid="2330538812283783022">"Voeg \'n taal by"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Instellings"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Instellingskortpad"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Vliegtuigmodus"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Nog"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Draadloos en netwerke"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Bestuur Wi-Fi, Bluetooth, vliegtuigmodus, mobiele netwerke en VPN\'e"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobiele data"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privaatheid"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Gedeaktiveer deur administrateur"</string>
<string name="security_status_title" msgid="5848766673665944640">"Sekuriteitstatus"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Skermslot, gesigslot"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Skermslot, vingerafdruk"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Skermslot"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Gesig is bygevoeg"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Ontsluit met jou gesig"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Gebruik jou gesig om te staaf"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Gebruik jou gesig om jou foon te ontsluit, aankope te magtig, of by programme aan te meld."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Gebruik jou"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Gebruik jou gesig om jou foon te ontsluit of aankope goed te keur.\n\nLet wel: Jy kan nie jou gesig gebruik om hierdie toestel te ontsluit nie. Kontak jou organisasie se administrateur vir meer inligting."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Gebruik jou gesig om jou foon te ontsluit, aankope te magtig, of by programme aan te meld"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Jy kan tot <xliff:g id="COUNT">%d</xliff:g> vingerafdrukke byvoeg"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Sentreer jou gesig in die sirkel"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Doen dit later"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Jy kan tot <xliff:g id="COUNT">%d</xliff:g> gesigte byvoeg"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Jy het die maksimum aantal gesigte bygevoeg"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Kan nie meer gesigte byvoeg nie"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Inskrywing is nie voltooi nie"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Tydlimiet vir gesiginskrywing is bereik. Probeer weer."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Gesiginskrywing het nie gewerk nie."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Gereed. Lyk goed."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Klaar"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Gebruik jou gesig om"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Ontsluit jou toestel"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Programaanmelding en betalings"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Oë oop om te ontsluit"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Wanneer jy gesigstawing gebruik, moet jou oë oop wees"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Verwyder gesigdata"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Verbeter jou gesigdata"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Jou gesig kan gebruik word om jou toestel te ontsluit en toegang tot programme te kry. "<annotation id="url">"Kom meer te wete"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vingerafdruk"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Bestuur vingerafdrukke"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gebruik vingerafdruk vir"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Kies minstens een band vir Wi-Fi-warmkol:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP-instellings"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privaatheid"</string>
<string name="wifi_shared" msgid="844142443226926070">"Deel met ander toestelgebruikers"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(onveranderd)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Kies asseblief"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Kanselleer"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Vergeet netwerk?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Alle wagwoorde vir hierdie netwerk sal uitgevee word"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Gestoorde netwerke"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d netwerke</item>
<item quantity="one">1 netwerk</item>
@@ -998,7 +1005,7 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Swerfvoorkeur"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"Verkieslik Wi-Fi"</item>
+ <item msgid="2124257075906188844">"Wi-Fi verkies"</item>
<item msgid="1335127656328817518">"Verkies mobiel"</item>
<item msgid="3132912693346866895">"Net Wi-Fi"</item>
</string-array>
@@ -1013,7 +1020,7 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"Verkieslik Wi-Fi"</item>
+ <item msgid="5782108782860004851">"Verkies Wi-Fi"</item>
<item msgid="5074515506087318555">"Verkies mobiel"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Helderheid"</string>
<string name="brightness_summary" msgid="838917350127550703">"Verstel die helderheid van die skerm"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Aan"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Af"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Voorkeurhelderheid is baie laag"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Voorkeurhelderheid is laag"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Kan nie PIN verander nie.\nMoontlik verkeerde PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-PIN is suksesvol verander"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Kan nie SIM-kaart se sluitstatus verander nie.\nMoontlik \'n verkeerde PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Kan nie PIN deaktiveer nie."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Kan nie PIN aktiveer nie."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Kanselleer"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Verskeie SIMs gevind"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Dit vereis dat die <xliff:g id="NAME_0">^1</xliff:g> geformateer word. \n\n"<b>"Formatering vee alle data uit wat tans op die <xliff:g id="NAME_1">^1</xliff:g> geberg is."</b>" Oorweeg dit om die data te rugsteun om te keer dat jy dit verloor."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Vee uit en formateer"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formateer tans <xliff:g id="NAME">^1</xliff:g> …"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder terwyl dit geformateer word nie."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Moenie die <xliff:g id="NAME">^1</xliff:g> verwyder terwyl dit geformateer word nie."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Skuif data na nuwe berging"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Jy kan jou foto\'s, lêers en sommige programme na hierdie nuwe <xliff:g id="NAME">^1</xliff:g> skuif. \n\nDit sal sowat <xliff:g id="TIME">^2</xliff:g> neem om te skuif en sal <xliff:g id="SIZE">^3</xliff:g> interne berging beskikbaar stel. Sommige programme sal nie werk terwyl dit besig is nie."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Skuif nou"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Geïnstalleer"</string>
<string name="no_applications" msgid="7336588977497084921">"Geen programme nie"</string>
<string name="internal_storage" msgid="1584700623164275282">"Interne berging"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"interne berging"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-berging"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kaartberging"</string>
<string name="recompute_size" msgid="7722567982831691718">"Herbereken tans grootte…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Vee programdata uit?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Alle data van hierdie program sal permanent uitgevee word. Dit sluit alle lêers, instellings, rekeninge, databasisse ens. in."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Die program is nie in die lys geïnstalleerde programme gevind nie."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Kon nie berging vir program uitvee nie."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Hierdie program het toegang tot die volgende op jou tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Hierdie program kan by die volgende op jou foon ingaan:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Hierdie program kan by die volgende inligting op jou tablet ingaan. Om prestasie te verbeter en geheuegebruik te verminder, is sommige van hierdie regte aan <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> beskikbaar, want dit loop in dieselfde proses as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Hierdie program kan by die volgende inligting op jou foon ingaan. Om prestasie te verbeter en geheuegebruik te verminder, is sommige van hierdie regte aan <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> beskikbaar, want dit loop in dieselfde proses as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> en <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Hierdie program kan dalk geld van jou hef:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Stuur \'n premium-SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Bereken tans..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Kon nie pakketgrootte bereken nie."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Jy het geen geïnstalleerde derdeparty-programme nie."</string>
<string name="version_text" msgid="9189073826278676425">"weergawe <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Skuif"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Skuif na tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Skuif na foon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Skuif na USB-berging"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Skuif na SD-kaart"</string>
- <string name="moving" msgid="6431016143218876491">"Skuif"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"\'n Ander migrasie is reeds aan die gang."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nie genoeg stoorplek nie."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Program bestaan nie."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Toesteladministrateurprogram kan nie op eksterne media geïnstalleer word nie"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Dwing stop?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"As jy \'n program dwing om te stop, kan dit wangedra."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Kon nie program beweeg nie. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Voorkeur-installeerligging"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Verander die voorkeur-installeerligging vir nuwe programme."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktiveer ingeboude program?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Deaktiveer program"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"As jy hierdie program deaktiveer, sal Android en ander programme dalk nie meer soos bedoel werk nie."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vee data uit en deaktiveer program?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"As jy hierdie program deaktiveer, sal Android en ander programme dalk nie meer soos bedoel werk nie. Jou data sal ook uitgevee word."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Wil jy kennisgewings afskakel?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"As jy kennisgewings vir hierdie program afskakel, kan jy moontlik belangrike waarskuwings en opdaterings mis."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Winkel"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Programbesonderhede"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Program is vanaf <xliff:g id="APP_STORE">%1$s</xliff:g> geïnstalleer"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Gebruik diens"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Gebruik kleurregstelling"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Gebruik onderskrifte"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Gaan voort"</string>
<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="6371077608778830020">"Voeg gehoortoestel by"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"As jy agtergrondaktiwiteit vir \'n program beperk, kan dit verkeerd werk"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Hierdie program is nie gestel om batterykrag te optimeer nie en daarom kan jy dit nie beperk nie.\n\nOm die program te beperk, moet jy eers batterykrag-optimering aanskakel."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Skermgebruik sedert battery volgelaai is"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Skermverbruik"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Skandering van mobiele netwerk"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Batterygebruik sedert dit vol gelaai is"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Hoe lank skerm aan was sedert battery volgelaai is"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Toestelgebruik sedert battery volgelaai is"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Gebruikdetails"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Verstel kraggebruik"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Ingeslote pakkette"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Programme wat tans battery laat afloop"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Hou toestel wakker"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Maak toestel in agtergrond wakker"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Vra gereeld vir ligging"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> programme wat tans vreemd optree"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Programme werk normaalweg"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Foon het gewone agtergrondbatteryverbruik"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet het gewone agtergrondbatteryverbruik"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Beperk tans batterygebruik vir %1$d programme</item>
<item quantity="one">Beperk tans batterygebruik vir %1$d program</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Beperk: <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Hierdie programme het battery in die agtergrond gebruik. Beperkte programme sal dalk nie behoorlik werk nie en kennisgewings sal dalk vertraag word."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Gebruik Batterybestuurder"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Bespeur wanneer programme battery leegmaak"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Kanselleer"</string>
<string name="tts_reset" msgid="2661752909256313270">"Stel terug"</string>
<string name="tts_play" msgid="2628469503798633884">"Speel"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Kragbeheer"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Dateer Wi-Fi-instelling op"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Werk Bluetooth-instelling by"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"aan"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"af"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"skakel aan"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"skakel af"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Ligging"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinkroniseer"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Helderheid <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"outo"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"vol"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"af"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Eiebewysberging"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installeer uit berging"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Kies almal"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Programdatagebruik"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobiele data en Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Diensverskaffer se datarekeninge kan van jou toestel verskil."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Programgebruik"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"PROGRAMINLIGTING"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Wys %d versteekte items</item>
<item quantity="one">Wys %d versteekte item</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Vou in"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Netwerk en internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiel"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datagebruik"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps en kennisgewings"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Toestemmings, verstekprogramme"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Kennisgewingtoegang is nie vir programme in die werkprofiel beskikbaar nie."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Rekeninge"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Geen rekeninge is bygevoeg nie"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Verstekprogramme"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Tale, tyd, rugsteun, opdaterings"</string>
<string name="search_results_title" msgid="1796252422574886932">"Instellings"</string>
- <string name="search_menu" msgid="6283419262313758339">"Deursoek instellings"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, netwerkverbinding, internet, draadloos, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, wissel, beheer"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"sms, teksboodskap, boodskappe, boodskapdiens, verstek"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"betaal, tik, betalings"</string>
<string name="keywords_backup" msgid="470070289135403022">"rugsteun, rugsteun"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gebaar"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"gesig, ontsluit, stawing, meld aan"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl-weergawe, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"netwerk, selnetwerktoestand, dienstoestand, seinsterkte, selnetwerktipe, swerf, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"reeksnommer, hardewareweergawe"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"donker tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"fout"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Stemmingvertoning, sluitskermvertoning"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"sluitskermkennisgewing"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"gesig"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"vingerafdruk"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"verdof skerm, raakskerm, battery, slimhelderheid, dinamiese helderheid"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Wanneer jy jou PIN invoer om hierdie toestel te begin, sal toeganklikheiddienste soos <xliff:g id="SERVICE">%1$s</xliff:g> nog nie beskikbaar wees nie."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Wanneer jy jou patroon invoer om hierdie toestel te begin, sal toeganklikheiddienste soos <xliff:g id="SERVICE">%1$s</xliff:g> nog nie beskikbaar wees nie."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Wanneer jy jou wagwoord invoer om hierdie toestel te begin, sal toeganklikheiddienste soos <xliff:g id="SERVICE">%1$s</xliff:g> nog nie beskikbaar wees nie."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Let wel: Ná \'n herselflaai kan hierdie program nie begin voordat jy jou foon ontsluit het nie"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Let wel: As jy jou foon herbegin en \'n skermslot gestel het, kan hierdie program eers begin nadat jy jou foon ontsluit het"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI-inligting"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI se relatiewe inligting"</string>
<string name="slot_number" msgid="3762676044904653577">"(Gleuf<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Persoonlik"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Werk"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Programme: Alle"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Programme: Afgeskakel"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Afgeskakel"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorieë: Dringend"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorieë: Onbelangrik"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorieë: Afgeskakel"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Opletberigte oor gebruik"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Wys volle toestelgebruik"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Wys programgebruik"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Groot gebruik"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> programme tree abnormaal op</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> tree abnormaal op</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Interne gebruik: <xliff:g id="PERCENTAGE">%1$s</xliff:g> is gebruik – <xliff:g id="FREE_SPACE">%2$s</xliff:g> is beskikbaar"</string>
<string name="display_summary" msgid="6737806235882127328">"Slaap ná <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Muurpapier, slaap, lettergrootte"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Slaap ná 10 minute se onaktiwiteit"</string>
<string name="memory_summary" msgid="8080825904671961872">"Gemiddeld <xliff:g id="USED_MEMORY">%1$s</xliff:g> van <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> berging gebruik"</string>
<string name="users_summary" msgid="1674864467098487328">"Aangemeld as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS word nie toegelaat nie"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kamera word nie toegelaat nie"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Skermkiekie word nie toegelaat nie"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Kan nie rugsteune afskakel nie"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Kan nie hierdie program oopmaak nie"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Kontak jou IT-administrateur as jy vrae het"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Meer besonderhede"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simuleer \'n skerm met \'n knipmodel"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Skermuitsnede"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"skermuitsnede, uitkeep"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Geen"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Toestelverstek"</string>
<string name="special_access" msgid="3458780842491881155">"Spesiale app-toegang"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> programme kan onbeperkte data gebruik</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Gekoppel aan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Gekoppel aan veelvuldige toestelle"</string>
<string name="demo_mode" msgid="2798762752209330277">"Stelsel-UI-demonstrasiemodus"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Nagmodus"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Stel nagmodus"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Donkermodus"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Stel Donkermodus"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Kitsinstellings-ontwikkelaarteëls"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-spoor"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Werkprofielinstellings"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaksoektog"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Laat kontaksoektogte deur jou organisasie toe om bellers en kontakte te identifiseer"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dubbeltik om na foon te kyk"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dubbeltik om na tablet te kyk"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dubbeltik om na toestel te kyk"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Dubbeltik jou skerm om tyd, kennisgewingikone en ander inligting na te gaan."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Dubbeltik op jou skerm om na die horlosie, kennisgewings en ander inligting te kyk."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tel foon op om te kyk"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tel op om na tablet te kyk"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Tel op om na toestel te kyk"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Tel jou foon op om na tyd, kennisgewingikone en ander inligting te kyk."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Tel jou tablet op om tyd, kennisgewingikone en ander inligting na te gaan."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Tel jou toestel op om tyd, kennisgewingikone en ander inligting na te gaan."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Ontwaakskerm"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Tel jou foon op om na die horlosie, kennisgewings en ander inligting te kyk."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Tel jou tablet op om na die horlosie, kennisgewings en ander inligting te kyk."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Tel jou toestel op om na die horlosie, kennisgewings en ander inligting te kyk."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Wekslotskermgebaar"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swiep vingerafdruk vir kennisgewings"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Swiep vingerafdruk"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou foon om jou kennisgewings na te gaan."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pogings</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> poging</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Hierdie toestel se data word tans gerugsteun"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Hierdie toestel word deur jou organisasie bestuur."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Hierdie toestel word deur <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> bestuur."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Outovuldiens"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"outomaties, invul, outovul"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Maak seker dat jy hierdie program vertrou</b> <br/> <br/> <xliff:g id=app_name example=Google Outovul>%1$s</xliff:g> gebruik wat op jou skerm is om te bepaal wat outomaties ingevul kan word."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Outovul"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Aantekeningvlak"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maksimum aantal versoeke per sessie"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maks. aantal sigbare datastelle"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Stel terug na verstekwaardes"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Outovul-ontwikkelaaropsies is teruggestel"</string>
<string name="device_theme" msgid="4571803018917608588">"Toesteltema"</string>
<string name="default_theme" msgid="7085644992078579076">"Verstek"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Netwerknaam"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger-diensverskaffervoorsiening"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Dateer Moenie Steur Nie op"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Onderbreek kennisgewings om gefokus te bly"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Wat is nuut en opwindend?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Kry \'n kykie van jou nuwe foon"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kry \'n kykie van jou nuwe tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Kry \'n kykie van jou nuwe toestel"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Hierdie kenmerk is nie op hierdie toestel beskikbaar nie"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Dwing vol GNSS-metings af"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Spoor alle GNSS-konstellasies en -frekwensies na sonder enige dienssiklussering"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Wys altyd omvaldialoog"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Wys dialoog elke keer as \'n program omval"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Kies ANGLE-geaktiveerde program"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Geen ANGLE-gekativeerde program gestel nie"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE-geaktiveerde program: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Gidstoegang"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"gidstoegang"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Netwerkbesonderhede"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Programme op jou foon kan jou toestelnaam sien. Ander mense sal dit dalk ook kan sien wanneer jy aan Bluetooth-toestelle koppel of \'n Wi-Fi-warmkol opstel."</string>
<string name="devices_title" msgid="7701726109334110391">"Toestelle"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Alle instellings"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Voorstelle"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Kies netwerk"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Ontkoppel"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Gekoppel"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Koppel tans …"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Kon nie koppel nie"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Geen netwerke gekry nie."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Kon nie netwerke kry nie. Probeer weer."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(verbode)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Geen SIM-kaart nie"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Gevorderde oproepe"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Voorkeurnetwerkmodus: WCDMA verkies"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Voorkeurnetwerkmodus: net GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Voorkeurnetwerkmodus: net WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Voorkeurnetwerkmodus: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Voorkeurnetwerkmodus: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Voorkeurnetwerkmodus: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Voorkeurnetwerkmodus: net CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Voorkeurnetwerkmodus: net EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Voorkeurnetwerkmodus: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Voorkeurnetwerkmodus: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Voorkeurnetwerkmodus: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Voorkeurnetwerkmodus: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Voorkeurnetwerkmodus: globaal"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Voorkeurnetwerkmodus: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Voorkeurnetwerkmodus: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Voorkeurnetwerkmodus: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Voorkeurnetwerkmodus: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Voorkeurnetwerkmodus: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Voorkeurnetwerkmodus: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Voorkeurnetwerkmodus: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Voorkeurnetwerkmodus: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Voorkeurnetwerkmodus: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Voorkeurnetwerkmodus: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Voorkeurnetwerkmodus: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Voorkeurnetwerkmodus: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Voorkeurnetwerkmodus: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (aanbeveel)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (aanbeveel)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globaal"</string>
+ <string name="label_available" msgid="1731547832803057893">"Beskikbare netwerke"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Soek tans …"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registreer tans op <xliff:g id="NETWORK">%s</xliff:g> …"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Jou SIM-kaart laat nie \'n verbinding aan hierdie netwerk toe nie."</string>
+ <string name="connect_later" msgid="978991102125216741">"Kan nie op die oomblik aan hierdie netwerk koppel nie. Probeer later weer."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Geregistreer op netwerk."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Kies netwerk outomaties"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Diensverskafferstellings"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Stel datadiens op"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobiele data"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Kry toegang tot data deur selnetwerk"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Voorkeurnetwerktipe"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Verander die netwerkbedryfsmodus"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Voorkeurnetwerktipe"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Diensverskaffer"</string>
+ <string name="call_category" msgid="8108654745239563833">"Oproepe"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Diensverskaffervideo-oproepe"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Stelselkeuse"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Verander die CDMA-swerwingmodus"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Stelselkeuse"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Netwerk"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Netwerk"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA-intekening"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Wissel tussen RUIM/SIM en NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"intekening"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Outomatiese registrasie …"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Laat dataswerwing toe?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Kry pryse by jou netwerkverskaffer."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Programdatagebruik"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Ongeldige netwerkmodus <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignoreer."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Onbeskikbaar wanneer gekoppel aan <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Sien meer"</string>
+ <string name="see_less" msgid="1250265310929558370">"Sien minder"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Geen gekoppelde toestelle nie"</string>
</resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index d3e6a0c..69b8638 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"እንደ ተለካ አስተናግድ"</item>
<item msgid="2266114985518865625">"እንደ ያልተለካ አስተናግድ"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ነባሪ (የዘፈቀደ ማክ ይጠቀሙ)"</item>
+ <item msgid="5398461510512959597">"የታመነ"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"አይ"</item>
<item msgid="3863157480502955888">"አዎ"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"ሁልጊዜ አብራ"</item>
<item msgid="6385301106124765323">"ሁልጊዜ አጥፋ"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"አጥፋ"</item>
+ <item msgid="2182686878828390312">"አርም"</item>
+ <item msgid="5286514712714822064">"ዝርክርክ ቃላት"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"መነሻ ብቻ"</item>
+ <item msgid="5034813753274486448">"ራስ-ሰር"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA ይመረጣል"</item>
+ <item msgid="807926878589867564">"GSM ብቻ"</item>
+ <item msgid="488474605709912156">"WCDMA ብቻ"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA ራስ-ሰር"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo ራስ-ሰር"</item>
+ <item msgid="370391313511477301">"CDMA ያለEvDo"</item>
+ <item msgid="4678789463133969294">"EvDo ብቻ"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"ሁለንተናዊ"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA ብቻ"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"ሁለንተናዊ"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 73b9845..263b30a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"ፍጠር"</string>
<string name="allow" msgid="3349662621170855910">"ይፍቀዱ"</string>
<string name="deny" msgid="6947806159746484865">"ይከልክሉ"</string>
- <string name="dlg_close" msgid="7471087791340790015">"ዝጋ"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"ቀይር"</string>
<string name="device_info_default" msgid="7847265875578739287">"ያልታወቀ"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">አሁን ገንቢ ለመሆን <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ደረጃዎች ይቀርዎታል።</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"አያስፈልግም፣ አስቀድሞ ገንቢ ሆነዋል።"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"እባክዎ በመጀመሪያ የገንቢ አማራጮችን ያንቁ።"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"የገመድ አልባና አውታረ መረቦች"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"ግንኙነቶች"</string>
- <string name="header_category_device" msgid="4544026001618307754">"መሣሪያ"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"የግል"</string>
- <string name="header_category_access" msgid="7580499097416970962">"መዳረሻ"</string>
<string name="header_category_system" msgid="2816866961183068977">"ስርዓት"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"የውሂብ ግንኙነትን አንቃ"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"የውሂብ ግንኙነትን አሰናክል"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"የመሣሪያ የብሉቱዝ አድራሻ፦ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"የ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ግንኙነት ይቋረጥ?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"ማሰራጨት"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"ስም አልባ የብሉቱዝ መሣሪያ"</string>
<string name="progress_scanning" msgid="192587958424295789">"በመፈለግ ላይ"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"በአቅራቢያው ምንም የብሉቱዝ መሳሪያዎች አልተገኙም::"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"አንድ መተግበሪያ ብሉቱዝን አብርቶ ስልክዎን ለሌሎች መሣሪያዎች እንዲታይ ሊያደርገው ይፈልጋል። ይሄን በኋላ ላይ በብሉቱዝ ቅንብሮች ውስጥ ሊቀይሩት ይችላሉ።"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ብሉቱዝ በማብራት ላይ..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ብሉቱዝ በማጥፋት ላይ..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"በራስ ሰር ተገናኝ"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"የብሉቱዝ ተያያዥ ጠይቅ"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"ከ«<xliff:g id="DEVICE_NAME">%1$s</xliff:g>» ለመገናኘት ነካ ያድርጉ።"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"ወደ\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ለማያያዝ ይፈልጋሉ?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"የሚገኙ የጥሪ መሣሪያዎች"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"አሁን ላይ ተገናኝቷል"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"የተቀመጡ መሣሪያዎች"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"መሣሪያ ያክሉ"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"ብሉቱዝ ለማጣመር ይበራል"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"የግንኙነት ምርጫዎች"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"ከዚህ ቀደም የተገናኙ መሣሪያዎች"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ከዚህ ቀደም የተገናኘ"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ብሉቱዝ በርቷል"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"ሁሉንም ይመልከቱ"</string>
<string name="date_and_time" msgid="9062980487860757694">"ቀን እና ሰዓት"</string>
<string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"ዝለል"</string>
<string name="next_label" msgid="4693520878012668114">"ቀጥል"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ቋንቋዎች"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"የቋንቋ ምርጫዎች"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"አስወግድ"</string>
<string name="add_a_language" msgid="2330538812283783022">"ቋንቋ አክል"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"ቅንብሮች"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"የቅንብሮች አቋራጭ"</string>
<string name="airplane_mode" msgid="8837269988154128601">"የአውሮፕላን ሁነታ"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"ተጨማሪ"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"ገመድ አልባ& አውታረ መረቦች"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi፣ ብሉቱዝ፣ የአውሮፕላን ሁነታ፣ የተንቀሳቃሽ አውታረ መረቦች፣ እና VPNዎችን ያቀናብሩ"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"የተንቀሳቃሽ ስልክ ውሂብ"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"ግላዊነት"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"በአስተዳዳሪ ተሰናክሏል"</string>
<string name="security_status_title" msgid="5848766673665944640">"የደህንነት ሁኔታ"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"ማያ ገጽ መቆለፊያ፣ የፊት መክፈቻ"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"የማያ ገጽ ቁልፍ፣ የጣት አሻራ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ማሳያ መቆለፊያ"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"መልክ ታክሏል"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"በመልክዎ ይክፈቱ"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"ለማረጋገጥ መልክዎን ይጠቀሙ"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ስልክዎን ለመክፈት፣ ግዢዎችን ለመፍቀድ ወይም በመለያ ወደ መተግበሪያዎች ለመግባት መልክዎን ይጠቀሙ።"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"እርስዎን ይጠቀሙ"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"የእርስዎን ስልክ ለመክፈት ወይም ግዢዎችን ለማጽደቅ የእርስዎን ፊት ይጠቀሙ።\n\nማስታወሻ፦ ይህን መሣሪያ ለመክፈት ፊትን መጠቀም አይችሉም። ለተጨማሪ መረጃ፣ የእርስዎን ድርጅት አስተዳዳሪ ያነጋግሩ።"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ስልክዎን ለመክፈት፣ ግዢዎችን ለመፍቀድ ወይም በመለያ ወደ መተግበሪያዎች ለመግባት መልክዎን ይጠቀሙ"</string>
- <string name="face_add_max" msgid="2342250989212694454">"እስከ <xliff:g id="COUNT">%d</xliff:g> የሚደርሱ የጣት አሻራዎችን ማከል ይችላሉ"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ክቡ ውስጥ የእርስዎ ፊት መሃል ለመሃል ያድርጉት"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"በኋላ ላይ ያድርጉት"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"እስከ <xliff:g id="COUNT">%d</xliff:g> የሚደርሱ ፊቶችን ማከል ይችላሉ"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"የሚፈቀደውን ከፍተኛ የመልኮች ብዛት አክለዋል"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"ተጨማሪ መልኮችን ማከል አይቻልም"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"ምዝገባ አልተጠናቀቀም"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"እሺ"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"የፊት ምዝገባ ጊዜ ገደብ ላይ ተደርሷል። እንደገና ይሞክሩ።"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"የፊት ምዝገባ አልሠራም።"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"ሁሉም ተዘጋጅቷል። ጥሩ ይመስላል።"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"ተከናውኗል"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"የእርስዎ ፊትን ለዚህ ይጠቀሙ"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"መሣሪያዎን ይክፈቱት"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"የመተግበሪያ በመለያ መግቢያ እና ክፍያዎች"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"ለመክፈት ዓይኖችን ይክፈቱ"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"የፊት ማረጋገጫን በሚጠቀሙበት ጊዜ የእርስዎ ዓይኖች ክፍት መሆን አለባቸው"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"የፊት ውሂብ አስወግድ"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"የእርስዎን የፊት ውሂብ ያሻሽሉ"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"የእርስዎ ፊት የእርስዎን መሣሪያ ለመክፈት እና መተግበሪያዎችን ለመድረስ ጥቅም ላይ ሊውል ይችላል። "<annotation id="url">"የበለጠ ለመረዳት"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"የጣት አሻራ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"የጣት አሻራዎችን ያስተዳድሩ"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"የጣት አሻራን ይጠቀሙ ለ"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 ጊኸ"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"ለWi-Fi መገናኛ ነጥብ ቢያንስ አንድ ሞገድ ይምረጡ፦"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ቅንብሮች"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"ግላዊነት"</string>
<string name="wifi_shared" msgid="844142443226926070">"ለሌሎች የመሣሪያ ተጠቃሚዎች አጋራ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ያልተለወጠ)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"እባክዎ ይምረጡ"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"ይቅር"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"አውታረ መረብ ይረሳ?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ሁሉም የዚህ አውታረ መረብ ይለፍ ቃላት ይሰረዛሉ"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"የተቀመጡ አውታረ መረቦች"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d አውታረ መረቦች</item>
<item quantity="other">%d አውታረ መረቦች</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"ብሩህነት"</string>
<string name="brightness_summary" msgid="838917350127550703">"የማያ ብሩህነት አስተካክል"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"ተለማማጅ ብሩህነት"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"አብራ"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ጠፍቷል"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"የተመረጠው ብሩህነት በጣም ዝቅተኛው ነው"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"የተመረጠው ብሩህነት ዝቅተኛው ነው"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"ፒን መለወጥ አይቻልም::\n ምናልባት ልክ ያልኾነ ፒን ሊሆን ይችላል::"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM ፒን በተሳካ ተለውጧል"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"የሲም ካርድን ቆልፍ ሁኔታ ለመለወጥ አይቻልም። \n የተሳሳተ ፒን ሊሆን ይችላል።"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"ፒንን ማሰናከል አልተቻለም።"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"ፒንን ማንቃት አልተቻለም።"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"እሺ"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"ይቅር"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"በርካታ ሲሞች ተገኝተዋል"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ይሄ <xliff:g id="NAME_0">^1</xliff:g> ቅርጸት እንዲሰራለት ይፈልጋል። \n\n"<b>"ቅርጸት መስራት በአሁኑ ጊዜ በ<xliff:g id="NAME_1">^1</xliff:g> ላይ የተከማቸውን ውሂብ ሁሉ ይደመስሳል።"</b>" ውሂቡ እንዳይጠፋ ለመከላከል የእሱን ምትኬ ማስቀመጥ ያስቡበት።"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ደምስስ እና ቅርጸት ስራ"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"የ<xliff:g id="NAME">^1</xliff:g>ን ቅርጸት በመስራት ላይ…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g> ቅርጸት እየተሠራለት ሳለ አያስወግዱት።"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g> ቅርጸት እየተሠራለት ሳለ አያስወግዱት።"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ውሂብን ወደ አዲስ ማከማቻ ውሰድ"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"የእርስዎን ፎቶዎች፣ ፋይሎች፣ እና አንዳንድ መተግበሪያዎች ወደዚህ አዲስ <xliff:g id="NAME">^1</xliff:g> ማንቀሳቀስ ይችላሉ። \n\nእንቅስቃሴው <xliff:g id="TIME">^2</xliff:g> ያህል ይወስዳል እና <xliff:g id="SIZE">^3</xliff:g> በውስጣዊ ማከማቻው ላይ ነጻ ያደርጋል። ይህ በሚከናወንበት ጊዜ አንዳንድ መተግበሪያዎች አይሰሩም።"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"አሁን ይውሰዱ"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ተጭኗል"</string>
<string name="no_applications" msgid="7336588977497084921">"ምንም መተግበሪያዎች የሉም::"</string>
<string name="internal_storage" msgid="1584700623164275282">"የውስጥ ማከማቻ"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ውስጣዊ ማከማቻ"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"የUSB ማከማቻ"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD ካርድ ማከማቻ"</string>
<string name="recompute_size" msgid="7722567982831691718">"መጠን ድጋሚ በማስላት ላይ..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"መተግበሪያ ውሂብ ሰርዝ?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"የዚህ መተግበሪያ ውሂቦች ሁሉ በቋሚነት ይሰረዛሉ።እነዚህም ፋይሎችን፣ ቅንብሮችን፣ መለያዎችን፣ የውሂብ ጎታዎች እና የመሳሰሉትን ያካትታሉ።"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"መተግበሪያው በተጫኑ መተግበሪያዎች ዝርዝር ውስጥ አልተገኘም።"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"ለመተግበሪያው ማከማቻን ማጽዳት አልተቻለም"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ይህ መተግበሪያ የሚከተለውን በጡባዊዎ ላይ መድረስ ይችላል፡"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"ይህ መተግበሪያ ስልክዎ ላይ የሚከተለውን መድረስ ይችላል፡"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ይህ መተግበሪያ ጡባዊ ቱኮህ ላይ የሚከተለውን ሊደርስባቸው ይችላል። አፈጻጸሙን ለማሻሻልና የማህደረ ትውስታውን አጠቃቀም ለመቀነስ ሲባል ከእነኚህ ፍቃዶች ውስጥ አንዳንዶቹ ልክ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ባለበት ሂደት ውስጥ ስለሚካሄዱ ለ<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>ም ይገኛሉ፦"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ይህ መተግበሪያ ስልክዎ ላይ የሚከተሉትን ሊደርስባቸው ይችላል። አፈጻጸሙን ለማሻሻልና የማህደረ ትውስታውን አጠቃቀም ለመቀነስ ሲባል ከእነኚህ ፍቃዶች ውስጥ አንዳንዶቹ ልክ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ባለበት ሂደት ውስጥ ስለሚካሄዱ ለ<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>ም ይገኛሉ፦"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> እና <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>፣ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"ይህ መተግበሪያ ገንዘብ ሊያስከፍልዎት ይችላል፦"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"የክፍያ ኤስ ኤም ኤስ ይላክ?"</string>
<string name="computing_size" msgid="1599186977475211186">"በማስላት ላይ..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"የጥቅል መጠንን ለማስላት አልተቻለም።"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"የተጫኑ የማንኛውም ሦስተኛ ወገን መተግበሪያ የሉህም።"</string>
<string name="version_text" msgid="9189073826278676425">"ሥሪት<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"አንቀሳቅስ"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ወደ ጡባዊ አንቀሳቅስ"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ወደ ስልክ አንቀሳቅስ"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"ወደUSB ማከማቻ አንቀሳቅስ"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"ወደ SD ካርድ አንቀሳቅስ"</string>
- <string name="moving" msgid="6431016143218876491">"በማንቀሳቀስ ላይ"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"ሌላ ዝውውር አስቀድሞ በሂደት ላይ ነው።"</string>
<string name="insufficient_storage" msgid="481763122991093080">"በቂ ማከማቻ ቦታ የለም::"</string>
<string name="does_not_exist" msgid="1501243985586067053">"መተግበሪያ የለም::"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"የመሣሪያ አስተዳዳሪ መተግበሪያ በውጫዊ ማህደረመረጃ ላይ መጫን አይቻልም"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"በኃይል አቁም?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"መተግበሪያን በጉልበት እንዲቆም ካደረግከው ከአደብ ውጪ ሊሆን ይችላል::"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"መተግበሪያ ማንቀሳቀስ አልተቻለም:: <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"የሚመረጥ ጭነት ሥፍራ"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"ለአዲስ መተግበሪያዎች ተመራጭ መጫኛ ሥፍራዎችን ለውጥ።"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"የውስጠ ግንብ መተግበሪያ አቦዝን?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"መተግበሪያን አሰናክል"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"ይህን መተግበሪያ ካሰናከሉት ከዚህ በኋላ Android እና ሌሎች መተግበሪያዎች እንደተፈለገው ላይሠሩ ይችላሉ።"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ውሂብ ይሰረዝና መተግበሪያ ይሰናከል?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ይህን መተግበሪያ ካሰናከሉት ከዚህ በኋላ Android እና ሌሎች መተግበሪያዎች እንደተፈለገው ላይሠሩ ይችላሉ። የእርስዎ ውሂብም ይሰረዛል።"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ማሳወቂያዎችን አጥፋ?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ለእዚህ መተግበሪያ ማሳወቂያዎችን አጥፍተው ከሆነ፣ አስፈላጊ ማንቂያዎችን እና አዘምኖችን ሊያጡ ይችላሉ።"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"መደብር"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"የመተግበሪያ ዝርዝሮች"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"መተግበሪያ ከ<xliff:g id="APP_STORE">%1$s</xliff:g> ተጭኗል"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"አገልግሎትን ተጠቀም"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"የቀለም ማስተካከያን ተጠቀም"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"መግለጫ ጽሑፎችን ተጠቀም"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"ቀጥል"</string>
<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="6371077608778830020">"አጋዥ መስሚያ ያክሉ"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"የአንድ መተግበሪያ የጀርባ እንቅስቃሴን ከገደቡ ያልተገባ ባህሪ ሊያሳይ ይችላል"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ይህ መተግበሪያ ባትሪን ለማላቅ አልተቀናበረም፣ ሊገድቡት አይችሉም።\n\nመተግበሪያውን ለመገደብ፣ የባትሪ ማላቅን በመጀመሪያ ያብሩ።"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"ኃይሉ ሙሉ ከነበረበት ጊዜ ጀምሮ ያለው የማያ ገጽ አጠቃቀም"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"የማያ ገጽ ፍጆታ"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"የተንቀሳቃሽ ስልክ አውታረ መረብ ቅኝት"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"ከሙሉ ኃይል መሙላት ወዲህ የባትሪ አጠቃቀም"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ማያ ገጹ በርቶ የቆየበት ጊዜ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ያለው የመሣሪያ አጠቃቀም"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"ዝርዝሮችን ተጠቀም"</string>
<string name="controls_subtitle" msgid="390468421138288702">"የኃይል አጠቃቀም አስተካክል"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"የታከሉ አካታቾች"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"መተግበሪያዎች ባትሪ እያሟጠጡ ነው"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"መሣሪያው እንደነቃ እንዲቆይ በማድረግ ላይ"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"በበስተጀርባ መሣሪያውን እንዲነቃ በማድረግ ላይ"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"የመገኛ አካባቢ በተደጋጋሚ በመጠየቅ ላይ"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> መተግበሪያዎች ጥሩ ባህሪ እያሳዩ አይደሉም"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"መተግበሪያዎች በመደበኝነት እያሄዱ ናቸው"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ስልክ የታወቀ የዳራ ባትሪ አጠቃቀም አለው"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ጡባዊ የታወቀ የዳራ ባትሪ አጠቃቀም አለው"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">ለ%1$d መተግበሪያዎች የባትሪ አጠቃቀምን በመገደብ ላይ</item>
<item quantity="other">ለ%1$d መተግበሪያዎች የባትሪ አጠቃቀምን በመገደብ ላይ</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"የተገደበው <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"እነዚህ መተግበሪያዎች በበስተጀርባ ውስጥ ባትሪ ሲጠቀሙ ነበር። የተገደቡ መተግበሪያዎች በአግባቡ ላይሰሩ ይችላሉ፣ እና ማሳወቂያዎች ሊዘገዩ ይችላሉ።"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"የባትሪ አስተዳዳሪን ይጠቀሙ"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"መተግበሪያዎች ባትሪን ሲያንጠፈጥሩት ፈልገህ ዕወቅ"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"ይቅር"</string>
<string name="tts_reset" msgid="2661752909256313270">"ዳግም አስጀምር"</string>
<string name="tts_play" msgid="2628469503798633884">"አጫውት"</string>
- <string name="gadget_title" msgid="5519037532720577836">"የኃይል መቆጣጠሪያ"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"የWi-Fi ቅንብርን በማዘመን ላይ"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"የብሉቱዝቅንብር ማዘመን"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"በርቷል"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ጠፍቷል"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"በማብራት ላይ"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"በማጥፋት ላይ"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ብሉቱዝ"</string>
- <string name="gadget_location" msgid="2974757497945178165">"አካባቢ"</string>
- <string name="gadget_sync" msgid="858895763714222152">"አመሳስል"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"ብሩህነት <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ራስ-ሰር"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"ሙሉ"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"ግማሽ"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"ጠፍቷል"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"መረጃ ማከማቻ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ከUSB ማከማቻ ጫን"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"ከ<xliff:g id="NUMBER">%1$s</xliff:g><xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"ሁሉንም ምረጥ"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"የውሂብ አጠቃቀም"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"የመተግበሪያ ውሂብ አጠቃቀም"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"የተንቀሳቃሽ ስልክ ውሂብ እና Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"የአገልግሎት አቅራቢ ውሂብ አቆጣጠር ከየመሣሪያዎ ሊለይ ይችላል።"</string>
<string name="data_usage_app" msgid="4970478397515423303">"የመተግበሪያ አጠቃቀም"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"የመተግበሪያ መረጃ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">%d የተደበቁ ንጥሎችን አሳይ</item>
<item quantity="other">%d የተደበቁ ንጥሎችን አሳይ</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ሰብስብ"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"አውታረ መረብ እና በይነመረብ"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ሞባይል"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"የውሂብ አጠቃቀም"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ብሉቱዝ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"መተግበሪያዎች እና ማሳወቂያዎች"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ፈቃዶች፣ ነባሪ መተግበሪያዎች"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"የማሳወቂያ መዳረሻ በስራ መገለጫ ውስጥ ላሉ መተግበሪያዎች አይገኝም።"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"መለያዎች"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"ምንም መለያዎች አልታከሉም"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ነባሪ መተግበሪያዎች"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ቋንቋዎች፣ ጊዜ፣ ምትኬ፣ ዝማኔዎች"</string>
<string name="search_results_title" msgid="1796252422574886932">"ቅንብሮች"</string>
- <string name="search_menu" msgid="6283419262313758339">"የፍለጋ ቅንብሮች"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi፣ አውታረ መረብ ግንኙነት፣ በይነመርብ፣ ገመድ አልባ፣ ውሂብ፣ wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi፣ wi-fi፣ ቀያይር፣ ቁጥጥር"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"የጽሑፍ መልዕክት፣ መልዕክት ጽሑፍ መላላክ፣ መልዕክቶች፣ መልዕክት አላላክ፣ ነባሪ"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ይክፈሉ፣ መታ ያድርጉ፣ ክፍያዎች"</string>
<string name="keywords_backup" msgid="470070289135403022">"ምትኬ"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"የጣት ምልክት"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ፊት፣ ክፈት፣ ፈቀዳ፣ በመለያ መግቢያ"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei፣ meid፣ ደቂቃ፣ prl ስሪት፣ imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"አውታረ መረብ፣ የተንቀሳቃሽ ስልክ አውታረ መረብ ሁኔታ፣ አገልግሎት ሁኔታ፣ የሲግናል ጥንካሬ፣ የተንቀሳቃሽ ስልክ አውታረ መረብ ዓይነት፣ ከአገልግሎት መስጫ ክልል ውጭ፣ iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"ተከታታይ ቁጥር፣ የሃርድዌር ስሪት"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ጨለማ ገጽታ"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ሳንካ"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ድባባዊ ማሳያ፣ የማያ ገጽ ቁልፍ ማሳያ"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"የማያ ገጽ ቁልፍ ማሳወቂያ"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"መልክ"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"የጣት አሻራ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"የደበዘዘ ማያ ገጽ፣ ማያንካ፣ ባትሪ፣ ዘመናዊ ብሩህነት፣ ተለዋዋጭ ብሩህነት"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"ይህን መሣሪያ ለማስጀምር ፒንዎን ሲያስገቡ እንደ <xliff:g id="SERVICE">%1$s</xliff:g> ያሉ የተደራሽነት አገልግሎቶች ሊገኙ አይችሉም።"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"ይህን መሣሪያ ለማስጀምር የስርዓተ-ጥለትዎን ሲያስገቡ እንደ <xliff:g id="SERVICE">%1$s</xliff:g> ያሉ የተደራሽነት አገልግሎቶች ሊገኙ አይችሉም።"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"ይህን መሣሪያ ለማስጀምር የይለፍ ቃልዎን ሲያስገቡ እንደ <xliff:g id="SERVICE">%1$s</xliff:g> ያሉ የተደራሽነት አገልግሎቶች ሊገኙ አይችሉም።"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ማስታወሻ፦ እንደገና ከማስነሳት በኋላ ይህ መተግበሪያ ስልክዎን እስከሚከፍቱት ድረስ ሊጀምር አይችልም"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"ማስታወሻ፦ ስልክዎን ዳግም ካስነሱትና የማያ ገጽ መቆለፊያን ካቀናበሩ ስልክዎን እስኪከፍቱት ድረስ ይህ መተግበሪያ ሊጀመር አይችልም"</string>
<string name="imei_information_title" msgid="8499085421609752290">"የIMEI መረጃ"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"የIMEI ተዛማጅ መረጃ"</string>
<string name="slot_number" msgid="3762676044904653577">"(ቀዳዳ <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"የግል"</string>
<string name="filter_work_apps" msgid="24519936790795574">"ስራ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"መተግበሪያዎች፦ ሁሉም"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"መተግበሪያዎች፦ ጠፍተዋል"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ጠፍተዋል"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ምድቦች፦ በጣም አስቸኳይ አስፈላጊነት"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ምድቦች፦ ዝቅተኛ ቅድሚያ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ምድቦች፦ ጠፍተዋል"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"የአጠቃቀም ማንቂያዎች"</string>
<string name="show_all_apps" msgid="1512506948197818534">"ሙሉ የመሣሪያ አጠቃቀም አሳይ"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"የመተግበሪያ አጠቃቀም አሳይ"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ከፍተኛ የኃይል ፍጆታ"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> መተግበሪያዎች ልክ ያልሆነ ባህሪ እያሳዩ ነው</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> መተግበሪያዎች ልክ ያልሆነ ባህሪ እያሳዩ ነው</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"ውስጣዊ ማከማቻ፦ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ጥቅም ላይ ውሏል - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ነጻ"</string>
<string name="display_summary" msgid="6737806235882127328">"ከ<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> እንቅስቃሴ-አልባነት በኋላ ተኛ"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"ልጣፍ፣ እንቅልፍ፣ የቅርጸ-ቁምፊ መጠን"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"ከ10 ደቂቃዎች እንቅስቃሴ-አልባነት በኋላ ተኛ"</string>
<string name="memory_summary" msgid="8080825904671961872">"በአማካይ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ከ<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ማህደረ ትውስጥ ስራ ላይ ውሏል"</string>
<string name="users_summary" msgid="1674864467098487328">"እንደ <xliff:g id="USER_NAME">%1$s</xliff:g> ሆነው ገብተዋል።"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"ኤስኤምኤስ አልተፈቀደም"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"ካሜራ አልተፈቀደም"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ቅጽበታዊ ገጽ እይታ አልተፈቀደም"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"ምትኬዎችን ማጥፋት አይቻልም"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"ይህን መተግበሪያ መክፈት አልተቻለም"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"ጥያቄዎች ካልዎት የእርስዎን የአይቲ አስተዳዳሪ ያነጋግሩ"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ተጨማሪ ዝርዝሮች"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"አንድ ማሳያን በእሱ በተሰራ ቅርጽ አስመስል"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"የማሳያ ቅርጽ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"የማሳያ ቅርጽ፣ ስርጉድ"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ምንም"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"የመሣሪያ ነባሪ"</string>
<string name="special_access" msgid="3458780842491881155">"ልዩ የመተግበሪያ መዳረሻ"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> መተግበሪያዎች ያልተገደበ ውሂብ ሊጠቀሙ ይችላሉ</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"ከ<xliff:g id="ID_1">%1$s</xliff:g> ጋር ተገናኝቷል"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ከበርካታ መሣሪያዎች ጋር ተገናኝቷል"</string>
<string name="demo_mode" msgid="2798762752209330277">"የስርዓት ተጠቃሚ በይነገጽ ማሳያ ሁነታ"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"የሌሊት ሁነታ"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"የሌሊት ሁነታን አቀናብር"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"የጨለማ ሁነታ"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"የጨለማ ሁነታን ያቀናብሩ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"የፈጣን ቅንብሮች ገንቢ ሰድሮች"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope መከታተያ"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"የስራ መገለጫ ቅንብሮች"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"የእውቂያ ፍለጋ"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"በእርስዎ ድርጅት የሚደረጉ የእውቂያ ፍለጋዎች ደዋዮችን እና እውቂያዎችን እንዲለዩ ፍቀድ"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ስልኩን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ጡባዊውን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"መሣሪያውን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"ጊዜን፣ የማሳወቂያ አዶዎችን፣ እና ሌላ መረጃን ለመፈተሽ የእርስዎን ማያ ገጽ ሁለቴ መታ ያድርጉት።"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"ጊዜን፣ ማሳወቂያዎችን እና ሌላ መረጃን ለማረጋገጥ የእርስዎን ማያ ገጽ ሁለት ጊዜ መታ ያድርጉት።"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ስልኩን ለማረጋገጥ ያንሱ"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ጡባዊውን ለማረጋገጥ ያንሱ"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"መሣሪያውን ለማረጋገጥ ያንሱ"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ጊዜን፣ የማሳወቂያ አዶዎችን፣ እና ሌላ መረጃን ለመፈተሽ የእርስዎን ስልክ ያንሱት።"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ጊዜን፣ የማሳወቂያ አዶዎችን፣ እና ሌላ መረጃን ለመፈተሽ የእርስዎን ጡባዊ ያንሱት።"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ጊዜን፣ የማሳወቂያ አዶዎችን፣ እና ሌላ መረጃን ለመፈተሽ የእርስዎን መሣሪያ ያንሱት።"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ማሳያን ቀስቅስ"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"ጊዜን፣ ማሳወቂያዎችን እና ሌላ መረጃን ለማረጋገጥ የእርስዎን ስልክ ያንሱት።"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"ጊዜን፣ ማሳወቂያዎችን እና ሌላ መረጃን ለማረጋገጥ የእርስዎን ጡባዊ ያንሱት።"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"ጊዜን፣ ማሳወቂያዎችን እና ሌላ መረጃን ለማረጋገጥ የእርስዎን መሣሪያ ያንሱት።"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"የመቀስቀሻ ቁልፍ ማያ ገጽ ጣት ምልክት"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ማሳወቂያዎችን ለማግኘት የጣት አሻራን ያንሸራትቱ"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"የጣት አሻራን ያንሸራቱ"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"የእርስዎን ማሳወቂያዎች ለመመልከት በስልክዎ ጀርባ ላይ ባለው የጣት አሻራ ዳሳሽ ላይ ወደ ታች ጠረግ ያድርጉት"</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ሙከራዎች</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ሙከራዎች</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"የዚህ መሣሪያ ውሂብ በምትኬ እየተቀመጠ ነው"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"ይህ መሣሪያ በእርስዎ ድርጅት የሚተዳደር ነው።"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"ይህ መሣሪያ በ<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> የሚተዳደር ነው።"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"የራስ-ሙላ አገልግሎት"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ራስ-ሰር፣ ሙላ፣ ራስ-ሙላ"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ይህን መተግበሪያ የሚያምኑት መሆንዎን ያረጋግጡ</b> <br/> <br/> <xliff:g id=app_name example=Google ራስ-ሙላ>%1$s</xliff:g> ምን በራስ መሞላት እንደሚችል ለማወቅ በማያ ገጽዎ ላይ ያለውን ነገር ይጠቀማል።"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"ራስ-ሙላ"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"የምዝግብ ማስታወሻ ደረጃ"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"በክፍለ ጊዜ የተፈቀዱ ከፍተኛ ጥያቄዎች"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"ከፍተኛ የሚታዩ የውሂብ ስብስቦች"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ወደ ነባሪ እሴቶች ዳግም አስጀምር"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"የራስ-ሙላ ገንቢ አማራጮች ዳግም ተጀምረዋል"</string>
<string name="device_theme" msgid="4571803018917608588">"የመሣሪያ ገጽታ"</string>
<string name="default_theme" msgid="7085644992078579076">"ነባሪ"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"የአውታረ መረብ ስም"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"የቀስቃሴ አገልግሎት አቅራቢ አቅርቦት"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"አትረብሽን አዘምን"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"ትኩረት እንደሰጡ ለመቆየት ማሳወቂያዎችን ባሉበት አቁም"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"ምን አዲስ እና አስደሳች ነገር አለ?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"በአዲሱ ስልክዎ ላይ ጉብኝት ያድርጉ"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"በአዲሱ ጡባዊዎ ላይ ጉብኝት ያድርጉ"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"በአዲሱ መሣሪያዎ ላይ ጉብኝት ያድርጉ"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"ይህ ባህሪ በዚህ መሣሪያ ላይ አይገኝም"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ሙሉ የGNSS መለኪያዎች አስገድድ"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ሁሉንም የGNSS ህብረ ፎቶዎችን እና ድግምግሞሾችን ያለምንም የሥራ ብስክሌት ግልቢያ ዱካቸውን ይከታተሉ"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"የስንክል ንግግር ሳጥንን ሁልጊዜ አሳይ"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"መተግበሪያ በሚሰናከልበት እያንዳንዱ ጊዜ የንግግር ሳጥን አሳይ"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"በANGLE የነቃ መተግበሪያ ይምረጡ"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ምንም በANGLE የነቃ መተግበሪያ አልተቀናበረም"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"በANGLE የነቃ መተግበሪያ፦ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"የማውጫ መዳረሻ"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"የማውጫ መዳረሻ"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"የአውታረ መረብ ዝርዝሮች"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"የእርስዎ መሣሪያ በእርስዎ ስልክ ላይ ላሉ መተግበሪያዎች የሚታይ ነው። ወድ ብሉቱዝ መሣሪያዎች ሲያገኙ ወይም የWi-Fi መገናኛ ነጥብን ሲያቀናብሩ በተጨማሪ በሌሎች ሰዎች የሚታይ ይሆናል።"</string>
<string name="devices_title" msgid="7701726109334110391">"መሣሪያዎች"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"ሁሉም ቅንብሮች"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"የአስተያየት ጥቆማዎች"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ውሂብ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ውሂብ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"አውታረ መረብ ይምረጡ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ግንኙነት ተቋርጧል"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ተገናኝቷል"</string>
+ <string name="network_connecting" msgid="76404590784733557">"በመገናኘት ላይ…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"መገናኘት አልተቻለም"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ምንም አውታረመረብ አልተገኘም።"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"አውታረ መረቦችን ማግኘት አልተቻለም። እንደገና ይሞክሩ።"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(የተከለከለ)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"ምንም ሲም ካርድ የለም"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"የላቀ ጥሪ ማድረግ"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"ተመራጭ የአውታረ መረብ፦ WCDMA ሁነታ ተመራጭ"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"ተመራጭ የአውታረ መረብ፦ GSM ብቻ"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"ተመራጭ የአውታረ መረብ፦ WCDMA ብቻ"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"ተመራጭ የአውታረ መረብ ሁነታ፦ GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"ተመራጭ የአውታረ መረብ፦ CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"ተመራጭ የአውታረ መረብ፦ CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"ተመራጭ የአውታረ መረብ፦ CDMA ብቻ"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"ተመራጭ የአውታረ መረብ ሁነታ፦ EvDo ብቻ"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"ተመራጭ የአውታረ መረብ ሁነታ፦ CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"ተመራጭ የአውታረ መረብ ሁነታ፦ LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"ተመራጭ የአውታረ መረብ ሁነታ፦ GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"ተመራጭ የአውታረ መረብ ሁነታ፦ CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"ተመራጭ የአውታረ መረብ ሁነታ፦ አለምአቀፍ"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"ተመራጭ የአውታረ መረብ ሁነታ፦ LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"ተመራጭ የአውታረ መረብ ሁነታ፦ LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"ተመራጭ የአውታረ መረብ ሁነታ፦ LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"የተመረጠው የአውታረ መረብ ሁነታ፦ TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"የተመረጠው የአውታረ መረብ ሁነታ፦ TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"የተመረጠው የአውታረ መረብ ሁነታ፦ LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"የተመረጠው የአውታረ መረብ ሁነታ፦ TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"የተመረጠው የአውታረ መረብ ሁነታ፦ LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"የተመረጠው የአውታረ መረብ ሁነታ፦ TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"የተመረጠው የአውታረ መረብ ሁነታ፦ LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"የተመረጠው የአውታረ መረብ ሁነታ፦ LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"የተመረጠው የአውታረ መረብ ሁነታ፦ CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"የተመረጠው የአውታረ መረብ ሁነታ፦ LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (የሚመከር)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4ጂ (የሚመከር)"</string>
+ <string name="network_global" msgid="959947774831178632">"ሁለንተናዊ"</string>
+ <string name="label_available" msgid="1731547832803057893">"የሚገኙ አውታረ መረቦች"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"በመፈለግ ላይ…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"በ<xliff:g id="NETWORK">%s</xliff:g> ላይ በመመዝገብ ላይ…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"የእርስዎ ሲም ካርድ ከዚህ አውታረ መረብ ጋር ግንኙነት አይፈቅድም።"</string>
+ <string name="connect_later" msgid="978991102125216741">"በአሁኑ ጊዜ ከዚህ አውታረ መረብ ጋር መገናኘት አልተቻለም። ቆይተው እንደገና ይሞክሩ።"</string>
+ <string name="registration_done" msgid="4573820010512184521">"በአውታረ መረብ ላይ የተመዘገበ።"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"አውታረ መረብን በራስ-ሰር ይምረጡ"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"የአገልግሎት አቅራቢ ቅንብሮች"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"የውሂብ አግልግሎት አዋቅር"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"የተንቀሳቃሽ ስልክ ውሂብ"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"የተንቀሳቃሽ ስልክ አውታረ መረብን በመጠቀም ውሂብን ይድረሱበት"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"የሚመረጠው የአውታረ መረብ አይነት"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"የአውታረ መረቡን የክወና ሁነታን ለውጥ"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"የሚመረጠው የአውታረ መረብ አይነት"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"አገልግሎት አቅራቢ"</string>
+ <string name="call_category" msgid="8108654745239563833">"በመደወል ላይ"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"የአገልግሎት አቅራቢ የቪዲዮ ጥሪ"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"የሥርዓት ምርጫ"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"የCDMA በእንቅስቃሴ ላይ ሁነታ ለውጥ"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"የሥርዓት ምርጫ"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"አውታረ መረብ"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"አውታረ መረብ"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"የCDMA ደንበኝነት ምዝገባ"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"በRUIM/SIM እና NV መካከል ለውጥ"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"የደንበኝነት ምዝገባ"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ራስ-ሰር ምዝገባ…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"የውሂብ ዝውውር ይፈቀድ?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"ለዋጋው የአውታረ መረብ አቅራቢዎ ጋር ይመልከቱ።"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"የመተግበሪያ ውሂብ አጠቃቀም"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"ልክ ያልሆነ አውታረ መረብ ሁነታ <xliff:g id="NETWORKMODEID">%1$d</xliff:g>። ችላ በል።"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"ከ<xliff:g id="CARRIER">%1$s</xliff:g> ጋር ሲገናኝ የማይገኝ"</string>
+ <string name="see_more" msgid="5953815986207345223">"ተጨማሪ ይመልከቱ"</string>
+ <string name="see_less" msgid="1250265310929558370">"ያነሰ ይመልከቱ"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> መሣሪያዎች ተገናኝተዋል</item>
+ <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> መሣሪያዎች ተገናኝተዋል</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"ምንም የተገናኙ መሣሪያዎች የሉም"</string>
</resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index bcf8a5e..5d19b07 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -219,7 +219,7 @@
<item msgid="2681427309183221543">"GID"</item>
</string-array>
<string-array name="app_install_location_entries">
- <item msgid="8151497958991952759">"سعة تخزين الجهاز الداخلية"</item>
+ <item msgid="8151497958991952759">"مساحة تخزين الجهاز الداخلية"</item>
<item msgid="3738430123799803530">"بطاقة SD قابلة للإزالة"</item>
<item msgid="4498124044785815005">"ترك القرار للنظام"</item>
</string-array>
@@ -290,8 +290,8 @@
<item msgid="5895843015407713543">"أجهزة استشعار الجسم"</item>
<item msgid="1436446526955010826">"قراءة رسائل البث الخلوي"</item>
<item msgid="884172201575690484">"موقع وهمي"</item>
- <item msgid="3591971310048485247">"قراءة سعة التخزين"</item>
- <item msgid="4041187808621866119">"كتابة سعة التخزين"</item>
+ <item msgid="3591971310048485247">"قراءة مساحة التخزين"</item>
+ <item msgid="4041187808621866119">"كتابة مساحة التخزين"</item>
<item msgid="6628873315024166197">"تشغيل الشاشة"</item>
<item msgid="3253368931113490863">"الحصول على الحسابات"</item>
<item msgid="780392378084812901">"التشغيل في الخلفية"</item>
@@ -357,8 +357,8 @@
<item msgid="7864822459293570891">"أجهزة استشعار الجسم"</item>
<item msgid="6798698496904810960">"قراءة رسائل البث الخلوي"</item>
<item msgid="5242052845700875820">"موقع وهمي"</item>
- <item msgid="1246296877820358565">"قراءة سعة التخزين"</item>
- <item msgid="2404067308793740341">"كتابة سعة التخزين"</item>
+ <item msgid="1246296877820358565">"قراءة مساحة التخزين"</item>
+ <item msgid="2404067308793740341">"كتابة مساحة التخزين"</item>
<item msgid="5832543806893763620">"تشغيل الشاشة"</item>
<item msgid="5258373962467495905">"الحصول على الحسابات"</item>
<item msgid="334625385979270703">"التشغيل في الخلفية"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"معاملة الشبكة باعتبارها ذات سعة محدودة"</item>
<item msgid="2266114985518865625">"معاملة الشبكة باعتبارها ذات سعة غير محدودة"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"الإعداد التلقائي (استخدام عنوان MAC عشوائي)"</item>
+ <item msgid="5398461510512959597">"موثوق به"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"لا"</item>
<item msgid="3863157480502955888">"نعم"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"التشغيل دائمًا"</item>
<item msgid="6385301106124765323">"إيقاف دائمًا"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"إيقاف"</item>
+ <item msgid="2182686878828390312">"تصحيح الأخطاء"</item>
+ <item msgid="5286514712714822064">"مطوّل"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"الرئيسية فقط"</item>
+ <item msgid="5034813753274486448">"تلقائي"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA المُفضَّل"</item>
+ <item msgid="807926878589867564">"نظام GSM فقط"</item>
+ <item msgid="488474605709912156">"WCDMA فقط"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA تلقائي"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo تلقائي"</item>
+ <item msgid="370391313511477301">"CDMA بدون EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo فقط"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"عام"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA فقط"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"بطاقة RUIM/شريحة SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"عام"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1778df3..ea25f18 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"إنشاء"</string>
<string name="allow" msgid="3349662621170855910">"سماح"</string>
<string name="deny" msgid="6947806159746484865">"رفض"</string>
- <string name="dlg_close" msgid="7471087791340790015">"إغلاق"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"تبديل"</string>
<string name="device_info_default" msgid="7847265875578739287">"غير معروف"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="zero">لا يفصلك الآن عن الوصول إلى مرحلة مطوري البرامج أي خطوة (<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>).</item>
@@ -36,10 +34,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"لا حاجة لذلك، فأنت مطور برامج فعلاً."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"يُرجى تفعيل خيارات المطوري أولاً."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"اللاسلكي والشبكات"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"الاتصالات"</string>
- <string name="header_category_device" msgid="4544026001618307754">"الجهاز"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"شخصي"</string>
- <string name="header_category_access" msgid="7580499097416970962">"الدخول"</string>
<string name="header_category_system" msgid="2816866961183068977">"النظام"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"تفعيل اتصال البيانات"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"إيقاف اتصال البيانات"</string>
@@ -125,7 +119,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"عنوان البلوتوث للجهاز: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"هل تريد فصل <xliff:g id="DEVICE_NAME">%1$s</xliff:g>؟"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"البث"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"جهاز بلوتوث بدون اسم"</string>
<string name="progress_scanning" msgid="192587958424295789">"البحث"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"لم يتم العثور على أجهزة بلوتوث."</string>
@@ -157,7 +150,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"يريد أحد التطبيقات تشغيل البلوتوث وجعل هاتفك مرئيًا للأجهزة الأخرى. يمكنك تغيير هذا لاحقًا في إعدادات بلوتوث."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"جارٍ تشغيل البلوتوث..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"جارٍ إيقاف تشغيل البلوتوث..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"اتصال تلقائي"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"طلب اتصال بلوتوث"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"انقر للاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"هل تريد الاتصال بـ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"؟"</string>
@@ -185,12 +177,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"أجهزة الاتصال المتاحة"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"الأجهزة المتصلة حاليًا"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"الأجهزة المحفوظة"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"إضافة جهاز"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"سيتم تشغيل بلوتوث للإقران"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"تفضيلات الاتصال"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"الأجهزة المتصلة سابقًا"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"الأجهزة المتصلة سابقًا"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"تم تفعيل البلوتوث."</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"عرض الكل"</string>
<string name="date_and_time" msgid="9062980487860757694">"التاريخ والوقت"</string>
<string name="choose_timezone" msgid="1362834506479536274">"اختيار المنطقة الزمنية"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -273,7 +265,6 @@
<string name="skip_label" msgid="47510779345218297">"تخطي"</string>
<string name="next_label" msgid="4693520878012668114">"التالي"</string>
<string name="language_picker_title" msgid="3596315202551687690">"اللغات"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"تفضيلات اللغة"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"إزالة"</string>
<string name="add_a_language" msgid="2330538812283783022">"إضافة لغة"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -311,7 +302,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"الإعدادات"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"اختصار الإعدادات"</string>
<string name="airplane_mode" msgid="8837269988154128601">"وضع الطائرة"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"المزيد"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"اللاسلكي والشبكات"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"إدارة Wi-Fi والبلوتوث ووضع الطائرة وشبكات الجوّال والشبكات الافتراضية الخاصة (VPN)"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"بيانات الجوّال"</string>
@@ -383,7 +373,7 @@
<string name="location_settings_title" msgid="1369675479310751735">"الموقع"</string>
<string name="location_settings_master_switch_title" msgid="3560242980335542411">"استخدام الموقع الجغرافي"</string>
<string name="account_settings_title" msgid="626177544686329806">"الحسابات"</string>
- <string name="security_settings_title" msgid="4918904614964215087">"الحماية والموقع"</string>
+ <string name="security_settings_title" msgid="4918904614964215087">"الأمان والموقع الجغرافي"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"التشفير وبيانات الاعتماد"</string>
<string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"تم تشفير الهاتف"</string>
<string name="decryption_settings_summary" product="default" msgid="5671817824042639849">"الهاتف ليس مشفّرًا."</string>
@@ -396,6 +386,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"الخصوصية"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"تم إيقاف الإعداد بواسطة المشرف"</string>
<string name="security_status_title" msgid="5848766673665944640">"حالة الأمان"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"قفل الشاشة، فتح القفل بالوجه"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"قفل الشاشة، بصمة الإصبع"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"قفل الشاشة"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"تمت إضافة الوجه"</string>
@@ -405,11 +396,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"إلغاء القفل باستخدام وجهك"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"استخدام وجهك للمصادقة"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"استخدم وجهك لإلغاء قفل الهاتف أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"يستخدمك"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"يمكنك استخدام وجهك لفتح الهاتف أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدام وجهك لفتح هذا الجهاز. للحصول على المزيد من المعلومات، اتصل بمشرف المؤسسة."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"استخدم وجهك لإلغاء قفل الهاتف أو السماح بعمليات الشراء أو تسجيل الدخول إلى التطبيقات."</string>
- <string name="face_add_max" msgid="2342250989212694454">"يمكنك إضافة ما يصل إلى <xliff:g id="COUNT">%d</xliff:g> بصمات الإصبع"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"وضع الوجه في منتصف الدائرة"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"تنفيذ ذلك لاحقًا"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"يمكنك إضافة ما يصل إلى <xliff:g id="COUNT">%d</xliff:g> وجه."</string>
<string name="face_intro_error_max" msgid="160022811747660581">"لقد أضفت الحد الأقصى لعدد الأوجه"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"لا يمكن إضافة مزيد من الأوجه"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"لم يكتمل التسجيل."</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"حسنًا"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"تم بلوغ الحد الأقصى لوقت تسجيل الوجه. يُرجى إعادة المحاولة."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"تعذّر تسجيل الوجه."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"اكتمل التسجيل بنجاح."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"تم"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"استخدام الوجه في"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"إلغاء قفل جهازك"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"الدخول إلى التطبيقات والدفع"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"افتَح عينيك لفتح القفل"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"عند استخدام مصادقة الوجه، يجب فتح العينين."</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"إزالة بيانات الوجه"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"تحسين بيانات الوجه"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"يمكن إلغاء قفل جهازك والوصول إلى التطبيقات بالوجه. "<annotation id="url">"مزيد من المعلومات"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"بصمة الإصبع"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"إدارة بصمات الإصبع"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"استخدام بصمة الإصبع في"</string>
@@ -819,7 +826,7 @@
<string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"تفعيل عرض شاشة لاسلكي"</string>
<string name="wifi_display_no_devices_found" msgid="1382012407154143453">"لم يتم العثور على أجهزة قريبة."</string>
<string name="wifi_display_status_connecting" msgid="5688608834000748607">"جارٍ الاتصال"</string>
- <string name="wifi_display_status_connected" msgid="8364125226376985558">"متصل"</string>
+ <string name="wifi_display_status_connected" msgid="8364125226376985558">"متّصلة"</string>
<string name="wifi_display_status_in_use" msgid="8556830875615434792">"قيد الاستخدام"</string>
<string name="wifi_display_status_not_available" msgid="5714978725794210102">"غير متاح"</string>
<string name="wifi_display_details" msgid="7791118209992162698">"عرض الإعدادات"</string>
@@ -944,6 +951,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 غيغاهرتز"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"اختر نطاقًا واحدًا على الأقل لنقطة اتصال Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"إعدادات IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"الخصوصية"</string>
<string name="wifi_shared" msgid="844142443226926070">"المشاركة مع مستخدمي الجهاز الآخرين"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(لم يتم التغيير)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"يُرجى التحديد"</string>
@@ -983,7 +991,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"إلغاء"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"هل تريد حذف الشبكة؟"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"سيتم حذف جميع كلمات المرور لهذه الشبكة"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"الشبكات المحفوظة"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="zero">%d شبكة</item>
<item quantity="two">شبكتان (%d)</item>
@@ -1165,9 +1172,8 @@
<string name="brightness" msgid="8480105032417444275">"مستوى السطوع"</string>
<string name="brightness_title" msgid="5746272622112982836">"السطوع"</string>
<string name="brightness_summary" msgid="838917350127550703">"ضبط سطوع الشاشة"</string>
- <string name="auto_brightness_title" msgid="6341042882350279391">"السطوع التلقائي"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_title" msgid="6341042882350279391">"السطوع التكيُّفي"</string>
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"مفعّل"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"تم الإيقاف"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"السطوع المفضل منخفض جدًا"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"السطوع المفضل منخفض"</string>
@@ -1186,11 +1192,11 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"يمكنك تحسين مستوى السطوع حسب الإضاءة. وعند تشغيل هذه الميزة، سيظل بإمكانك ضبط السطوع مؤقتًا."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"سيتم ضبط سطوع الشاشة تلقائيًا حسب البيئة المحيطة والأنشطة. ويمكنك تحريك شريط التمرير يدويًا لضبط السطوع التكيُّفي وفقًا لتفضيلاتك."</string>
<string name="night_display_title" msgid="2626451512200357686">"الإضاءة الليلية"</string>
- <string name="night_display_text" msgid="1837277457033025056">"تؤدي الإضاءة الليلية إلى تلوين الشاشة باللون الكهرماني الخفيف. ويساعد هذا في تسهيل النظر إلى الشاشة في الإضاءة المعتمة ويمكن أن يساعدك في الشعور بالنعاس أيضًا."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"تؤدي الإضاءة الليلية إلى تلوين الشاشة باللون الكهرماني الخفيف، ما يسهّل النظر إلى الشاشة في الإضاءة الخافتة ويمكن أن يساعدك على الشعور بالنعاس أيضًا."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"تحديد جدول زمني"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"عدم التشغيل أو الإيقاف مطلقًا"</string>
- <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"تشغيل في وقت مخصص"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"تشغيل من غروب الشمس إلى شروقها"</string>
+ <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"التفعيل في وقت مخصّّص"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"التفعيل من غروب الشمس حتى شروقها"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"وقت البدء"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"وقت الانتهاء"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"الحالة"</string>
@@ -1205,10 +1211,10 @@
<string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"سيتم الإيقاف تلقائيًا عند شروق الشمس"</string>
<string name="night_display_activation_on_manual" msgid="277343561277625826">"التفعيل الآن"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"إيقاف الوضع الآن"</string>
- <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"تشغيل حتى الشروق"</string>
- <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"إيقاف حتى الغروب"</string>
- <string name="night_display_activation_on_custom" msgid="5472029024427933598">"إيقاف حتى <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="night_display_activation_off_custom" msgid="6169984658293744715">"إيقاف حتى <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+ <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"تفعيل الميزة حتى الشروق"</string>
+ <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"إيقاف الميزة حتى الغروب"</string>
+ <string name="night_display_activation_on_custom" msgid="5472029024427933598">"تفعيل الميزة حتى <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+ <string name="night_display_activation_off_custom" msgid="6169984658293744715">"إيقاف الميزة حتى <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="screen_timeout" msgid="4351334843529712571">"السكون"</string>
<string name="screen_timeout_title" msgid="5130038655092628247">"إيقاف الشاشة"</string>
<string name="screen_timeout_summary" msgid="327761329263064327">"بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
@@ -1263,6 +1269,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"لا يمكن تغيير رمز PIN.\nيحتمل أن يكون رمز PIN غير صحيح."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"تم تغيير رمز PIN لبطاقة SIM بنجاح"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"لا يمكن تغيير حالة تأمين شريحة SIM.\nيحتمل أن يكون رمز PIN غير صحيح."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"يتعذَّر إيقاف رقم التعريف الشخصي."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"يتعذَّر تفعيل رقم التعريف الشخصي."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"موافق"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"إلغاء"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"تم العثور على بطاقات SIM متعددة"</string>
@@ -1302,8 +1310,8 @@
<string name="storage_settings" msgid="4211799979832404953">"التخزين"</string>
<string name="storage_usb_settings" msgid="7293054033137078060">"التخزين"</string>
<string name="storage_settings_title" msgid="8746016738388094064">"إعدادات وحدة التخزين"</string>
- <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"إلغاء تركيب وحدة تخزين USB، وعرض سعة التخزين المتاحة"</string>
- <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"إلغاء تحميل بطاقة SD، عرض سعة التخزين المتاحة"</string>
+ <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"إلغاء تركيب وحدة تخزين USB، وعرض مساحة التخزين المتاحة"</string>
+ <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"إلغاء تحميل بطاقة SD، عرض مساحة التخزين المتاحة"</string>
<string name="imei_multi_sim" msgid="6387012961838800539">"IMEI (المنفذ %1$d لشريحة SIM)"</string>
<string name="status_number" product="tablet" msgid="1138837891091222272">"MDN (رقم دليل الجوال)"</string>
<string name="status_number" product="default" msgid="5948892105546651296">"رقم الهاتف"</string>
@@ -1387,7 +1395,7 @@
<string name="storage_menu_set_up" msgid="4263294929451685366">"إعداد"</string>
<string name="storage_menu_explore" msgid="4637496051816521560">"استكشاف"</string>
<string name="storage_menu_free" msgid="6386070442027135427">"إخلاء بعض المساحة"</string>
- <string name="storage_menu_manage" msgid="5914482953856430780">"إدارة سعة التخزين"</string>
+ <string name="storage_menu_manage" msgid="5914482953856430780">"إدارة مساحة التخزين"</string>
<string name="storage_title_usb" msgid="679612779321689418">"اتصال USB بالكمبيوتر"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"اتصال كـ"</string>
<string name="usb_mtp_title" msgid="3399663424394065964">"جهاز الوسائط (MTP)"</string>
@@ -1397,7 +1405,7 @@
<string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
<string name="usb_midi_summary" msgid="539169474810956358">"للسماح للتطبيقات التي تمكّن MIDI بالعمل عبر USB باستخدام برامج MIDI على الكمبيوتر."</string>
<string name="storage_other_users" msgid="808708845102611856">"مستخدمون آخرون"</string>
- <string name="storage_internal_title" msgid="690771193137801021">"سعة التخزين للجهاز"</string>
+ <string name="storage_internal_title" msgid="690771193137801021">"مساحة التخزين للجهاز"</string>
<string name="storage_external_title" msgid="3433462910096848696">"وحدة تخزين محمولة"</string>
<string name="storage_volume_summary" msgid="7023441974367853372">"تم استخدام <xliff:g id="USED">%1$s</xliff:g> من <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
@@ -1428,7 +1436,7 @@
<string name="storage_detail_explore" msgid="7911344011431568294">"استكشاف <xliff:g id="NAME">^1</xliff:g>"</string>
<string name="storage_detail_dialog_other" msgid="8845766044697204852">"تشمل الملفات الأخرى الملفات المشتركة التي تم حفظها بواسطة التطبيقات والملفات التي تم تنزيلها من مواقع الإنترنت أو عبر البلوتوث وملفات Android وما إلى ذلك. \n\nللاطلاع على المحتويات المرئية على بطاقة <xliff:g id="NAME">^1</xliff:g> هذه، انقر على \"استكشاف\"."</string>
<string name="storage_detail_dialog_system" msgid="862835644848361569">"يتضمّن النظام الملفات المستخدمة لتشغيل إصدار Android <xliff:g id="VERSION">%s</xliff:g>"</string>
- <string name="storage_detail_dialog_user" msgid="3267254783294197804">"ربما يكون لدى <xliff:g id="USER_0">^1</xliff:g> صور أو موسيقى أو تطبيقات أو بيانات أخرى محفوظة، ويتم استخدام <xliff:g id="SIZE">^2</xliff:g> من سعة التخزين. \n\nللاطلاع على التفاصيل، يمكنك التبديل إلى <xliff:g id="USER_1">^1</xliff:g>."</string>
+ <string name="storage_detail_dialog_user" msgid="3267254783294197804">"ربما يكون لدى <xliff:g id="USER_0">^1</xliff:g> صور أو موسيقى أو تطبيقات أو بيانات أخرى محفوظة، ويتم استخدام <xliff:g id="SIZE">^2</xliff:g> من مساحة التخزين. \n\nللاطلاع على التفاصيل، يمكنك التبديل إلى <xliff:g id="USER_1">^1</xliff:g>."</string>
<string name="storage_wizard_init_title" msgid="5085400514028585772">"إعداد <xliff:g id="NAME">^1</xliff:g>"</string>
<string name="storage_wizard_init_external_title" msgid="4867326438945303598">"الاستخدام كوحدة تخزين محمولة"</string>
<string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"لنقل الصور والوسائط الأخرى بين الأجهزة."</string>
@@ -1440,7 +1448,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"يتطلب هذا تهيئة <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"وتجدر الإشارة إلى أن التهيئة ستؤدي إلى محو جميع البيانات المخزنة حاليًا على <xliff:g id="NAME_1">^1</xliff:g>."</b>" لتجنب فقد البيانات، يمكنك الاحتفاظ بنسخة احتياطية منها."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"محو البيانات والتنسيق"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"جارٍ تنسيق <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"لا تزِل <xliff:g id="NAME">^1</xliff:g> أثناء التنسيق."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"لا تُزِل <xliff:g id="NAME">^1</xliff:g> أثناء تنفيذ عملية التنسيق."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"نقل البيانات إلى وحدة التخزين الجديدة"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"يمكنك نقل الصور والملفات وبعض التطبيقات إلى <xliff:g id="NAME">^1</xliff:g> الجديدة هذه. \n\nتستغرق عملية النقل حوالي <xliff:g id="TIME">^2</xliff:g> وسيتم إخلاء <xliff:g id="SIZE">^3</xliff:g> على وحدة التخزين الداخلية. ولن تعمل بعض التطبيقات أثناء إجراء عملية النقل."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"النقل الآن"</string>
@@ -1463,10 +1471,10 @@
<string name="storage_wizard_init_v2_title" msgid="8858395869710288372">"كيف ستستخدم <xliff:g id="NAME">^1</xliff:g>؟"</string>
<string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="4315585580670552654">"الاستخدام كوحدة تخزين إضافية بالجهاز اللوحي"</string>
<string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="570443086512059390">"للتطبيقات والملفات والوسائط على هذا الجهاز اللوحي فقط"</string>
- <string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="7760758592993284143">"سعة تخزين الجهاز اللوحي"</string>
+ <string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="7760758592993284143">"مساحة تخزين الجهاز اللوحي"</string>
<string name="storage_wizard_init_v2_internal_title" product="default" msgid="8373070138732653456">"الاستخدام كوحدة تخزين إضافية بالهاتف"</string>
<string name="storage_wizard_init_v2_internal_summary" product="default" msgid="685194340141573218">"للتطبيقات والملفات والوسائط على هذا الهاتف فقط"</string>
- <string name="storage_wizard_init_v2_internal_action" product="default" msgid="904425171564310150">"سعة تخزين الهاتف"</string>
+ <string name="storage_wizard_init_v2_internal_action" product="default" msgid="904425171564310150">"مساحة تخزين الهاتف"</string>
<string name="storage_wizard_init_v2_or" msgid="1958295749349454436">"أو"</string>
<string name="storage_wizard_init_v2_external_title" msgid="3565348221712759463">"الاستخدام كوحدة تخزين محمولة"</string>
<string name="storage_wizard_init_v2_external_summary" msgid="801198071793584445">"لنقل الملفات والوسائط بين الأجهزة"</string>
@@ -1476,8 +1484,8 @@
<string name="storage_wizard_format_confirm_v2_body" msgid="4614199613500900975">"يجب تنسيق <xliff:g id="NAME_0">^1</xliff:g> لتخزين التطبيقات والملفات والوسائط. \n\nسيؤدي التنسيق إلى محو المحتوى الحالي على <xliff:g id="NAME_1">^2</xliff:g>. ولتجنّب فقد المحتوى، يمكنك نسخه احتياطيًا إلى <xliff:g id="NAME_2">^3</xliff:g> أو جهاز آخر."</string>
<string name="storage_wizard_format_confirm_v2_action" msgid="8258363472135537500">"تنسيق <xliff:g id="NAME">^1</xliff:g>"</string>
<string name="storage_wizard_migrate_v2_title" msgid="31406330052996898">"هل تريد نقل المحتوى إلى <xliff:g id="NAME">^1</xliff:g>؟"</string>
- <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4476553430145054781">"يمكنك نقل الملفات والوسائط وتطبيقات معيّنة إلى <xliff:g id="NAME">^1</xliff:g>. \n\nإخلاء مساحة قدرها <xliff:g id="SIZE">^2</xliff:g> من سعة التخزين بالجهاز اللوحي وتستغرق في الغالب <xliff:g id="DURATION">^3</xliff:g> تقريبًا."</string>
- <string name="storage_wizard_migrate_v2_body" product="default" msgid="744760728669284385">"يمكنك نقل الملفات والوسائط وتطبيقات معيّنة إلى <xliff:g id="NAME">^1</xliff:g>. \n\nستؤدي عملية النقل هذه إلى إخلاء مساحة قدرها <xliff:g id="SIZE">^2</xliff:g> من سعة التخزين بالهاتف وتستغرق في الغالب <xliff:g id="DURATION">^3</xliff:g> تقريبًا."</string>
+ <string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4476553430145054781">"يمكنك نقل الملفات والوسائط وتطبيقات معيّنة إلى <xliff:g id="NAME">^1</xliff:g>. \n\nإخلاء مساحة قدرها <xliff:g id="SIZE">^2</xliff:g> من مساحة التخزين بالجهاز اللوحي وتستغرق في الغالب <xliff:g id="DURATION">^3</xliff:g> تقريبًا."</string>
+ <string name="storage_wizard_migrate_v2_body" product="default" msgid="744760728669284385">"يمكنك نقل الملفات والوسائط وتطبيقات معيّنة إلى <xliff:g id="NAME">^1</xliff:g>. \n\nستؤدي عملية النقل هذه إلى إخلاء مساحة قدرها <xliff:g id="SIZE">^2</xliff:g> من مساحة التخزين بالهاتف وتستغرق في الغالب <xliff:g id="DURATION">^3</xliff:g> تقريبًا."</string>
<string name="storage_wizard_migrate_v2_checklist" msgid="1239103359606165360">"أثناء النقل:"</string>
<string name="storage_wizard_migrate_v2_checklist_media" msgid="7176991995007075843">"تجنّب إزالة <xliff:g id="NAME">^1</xliff:g>"</string>
<string name="storage_wizard_migrate_v2_checklist_apps" msgid="3671266712947078734">"لن تعمل بعض التطبيقات"</string>
@@ -1491,8 +1499,8 @@
<string name="storage_wizard_slow_v2_start_over" msgid="4126873669723115805">"البدء من جديد"</string>
<string name="storage_wizard_slow_v2_continue" msgid="49399942893518218">"متابعة"</string>
<string name="storage_wizard_ready_v2_external_body" msgid="11937346870534608">"يمكنك نقل محتوى إلى <xliff:g id="NAME">^1</xliff:g>"</string>
- <string name="storage_wizard_ready_v2_internal_body" msgid="4658433206901211269">"لنقل المحتوى إلى <xliff:g id="NAME">^1</xliff:g>، انتقِل إلى "<b>"الإعدادات > سعة التخزين"</b></string>
- <string name="storage_wizard_ready_v2_internal_moved_body" msgid="6239886818487538806">"تمّ نقل المحتوى إلى <xliff:g id="NAME_0">^1</xliff:g>. \n\nلإدارة <xliff:g id="NAME_1">^2</xliff:g>، انتقِل إلى "<b>"الإعدادات > سعة التخزين"</b>"."</string>
+ <string name="storage_wizard_ready_v2_internal_body" msgid="4658433206901211269">"لنقل المحتوى إلى <xliff:g id="NAME">^1</xliff:g>، انتقِل إلى "<b>"الإعدادات > مساحة التخزين"</b></string>
+ <string name="storage_wizard_ready_v2_internal_moved_body" msgid="6239886818487538806">"تمّ نقل المحتوى إلى <xliff:g id="NAME_0">^1</xliff:g>. \n\nلإدارة <xliff:g id="NAME_1">^2</xliff:g>، انتقِل إلى "<b>"الإعدادات > مساحة التخزين"</b>"."</string>
<string name="battery_status_title" msgid="9159414319574976203">"حالة البطارية"</string>
<string name="battery_level_title" msgid="2965679202786873272">"مستوى البطارية"</string>
<string name="apn_settings" msgid="3743170484827528406">"أسماء نقاط الوصول"</string>
@@ -1644,7 +1652,7 @@
<string name="location_access_title" msgid="7064108942964081243">"الدخول إلى موقعي"</string>
<string name="location_access_summary" msgid="69031404093194341">"السماح للتطبيقات التي طلبت إذنك باستخدام معلومات موقعك"</string>
<string name="location_sources_heading" msgid="1278732419851088319">"مصادر الموقع"</string>
- <string name="about_settings" product="tablet" msgid="593457295516533765">"حول الجهاز اللوحي"</string>
+ <string name="about_settings" product="tablet" msgid="593457295516533765">"لمحة عن الجهاز اللوحي"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"لمحة عن الهاتف"</string>
<string name="about_settings" product="device" msgid="6717640957897546887">"لمحة حول الجهاز"</string>
<string name="about_settings" product="emulator" msgid="221313099578564438">"حول الجهاز في وضع المحاكاة"</string>
@@ -1792,7 +1800,7 @@
<string name="install_text" msgid="884360662922471113">"تثبيت"</string>
<string name="disable_text" msgid="6544054052049395202">"إيقاف"</string>
<string name="enable_text" msgid="9217362512327828987">"تفعيل"</string>
- <string name="clear_user_data_text" msgid="355574089263023363">"مسح سعة تخزين"</string>
+ <string name="clear_user_data_text" msgid="355574089263023363">"مسح مساحة تخزين"</string>
<string name="app_factory_reset" msgid="6635744722502563022">"إزالة التحديثات"</string>
<string name="auto_launch_enable_text" msgid="4275746249511874845">"لقد اخترت تشغيل هذا التطبيق بشكل تلقائي لبعض الإجراءات."</string>
<string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"لقد اخترت السماح لهذا التطبيق بإنشاء الأدوات والوصول إلى بياناتها."</string>
@@ -1826,9 +1834,6 @@
<string name="installed" msgid="3070865169422600098">"مثبّت"</string>
<string name="no_applications" msgid="7336588977497084921">"ليست هناك أي تطبيقات."</string>
<string name="internal_storage" msgid="1584700623164275282">"وحدة التخزين الداخلية"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"وحدة تخزين داخلية"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"وحدة تخزين USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"وحدة تخزين بطاقة SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"جارٍ إعادة حساب الحجم..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"هل تريد حذف بيانات التطبيق؟"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"سيتم حذف جميع بيانات التطبيق نهائيًا. يتضمن ذلك جميع الملفات والإعدادات والحسابات وقواعد البيانات، إلخ."</string>
@@ -1836,25 +1841,17 @@
<string name="dlg_cancel" msgid="1674753358972975911">"إلغاء"</string>
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"لم يتم العثور على التطبيق في قائمة التطبيقات المثبتة."</string>
- <string name="clear_failed_dlg_text" msgid="8651231637137025815">"تعذّر مسح سعة تخزين للتطبيق."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"يمكن لهذا التطبيق الدخول إلى ما يلي على الجهاز اللوحي:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"يمكن لهذا التطبيق الدخول إلى ما يلي على هاتفك:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"بإمكان هذا الهاتف الدخول إلى ما يلي على جهازك اللوحي. لتحسين الأداء وتقليل نسبة استخدام الذاكرة، بعض هذه الأذونات تتوفر لـ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> لأنه يتم تشغيله في العملية نفسها كـ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"بإمكان هذا الهاتف الدخول إلى ما يلي على هاتفك. لتحسين الأداء وتقليل نسبة استخدام الذاكرة، بعض هذه الأذونات تتوفر لـ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> لأنه يتم تشغيله في العملية نفسها كـ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+ <string name="clear_failed_dlg_text" msgid="8651231637137025815">"تعذّر مسح مساحة تخزين للتطبيق."</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> و<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> و<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"قد يكلفك هذا التطبيق مالاً:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"إرسال رسالة قصيرة SMS مميزة"</string>
<string name="computing_size" msgid="1599186977475211186">"جارٍ الحساب..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"يتعذر حساب حجم الحزمة."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"ليست لديك أي تطبيقات لجهات خارجية مثبتة."</string>
<string name="version_text" msgid="9189073826278676425">"الإصدار <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"نقل"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"نقل إلى الجهاز اللوحي"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"نقل إلى الهاتف"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"نقل إلى وحدة تخزين USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"نقل إلى بطاقة SD"</string>
- <string name="moving" msgid="6431016143218876491">"نقل"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"هناك عملية ترحيل أخرى قيد التقدم حاليًا."</string>
<string name="insufficient_storage" msgid="481763122991093080">"ليست هناك مساحة تخزين كافية."</string>
<string name="does_not_exist" msgid="1501243985586067053">"التطبيق غير موجود."</string>
@@ -1864,17 +1861,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"لا يمكن تثبيت تطبيق مشرف الجهاز على وسائط خارجية"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"هل تريد فرض الإيقاف؟"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"في حالة فرض إيقاف التطبيق، ربما لا يعمل بشكل صحيح."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"تعذر نقل التطبيق. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"موقع التثبيت المفضل"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"تغيير موقع التثبيت المفضل للتطبيقات الجديدة"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"هل تريد إيقاف التطبيق المضمن؟"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"إيقاف التطبيق"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"سيؤدي إيقاف هذا التطبيق إلى عدم عمل كل من نظام التشغيل Android وتطبيقات أخرى على النحو المنشود."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"هل تريد حذف البيانات وتعطيل التطبيق؟"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"سيؤدي إيقاف هذا التطبيق إلى عدم عمل كل من نظام التشغيل Android وتطبيقات أخرى على النحو المنشود، فضلاً عن حذف بياناتك."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"هل تريد إيقاف الإشعارات؟"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"إذا كنت قد أجريت إيقافًا للإشعارات حول هذا التطبيق، فقد تفوتك اشعارات وتحديثات مهمة."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"المتجر"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"تفاصيل التطبيق"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"تم تثبيت التطبيق من <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1883,7 +1876,7 @@
<string name="app_ops_never_used" msgid="9114608022906887802">"(لم يسبق الاستخدام مطلقًا)"</string>
<string name="no_default_apps" msgid="2915315663141025400">"ليست هناك تطبيقات تلقائية."</string>
<string name="storageuse_settings_title" msgid="5657014373502630403">"استخدام وحدة التخزين"</string>
- <string name="storageuse_settings_summary" msgid="3748286507165697834">"عرض سعة التخزين المستخدمة بواسطة التطبيقات"</string>
+ <string name="storageuse_settings_summary" msgid="3748286507165697834">"عرض مساحة التخزين المستخدمة بواسطة التطبيقات"</string>
<string name="service_restarting" msgid="2242747937372354306">"إعادة التشغيل"</string>
<string name="cached" msgid="1059590879740175019">"عملية الخلفية المخزنة مؤقتًا"</string>
<string name="no_running_services" msgid="2059536495597645347">"لا شيء قيد التشغيل."</string>
@@ -2034,9 +2027,9 @@
<string name="select_to_speak_summary" msgid="4282846695497544515">"يمكنك النقر على بيانات على شاشتك لتتم قراءتها بصوت عالٍ"</string>
<string name="accessibility_captioning_title" msgid="7589266662024836291">"الترجمة"</string>
<string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"التكبير"</string>
- <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"تكبير باستخدام النقر الثلاثي"</string>
+ <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"التكبير بالنقر ثلاث مرّات"</string>
<string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"التكبير باستخدام الزر"</string>
- <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"التكبير باستخدام الزر والنقر الثلاثي"</string>
+ <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"التكبير باستخدام الزر والنقر ثلاث مرّات"</string>
<string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"التكبير على الشاشة"</string>
<string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"انقر ٣ مرات للتكبير."</string>
<string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"انقر على أحد الأزرار للتكبير"</string>
@@ -2067,6 +2060,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"استخدام الخدمة"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"استخدام تصحيح الألوان"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"استخدام الترجمة"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"متابعة"</string>
<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="6371077608778830020">"إضافة سماعة أذن طبية"</string>
@@ -2242,8 +2236,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"قد يتأثر أداء أحد التطبيقات سلبًا في حالة وضع حد لنشاطه في الخلفية"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"نظرًا لعدم تعيين هذا التطبيق للعمل على تحسين البطارية، فلا يمكنك تقييده.\n\nلتقييد التطبيق، شغِّل ميزة تحسين البطارية أولاً."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"استخدام الشاشة منذ الشحن الكامل"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"استهلاك الشاشة"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"البحث عن شبكات الجوال"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"استخدام البطارية منذ الشحن الكامل"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"مقدار وقت تشغيل الشاشة منذ الشحن الكامل"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"استخدام الجهاز منذ الشحن الكامل"</string>
@@ -2270,11 +2262,6 @@
<string name="details_subtitle" msgid="32593908269911734">"استخدام التفاصيل"</string>
<string name="controls_subtitle" msgid="390468421138288702">"ضبط استخدام الطاقة"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"الحزم المضمنة"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"التطبيقات التي تستنفذ البطارية"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"إبقاء الجهاز مشغّلًا"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ينشِّط الجهاز في الخلفية"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"يطلب معرفة الموقع بشكل متكرر"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"يعمل <xliff:g id="NUMBER">%1$d</xliff:g> من التطبيقات بطريقة غير طبيعية"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"التطبيقات تعمل بشكل طبيعي"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"استخدام البطارية في خلفية الهاتف عادي."</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"استخدام البطارية في خلفية الجهاز اللوحي عادي."</string>
@@ -2362,6 +2349,7 @@
<item quantity="other">تقييد استخدام شحن البطارية لـ %1$d تطبيق</item>
<item quantity="one">تقييد استخدام شحن البطارية لتطبيق واحد</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"مُقيَّد لمدة <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"تستهلك هذه التطبيقات شحن البطارية في الخلفية. علمًا بأن التطبيقات المقيدة قد لا تعمل على نحو صحيح وقد تتأخر الإشعارات."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"استخدام مدير البطارية"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"الرصد عندما تستنزف تطبيقات شحن البطارية."</string>
@@ -2543,23 +2531,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"إلغاء"</string>
<string name="tts_reset" msgid="2661752909256313270">"إعادة التعيين"</string>
<string name="tts_play" msgid="2628469503798633884">"تشغيل"</string>
- <string name="gadget_title" msgid="5519037532720577836">"التحكم في الطاقة"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"تحديث إعداد Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"تحديث إعداد البلوتوث"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"تشغيل"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"إيقاف"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"جارٍ التشغيل…"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"جارٍ إيقاف التشغيل"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"بلوتوث"</string>
- <string name="gadget_location" msgid="2974757497945178165">"الموقع"</string>
- <string name="gadget_sync" msgid="858895763714222152">"المزامنة"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"السطوع <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"تلقائي"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"كامِل"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"نِصْف"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"إيقاف"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"الشبكات الافتراضية الخاصة"</string>
<string name="credentials_title" msgid="4446234003860769883">"تخزين بيانات الاعتماد"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"التثبيت من وحدة تخزين"</string>
@@ -2618,10 +2589,10 @@
<string name="add_device_admin_msg" msgid="1501847129819382149">"هل تريد تفعيل تطبيق مشرف الجهاز؟"</string>
<string name="add_device_admin" msgid="4192055385312215731">"تفعيل تطبيق مشرف الجهاز هذا"</string>
<string name="device_admin_add_title" msgid="3140663753671809044">"مشرف الجهاز"</string>
- <string name="device_admin_warning" msgid="7482834776510188134">"سيؤدي تفعيل تطبيق المشرف إلى السماح لتطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> بتنفيذ العمليات التالية:"</string>
+ <string name="device_admin_warning" msgid="7482834776510188134">"سيؤدي تفعيل تطبيق المشرف إلى السماح لتطبيق \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" بتنفيذ العمليات التالية:"</string>
<string name="device_admin_status" msgid="7234814785374977990">"تطبيق المشرف نشط ويسمح لتطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> بتنفيذ العمليات التالية:"</string>
<string name="profile_owner_add_title" msgid="6249331160676175009">"هل تريد تفعيل مدير الملف الشخصي؟"</string>
- <string name="adding_profile_owner_warning" msgid="1354474524852805802">"من خلال المتابعة، ستتم إدارة بيانات المستخدم بواسطة المشرف والذي قد يتمكن أيضًا من تخزين البيانات المرتبطة، بالإضافة إلى البيانات الشخصية.\n\nيمكن للمشرف مراقبة الإعدادات والوصول والتطبيقات والبيانات المرتبطة بهذا المستخدم وإدارتها، بما في ذلك نشاط الشبكة ومعلومات موقع جهازك."</string>
+ <string name="adding_profile_owner_warning" msgid="1354474524852805802">"من خلال المتابعة، ستتم إدارة بيانات المستخدم من خلال المشرف الذي يمكنه أيضًا تخزين البيانات المرتبطة بالإضافة إلى بياناتك الشخصية.\n\nويمكن للمشرف مراقبة الإعدادات وإمكانيات الوصول والتطبيقات والبيانات المرتبطة بهذا المستخدم وإدارتها، بما في ذلك نشاط الشبكة ومعلومات موقع جهازك."</string>
<string name="admin_disabled_other_options" msgid="7712694507069054530">"تم إيقاف الخيارات الأخرى بواسطة المشرف"</string>
<string name="admin_more_details" msgid="7901420667346456102">"مزيد من التفاصيل"</string>
<string name="sound_category_sound_title" msgid="1488759370067953996">"إعدادات عامة"</string>
@@ -2717,7 +2688,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> من إجمالي <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"تحديد الكل"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"استخدام البيانات"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"استخدام التطبيقات للبيانات"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"بيانات الجوّال وWi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"قد تختلف طريقة حساب بيانات مشغل شبكة الجوّال عن طريقة الحساب على جهازك."</string>
<string name="data_usage_app" msgid="4970478397515423303">"استخدام التطبيق"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"معلومات التطبيق"</string>
@@ -3019,7 +2990,7 @@
<string name="restriction_menu_change_pin" msgid="740081584044302775">"تغيير رمز PIN"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"إظهار الإشعارات"</string>
<string name="help_label" msgid="6886837949306318591">"المساعدة والتعليقات"</string>
- <string name="support_summary" msgid="2705726826263742491">"مقالات المساعدة، الهاتف والمحادثة، البدء"</string>
+ <string name="support_summary" msgid="2705726826263742491">"مقالات المساعدة، الاتصال الهاتفي والمحادثة، البدء"</string>
<string name="user_account_title" msgid="1127193807312271167">"حساب المحتوى"</string>
<string name="user_picture_title" msgid="7297782792000291692">"معرف الصورة"</string>
<string name="extreme_threats_title" msgid="6549541803542968699">"التهديدات القصوى"</string>
@@ -3114,7 +3085,6 @@
<item quantity="other">عرض %d عنصر مخفي</item>
<item quantity="one">عرض %d عنصر مخفي</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"تصغير"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"الشبكة والإنترنت"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"الجوّال"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"استخدام البيانات"</string>
@@ -3126,12 +3096,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"بلوتوث"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"التطبيقات والإشعارات"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"أذونات، تطبيقات تلقائية"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"لا تتوفر إمكانية الدخول إلى الإشعارات للتطبيقات في الملف الشخصي للعمل."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"الحسابات"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"لم تتم إضافة أي حسابات."</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"التطبيقات التلقائية"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"اللغات، الوقت، الاحتفاظ بنسخة احتياطية، التحديثات"</string>
<string name="search_results_title" msgid="1796252422574886932">"الإعدادات"</string>
- <string name="search_menu" msgid="6283419262313758339">"البحث في الإعدادات"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"لاسلكي، wi-fi، اتصال شبكة، إنترنت، لاسلكي، بيانات، واي فاي"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi، wi-fi، تبديل، التحكم"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"رسالة نصية، مراسلة نصية، رسائل، مراسلة، تلقائي"</string>
@@ -3176,6 +3146,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"دفع، نقر، دفعات"</string>
<string name="keywords_backup" msgid="470070289135403022">"نسخ احتياطية، نسخة احتياطية"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"إيماءة"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"بالوجه، فتح القفل، مصادقة، تسجيل الدخول"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei، meid، min، إصدار prl، imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"شبكة، حالة شبكة الجوّال، حالة الخدمة، قوة الإشارة، نوع شبكة الجوّال، التجوال، iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"رقم تسلسلي، إصدار الجهاز"</string>
@@ -3183,6 +3154,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"مظهر مُعتِم"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"خطأ"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"العرض على الشاشة، عرض شاشة التأمين"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"إشعار شاشة التأمين"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"وجه"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"بصمة الإصبع"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"تعتيم الشاشة، شاشة تعمل باللمس، بطارية، سطوع ذكي، سطوع ديناميكي"</string>
@@ -3654,7 +3626,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"عند إدخال رقم التعريف الشخصي لبدء هذا الجهاز، فلن تكون خدمات الدخول مثل <xliff:g id="SERVICE">%1$s</xliff:g> متاحة."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"عند إدخال نمط لبدء هذا الجهاز، فلن تكون خدمات الدخول مثل <xliff:g id="SERVICE">%1$s</xliff:g> متاحة."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"عند إدخال كلمة المرور لبدء هذا الجهاز، فلن تكون خدمات الدخول مثل <xliff:g id="SERVICE">%1$s</xliff:g> متاحة."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ملاحظة: بعد إعادة التشغيل، يتعذر بدء هذا التطبيق إلى أن تلغي قفل هاتفك."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"ملاحظة: عند إعادة تشغيل الهاتف وضبط قفل شاشة، سيتعذّر تشغيل هذا التطبيق إلى أن تلغي قفل هاتفك."</string>
<string name="imei_information_title" msgid="8499085421609752290">"معلومات IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"المعلومات ذات الصلة بـ IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(فتحة <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3669,9 +3641,9 @@
<string name="storage_type_external" msgid="7738894330670001898">"وحدة تخزين خارجية"</string>
<string name="app_data_usage" msgid="7942375313697452803">"استخدام التطبيقات للبيانات"</string>
<string name="data_summary_format" msgid="6213211533341068366">"تم استخدام <xliff:g id="SIZE">%1$s</xliff:g> منذ <xliff:g id="DATE">%2$s</xliff:g>"</string>
- <string name="storage_used" msgid="7128074132917008743">"سعة التخزين المستخدمة"</string>
+ <string name="storage_used" msgid="7128074132917008743">"مساحة التخزين المستخدمة"</string>
<string name="change" msgid="6657848623929839991">"تغيير"</string>
- <string name="change_storage" msgid="600475265207060436">"تغيير سعة التخزين"</string>
+ <string name="change_storage" msgid="600475265207060436">"تغيير مساحة التخزين"</string>
<string name="notifications_label" msgid="2872668710589600731">"الإشعارات"</string>
<string name="notifications_enabled" msgid="6983396130566021385">"تشغيل"</string>
<string name="notifications_enabled_with_info" msgid="5669544704839269901">"<xliff:g id="NOTIFICATIONS_SENT">%1$s</xliff:g> / <xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%2$s</xliff:g>"</string>
@@ -3724,7 +3696,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"شخصي"</string>
<string name="filter_work_apps" msgid="24519936790795574">"العمل"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"التطبيقات: الكل"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"التطبيقات: متوقفة"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"تطبيقات تم إيقاف إشعاراتها"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"الفئات: أهمية ملحّة"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"الفئات: منخفضة الأهمية"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"الفئات: متوفقة"</string>
@@ -3768,7 +3740,7 @@
<string name="default_app" msgid="6864503001385843060">"(تلقائي)"</string>
<string name="system_app" msgid="9068313769550747372">"(النظام)"</string>
<string name="system_default_app" msgid="3091113402349739037">"(الإعداد التلقائي للنظام)"</string>
- <string name="apps_storage" msgid="4353308027210435513">"سعة تخزين التطبيقات"</string>
+ <string name="apps_storage" msgid="4353308027210435513">"مساحة تخزين التطبيقات"</string>
<string name="usage_access" msgid="5479504953931038165">"الدخول إلى الاستخدام"</string>
<string name="permit_usage_access" msgid="4012876269445832300">"السماح بالدخول إلى الاستخدام"</string>
<string name="app_usage_preference" msgid="7065701732733134991">"تفضيلات استخدام التطبيقات"</string>
@@ -3789,7 +3761,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"تنبيهات الاستخدام"</string>
<string name="show_all_apps" msgid="1512506948197818534">"عرض الاستخدام الكامل للجهاز"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"عرض استخدام التطبيق"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"معدّل استخدام مرتفع"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="zero">يعمل <xliff:g id="NUMBER">%2$d</xliff:g> تطبيق بشكل غير طبيعي</item>
<item quantity="two">يعمل تطبيقان (<xliff:g id="NUMBER">%2$d</xliff:g>) بشكل غير طبيعي</item>
@@ -3890,8 +3861,8 @@
<string name="running_frequency" msgid="6622624669948277693">"معدل الاستخدام"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"الاستخدام الأقصى"</string>
<string name="no_data_usage" msgid="9131454024293628063">"لم يتم استخدام أي بيانات"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"هل تسمح بوصول <xliff:g id="APP">%1$s</xliff:g> إلى إعداد \"عدم الإزعاج\"؟"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"سيكون التطبيق قادرًا على تشغيل/إيقاف \"عدم الإزعاج\" وإجراء تغييرات على الإعدادات ذات الصلة."</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"هل تسمح بوصول \"<xliff:g id="APP">%1$s</xliff:g>\" إلى إعداد \"عدم الإزعاج\"؟"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"سيكون التطبيق قادرًا على تشغيل/إيقاف ميزة \"عدم الإزعاج\" وإجراء تغييرات على الإعدادات ذات الصلة."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"يجب أن يظل قيد التشغيل نظرًا لأن الوصول إلى الإشعارات قيد التشغيل"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"هل تريد إبطال إمكانية وصول تطبيق <xliff:g id="APP">%1$s</xliff:g> إلى قواعد \"عدم الإزعاج\"؟"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ستتم إزالة كل قواعد \"عدم الإزعاج\" التي أنشأها هذا التطبيق."</string>
@@ -3969,6 +3940,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"وحدة التخزين الداخلية: <xliff:g id="PERCENTAGE">%1$s</xliff:g> مستخدمة - <xliff:g id="FREE_SPACE">%2$s</xliff:g> فارغة"</string>
<string name="display_summary" msgid="6737806235882127328">"السكون بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"خلفية، سكون، حجم الخط"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"السكون بعد 10 دقائق من عدم النشاط"</string>
<string name="memory_summary" msgid="8080825904671961872">"تم استخدام متوسط ذاكرة بحجم <xliff:g id="USED_MEMORY">%1$s</xliff:g> من إجمالي <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"تم تسجيل الدخول باسم <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3984,7 +3957,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"غير مسموح بالرسائل القصيرة SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"غير مسموح باستخدام الكاميرا"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"غير مسموح بالتقاط لقطة شاشة"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"يتعذّر إيقاف النُسخ الاحتياطية."</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"يتعذّر فتح هذا التطبيق."</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"إذا كانت لديك أسئلة، يُرجى الاتصال بمشرف تكنولوجيا المعلومات"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"مزيد من التفاصيل"</string>
@@ -4016,7 +3988,7 @@
<string name="condition_device_vibrate_title" product="default" msgid="1087633233379991925">"تم ضبط الهاتف إلى الاهتزاز."</string>
<string name="condition_device_vibrate_summary" product="tablet" msgid="433514444618164607">"سيهتز الجهاز عند تلقي المكالمات والإشعارات."</string>
<string name="condition_device_vibrate_summary" product="default" msgid="5877034997839162763">"سيهتز الهاتف عند تلقي المكالمات والإشعارات."</string>
- <string name="night_display_suggestion_title" msgid="6602129097059325291">"تعيين جدول زمني للإضاءة الليلية"</string>
+ <string name="night_display_suggestion_title" msgid="6602129097059325291">"تحديد جدول زمني للإضاءة الليلية"</string>
<string name="night_display_suggestion_summary" msgid="228346372178218442">"تلوين الشاشة كل ليلة تلقائيًا"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"تم تشغيل الإضاءة الليلية"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"الشاشة ملوّنة بلون كهرماني خفيف، وهذا قد يساعدك على النوم."</string>
@@ -4168,9 +4140,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"محاكاة شاشة بها صورة مقطوعة"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"صورة مقطوعة للشاشة"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"جزء مقتطع من الشاشة، قطع علوي"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"بدون"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"الإعداد التلقائي للجهاز"</string>
<string name="special_access" msgid="3458780842491881155">"أذونات خاصة للتطبيقات"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="zero">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيق استخدام البيانات غير المقيدة</item>
@@ -4196,11 +4168,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"متصل بـ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"متصل بأجهزة متعددة"</string>
<string name="demo_mode" msgid="2798762752209330277">"وضع تجريبي لواجهة مستخدم النظام"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"الوضع الليلي"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"ضبط الوضع الليلي"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"الوضع المُعتم"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"ضبط الوضع المُعتم"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"فئات مطوّري البرامج في الإعدادات السريعة"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"تتبّع أنشطة Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"إعدادات الملف الشخصي للعمل"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"البحث في جهات الاتصال"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"السماح بعمليات البحث عن جهات اتصال بواسطة مؤسستك لتحديد المتصلين وجهات الاتصال"</string>
@@ -4228,11 +4199,11 @@
<item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> ثانية</item>
<item quantity="one">ثانية واحدة</item>
</plurals>
- <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"إدارة سعة التخزين"</string>
- <string name="automatic_storage_manager_text" msgid="4562950476680600604">"للمساعدة في تفريغ مساحة التخزين، يزيل مدير سعة التخزين من جهاز الصور والفيديوهات التي تم الاحتفاظ بنسخة احتياطية منها."</string>
+ <string name="automatic_storage_manager_settings" msgid="7819434542155181607">"إدارة مساحة التخزين"</string>
+ <string name="automatic_storage_manager_text" msgid="4562950476680600604">"للمساعدة في تفريغ مساحة التخزين، يزيل مدير مساحة التخزين من جهاز الصور والفيديوهات التي تم الاحتفاظ بنسخة احتياطية منها."</string>
<string name="automatic_storage_manager_days_title" msgid="2017913896160914647">"إزالة الصور والفيديوهات"</string>
- <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"مدير سعة التخزين"</string>
- <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"استخدام مدير سعة التخزين"</string>
+ <string name="automatic_storage_manager_preference_title" msgid="5753702798151073383">"مدير مساحة التخزين"</string>
+ <string name="automatic_storage_manager_master_switch_title" msgid="6792996736190821417">"استخدام مدير مساحة التخزين"</string>
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"تلقائي"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"يدوي"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"إخلاء بعض المساحة الآن"</string>
@@ -4253,13 +4224,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"النقر مرّتين للاطّلاع على الهاتف"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"انقر مرّتين للاطلاع على الجهاز اللوحي"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"انقر مرّتين للاطلاع على الجهاز"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"للاطّلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، انقر مرّتين على الشاشة."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، انقر مرّتين على شاشتك."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"حمل الهاتف للاطّلاع عليه"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"يمكنك حمل الجهاز اللوحي للاطلاع عليه"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"يمكنك حمل الجهاز للاطلاع عليه"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ما عليك سوى حمل هاتفك للاطّلاع على الوقت ورموز الإشعارات والمعلومات الأخرى."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، اختر جهازك اللوحي."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"للاطلاع على الوقت ورموز الإشعارات والمعلومات الأخرى، يمكنك إلقاء نظرة على جهازك."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"عرض إيماءة التنبيه"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، يمكنك إلقاء نظرة على هاتفك."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، يمكنك إلقاء نظرة على جهازك اللوحي."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، يمكنك إلقاء نظرة على جهازك."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"إيماءة شاشة قفل التنشيط"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"تمرير البصمة للحصول على الإشعارات"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"تمرير بصمة الإصبع"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"للاطّلاع على الإشعارات، مرر للأسفل على جهاز استشعار بصمة الإصبع على الجزء الخلفي لهاتفك."</string>
@@ -4279,7 +4254,7 @@
<string name="web_action_section_title" msgid="7364647086538399136">"التطبيقات الفورية"</string>
<string name="instant_apps_settings" msgid="8827777916518348213">"تفضيلات التطبيقات الفورية"</string>
<string name="domain_url_section_title" msgid="7046835219056428883">"التطبيقات المثبَّتة"</string>
- <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"تتم إدارة سعة التخزين لجهازك الآن عن طريق مدير سعة التخزين"</string>
+ <string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"تتم إدارة مساحة التخزين لجهازك الآن عن طريق مدير مساحة التخزين"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"حسابات <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="configure_section_header" msgid="7391183586410814450">"تهيئة"</string>
<string name="auto_sync_account_title" msgid="898796354710116383">"مزامنة البيانات تلقائيًا"</string>
@@ -4355,7 +4330,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> محاولة</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> محاولة</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"يتم إجراء نسخ احتياطي لبيانات هذا الجهاز"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"تتولى مؤسستك إدارة هذا الجهاز."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"تتم إدارة هذا الجهاز بواسطة <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4395,7 +4369,7 @@
<string name="storage_other_apps" msgid="5524321740031718083">"تطبيقات أخرى"</string>
<string name="storage_files" msgid="8581083146777364063">"الملفات"</string>
<string name="storage_size_large_alternate" msgid="3395208658399637645">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
- <string name="storage_volume_total" msgid="3499221850532701342">"سعة التخزين المستخدمة من أصل <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+ <string name="storage_volume_total" msgid="3499221850532701342">"مساحة التخزين المستخدمة من أصل <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"مستخدمة"</string>
<string name="clear_instant_app_data" msgid="2004222610585890909">"مسح التطبيق"</string>
<string name="clear_instant_app_confirmation" msgid="7451671214898856857">"هل تريد إزالة هذا التطبيق الفوري؟"</string>
@@ -4408,29 +4382,34 @@
<string name="autofill_app" msgid="7338387238377914374">"خدمة الملء التلقائي"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ملء، تعبئة، ملء تلقائي"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>تأكّد من أنك تثق بهذا التطبيق</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> تستخدم البيانات المعروضة على الشاشة لتحديد ما يمكن ملؤه تلقائيًا."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"ملء تلقائي"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"مستوى التسجيل"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"الحد الأقصى للطلبات في كل جلسة"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"الحد الأقصى لعدد مجموعات البيانات المرئية"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"إعادة الضبط على القيم التلقائية"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"تمّت إعادة ضبط الملء التلقائي لخيارات مطوّري البرامج"</string>
<string name="device_theme" msgid="4571803018917608588">"مظهر الجهاز"</string>
<string name="default_theme" msgid="7085644992078579076">"تلقائي"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"اسم الشبكة"</string>
<string name="show_operator_name_summary" msgid="5962567590205757550">"عرض اسم الشبكة في شريط الحالة"</string>
- <string name="storage_manager_indicator" msgid="1516810749625915020">"إدارة سعة التخزين: <xliff:g id="STATUS">^1</xliff:g>"</string>
+ <string name="storage_manager_indicator" msgid="1516810749625915020">"إدارة مساحة التخزين: <xliff:g id="STATUS">^1</xliff:g>"</string>
<string name="storage_manager_indicator_off" msgid="7488057587180724388">"إيقاف"</string>
<string name="storage_manager_indicator_on" msgid="8625551710194584733">"تشغيل"</string>
<string name="install_type_instant" msgid="3174425974536078647">"تطبيق فوري"</string>
- <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"هل تريد إيقاف مدير سعة التخزين؟"</string>
+ <string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"هل تريد إيقاف مدير مساحة التخزين؟"</string>
<string name="storage_movies_tv" msgid="5498394447562086890">"تطبيقات الأفلام والتلفزيون"</string>
<string name="carrier_provisioning" msgid="4398683675591893169">"معلومات توفير خدمة مشغل شبكة الجوال"</string>
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"بدء توفير خدمة مشغل شبكة الجوال"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"تحديث إعداد \"الرجاء عدم الإزعاج\""</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"إيقاف الإشعارات مؤقتًا للحفاظ على التركيز"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"ما الميزات الجديدة والمثيرة للاهتمام؟"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"الحصول على جولة في هاتفك الجديد"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"الحصول على جولة في جهازك اللوحي الجديد"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"الحصول على جولة في جهازك الجديد"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"لا تتوفر هذه الميزة على هذا الجهاز"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"فرض كامل لقياسات GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"تتبّع جميع مجموعات وفترات تكرار GNSS التي لا تحتوي على دورات عمل"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"عرض مربع حوار الأعطال دائمًا"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"عرض مربع الحوار في كل مرة يتعطل فيها تطبيق"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"تحديد التطبيق الذي يستخدم ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"لم يتم تعيين تطبيق لاستخدام ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"التطبيق الذي يستخدم ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"الوصول إلى الدليل"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"الوصول إلى الدليل"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4471,4 +4450,89 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"تفاصيل الشبكة"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"اسم جهازك مرئي للتطبيقات على هاتفك. ويمكن أيضًا أن يراه أشخاص آخرون عند الاتصال بأجهزة بلوتوث أو إعداد نقطة اتصال Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"الأجهزة"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"جميع الإعدادات"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"اقتراحات"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"بيانات CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"بيانات CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"اختيار شبكة"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"غير متصلة"</string>
+ <string name="network_connected" msgid="4943925032253989621">"متصلة"</string>
+ <string name="network_connecting" msgid="76404590784733557">"جارٍ الاتصال…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"تعذّر الاتصال"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"لم يتم العثور على شبكات."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"تعذّر العثور على شبكات. حاوِل مرة أخرى."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(محظورة)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"ليست هناك شريحة SIM."</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"اتصال متقدِّم"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"وضع الشبكة المُفضَّل: تمّ تفضيل WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"وضع الشبكة المُفضَّل: GSM فقط"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"وضع الشبكة المُفضَّل: WCDMA فقط"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"وضع الشبكة المُفضَّل: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"وضع الشبكة المُفضَّل: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"وضع الشبكة المُفضَّل: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"وضع الشبكة المُفضَّل: CDMA فقط"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"وضع الشبكة المُفضَّل: EvDo فقط"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"وضع الشبكة المُفضَّل: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"وضع الشبكة المُفضَّل: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"وضع الشبكة المُفضَّل: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"وضع الشبكة المُفضَّل: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"وضع الشبكة المُفضَّل: عام"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"وضع الشبكة المُفضَّل: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"وضع الشبكة المُفضَّل: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"وضع الشبكة المُفضَّل: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"وضع الشبكة المُفضَّل: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"وضع الشبكة المُفضَّل: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"وضع الشبكة المُفضَّل: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"وضع الشبكة المُفضَّل: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"وضع الشبكة المُفضَّل: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"وضع الشبكة المُفضَّل: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"وضع الشبكة المُفضَّل: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"وضع الشبكة المُفضَّل: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"وضع الشبكة المُفضَّل: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"وضع الشبكة المُفضَّل: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (مُستحسَن)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"الجيل الرابع (مُستحسَن)"</string>
+ <string name="network_global" msgid="959947774831178632">"عام"</string>
+ <string name="label_available" msgid="1731547832803057893">"الشبكات المُتاحة"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"جارٍ البحث…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"جارٍ التسجيل على <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"لا تسمح شريحة SIM بالاتصال بهذه الشبكة."</string>
+ <string name="connect_later" msgid="978991102125216741">"يتعذَّر الاتصال بهذه الشبكة في الوقت الحالي. حاول مرة أخرى لاحقًا."</string>
+ <string name="registration_done" msgid="4573820010512184521">"مُسجَّلة على الشبكة."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"اختيار الشبكة تلقائيًا"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"إعدادات مشغّل شبكة الجوال"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"إعداد خدمة البيانات"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"بيانات الجوّال"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"الوصول إلى البيانات باستخدام شبكة الجوّال"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"نوع الشبكة المُفضَّل"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"تغيير وضع تشغيل الشبكة"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"نوع الشبكة المُفضَّل"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"مشغّل شبكة جوّال"</string>
+ <string name="call_category" msgid="8108654745239563833">"الاتصال"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"مكالمة فيديو باستخدام مشغّل شبكة الجوال"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"اختيار النظام"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"تغيير وضع التجوال عبر CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"اختيار النظام"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"الشبكة"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"الشبكة"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"اشتراك CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"تغيير بين \"بطاقة RUIM/شريحة SIM\" وNV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"اشتراك"</string>
+ <string name="register_automatically" msgid="518185886971595020">"التسجيل التلقائي…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"هل تريد السماح بتجوال البيانات؟"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"راجع مقدِّم الشبكة للتعرُّف على الأسعار."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"استخدام بيانات التطبيق"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"وضع الشبكة <xliff:g id="NETWORKMODEID">%1$d</xliff:g> غير صالح، وعليك تجاهله."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"عدم التوفُّر عند الربط بمشغّل شبكة الجوّال <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"عرض المزيد"</string>
+ <string name="see_less" msgid="1250265310929558370">"عرض عناصر أقل"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ <item quantity="few">تمَّ توصيل <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>
+ <item quantity="other">تمَّ توصيل <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> جهاز.</item>
+ <item quantity="one">تمَّ توصيل جهاز واحد (<xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g>).</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"ليست هناك أجهزة متصلة."</string>
</resources>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index 77a3b94..46d9fa8 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"মিটাৰ কৰা হিছাপে আচৰণ কৰক"</item>
<item msgid="2266114985518865625">"নিৰিখ অনিৰ্দিষ্ট বুলি গণ্য কৰক"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ডিফ’ল্ট (যাদৃচ্ছিক MAC ব্যৱহাৰ কৰক)"</item>
+ <item msgid="5398461510512959597">"বিশ্বাসী"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"নহয়"</item>
<item msgid="3863157480502955888">"হয়"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"সদায় অন"</item>
<item msgid="6385301106124765323">"সদায় অফ"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"অফ আছে"</item>
+ <item msgid="2182686878828390312">"ডিবাগ"</item>
+ <item msgid="5286514712714822064">"ভাৰ্ব\'ছ"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"কেৱল গৃহ পৃষ্ঠাত"</item>
+ <item msgid="5034813753274486448">"স্বয়ংক্ৰিয়"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA অগ্ৰাধিকাৰপ্ৰাপ্ত"</item>
+ <item msgid="807926878589867564">"কেৱল GSM"</item>
+ <item msgid="488474605709912156">"কেৱল WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA স্বয়ংক্ৰিয়"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo স্বয়ংক্ৰিয়"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"কেৱল EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"গোলকীয়"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"কেৱল TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"০"</item>
+ <item msgid="8113210705878681550">"১"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"গোলকীয়"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"১০"</item>
+ <item msgid="4187053702071521357">"৮"</item>
+ <item msgid="5461421967189969022">"৯"</item>
+ </string-array>
</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 93b5a8f..393c893 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"সৃষ্টি কৰক"</string>
<string name="allow" msgid="3349662621170855910">"অনুমতি দিয়ক"</string>
<string name="deny" msgid="6947806159746484865">"প্ৰত্যাখ্যান কৰক"</string>
- <string name="dlg_close" msgid="7471087791340790015">"বন্ধ কৰক"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"সলনি কৰক"</string>
<string name="device_info_default" msgid="7847265875578739287">"অজ্ঞাত"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">আপুনি এতিয়া বিকাশকৰ্তা হোৱাৰ পৰা<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূৰত।</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"কোনো প্ৰয়োজন নাই, আপুনি ইতিমধ্যে এজন ডেভেলপাৰ।"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"অনুগ্ৰহ কৰি প্ৰথমে বিকাশকৰ্তাৰ বিকল্পসমূহ সক্ষম কৰক।"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"বেতাঁৰ আৰু নেটৱৰ্কসমূহ"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"সংযোগসমূহ"</string>
- <string name="header_category_device" msgid="4544026001618307754">"ডিভাইচ"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ব্যক্তিগত"</string>
- <string name="header_category_access" msgid="7580499097416970962">"প্ৰৱেশ"</string>
<string name="header_category_system" msgid="2816866961183068977">"ছিষ্টেম"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ডেটা সংযোগ সক্ৰিয় কৰক"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ডেটা সংযোগ নিষ্ক্ৰিয় কৰক"</string>
@@ -120,7 +114,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ডিভাইচৰ ব্লুটুথৰ ঠিকনা: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"সংযোগ বিচ্ছিন্ন কৰিবনে <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"সম্প্ৰচাৰণ"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"নামবিহীন ব্লুটুথ ডিভাইচ"</string>
<string name="progress_scanning" msgid="192587958424295789">"অনুসন্ধান কৰি থকা হৈছে"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"কোনো নিকটৱৰ্তী ব্লুটুথ ডিভাইচ পোৱা নগ\'ল।"</string>
@@ -152,7 +145,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"এটা এপে আপোনাৰ ফ\'নটোৰ ব্লুটুথ অন কৰিব বিচাৰিছে আৰু ফ\'নটো অন্য ব্লুটুথ ডিভাইচে বিচাৰি পাব পৰা কৰিব বিচাৰিছে। আপুনি ইয়াক পিছত ব্লুটুথ ছেটিঙত সলনি কৰিব পাৰিব।"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ব্লুটুথ অন কৰি থকা হৈছে…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ব্লুটুথ অফ কৰি থকা হৈছে…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"স্বয়ং-সংযোগ"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ব্লুটুথ যোৰা লগোৱাৰ অনুৰোধ"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"ৰ সৈতে সংযোগ কৰিবলৈ টিপক৷"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"ৰ লগত সংযোগ কৰিবলৈ বিচাৰে নেকি?"</string>
@@ -180,12 +172,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"কল কৰিবৰ বাবে উপলব্ধ ডিভাইচবোৰ"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"বৰ্তমান সংযোজিত হৈ আছে"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"ছেভ কৰি থোৱা ডিভাইচসমূহ"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"ডিভাইচ যোগ কৰক"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"যোৰা লগাবলৈ ব্লুটুথ অন হ\'ব"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"সংযোগৰ অগ্ৰাধিকাৰসমূহ"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"পূৰ্বৱৰ্তী সংযোগ হোৱা ডিভাইচবোৰ"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"আগতে সংযোগ কৰা"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ব্লুটুথ অন কৰা হ\'ল"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"সকলো চাওক"</string>
<string name="date_and_time" msgid="9062980487860757694">"তাৰিখ আৰু সময়"</string>
<string name="choose_timezone" msgid="1362834506479536274">"সময় মণ্ডল নিৰ্বাচন কৰক"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -268,7 +260,6 @@
<string name="skip_label" msgid="47510779345218297">"এৰিথৈ যাওক"</string>
<string name="next_label" msgid="4693520878012668114">"পৰৱৰ্তী"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ভাষাবোৰ"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ভাষাৰ অগ্ৰাধিকাৰসমূহ"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"আঁতৰাওক"</string>
<string name="add_a_language" msgid="2330538812283783022">"ভাষা বাছনি কৰক"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -302,7 +293,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"ছেটিংসমূহ"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"ছেটিংসমূহৰ শ্বৰ্টকাট"</string>
<string name="airplane_mode" msgid="8837269988154128601">"এয়াৰপ্লেইন ম\'ড"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"অধিক"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"বেতাঁৰ আৰু নেটৱৰ্কসমূহ"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"ৱাই-ফাই, ব্লুটুথ, এয়াৰপ্লেন ম\'ড, ম\'বাইল নেটৱৰ্ক আৰু ভিপিএনবোৰ পৰিচালনা কৰক"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"ম\'বাইল ডেটা"</string>
@@ -387,6 +377,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"গোপনীয়তা"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"প্ৰশাসকে অক্ষম কৰিছে"</string>
<string name="security_status_title" msgid="5848766673665944640">"সুৰক্ষা স্থিতি"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"স্ক্ৰীণ লক, ফে’চ আনলক"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"স্ক্ৰীণ লক, ফিংগাৰপ্ৰিণ্ট"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"স্ক্ৰীণ লক"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"চেহেৰা যোগ কৰা হ\'ল"</string>
@@ -396,11 +387,30 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"নিজৰ চেহেৰাৰ জৰিয়তে আনলক কৰক"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"প্ৰমাণীকৰণ কৰিবলৈ নিজৰ চেহেৰা ব্য়ৱহাৰ কৰক"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"নিজৰ ফ’ন আনলক কৰা, ক্ৰয়সমূহক স্বীকৃতি দিয়া বা এপসমূহত ছাইন ইন কৰা কাৰ্যৰ বাবে নিজৰ চেহেৰা ব্য়ৱহাৰ কৰক।"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"নিজৰ প্ৰয়োগ কৰক"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"আপোনাৰ ফ\'নটো আনলক কৰিবলৈ বা ক্ৰয়ৰ অনুমোদন জনাবলৈ আপোনাৰ মুখমণ্ডল ব্যৱহাৰ কৰক।\n\nটোকা: আপুনি এই ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ মুখমণ্ডল ব্যৱহাৰ কৰিব নোৱাৰে৷ অধিক তথ্যৰ বাবে আপোনাৰ প্ৰতিষ্ঠানৰ প্ৰশাসকৰ সৈতে যোগাযোগ কৰক।"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"নিজৰ ফ’ন আনলক কৰা, ক্ৰয়সমূহক স্বীকৃতি দিয়া বা এপসমূহত ছাইন ইন কৰা কাৰ্যৰ বাবে নিজৰ চেহেৰা ব্য়ৱহাৰ কৰক"</string>
- <string name="face_add_max" msgid="2342250989212694454">"আপুনি <xliff:g id="COUNT">%d</xliff:g>লৈকে ফিংগাৰপ্ৰিণ্ট যোগ কৰিব পাৰে"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"আপোনাৰ মুখমণ্ডলটো বৃত্তৰ ভিতৰলৈ আনক"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"এইটো পিছত কৰিব"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"আপুনি <xliff:g id="COUNT">%d</xliff:g>লৈকে মুখমণ্ডল যোগ কৰিব পাৰে"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"আপুনি অনুমোদিত সৰ্বাধিক সংখ্যক ফিংগাৰপ্ৰিণ্টবোৰ যোগ কৰিছে"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"আৰু বেছি চেহেৰা যোগ কৰিব নোৱাৰি"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"অন্তৰ্ভুক্ত কৰা কাৰ্য সম্পূৰ্ণ নহ\'ল"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ঠিক আছে"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"মুখমণ্ডল অন্তৰ্ভুক্ত কৰাৰ সময় উকলিল। আকৌ চেষ্টা কৰক।"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"মুখমণ্ডল অন্তৰ্ভুক্ত কৰা কাৰ্যই কাম নকৰিলে।"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"সকলো সাজু। ঠিকেই দেখা গৈছে।"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"সম্পন্ন হ\'ল"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"এই কাৰ্যত মুখমণ্ডল"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"নিজৰ ডিভাইচ আনলক কৰক"</string>
+ <!-- no translation found for security_settings_face_settings_use_face_for_apps (5751549943998662469) -->
+ <skip />
+ <!-- no translation found for security_settings_face_settings_require_attention (1638445716306615123) -->
+ <skip />
+ <!-- no translation found for security_settings_face_settings_require_attention_details (5749808567341263288) -->
+ <skip />
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"মুখমণ্ডল ডেটা আঁতৰাওক"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"নিজৰ মুখমণ্ডলৰ ডেটা উন্নত কৰক"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"আপোনাৰ মুখমণ্ডল আপোনাৰ ডিভাইচ আনলক কৰা আৰু এপসমূহ এক্সেছ কৰাত ব্যৱহাৰ কৰিব পাৰি।"<annotation id="url">"অধিক জানক"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ফিংগাৰপ্ৰিণ্ট"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ফিংগাৰপ্ৰিণ্টসমূহ পৰিচালনা কৰক"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰক"</string>
@@ -883,6 +893,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"৫.০ গিগাহাৰ্টজ"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"ৱাই-ফাই হ\'টস্প\'টৰ বাবে কমেও এটা বেণ্ড বাছনি কৰক:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"আইপি ছেটিংসমূহ"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"গোপনীয়তা"</string>
<string name="wifi_shared" msgid="844142443226926070">"ডিভাইচৰ অন্য ব্যৱহাৰকাৰীৰ সৈতে শ্বেয়াৰ কৰক"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(সালসলনি নাই)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"অনুগ্ৰহ কৰি বাছনি কৰক"</string>
@@ -922,7 +933,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"বাতিল কৰক"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"নেটৱৰ্কটো পাহৰেনে?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"এই নেটৱৰ্কৰ সকলো পাছৱৰ্ড মচি পেলোৱা হ\'ব"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"ছেভ কৰি ৰখা নেটৱৰ্কসমূহ"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d নেটৱৰ্ক</item>
<item quantity="other">%d নেটৱৰ্ক</item>
@@ -1101,8 +1111,7 @@
<string name="brightness_title" msgid="5746272622112982836">"উজ্জ্বলতা"</string>
<string name="brightness_summary" msgid="838917350127550703">"স্ক্ৰীণৰ উজ্জ্বলতা খাপ খুৱাওক"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"অভিযোজিত উজ্জ্বলতা"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"অন আছে"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"অফ হৈ আছে"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"আপুনি স্ক্ৰীণৰ বাবে বাছনি কৰা উজ্জ্বলতা অতি কম হৈছে"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"আপুনি স্ক্ৰীণৰ বাবে বাছনি কৰা উজ্জ্বলতাটো কম"</string>
@@ -1120,13 +1129,13 @@
<string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"বেটাৰিৰ বৰ্ধিত ব্যৱহাৰ"</string>
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"উপলব্ধ পোহৰ অনুযায়ী উজ্জ্বলতাৰ স্তৰ অপ্টিমাইজ কৰক। এই সুবিধাটো অন হৈ থাকিলেও আপুনি সাময়িকভাৱে উজ্জ্বলতা সাল-সলনি কৰিব পাৰিব।"</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"আপোনাৰ স্ক্ৰীণৰ উজ্জ্বলতা আপোনাৰ পৰিবেশ আৰু কাৰ্যকলাপবোৰৰ লগত স্ৱয়ংক্ৰিয়ভাৱে খাপ খায়। আপুনি অনুকূলনযোগ্য় উজ্জ্বলতাক আপোনাৰ অগ্ৰাধিকাৰসমূহ বুজিবলৈ সহায় কৰিবৰ বাবে শ্লাইডাৰক মেনুয়েলভাৱে স্থানান্তৰ কৰিব পাৰে।"</string>
- <string name="night_display_title" msgid="2626451512200357686">"ৰাতিৰ লাইট"</string>
- <string name="night_display_text" msgid="1837277457033025056">"ৰাতিৰ পোহৰে আপোনাৰ স্ক্ৰিণ সংকেতক ৰঙীণ বনাই দিয়ে। এই কাৰ্যই আপোনাক নিজৰ স্ক্ৰিণ চাবলৈ বা কম পোহৰতো পঢ়িবলৈ সুবিধা দিয়ে আৰু আপোনাক শান্তিৰে শোৱাত সহায়ও কৰিব পাৰে।"</string>
+ <string name="night_display_title" msgid="2626451512200357686">"ৰাতিৰ পোহৰ"</string>
+ <string name="night_display_text" msgid="1837277457033025056">"ৰাতিৰ পোহৰে আপোনাৰ স্ক্ৰীণখন মৌ-বৰণীয়া কৰি তোলে। এই কাৰ্যই আপোনাক স্ক্ৰীণখন চাবলৈ বা কম পোহৰতো পঢ়িবলৈ সুবিধা দিয়ে আৰু ই আপোনাক সহজে টোপনি যোৱাতো সহায় কৰিব পাৰে।"</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"সূচী"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"নাই"</string>
- <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"নিজৰ অনুসৰি কৰা সময়ত অন হ’ব"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"সূৰ্যাস্তৰ পৰা সূৰ্যোদয়লৈ অন কৰি ৰাখক"</string>
- <string name="night_display_start_time_title" msgid="8918016772613689584">"আৰম্ভণিৰ সময়"</string>
+ <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"কাষ্টম সময়ত অন হ’ব"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"সূৰ্যাস্তৰ পৰা সূৰ্যোদয়লৈ অন হয়"</string>
+ <string name="night_display_start_time_title" msgid="8918016772613689584">"আৰম্ভ হোৱাৰ সময়"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"সমাপ্ত হোৱাৰ সময়"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"স্থিতি"</string>
<string name="night_display_temperature_title" msgid="1435292789272017136">"তীব্ৰতা"</string>
@@ -1142,7 +1151,7 @@
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"এতিয়া অফ কৰক"</string>
<string name="night_display_activation_on_twilight" msgid="6976051971534953845">"সূৰ্যোদয় নোহোৱালৈকে অন কৰি ৰাখক"</string>
<string name="night_display_activation_off_twilight" msgid="7196227685059907233">"সূৰ্যাস্ত নোহোৱালৈকে অফ কৰি ৰাখক"</string>
- <string name="night_display_activation_on_custom" msgid="5472029024427933598">"<xliff:g id="ID_1">%1$s</xliff:g> নবজালৈকে অফ কৰি ৰাখক"</string>
+ <string name="night_display_activation_on_custom" msgid="5472029024427933598">"<xliff:g id="ID_1">%1$s</xliff:g> নবজালৈকে অন কৰি ৰাখক"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"<xliff:g id="ID_1">%1$s</xliff:g> নবজালৈকে অফ কৰি ৰাখক"</string>
<string name="screen_timeout" msgid="4351334843529712571">"সুপ্ত অৱস্থা"</string>
<string name="screen_timeout_title" msgid="5130038655092628247">"স্ক্ৰীণ অফ হৈ যায়"</string>
@@ -1198,6 +1207,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"পিন সলনি কৰিব পৰা নহ\'ল৷\nসম্ভৱতঃ ভুল পিন নম্বৰ দিয়া হৈছে৷"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"ছিমৰ পিন সফলতাৰে সলনি কৰা হ\'ল"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"ছিম কাৰ্ড লক কৰা অৱস্থাটো সলনি কৰিব পৰা নহ\'ল৷\nসম্ভৱতঃ ভুল পিন নম্বৰ দিয়া হৈছে৷"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"পিন অক্ষম কৰিব নোৱাৰি।"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"পিন সক্ষম কৰিব নোৱাৰি।"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ঠিক"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"বাতিল কৰক"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"একাধিক ছিম কাৰ্ড পোৱা গৈছে"</string>
@@ -1371,7 +1382,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"এই কামৰ বাবে <xliff:g id="NAME_0">^1</xliff:g>ক ফৰমেট কৰা দৰকাৰ। \n\n"<b>"ফৰমেট কৰিলে বৰ্তমান <xliff:g id="NAME_1">^1</xliff:g>ত থকা সকলো ডেটা মচা যাব।"</b>" ডেটা হেৰুৱাৰ পৰা হাত সাৰিবলৈ, প্ৰথমে ইয়াৰ বেকআপ লোৱাৰ কথা বিবেচনা কৰক।"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"মচক আৰু ফৰমেট কৰক"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>ক ফৰ্মেট কৰি থকা হৈছে…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"ফৰমেটহৈ থাকোতে <xliff:g id="NAME">^1</xliff:g> নাঁতৰাব।"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"ফৰমেট হৈ থাকোঁতে <xliff:g id="NAME">^1</xliff:g>ক আঁতৰ নকৰিব।"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"নতুন সঞ্চয়াগাৰলৈ ডেটা স্থানান্তৰ কৰক"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"আপুনি আপোনাৰ ফ\'টো, ফাইল ৰ কিছুমান এপবোৰ এই নতুন <xliff:g id="NAME">^1</xliff:g>লৈ নিব পাৰে। \n\nএই কামত প্ৰায <xliff:g id="TIME">^2</xliff:g> সময় লাগে আৰু ই আভ্যন্তৰীণ সঞ্চয়াগাৰৰ পৰা <xliff:g id="SIZE">^3</xliff:g> ঠাই খালী কৰিব। এই প্ৰক্ৰিয়া চলি থকা সময়ত কিছুমান এপে কাম নকৰিব।"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"এতিয়াই স্থানান্তৰ কৰক"</string>
@@ -1753,9 +1764,6 @@
<string name="installed" msgid="3070865169422600098">"ইনষ্টল হ’ল"</string>
<string name="no_applications" msgid="7336588977497084921">"কোনো এপ নাই।"</string>
<string name="internal_storage" msgid="1584700623164275282">"আভ্যন্তৰীণ সঞ্চয়াগাৰ"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"আভ্যন্তৰিণ সঞ্চয়াগাৰ"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"ইউএছবি সঞ্চয়াগাৰ"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD কাৰ্ড সঞ্চয়াগাৰ"</string>
<string name="recompute_size" msgid="7722567982831691718">"এপৰ আকাৰ পুনঃগণনা কৰা হৈছে…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"এপ্ ডেটা মচিবনে?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"এই এপটোৰ সকলো ডেটা চিৰদিনৰ বাবে মচা হ\'ব। সেই ডেটাসমূহৰ ভিতৰত ফাইল ছেটিং, একাউণ্ট, ডেটাবেইছ আদিসমূহ অন্তৰ্ভুক্ত।"</string>
@@ -1764,24 +1772,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ইনষ্টলহৈ থকা এপৰ তালিকাত এপটো পোৱা নগ\'ল।"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"এপৰ সঞ্চয়াগাৰ মচিব পৰা নগ\'ল৷"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"এই এপ্টোৱে আপোনাৰ টে\'বলেটৰ নিম্নলিখিতখিনিত প্ৰৱেশ কৰিব পাৰে:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"এই এপ্টোৱে আপোনাৰ ফ\'নৰ নিম্নলিখিতখিনিত প্ৰৱেশ কৰিব পাৰে:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"এই এপে আপোনাৰ টে\'বলেটত তলত দিয়া বস্তুবোৰ ব্যৱহাৰ কৰিব পাৰে। কাৰ্যপ্ৰদৰ্শণ উন্নত কৰিবলৈ আৰু মেম\'ৰীৰ ব্যৱহাৰ হ্ৰাস কৰিবলৈ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>ত কিছুমান অনুমতি উপলব্ধ হয় কিয়নো ই <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>ৰ নিচিনাকৈ একেটা প্ৰক্ৰিয়াতে চলে:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"এই এপ্টোৱে আপোনাৰ ফ\'নৰ নিম্নলিখিতখিনিত প্ৰৱেশ কৰিব পাৰে। কাৰ্যক্ষমতা উন্নত কৰিবলৈ আৰু মেম’ৰিৰ ব্যৱহাৰ কমাবলৈ, এই অনুমতিবোৰৰ কিছুমান <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>ত উপলব্ধ, কিয়নো ই একেটা প্ৰক্ৰিয়াকে নিম্নলিখিতখিনিৰ দৰে চলাই <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> আৰু <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"এই এপটো ব্যৱহাৰ কৰিলে পইচা খৰচ হ\'ব পাৰে:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"প্ৰিমিয়াম এছএমএছ প্ৰেৰণ কৰক"</string>
<string name="computing_size" msgid="1599186977475211186">"গণনা কৰি থকা হৈছে…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"পেকেজৰ আকাৰ গণনা কৰিব পৰা নগ\'ল।"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"আপুনি কোনো তৃতীয় পক্ষৰ এপ্ ইনষ্টল কৰি থোৱা নাই"</string>
<string name="version_text" msgid="9189073826278676425">"সংস্কৰণ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"স্থানান্তৰ কৰক"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"টে\'বলেটত লৈ যাওক"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ফ\'নলৈ নিয়ক"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB সঞ্চয়াগাৰলৈ স্থানান্তৰ কৰক"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"এছডি কাৰ্ডলৈ স্থানান্তৰ কৰক"</string>
- <string name="moving" msgid="6431016143218876491">"স্থানান্তৰ কৰি থকা হৈছে"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"অন্য এটা স্থানান্তৰণ কাৰ্য ইতিমধ্যে চলি আছে৷"</string>
<string name="insufficient_storage" msgid="481763122991093080">"সঞ্চয়াগাৰত পৰ্যাপ্ত খালী ঠাই নাই।"</string>
<string name="does_not_exist" msgid="1501243985586067053">"এপটোৰ অস্তিত্ব নাই"</string>
@@ -1791,17 +1791,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"বাহ্যিক মিডিয়াত ডিভাইচৰ প্ৰশাসক এপ্ ইনষ্টল কৰিব নোৱাৰি"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"বলেৰে বন্ধ কৰিবনে?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"আপুনি কোনো এপ্ বলেৰে বন্ধ কৰিবলৈ চেষ্টা কৰিলে ই অস্বাভাৱিক আচৰণ কৰিব পাৰে৷"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"<xliff:g id="REASON">%1$s</xliff:g>ক স্থানান্তৰ কৰিব পৰা নগ\'ল।"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"ইনষ্টল কৰাৰ বাবে অগ্ৰাধিকাৰ দিয়া অৱস্থান"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"নতুন এপৰ বাবে পচন্দৰ ইনষ্টলেশ্বন অৱস্থান সলনি কৰক"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"অন্তৰ্নিৰ্মিত এপটো অক্ষম কৰিবনে?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"এপ্ অক্ষম কৰক"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"আপুনি যদি এই এপটো নিষ্ক্ৰিয় কৰে, তেন্তে Android আৰু অন্য এপসমূহে বিচৰাৰ দৰে কাম নকৰিব পাৰে।"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ডেটা মচিবনে আৰু এপক অক্ষম কৰিবনে?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"আপুনি যদি এই এপটো নিষ্ক্ৰিয় কৰে, তেন্তে Android আৰু অন্য এপসমূহে বিচৰাৰ দৰে কাম নকৰিব পাৰে। আপোনাৰ ডেটাও মচা হ\'ব।"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"জাননীসমুহ অফ কৰিবনে?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"যদি আপুনি এই এপৰ জাননীসমুহ অফ কৰি ৰাখে তেন্তে আপুনি গুৰুত্বপূৰ্ণ বিপদ-জাননী আৰু আপডেটবোৰ নাপাবও পাৰে।"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"ষ্ট’ৰ"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"এপ্ৰ সবিশেষ"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g>ৰ পৰা এপ্ ইনষ্টল কৰা হৈছে"</string>
@@ -1943,7 +1939,7 @@
<string name="app_name_label" msgid="5440362857006046193">"এপ্"</string>
<string name="last_time_used_label" msgid="8459441968795479307">"অন্তিমবাৰ ব্যৱহাৰ হৈছে"</string>
<string name="usage_time_label" msgid="295954901452833058">"ব্যৱহাৰৰ সময়"</string>
- <string name="accessibility_settings" msgid="3975902491934816215">"দিব্যাংগসকলৰ বাবে সুবিধাসমূহ"</string>
+ <string name="accessibility_settings" msgid="3975902491934816215">"সাধ্য সুবিধা"</string>
<string name="accessibility_settings_title" msgid="2130492524656204459">"দিব্যাংগসকলৰ বাবে থকা সুবিধাসমূহৰ ছেটিংসমূহ"</string>
<string name="accessibility_settings_summary" msgid="981260486011624939">"স্ক্ৰীণ ৰিডাৰ, ডিছপ্লে, ভাব-বিনিময় নিয়ন্ত্ৰণ"</string>
<string name="vision_settings_title" msgid="4204111425716868288">"দৃষ্টি সম্পৰ্কীয় ছেটিংসমূহ"</string>
@@ -1994,6 +1990,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"সেৱা ব্যৱহাৰ কৰক"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ৰং শুধৰণি ব্যৱহাৰ কৰক"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"কেপশ্বন ব্যৱহাৰ কৰক"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"অব্যাহত ৰাখক"</string>
<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="6371077608778830020">"শ্ৰৱণ যন্ত্ৰ যোগ কৰক"</string>
@@ -2137,8 +2134,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"আপুনি এটা এপৰ নেপথ্য কাৰ্যকলাপ সীমিত কৰিলে ই অস্বাভাৱিক আচৰণ কৰিব পাৰে"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"যিহেতু এই এপটো বেটাৰি অপ্টিমাইজ কৰিবলৈ ছেট কৰি থোৱা হোৱা নাই, সেয়ে ইয়াক আপুনি সীমিত কৰিব নোৱাৰে।\n\nএপটো সীমিত কৰিবলৈ প্ৰথমে বেটাৰি অপ্টিমাইজেশ্বন অন কৰক।"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"সম্পূৰ্ণ চ্চাৰ্জ হোৱাৰ পিছত স্ক্ৰীণৰ ব্যৱহাৰ"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"স্ক্ৰীণে কৰা খৰচ"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"ম\'বাইল নেটৱৰ্ক স্কেনিং"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"সম্পূৰ্ণকৈ চ্চাৰ্জ হোৱাৰ পিছত বেটাৰিৰ ব্যৱহাৰ"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"সম্পূৰ্ণকৈ চ্চাৰ্জ হোৱাৰ পিছত স্ক্ৰীণ অন হৈ থকা সময়"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"সম্পূৰ্ণ চ্চাৰ্জ হোৱাৰ পিছত ডিভাইচৰ ব্যৱহাৰ"</string>
@@ -2165,11 +2160,6 @@
<string name="details_subtitle" msgid="32593908269911734">"ব্যৱহাৰৰ বিৱৰণ"</string>
<string name="controls_subtitle" msgid="390468421138288702">"পাৱাৰৰ ব্যৱহাৰ খাপ খুৱাওক"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"পেকেজসমূহ অন্তৰ্ভুক্ত আছে"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"বেটাৰি অত্যাধিক খৰচ কৰা এপসমূহ"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ডিভাইচ সক্ৰিয় ৰখা হৈছে"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ডিভাইচক নেপথ্যত সক্ৰিয় কৰক"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"অৱস্থান ঘনাই অনুৰোধ কৰিছে"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> এপে অস্বাভাৱিক আচৰণ কৰিছে"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"এপসমূহ স্বাভাৱিকভাৱে চলি আছে"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ফ\'নটোত গতানুগতিক বেটাৰিৰ নেপথ্য ব্যৱহাৰ চলি আছে"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"টেবলেটটোত গতানুগতিক বেটাৰিৰ নেপথ্য ব্যৱহাৰ চলি আছে"</string>
@@ -2233,6 +2223,7 @@
<item quantity="one">%1$dটা এপৰ বেটাৰি ব্য়ৱহাৰ সীমিতকৰণ</item>
<item quantity="other">%1$dটা এপৰ বেটাৰি ব্য়ৱহাৰ সীমিতকৰণ</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"নিষিদ্ধ কৰা হ’ল <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"এই এপসমূহে বহু সময়ধৰি নেপথ্য়ত বেটাৰি ব্য়ৱহাৰ কৰি আছে। সীমিত কৰা এপসমূহে ভালকৈ কাম নকৰিবও পাৰে আৰু জাননীসমূহ পলমকৈ আহিব পাৰে।"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"বেটাৰি মেনেজাৰ ব্য়ৱহাৰ কৰক"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"এপসমূহে বেটাৰিৰ চ্চাৰ্জ বেছিকৈ হ্ৰাস কৰাটো চিনাক্ত কৰক"</string>
@@ -2410,23 +2401,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"বাতিল কৰক"</string>
<string name="tts_reset" msgid="2661752909256313270">"ৰিছেট কৰক"</string>
<string name="tts_play" msgid="2628469503798633884">"চলাওক"</string>
- <string name="gadget_title" msgid="5519037532720577836">"পাৱাৰ নিয়ন্ত্ৰণ"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"ৱাই-ফাই ছেটিং আপডেইট কৰি থকা হৈছে"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ব্লুটুথ ছেটিংসমূহ আপডেইট কৰা হৈছে"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"অন হৈ আছে"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"অফ হৈ আছে"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"অন কৰি থকা হৈছে"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"অফ কৰি থকা হৈছে"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"ৱাই-ফাই"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ব্লুটুথ"</string>
- <string name="gadget_location" msgid="2974757497945178165">"অৱস্থান"</string>
- <string name="gadget_sync" msgid="858895763714222152">"ছিংক"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"উজ্জ্বলতা <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"স্বয়ং"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"পূৰ্ণ"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"আধা"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"অফ হৈ আছে"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"ভিপিএন"</string>
<string name="credentials_title" msgid="4446234003860769883">"ক্ৰেডেনশ্বিয়েল সঞ্চয়াগাৰ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"সঞ্চয়াগাৰৰ পৰা ইনষ্টল কৰক"</string>
@@ -2584,7 +2558,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>ৰ ভিতৰত <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"সকলো বাছনি কৰক"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ডেটাৰ ব্যৱহাৰ"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"এপে ব্যৱহাৰ কৰা ডেটা"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"ম’বাইল ডেটা আৰু ৱাই-ফাই"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"বাহকৰ ডেটা গণনা কাৰ্য আপোনাৰ ডিভাইচতকৈ পৃথক হ’ব পাৰে৷"</string>
<string name="data_usage_app" msgid="4970478397515423303">"এপৰ ব্যৱহাৰ"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"এপ্ সম্পৰ্কীয় তথ্য"</string>
@@ -2961,7 +2935,6 @@
<item quantity="one">লুকুৱাই থোৱা বস্তু %d দেখুৱাওক</item>
<item quantity="other">লুকুৱাই থোৱা বস্তু %d দেখুৱাওক</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"সংকুচিত কৰক"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"নেটৱৰ্ক আৰু ইণ্টাৰনেট"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ম’বাইল"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ডেটাৰ ব্যৱহাৰ"</string>
@@ -2973,12 +2946,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ব্লুটুথ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"এপ্ আৰু জাননীসমূহ"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"অনুমতি, ডিফ\'ল্ট এপসমূহ"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"কৰ্মস্থলৰ প্ৰ’ফাইলত থকা এপৰ বাবে জাননী সম্পৰ্কীয় এক্সেছ নাথাকে।"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"একাউণ্টসমূহ"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"কোনো একাউণ্ট যোগ কৰা হোৱা নাই"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ডিফ\'ল্ট এপসমূহ"</string>
- <string name="system_dashboard_summary" msgid="5797743225249766685">"ভাষা, সময়, বেকআপ, আপডেইট"</string>
+ <string name="system_dashboard_summary" msgid="5797743225249766685">"ভাষা, সময়, বেক আপ, আপডে’ট"</string>
<string name="search_results_title" msgid="1796252422574886932">"ছেটিংসমূহ"</string>
- <string name="search_menu" msgid="6283419262313758339">"ছেটিংবোৰ সন্ধান কৰক"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"ৱাইফাই, ৱাই-ফাই, নেটৱৰ্ক সংযোগ, ইণ্টাৰনেট, বেঁতাৰ, ডেটা, ৱাই ফাই"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"ৱাইফাই, ৱাই-ফাই, ট\'গল, নিয়ন্ত্ৰণ"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"পাঠ বাৰ্তা, পাঠ বাৰ্তা প্ৰেৰণ, বাৰ্তা, বাৰ্তা প্ৰেৰণ, ডিফ\'ল্ট"</string>
@@ -3023,6 +2996,8 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"পৰিশোধ, টিপক, ধন পৰিশোধ"</string>
<string name="keywords_backup" msgid="470070289135403022">"বেকআপ, বেক আপ"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"নিৰ্দেশ"</string>
+ <!-- no translation found for keywords_face_unlock (254144854349092754) -->
+ <skip />
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl সংস্কৰণ, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"নেটৱৰ্ক, ম\'বাইল নেটৱৰ্কৰ স্থিতি, সেৱাৰ স্থিতি, সংকেতৰ ক্ষমতা, ম\'বাইল নেটৱৰ্কৰ প্ৰকাৰ, ৰ\'মিং, আইচিচিআইডি"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"ক্ৰমিক নম্বৰ, হাৰ্ডৱেৰৰ সংস্কৰণ"</string>
@@ -3030,6 +3005,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"গাঢ় ৰঙৰ থীম"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"বাগ"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"স্তিমিত ডিছপ্লে, বন্ধ স্ক্ৰীণৰ ডিছপ্লে"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"লক স্ক্ৰীণৰ জাননী"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"চেহেৰা"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ফিংগাৰপ্ৰিণ্ট"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"অনুজ্জ্বল স্ক্ৰীণ, টাচ্চস্ক্ৰীণ, বেটাৰি, স্মার্ট উজ্জ্বলতা, গতিশীল উজ্জ্বলতা"</string>
@@ -3461,7 +3437,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"যেতিয়া আপুনি এই ডিভাইচটো আৰম্ভ কৰিবলৈ আপোনাৰ পিন দিব, দিব্যাংগসকলৰ সেৱাসমূহ যেনে <xliff:g id="SERVICE">%1$s</xliff:g> উপলব্ধ নহ\'ব।"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"যেতিয়া আপুনি এই ডিভাইচটো আৰম্ভ কৰিবলৈ আপোনাৰ আৰ্হিটো দিব, দিব্যাংগসকলৰ সেৱাসমূহ যেনে <xliff:g id="SERVICE">%1$s</xliff:g> উপলব্ধ নহ\'ব।"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"যেতিয়া আপুনি এই ডিভাইচটো আৰম্ভ কৰিবলৈ আপোনাৰ পাছৱৰ্ডটো দিয়ে, দিব্যাংগসকলৰ সেৱাসমূহ যেনে <xliff:g id="SERVICE">%1$s</xliff:g> উপলব্ধ নহ\'ব।"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"টোকা: ৰিবুট কৰাৰ পিছত আপুনি ফ\'নটো আনলক নকৰালৈকে এই এপটো ষ্টাৰ্ট নহ\'ব"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"টোকা: যদি আপুনি নিজৰ ফ\'নটো ৰিষ্টার্ট কৰি কোনো স্ক্ৰীণ লক ছেট কৰে, আপুনি ফ\'নটো আনলক নকৰা পর্যন্ত এই এপটো ব্যৱহাৰ কৰিব নোৱাৰি।"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI তথ্য"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI বিষয়ক তুললামূলক তথ্য"</string>
<string name="slot_number" msgid="3762676044904653577">"(শ্লট<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3492,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ব্যক্তিগত"</string>
<string name="filter_work_apps" msgid="24519936790795574">"কৰ্মস্থান"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"এপ্: সকলো"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"এপ্: অফ"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"অফ কৰা হ’ল"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"শ্ৰেণী: অতি গুৰুত্বপূৰ্ণ"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"শ্ৰেণীবোৰ: কম গুৰুত্বপূৰ্ণ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"শ্ৰেণীসমূহ: বন্ধ কৰা আছে"</string>
@@ -3577,7 +3553,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"ব্যৱহাৰ সম্পৰ্কে আগজাননী"</string>
<string name="show_all_apps" msgid="1512506948197818534">"ডিভাইচৰ সম্পূৰ্ণ ব্যৱহাৰ দেখুৱাওক"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"এপৰ ব্যৱহাৰ দেখুৱাওক"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"অত্যাধিক ব্যৱহাৰ"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> টা এপে অস্বাভাৱিক আচৰণ কৰিছে</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> টা এপে অস্বাভাৱিক আচৰণ কৰিছে</item>
@@ -3668,8 +3643,8 @@
<string name="running_frequency" msgid="6622624669948277693">"ফ্ৰিকুৱেন্সী"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"সৰ্বাধিক ব্যৱহাৰ"</string>
<string name="no_data_usage" msgid="9131454024293628063">"কোনো ডেটা ব্যৱহাৰ হোৱা নাই"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g>ক অসুবিধা নিদিবত প্ৰৱেশ কৰিবলৈ অনুমতি দিবনে?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"এই এপে অসুবিধা নিদিবক অন/অফ কৰিব পাৰিব আৰু তাৰ লগত জড়িত ছেটিংসমূহ সলনি কৰিব পাৰিব।"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g>ক অসুবিধা নিদিব-ক এক্সেছ কৰিবলৈ অনুমতি দিবনে?"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"এই এপটোৱে অসুবিধা নিদিব-ক অন/অফ কৰিব পাৰিব আৰু তাৰ লগত জড়িত ছেটিংসমূহ সলনি কৰিব পাৰিব।"</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"জাননীৰ প্ৰৱেশ অন হৈ থকাৰ বাবে অন কৰি ৰাখিবৈ লাগিব"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g>ৰ অসুবিধা নিদিবলৈ থকা প্ৰৱেশৰ অনুমতি প্ৰত্যাহাৰ কৰিবনে?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"এই এপে সৃষ্টি কৰা সকলো অসুবিধা নিদিব নিয়ম আঁতৰোৱা হ\'ব।"</string>
@@ -3743,6 +3718,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"আভ্যন্তৰিণ সঞ্চয়াগাৰ: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ব্যৱহৃত - <xliff:g id="FREE_SPACE">%2$s</xliff:g> খালী"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> নিষ্ক্ৰিয় হৈ থাকিলে সুপ্ত কৰক"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"ৱালপেপাৰ, নিদ্ৰা, ফ\'ণ্টৰ আকাৰ"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"১০মিনিট ধৰি কোনো কাৰ্যকলাপ নহ\'লে সুপ্ত কৰক"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>ৰ ভিতৰত গড় <xliff:g id="USED_MEMORY">%1$s</xliff:g> মেম\'ৰি ব্যৱহৃত হৈছে"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> হিচাপে ছাইন কৰিছে"</string>
@@ -3758,7 +3735,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"এছএমএছৰ অনুমতি নাই"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"কেমেৰাক অনুমতি দিয়া হোৱা নাই"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"স্ক্ৰীণশ্বটৰ অনুমতি নাই"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"বেক আপবোৰ অফ কৰিব নোৱাৰি"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"এই এপটো খুলিব নোৱাৰি"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"আপোনাৰ কিবা প্ৰশ্ন থাকিলে আপোনাৰ আইটি প্ৰশাসকৰ সৈতে যোগাযোগ কৰক"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"অধিক বিৱৰণ"</string>
@@ -3922,9 +3898,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"কাটআউটৰ জৰিয়তে ডিছপ্লে অনুকৰণ কৰক"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ডিছপ্লে’ কাটআউট"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ডিছপ্লে কাটআউট, ন\'চ্চ"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"একো নাই"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ডিভাইচ ডিফ’ল্ট"</string>
<string name="special_access" msgid="3458780842491881155">"বিশেষ এপৰ বাবে সুবিধা"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g>টা এপে সীমাহীন ডেটা ব্যৱহাৰ কৰিব পাৰে</item>
@@ -3937,7 +3913,7 @@
<string name="notification_suggestion_title" msgid="387052719462473500">"লক স্ক্ৰীণত নিয়ন্ত্ৰণসম্পৰ্কীয় তথ্য"</string>
<string name="notification_suggestion_summary" msgid="8521159741445416875">"জাননীৰ সমল দেখুৱাওক বা লুকুৱাওক"</string>
<string name="page_tab_title_summary" msgid="4070309266374993258">"সকলো"</string>
- <string name="page_tab_title_support" msgid="4407600495101788249">"কিটিপ আৰু সহায়"</string>
+ <string name="page_tab_title_support" msgid="4407600495101788249">"উপদেশ আৰু সহায়"</string>
<string name="developer_smallest_width" msgid="7516950434587313360">"সকলোতকৈ সৰু পুতল"</string>
<string name="premium_sms_none" msgid="8268105565738040566">"ইনষ্টল কৰি ৰখা কোনো এপে প্ৰিমিয়াম এছএমএছ পঠাবলৈ অনুমতি বিচাৰি অনুৰোধ কৰা নাই"</string>
<string name="premium_sms_warning" msgid="9086859595338944882">"প্ৰিমিয়াম এছএমএছৰ কাৰণে আপুনি খৰচ বহন কৰিবলগীয়া হ \'ব পাৰে যাৰ বাবে বাহকে আপোনালৈ পঠিওৱা বিলত দেয়ৰ পৰিমাণ বাঢ়িব পাৰে। আপুনি যদি কোনো এপক অনুমতি দিয়ে, তেন্তে আপুনি সেই এপটো ব্যৱহাৰ কৰি প্ৰিমিয়াম এছএমএছ পঠাব পাৰিব।"</string>
@@ -3946,11 +3922,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰক"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"একাধিক ডিভাইচৰ সৈতে সংযোজিত হৈ আছে"</string>
<string name="demo_mode" msgid="2798762752209330277">"ছিষ্টেম ইউআই প্ৰদৰ্শন ম\'ড"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"নৈশ ম\'ড"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"নৈশ ম\'ড ছেট কৰক"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"গাঢ় ম\'ড"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"গাঢ় ম\'ড ছেট কৰক"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"বিকাশকৰ্তাৰ তাৎক্ষণিক ছেটিংসমূহৰ টাইল"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"ৱিনস্ক\'প ট্ৰেচ"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"কৰ্মস্থানৰ প্ৰ’ফাইলৰ ছেটিংসমূহ"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"সম্পৰ্ক অনুসন্ধান"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"কল কৰোঁতা আৰু সম্পৰ্কসমূহ চিনাক্তকৰণৰ বাবে প্ৰতিষ্ঠানসমূহক সম্পৰ্ক অনুসন্ধান কৰিবলৈ অনুমত দিয়ক"</string>
@@ -3991,13 +3966,19 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ফ\'ন চাবলৈ দুবাৰ টুকুৰিয়াওক"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"টেবলেটো চাবলৈ দুবাৰ টুকুৰিয়াওক"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"ডিভাইচ চাবলৈ দুবাৰ টুকুৰিয়াওক"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"সময়, জাননী আইকন আৰু অন্য তথ্য চাবলৈ আপোনাৰ স্ক্ৰীণত দুবাৰ টুকুৰিয়াওক।"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"সময়, জাননী আৰু অন্য তথ্য চাবলৈ আপোনাৰ স্ক্ৰীণত দুবাৰ টিপক।"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ফোন চাবলৈ তোলক"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"টে\'বলেট চাবলৈ ওপৰলৈ উঠাওক"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ডিভাইচ চাবলৈ ওপৰলৈ উঠাওক"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"সময়, জাননী আইকন আৰু অন্য তথ্য চাবলৈ আপোনাৰ ডিভাইচটো উঠাওক।"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"সময়, জাননী আইকন আৰু অন্য তথ্য চাবলৈ আপোনাৰ ডিভাইচটো উঠাওক।"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"সময়, জাননী আইকন আৰু অন্য তথ্য চাবলৈ আপোনাৰ ডিভাইচটো ব্যৱহাৰ কৰক।"</string>
+ <!-- no translation found for ambient_display_wake_screen_title (4091523525326925790) -->
+ <skip />
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"সময়, জাননী আৰু অন্য তথ্য চাবলৈ আপোনাৰ ফ’নটো হাতত তুলি লওক।"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"সময়, জাননী আৰু অন্য তথ্য চাবলৈ আপোনাৰ টেবলেটটো হাতত তুলি লওক।"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"সময়, জাননী আৰু অন্য তথ্য চাবলৈ আপোনাৰ ডিভাইচটো হাতত তুলি লওক।"</string>
+ <!-- no translation found for ambient_display_wake_lock_screen_title (562547995385322349) -->
+ <skip />
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"জাননীৰ বাবে ফিংগাৰপ্ৰিণ্ট ছোৱাইপ কৰক"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ফিংগাৰপ্ৰিণ্ট ছোৱাইপ কৰক"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"জাননীবিলাক চাবলৈ আপোনাৰ ফ\'নটোৰ পিছফালে থকা ফিংগাৰপ্ৰিণ্ট ছেন্সৰত ওপৰৰ পৰা তললৈ আঙুলি বুলাওক।"</string>
@@ -4077,7 +4058,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> প্ৰয়াস</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> প্ৰয়াস</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"এই ডিভাইচটোৰ ডেটাৰ বেক আপ লৈ থকা হৈছে"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"এই ডিভাইচটো আপোনাৰ প্ৰতিষ্ঠানৰ দ্বাৰা পৰিচালিত৷"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"এই ডিভাইচটো <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>ৰ দ্বাৰা পৰিচালিত।"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4118,6 +4098,12 @@
<string name="autofill_app" msgid="7338387238377914374">"স্বয়ংপূৰ্তি সেৱা"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"স্বয়ং, পূৰ কৰা, স্বয়ংপূৰ্তি"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>আপুনি এই এপটোক বিশ্বাস কৰাটো নিশ্চিত কৰক</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> এ স্বয়ংভৰ্তিৰ বাবে নিৰ্ধাৰণ কৰিবলৈ আপোনাৰ স্ক্ৰীণত দেখা দিয়া বস্তুবোৰ ব্য়ৱহাৰ কৰে।"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"স্বয়ংপূৰ্তি"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"লগিঙৰ স্তৰ"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"প্ৰতি ছেশ্বন কৰিব পৰা অধিকতম অনুৰোধ"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"দেখিব পৰা অধিকতম ডেটাছেট"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ডিফ’ল্ট মানলৈ ৰিছেট কৰক"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"বিকাশকৰ্তাৰ স্বয়ংপূৰ্তি হোৱা বিকল্পসমূহ ৰিছেট কৰা হৈছে"</string>
<string name="device_theme" msgid="4571803018917608588">"ডিভাইচৰ থিম"</string>
<string name="default_theme" msgid="7085644992078579076">"ডিফ\'ল্ট"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"নেটৱৰ্কৰ নাম"</string>
@@ -4132,15 +4118,17 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"কেৰিয়াৰ প্ৰভিজনিং সূচনা কৰক"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"অসুবিধা নিদিব-ক আপডেট কৰক"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"মনোযোগ বৰ্তাই ৰাখিবলৈ জাননী বন্ধ কৰক"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"নতুন আৰু আকৰ্ষণীয় কি আছে?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"আপোনাৰ নতুন ফ\'নটো চলাই চাওক"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"আপোনাৰ নতুন টে\'বলেটটো চলাই চাওক"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"আপোনাৰ নতুন ডিভাইচটো চলাই চাওক"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"এই ডিভাইচটোত এই সুবিধাটো উপলব্ধ নহয়"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"সম্পূৰ্ণ জিএনএছএছ পৰিমাপ প্ৰয়োগ কৰক"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"কোনো উপযোগীতা অনুপাতৰ সহায় নোলোৱাকৈ GNSS কনষ্টেলেশ্বন আৰু ফ্ৰিকুৱেন্সী নিৰীক্ষণ কৰক"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"সদায় ক্ৰেশ্ব ডায়ল\'গ দেখুৱাওক"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"কোনো এপ্ ক্ৰেশ্ব হ\'লে প্ৰতিবাৰতে ডায়ল\'গ দেখুৱাওক"</string>
+ <!-- no translation found for angle_enabled_app (1841862539745838255) -->
+ <skip />
+ <!-- no translation found for angle_enabled_app_not_set (864740024581634768) -->
+ <skip />
+ <!-- no translation found for angle_enabled_app_set (226015765615525056) -->
+ <skip />
<string name="directory_access" msgid="4722237210725864244">"ডাইৰেক্টৰী ব্যৱহাৰ সম্পৰ্কীয় অনুমতিৰ ছেটিংসমূহ"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ডাইৰেক্টৰী ব্যৱহাৰ সম্পৰ্কীয় অনুমতিৰ ছেটিংসমূহ"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4181,4 +4169,84 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"নেটৱৰ্কৰ সবিশেষ"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"আপোনাৰ ডিভাইচটোৰ নাম আপোনাৰ ফ\'নটোত থকা এপসমূহৰ বাবে দৃশ্যমান। আপুনি ব্লুটুথ ডিভাইচৰ সৈতে সংযোগ কৰোঁতে বা ৱাই-ফাই হ\'টস্প\'ট ছেট আপ কৰোঁতেও নামটো অইনে দেখা পাব পাৰে।"</string>
<string name="devices_title" msgid="7701726109334110391">"ডিভাইচসমূহ"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"সকলো ছেটিং"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"পৰামৰ্শ"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ডেটা"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ডেটা"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"নেটৱৰ্ক বাছনি কৰক"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"সংযোগ বিচ্ছিন্ন কৰা হ\'ল"</string>
+ <string name="network_connected" msgid="4943925032253989621">"সংযোগ কৰা হ’ল"</string>
+ <string name="network_connecting" msgid="76404590784733557">"সংযোগ কৰি থকা হৈছে…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"সংযোগ কৰিব পৰা নগ\'ল"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"কোনো নেটৱৰ্ক নাই।"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"নেটৱৰ্ক বিচাৰি পোৱা নগ\'ল। আকৌ চেষ্টা কৰক।"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(নিষিদ্ধ)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"কোনো ছিম কাৰ্ড নাই"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"উন্নত কলিং সুবিধা"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: WCDMA অগ্ৰাধিকাৰপ্ৰাপ্ত"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: GSM মাত্ৰ"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: WCDMA মাত্ৰ"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: CDMA মাত্ৰ"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: EvDo মাত্ৰ"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: গোলকীয়"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (চুপাৰিছ কৰা)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (চুপাৰিছ কৰা)"</string>
+ <string name="network_global" msgid="959947774831178632">"গোলকীয়"</string>
+ <string name="label_available" msgid="1731547832803057893">"উপলব্ধ নেটৱৰ্ক"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"সন্ধান চলি আছে…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g>ত পঞ্জীয়ন কৰি থকা হৈছে…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"আপোনাৰ ছিম কাৰ্ডখনে এই নেটৱৰ্কটোৰ সৈতে সংযোগ কৰিবলৈ অনুমতি নিদিয়ে।"</string>
+ <string name="connect_later" msgid="978991102125216741">"এই মুহূৰ্তত এই নেটৱৰ্কটোৰ সৈতে সংযোগ কৰিব নোৱাৰি। পিছত আকৌ চেষ্টা কৰক।"</string>
+ <string name="registration_done" msgid="4573820010512184521">"নেটৱৰ্কত পঞ্জীয়ন কৰা হ\'ল।"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"স্বয়ংক্ৰিয়ভাৱে নেটৱৰ্ক বাছনি কৰক"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"বাহকৰ ছেটিংসমূহ"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ডেটা সেৱা ছেট আপ কৰক"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"ম\'বাইল ডেটা"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"ম\'বাইল নেটৱৰ্ক ব্যৱহাৰ কৰি ডেটা এক্সেছ কৰক"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ প্ৰকাৰ"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"নেটৱৰ্ক অপাৰেটিং ম\'ডটো সলনি কৰক"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ প্ৰকাৰ"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"বাহক"</string>
+ <string name="call_category" msgid="8108654745239563833">"কল ছেটিং"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"বাহকৰ ভিডিঅ\' কলিং"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"ছিষ্টেম বাছনি"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA ৰ\'মিং ম\'ড সলনি কৰক"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"ছিষ্টেম বাছনি"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"নেটৱৰ্ক"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"নেটৱৰ্ক"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA গ্ৰাহকভুক্তি"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM আৰু NVৰ মাজত সাল সলনি কৰক"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"গ্ৰাহকভুক্তি"</string>
+ <string name="register_automatically" msgid="518185886971595020">"স্বয়ংক্ৰিয় পঞ্জীয়ন…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"ডেটা ৰ\'মিঙত ব্যৱহাৰ কৰিবলৈ অনুমতি দিবনে?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"দাম জানিবলৈ আপোনাৰ বাহকৰ সৈতে যোগাযোগ কৰক।"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"এপৰ ডেটা ব্যৱহাৰ"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"অমান্য নেটৱৰ্কৰ ম’ড <xliff:g id="NETWORKMODEID">%1$d</xliff:g>। উপেক্ষা কৰক।"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰিলে উপলব্ধ নহয়"</string>
+ <string name="see_more" msgid="5953815986207345223">"অধিক চাওক"</string>
+ <!-- no translation found for see_less (1250265310929558370) -->
+ <skip />
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 30a2811..122e384 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Limitli olaraq qəbul edin"</item>
<item msgid="2266114985518865625">"Limitisiz olaraq qəbul edin"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Defolt (ixtiyari MAC-dan istifadə edin)"</item>
+ <item msgid="5398461510512959597">"Güvənli"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Xeyr"</item>
<item msgid="3863157480502955888">"Bəli"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Həmişə aktiv"</item>
<item msgid="6385301106124765323">"Həmişə deaktiv"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Deaktiv"</item>
+ <item msgid="2182686878828390312">"Sazlama"</item>
+ <item msgid="5286514712714822064">"Verbose"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Yalnız daxili"</item>
+ <item msgid="5034813753274486448">"Avtomatik"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA seçilib"</item>
+ <item msgid="807926878589867564">"Yalnız GSM"</item>
+ <item msgid="488474605709912156">"Yalnız WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA avtomatik"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo avtomatik"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"Yalnız EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Qlobal"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"Yalnız TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Qlobal"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 877cbe8..78abed9 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Yarat"</string>
<string name="allow" msgid="3349662621170855910">"İcazə verin"</string>
<string name="deny" msgid="6947806159746484865">"Rədd edin"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Qapadın"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Keçid"</string>
<string name="device_info_default" msgid="7847265875578739287">"Naməlum"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Tərtibatçı olmaqdan <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> addım uzaqsınız.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Ehtiyac yoxdur, Siz artı gəlişdiricisiniz."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Əvvəlcə developer seçimlərini aktiv edin."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Simsiz və şəbəkələr"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Əlaqələr"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Cihaz"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Şəxsi"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Access"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Data Bağlantısını Aktiv Edin"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Data Bağlantısını Deaktiv Edin"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Cihazın Bluetooth ünvanı: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ayrılsın?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Yayım"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Adsız Bluetooth cihazı"</string>
<string name="progress_scanning" msgid="192587958424295789">"Axtarılır"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Yaxınlıqda heç bir Bluetooth cihazı tapılmadı."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Tətbiq Bluetooth\'u yandırmaq və telefonunuzun digər cihazlarda görünməsini sağlamaq istəyir. Siz bunu sonra Bluetooth ayarlarında dəyişə bilərsiniz."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth yandırılır..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth söndürülür..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Avto bağlantı"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth bağlantı sorğusu"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ilə bağlantı yaratmaq üçün tıklayın."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" cihazına qoşulmaq istəyirsiniz?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Əlçatan zəng cihazları"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Ən son qoşulmuş cihazlar"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Yadda saxlanmış cihazlar"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Cihaz əlavə edin"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth qoşulmaq üçün aktiv ediləcək"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Bağlantı tərcihləri"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Əvvəl qoşulmuş cihazlar"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Əvvəl qoşulmusunuz"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth aktivdir"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Hamısına baxın"</string>
<string name="date_and_time" msgid="9062980487860757694">"Vaxt və tarix"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Vaxt zonasını seçin"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Atlayın"</string>
<string name="next_label" msgid="4693520878012668114">"Sonrakı"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Dillər"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Dil seçimləri"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Silin"</string>
<string name="add_a_language" msgid="2330538812283783022">"Dil əlavə edin"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Ayarlar"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Ayarlar qısayolunu seçin"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Uçuş rejimi"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Digər"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Simsiz & şəbəkələr"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"WiFi, Bluetooth, uçuş rejimi, mobil şəbəkələr, & VPNs idarə edin"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobil data"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Məxfilik"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Admin tərəfindən deaktiv edildi"</string>
<string name="security_status_title" msgid="5848766673665944640">"Təhlükəsizlik statusu"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Ekran kilidi, üzün kiliddən çıxarılması"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Ekran kilidi, barmaq izi"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekran kilidi"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Üz əlavə edildi"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Üzünüz ilə kildi açın"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Doğrulamaq üçün üzünüzdən istifadə edin"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Telefonu kiliddən çıxarmaq, satınalmaları doğrulamaq və ya tətbiqlərə daxil olmaq üçün üzünüzdən istifadə edin."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Öz üzünüzdən istifadə edin"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Telefonu kiliddən çıxarmaq və ya satınalmaları təsdiq etmək üçün üzünüzdən istifadə edin.\n\nQeyd: Bu cihazı kiliddən çıxarmaq üçün üzünüzdən istifadə edə bilməzsiniz. Ətraflı məlumat üçün təşkilat admini ilə əlaqə saxlayın."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Telefonu kiliddən çıxarmaq, satınalmaları doğrulamaq və ya tətbiqlərə daxil olmaq üçün üzünüzdən istifadə edin"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Maksimum <xliff:g id="COUNT">%d</xliff:g> barmaq izi əlavə edə bilərsiniz"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Üzünüzü dairənin mərkəzində saxlayın"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Daha sonra edin"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Maksimum <xliff:g id="COUNT">%d</xliff:g> üz əlavə edə bilərsiniz"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Maksimum sayda barmaq izi əlavə etmisiniz"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Daha çox üz əlavə etmək mümkün deyil"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Qeydiyyat tamamlanmadı"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Üz qeydiyyatı üçün vaxt limitinə çatdınız. Yenidən cəhd edin."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Üz qeydiyyatı işləmədi."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Hamısı hazırdır. Yaxşı görünür."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Hazırdır"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Üzünüzdən istifadə edin"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Cihazı kiliddən çıxarın"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Tətbiq girişi və ödənişlər"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Kiliddən çıxarmaq üçün gözlərinizi açın"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Üz doğrulamasından istifadə zamanı gözləriniz açıq olmalıdır"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Üz datasını silin"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Üz datasını təkmilləşdirin"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Üzünüzdən cihazı kiliddən çıxarmaq və tətbiqlərə daxil olmaq üçün istifadə edə bilərsiniz. "<annotation id="url">"Ətraflı məlumat"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Barmaq izi"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Barmaq izlərini idarə edin"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Bunun üçün barmaq izi istifadə edin:"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi‑Fi hotspotu üçün minimum bir bağlantı seçin:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP parametrləri"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Məxfilik"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Zəhmət olmasa, seçin"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Ləğv et"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Şəbəkə unudulsun?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Bu şəbəkə üçün olan bütün parollar silinəcək"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Saxlanmış şəbəkələr"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d şəbəkə</item>
<item quantity="one">1 şəbəkə</item>
@@ -1045,7 +1052,7 @@
<string name="notification_volume_title" msgid="2012640760341080408">"Bildiriş"</string>
<string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Bildirişlər üçün gələn zəng səsinin həcmini istifadə et"</string>
<string name="home_work_profile_not_supported" msgid="1357721012342357037">"İş profillərini dəstəkləmir"</string>
- <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Varsayılan bildiriş səsi"</string>
+ <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Defolt bildiriş səsi"</string>
<string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
<string name="media_volume_summary" msgid="5363248930648849974">"Musiqi və video üçün həcm ayarlayın"</string>
<string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Parlaqlıq"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ekran parlaqlığını tənzimləyin"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Adaptiv parlaqlıq"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Aktiv"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Deaktiv"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Tərcih edilmiş parlaqlıq çox aşağıdır"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Tərcih edilmiş parlaqlıq aşağıdır"</string>
@@ -1126,7 +1132,7 @@
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Cədvəl"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Heç biri"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Xüsusi vaxtda aktiv edir"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Qürubdan şəfəqə qədər aktiv edir"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Gün çıxandan batana qədər aktiv edir"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"Başlama vaxtı"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"Bitmə tarixi"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"Status"</string>
@@ -1141,9 +1147,9 @@
<string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Şəfəq vaxtı avtomatik deaktiv edəcək"</string>
<string name="night_display_activation_on_manual" msgid="277343561277625826">"İndi aktiv edin"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"İndi deaktiv edin"</string>
- <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Şəfəqə qədər deaktiv edin"</string>
- <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Qüruba qədər deaktiv edin"</string>
- <string name="night_display_activation_on_custom" msgid="5472029024427933598">"<xliff:g id="ID_1">%1$s</xliff:g> olana qədər deaktiv edin"</string>
+ <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Gün çıxanadək aktiv olsun"</string>
+ <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Gün batımına qədər deaktiv edin"</string>
+ <string name="night_display_activation_on_custom" msgid="5472029024427933598">"<xliff:g id="ID_1">%1$s</xliff:g> olana qədər aktiv edin"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"<xliff:g id="ID_1">%1$s</xliff:g> olanaq qədər deaktiv edin"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Yuxu"</string>
<string name="screen_timeout_title" msgid="5130038655092628247">"Ekran sönür"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN dəyişdirilə bilməz.\nBəlkə də PIN yanlışdır."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN uğurla dəyişdirildi"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIm kart kilid statusu dəyişdirilə bilmir.\nBəlkə PIN yanlışdır"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN-i deaktiv etmək mümkün deyil."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN-i aktiv etmək mümkün deyil."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Ləğv et"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Çoxsaylı SIM-lər tapıldı"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> cihazının format edilməsi tələb olunur. \n\n"<b>"Format etmə ilə <xliff:g id="NAME_1">^1</xliff:g> cihazında saxlanılan bütün data silinəcək."</b>" Datanın itirilməsinin qarşısını almaq üçün onu yedəkləyin."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Silinmə və formatlama"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> formatlanır…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Formatlama zamanı <xliff:g id="NAME">^1</xliff:g> silinməməlidir."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Formatlama zamanı <xliff:g id="NAME">^1</xliff:g> silinməməlidir."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Datanı yeni yaddaş ehtiyatına daşıyın"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Foto, fayl və bəzi tətbiqləri bu yeni <xliff:g id="NAME">^1</xliff:g>\n\n üzərinə daşıya bilərsiniz. Daşınma <xliff:g id="TIME">^2</xliff:g> qədər vaxt alır və daxili yaddaş ehtiyatında <xliff:g id="SIZE">^3</xliff:g> qədər yeri azad edir. Davam etmə müddətində bəzi tətbiqlər işləməyəcək."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"İndi daşıyın"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Quraşdırıldı"</string>
<string name="no_applications" msgid="7336588977497084921">"Tətbiq yoxdur."</string>
<string name="internal_storage" msgid="1584700623164275282">"Daxili yaddaş"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"daxili yaddaş"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB yaddaş"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD kart yaddaşı"</string>
<string name="recompute_size" msgid="7722567982831691718">"Ölçünü yenidən hesablayır..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Tətbiq məlumatları silinsin?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Bu tətbiq datası həmişəlik silinəcək. Buraya bütün fayllar, ayarlar, hesablar, verilənlər bazası və sairləri aiddir."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Tətbiq qurulmuş tətbiqlərin siyahısında tapılmadı."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Tətbiqin yaddaşını təmizləyin."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Bu tətbiq planşetinizdə bunlara giriş əldə edə bilər:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Bu tətbiq telefonunuzda bunlara giriş əldə edə bilər:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Bu tətbiq planşetinizdə bunlara giriş əldə edə bilər. Performansı artırmaq və yaddaş istifadəsini azaltmaq üçün bəzi icazələr əlçatımlıdırlar, <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> çünki eyni prosesi buna çevirir<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Bu tətbiq telefonunuzda bunlara giriş əldə edə bilər. Performansı artırmaq və yaddaş istifadəsini azaltmaq üçün bəzi icazələr əlçatımlıdırlar, <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> çünki eyni prosesi buna çevirir<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> və <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Bu tətbiq Sizdən pul tələb edə bilər:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Premium SMS göndərin"</string>
<string name="computing_size" msgid="1599186977475211186">"Hesablanır..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Paket ölçüsü hesablana bilmədi."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Sizin üçüncü tərəf quraşdırılmış tətbiqiniz yoxdur."</string>
<string name="version_text" msgid="9189073826278676425">"versiya <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Daşıyın"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Planşetə daşıyın"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Telefona köçür"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB yaddaşına daşıyın"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD karta daşıyın"</string>
- <string name="moving" msgid="6431016143218876491">"Köçürülür"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Digər miqrasiya artıq icra olunur."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Kifayət qədər yer yoxdur."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Tətbiq mövcud deyil."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Cihaz admin tətbiqi xarici mediada quraşdırıla bilməz"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Məcburən dayansın?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Tətbiqi dayanmağa məcbur etsəniz, o, səhv işləyə bilər."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"<xliff:g id="REASON">%1$s</xliff:g> tətbiqi daşına bilmədi"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Tərcih edilmiş quraşdırma yeri"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Yeni tətbiq üçün tərcih edilmiş quraşdırma yerini dəyişin"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Quraşdırılmış tətbiqlər deaktiv edilsin?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Tətbiqi deaktiv edin"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Əgər bu tətbiqi deaktiv etsəniz, Android və digər tətbiqlər düzgün işlməyə bilər."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Data silinsin və tətbiq deaktiv edilsin?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Əgər siz bu tətbiqi deaktiv etsəniz, Android və digər tətbiqlər düzgün işləməyə bilər. Həmçinin, datanız da silinəcək."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Bildirişlər deaktiv edilsin?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Əgər bu tətbiq üçün bildirişləri söndürsəniz, əhəmiyyəli xəbərdarlıq və güncəlləmələri əldən buraxmış oa bilərsiniz."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Mağaza"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Tətbiq məlumatları"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Tətbiq <xliff:g id="APP_STORE">%1$s</xliff:g> bölməsindən yükləndi"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Xidmətdən istifadə edin"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Rəng korreksiyasından istifadə edin"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Başlıqlardan istifadə edin"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Davam edin"</string>
<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="6371077608778830020">"Qulaqlıq əlavə edin"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Tətbiqin arxa fon fəaliyyətini məhdudlaşdırsanız, o səhv işləyə bilər"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Bu tətbiqdə batareyanın optimallaşdırılması ayarlanmadığına görə onu məhdudlaşdıra bilməzsiniz.\n\nTətbiqi məhdudlaşdırmaq üçün əvvəlcə batareya optimallaşdırmasını aktiv edin."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Tam doldurmadan sonrakı ekran istifadəsi"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın enerji sərfiyyatı"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobil şəbəkənin skan edilməsi"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Tam doldurmadan sonra batareya istifadəsi"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Dam doldurmadan sonra ekranın vaxtı miqdarı aktiv edilib"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Tam doldurmadan sonrakı cihaz istifadəsi"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Ətraflı istifadə"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Enerji istifadəsini idarə edin"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Daxil edilmiş paketlər"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Tətbiq batareyanı azaldır"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Cihaz oyaq saxlanılır"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Cihaz arxa fonda oyadılır"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Məkan tez-tez təklif edilir"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> tətbiq səhv işləyir"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Tətbiqlər normal işləyir"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon arxa fonda səciyyəvi batareya istifadəsinə sahibdir"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Planşet arxa fonda səciyyəvi batareya istifadəsinə sahibdir"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d tətbiq üçün batareya istifadəsinin məhdudlaşdırılması</item>
<item quantity="one">%1$d tətbiq üçün batareya istifadəsinin məhdudlaşdırılması</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> məhdudlaşdırılıb"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Bu tətbiqlər arxa fonda batareyadan istifadə edə bilər. Məhdudlaşdırılmış tətbiqlər düzgün işləməyə və bildirişlər gecikə bilər."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Batareya Menecerindən istifadə edin"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Batareyadan çox istifadə edən tətbiqlər aşkarlansın"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Ləğv edin"</string>
<string name="tts_reset" msgid="2661752909256313270">"Sıfırlayın"</string>
<string name="tts_play" msgid="2628469503798633884">"Oxutma"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Enerji nəzarəti"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi parametri güncəllənir"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ayarının güncəllənməsi"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"açıq"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"deaktiv"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"yandırılır"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"söndürülür"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Yer"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinxronizasiya"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Parlaqlıq <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"avto"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"tam"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"orta"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"deaktiv"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN (Virtual Şəxsi Şəbəkələr)"</string>
<string name="credentials_title" msgid="4446234003860769883">"Etimadnamə yaddaşı"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Yaddaşdan quraşdır"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ədəddən <xliff:g id="NUMBER">%1$s</xliff:g> qədər"</string>
<string name="select_all" msgid="1562774643280376715">"Hamısını seç"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Data istifadəsi"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Tətbiq data istifadəsi"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobil data və Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operator data hesablanması cihazınızdakından fərqli ola bilər."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Tətbiq istifadəsi"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"TƏTBİQ İNFOSU"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">%d gizli element göstərin</item>
<item quantity="one">%d gizli element göstərin</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Yığcamlaşdırın"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Şəbəkə və internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"data istifadəsi"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Tətbiq və bildirişlər"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"İcazələr, defolt tətbiqlər"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Bildiriş girişi iş profilindəki tətbiqlər üçün əlçatan deyil."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Hesablar"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Hesab əlavə edilməyib"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Defolt tətbiqlər"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Dil, vaxt, yedəkləmə, yeniliklər"</string>
<string name="search_results_title" msgid="1796252422574886932">"Ayarlar"</string>
- <string name="search_menu" msgid="6283419262313758339">"Ayarları axtarın"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, şəbəkə, internet, simsiz, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, aktiv, nəzarət"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"mətn mesajı, mətn, mesaj, mesajlaşma, defolt"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ödəyin, tıklayın, ödəmələr"</string>
<string name="keywords_backup" msgid="470070289135403022">"yedəkləmə, yedəkləyin"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"jest"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"üz, kiliddən çıxarma, orijinal, giriş"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl versiyası, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"şəbəkə, mobil şəbəkə vəziyyəti, servis vəziyyəti, siqnalın gücü, mobil şəbəkə növü, roaminq, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"seriya nömrəsi, proqram versiyası"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tünd tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"baq"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient displey, Kilid ekranı"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"kilid ekranı bildirişi"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"üz"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"barmaq izi"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"qara ekran, sensor ekran, batareya, yeni parlaqlıq, dinamik parlaqlıq"</string>
@@ -3309,7 +3281,7 @@
<string name="notification_content_block_summary" msgid="7746185794438882389">"Bildirişləri heç vaxt ekranda və ya periferik cihazlarda göstərməyin."</string>
<string name="notification_badge_title" msgid="6370122441168519809">"Bildiriş nöqtəsinə icazə verin"</string>
<string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildiriş nöqtəsini göstərin"</string>
- <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Narahat etməyin\" seçimini əvəzləyin"</string>
+ <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Narahat etməyin\" seçimini buraxın"</string>
<string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"\"Narahat Etməyin\" rejimi aktiv olduqda bu bildirişlər mane olmağa davam etsin"</string>
<string name="app_notification_visibility_override_title" msgid="7821124557634786985">"Ekran kilidində"</string>
<string name="app_notification_row_banned" msgid="5983655258784814773">"Bloklanmış"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Bu cihazı işə salmaq üçün PIN kodunu daxil etdiyiniz zaman <xliff:g id="SERVICE">%1$s</xliff:g> kimi giriş imkanı xidmətləri hələ əlçatan olmayacaq."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Bu cihazı işə salmaq üçün modelinizi daxil etdiyiniz zaman <xliff:g id="SERVICE">%1$s</xliff:g> kimi giriş imkanı xidmətləri hələ əlçatan olmayacaq."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Bu cihazı işə salmaq üçün parolunuzu daxil etdiyiniz zaman <xliff:g id="SERVICE">%1$s</xliff:g> kimi giriş imkanı xidmətləri hələ əlçatan olmayacaq."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Qeyd: Yenidən yüklənmədən sonra, bu cihazın kilidini açmamış tətbiq başlaya bilməz"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Qeyd: Telefonu yenidən başlatmısınızsa və cihazda ekran kilidi varsa, bu telefonun kilidini açmamış tətbiq başlaya bilməz"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI məlumat"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI nisbi məlumat"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Şəxsi"</string>
<string name="filter_work_apps" msgid="24519936790795574">"İş"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Tətbiqlər: Hamısı"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Tətbiqlər: Deaktiv"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Deaktiv edildi"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kateqoriyalar: Çox əhəmiyyətli"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kateqoriyalar: Az əhəmiyyətli"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kateqoriyalar: Deaktiv"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"İstifadə siqnalları"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Tam cihaz istifadəsini göstərin"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Tətbiq istifadəsini göstərin"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Yüksək səviyyədə istifadə"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> tətbiq düzgün işləmir</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> düzgün işləmir</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Daxili yaddaş: <xliff:g id="PERCENTAGE">%1$s</xliff:g> istifadə olunub - <xliff:g id="FREE_SPACE">%2$s</xliff:g> boşdur"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> fəaliyyətsizlikdən sonra yuxu rejimi"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Divar kağızı, mürgü rejimi, şrift ölçüsü"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 dəqiqəlik fəaliyyətsizlikdən sonra yuxu rejiminə keçir"</string>
<string name="memory_summary" msgid="8080825904671961872">"Ümumi <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> yaddaşdan ortalama <xliff:g id="USED_MEMORY">%1$s</xliff:g> yaddaş istifadə olunub"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> kimi daxil olundu"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-ə icazə verilmir"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kameraya icazə verilmir"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Skrinşota icazə verilmir"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Yedəkləmələri deaktiv etmək alınmadı"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Bu tətbiqi açmaq mümkün deyil"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Sualınız varsa, IT admini ilə əlaqə saxlayın"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Daha ətraflı"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Displeyi kəsim ilə göstərin"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Yoxdur"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Cihaz defoltu"</string>
<string name="special_access" msgid="3458780842491881155">"Xüsusi tətbiq girişi"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> tətbiq məhdudlaşdırılmamış data istifadə edə bilər</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> cihazına qoşuldu"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Bir çox cihaza qoşuldu"</string>
<string name="demo_mode" msgid="2798762752209330277">"Sistem İİ demo rejimi"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Gecə rejimi"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Gecə rejimi ayarlayın"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Qaranlıq rejim"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Qaranlıq rejimi ayarlayın"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Sürətli ayarlar üzrə developer xanaları"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Fəaliyyəti"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"İş profil ayarları"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontakt axtarışı"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Zəng edənləri və kontaktları təyin etmək üçün təşkilatınız tərəfindən kontakt axtarışlarına icazə verin"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefonu yoxlamaq üçün iki dəfə tıklayın"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Planşeti yoxlamaq üçün iki dəfə tıklayın"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Cihazı yoxlamaq üçün iki dəfə tıklayın"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Vaxt, bildiriş ikonası və digər məlumatı yoxlamaq üçün iki dəfə ekrana klikləyin."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Vaxt, bildiriş və digər məlumatı yoxlamaq üçün iki dəfə ekrana klikləyin."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefonu yoxlamaq üçün qaldırın"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Planşeti yoxlamaq üçün qaldırın"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Cihazı yoxlamaq üçün qaldırın"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Vaxt, bildiriş ikonası və digər məlumatı yoxlamaq üçün telefonu götürün."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Vaxt, bildiriş ikonası və digər məlumatı yoxlamaq üçün planşeti götürün."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Vaxt, bildiriş ikonası və digər məlumatı yoxlamaq üçün cihazı götürün."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Oyandırma ekranı"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Vaxt, bildiriş və digər məlumatı yoxlamaq üçün telefonu götürün."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Vaxt, bildiriş və digər məlumatı yoxlamaq üçün planşeti götürün."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Vaxt, bildiriş və digər məlumatı yoxlamaq üçün cihazı götürün."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Oyandırma kilid ekranı"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Bildirişlər üçün barmağınızı sürüşdürün"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Barmağınızı sürüşdürün"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirişləri yoxlamaq üçün, barmaq sensorunda aşağı sürüşdürün."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> cəhd</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> cəhd</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Bu cihazın datası yedəklənir"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Bu cihaz təşkilatınız tərəfindən idarə olunur."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tərəfindən idarə olunur."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Avtodoldurma xidməti"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"avtomatik, doldurmaq, avtomatik doldurmaq"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Bu tətbiqə etibar etdiyinizə əmin olun<b> <br/> <br/> <xliff:g id=tətbiq_adı nümunə=Google Avtodoldurma >%%1$s</xliff:g> nəyin avtomatik doldurula biləcəyini müəyyən etmək üçün ekrandakılardan istifadə edir."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Avtodoldurma"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Giriş səviyyəsi"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Hər sessiya üçün maksimum təklif"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maksimum görünən datasetlər"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Defolt dəyərlərə sıfırlayın"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Avto doldurma developer seçimləri sıfırlanıb"</string>
<string name="device_theme" msgid="4571803018917608588">"Cihaz teması"</string>
<string name="default_theme" msgid="7085644992078579076">"Defolt"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Şəbəkə adı"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator Təchizatlanmasını Tətikləyin"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\"Narahat Etməyin\" rejimini yeniləyin"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Foksulanmağa davam etmək üçün bildirişləri dayandırın"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Yeni və maraqlı olan nədir?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yeni telefonunuz ilə tanış olun"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni planşetiniz ilə tanış olun"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yeni cihazınız ilə tanış olun"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya artıq bu cihazda əlçatan deyil"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Tam GNSS ölçülərini icra edin"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"İş sistemi olmadan bütün GNSS qruplaşmaları və tezliklərini izləyin"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Xəta dialoqunu həmişə göstərin"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Tətbiqdə xəta baş verdiyi zaman dialoqu göstərin"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE aktiv olan tətbiq seçin"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE aktiv olan tətbiq ayarlanmayıb"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE aktiv olan tətbiq: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Kataloq girişi"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"kataloq girişi"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Şəbəkə məlumatları"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Cihazın adı telefondakı tətbiqlərdə görünəcək. Bluetooth cihazlarına qoşulduqda və ya Wi-Fi hotspotu ayarladıqda digərləri də onu görə bilər."</string>
<string name="devices_title" msgid="7701726109334110391">"Cihazlar"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Bütün Ayarlar"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Təkliflər"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Datası"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Datası"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Şəbəkəni seçin"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Bağlantı kəsildi"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Qoşuldu"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Qoşulur…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Qoşulmaq mümkün olmadı"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Şəbəkə tapılmadı."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Şəbəkə tapılmadı. Yenidən cəhd edin."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(qadağandır)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM kart yoxdur"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Qabaqcıl Zəng"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Tərcih edilmiş şəbəkə rejimi: WCDMA tərcih edilir"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Tərcih edilmiş şəbəkə rejimi: Yalnız GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Tərcih edilmiş şəbəkə rejimi: yalnız WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Tərcih edilmiş şəbəkə rejimi: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Tərcih edilmiş şəbəkə rejimi: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Tərcih edilmiş şəbəkə rejimi: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Tərcih edilmiş şəbəkə rejimi: CDMA only"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Tərcih edilmiş şəbəkə rejimi: yalnız EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Tərcih edilmiş şəbəkə rejimi: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Tərcih edilmiş şəbəkə rejimi: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Tərcih edilmiş şəbəkə rejimi: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Tərcih edilmiş şəbəkə rejimi: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Tərcih edilmiş şəbəkə rejimi: Qlobal"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Tərcih edilmiş şəbəkə rejimi: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Tərcih edilmiş şəbəkə rejimi: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Tərcih edilmiş şəbəkə rejimi: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Tərcih edilmiş şəbəkə rejimi: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Tərcih edilmiş şəbəkə rejimi: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Tərcih edilmiş şəbəkə rejimi: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Tərcih edilmiş şəbəkə rejimi: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Tərcih edilmiş şəbəkə rejimi: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Tərcih edilmiş şəbəkə rejimi: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Tərcih edilmiş şəbəkə rejimi: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Tərcih edilmiş şəbəkə rejimi: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Tərcih edilmiş şəbəkə rejimi: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Tərcih edilmiş şəbəkə rejimi: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (məsləhətlidir)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (məsləhətlidir)"</string>
+ <string name="network_global" msgid="959947774831178632">"Qlobal"</string>
+ <string name="label_available" msgid="1731547832803057893">"Əlçatan şəbəkələr"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Axtarılır..."</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> şəbəkəsində qeydiyyatdan keçirilir…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM kart bu şəbəkəyə qoşulmağa icazə vermir."</string>
+ <string name="connect_later" msgid="978991102125216741">"Hazırda bu şəbəkəyə qoşulmaq olmur. Sonra təkrar sınayın."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Şəbəkədə qeydiyyatlıdır."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Avtomatik olaraq şəbəkə seçin"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operator ayarları"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Data xidmətini quraşdırın"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobil data"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Mobil şəbəkədən istifadə edərək dataya daxil olun"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tərcih edilmiş şəbəkə növü"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Şəbəkə əməliyyat rejimini dəyişin"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tərcih edilmiş şəbəkə növü"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operator"</string>
+ <string name="call_category" msgid="8108654745239563833">"Zəng edilir"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operator video zəngi"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Sistem seçin"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA rouminq rejimini dəyişdirin"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Sistem seçin"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Şəbəkə"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Şəbəkə"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA abunəliyi"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM və NV-dən birini seçin"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"abunəlik"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Avtomatik qeydiyyat ..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Data rouminqinə icazə verilsin?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Qiymətlər üçün şəbəkə provayderi ilə yoxlayın."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Tətbiq data istifadəsi"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Yanlış Şəbəkə Rejimi <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. İqnor edin."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> ünvanına qoşulduqda əlçatan deyil"</string>
+ <string name="see_more" msgid="5953815986207345223">"Ətraflı"</string>
+ <string name="see_less" msgid="1250265310929558370">"Baxışı kiçildin"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Heç bir cihaz qoşulmayıb"</string>
</resources>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 8ef8da0..3a5900b 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tretiraj kao mrežu sa ograničenjem"</item>
<item msgid="2266114985518865625">"Tretiraj kao mrežu bez ograničenja"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Podrazumevano (koristi nasumično izabranu MAC adresu)"</item>
+ <item msgid="5398461510512959597">"Pouzdano"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ne"</item>
<item msgid="3863157480502955888">"Da"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Uvek uključeno"</item>
<item msgid="6385301106124765323">"Uvek isključeno"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Isključi"</item>
+ <item msgid="2182686878828390312">"Otkloni greške"</item>
+ <item msgid="5286514712714822064">"Detaljno"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Samo kućna"</item>
+ <item msgid="5034813753274486448">"Automatski"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA ima prednost"</item>
+ <item msgid="807926878589867564">"Samo GSM"</item>
+ <item msgid="488474605709912156">"Samo WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automatski"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automatski"</item>
+ <item msgid="370391313511477301">"CDMA bez EvDo-a"</item>
+ <item msgid="4678789463133969294">"Samo EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globalna"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Samo TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globalna"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 0bf3c22..63a319e 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Napravi"</string>
<string name="allow" msgid="3349662621170855910">"Dozvoli"</string>
<string name="deny" msgid="6947806159746484865">"Odbij"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Zatvori"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Prebaci na"</string>
<string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Treba da obavite još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak da biste postali programer.</item>
@@ -33,10 +31,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Nema potrebe, već ste programer."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Prvo omogućite opcije za programere."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Bežična veza i mreže"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Veze"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Uređaj"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Lični"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Pristup"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Omogući vezu za prenos podataka"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Onemogući vezu za prenos podataka"</string>
@@ -122,7 +116,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth adresa uređaja: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li da prekinete vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitovanje"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Neimenovani Bluetooth uređaj"</string>
<string name="progress_scanning" msgid="192587958424295789">"Pretražuje se"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nema Bluetooth uređaja u blizini."</string>
@@ -154,7 +147,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Aplikacija želi da uključi Bluetooth i učini telefon vidljivim za druge uređaje. Ovo možete kasnije da promenite u podešavanjima Bluetooth-a."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth se uključuje…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Isključivanje Bluetooth-a…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatsko povezivanje"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Zahtev za Bluetooth povezivanje"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Dodirnite da biste se povezali sa uređajem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Da li želite da se povežete sa uređajem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
@@ -182,12 +174,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dostupni uređaji za pozivanje"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Trenutno povezani"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Sačuvani uređaji"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Dodajte uređaj"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth će se uključiti radi uparivanja"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Podešavanja veze"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Prethodno povezani uređaji"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Prethodno povezani"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth je uključen"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Prikaži sve"</string>
<string name="date_and_time" msgid="9062980487860757694">"Datum i vreme"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Izbor vremenske zone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -270,7 +262,6 @@
<string name="skip_label" msgid="47510779345218297">"Preskoči"</string>
<string name="next_label" msgid="4693520878012668114">"Dalje"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Jezici"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Podešavanja jezika"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Ukloni"</string>
<string name="add_a_language" msgid="2330538812283783022">"Dodajte jezik"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -305,7 +296,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Podešavanja"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Prečica podešavanja"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Režim rada u avionu"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Još"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bežična veza i mreže"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Upravljanje Wi-Fi mrežom, Bluetooth-om, režimom rada u avionu, mobilnim mrežama i VPN-om"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobilni podaci"</string>
@@ -390,6 +380,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Administrator je onemogućio"</string>
<string name="security_status_title" msgid="5848766673665944640">"Bezbednosni status"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Zaključavanje ekrana, otključavanje licem"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Zaključavanje ekrana, otisak prsta"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zaključavanje ekrana"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Lice je dodato"</string>
@@ -399,11 +390,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Otključajte pomoću lica"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Potvrdite identitet licem"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Otključavajte telefon, odobravajte kupovine ili se prijavljujte u aplikacije pomoću lica."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Upotrebite svoje lice"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Otključavajte telefon ili odobravajte kupovine pomoću lica.\n\nNapomena: Ne možete da otključavate ovaj uređaj pomoću lica. Više informacija zatražite od administratora organizacije."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Otključavajte telefon, odobravajte kupovine ili se prijavljujte u aplikacije pomoću lica"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Maksimalan broj otisaka prstiju koji možete da dodate je <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Postavite lice u centar kruga"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Uradiću to kasnije"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Maksimalan broj lica koji možete da dodate je <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Dodali ste maksimalan broj lica"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Ne možete da dodate još lica"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registracija nije završena"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Potvrdi"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Isteklo je vreme za registraciju lica. Probajte ponovo."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Registracija lica nije uspela."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Gotovo. Izgleda da je sve u redu."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Gotovo"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Koristite lice za"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"otključavanje uređaja"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Prijava u aplikacije i plaćanja"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Otvorene oči radi otključavanja"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Kada koristite potvrdu identiteta licem, oči moraju da budu otvorene."</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Uklonite podatke o licu"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Poboljšajte podatke o licu"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Koristite lice da biste otključali uređaj i pristupili aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisak prsta"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Upravljaj otis. prstiju"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Koristi otis. prsta za"</string>
@@ -899,6 +906,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Izaberite barem jedan opseg za Wi‑Fi hotspot:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP podešavanja"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privatnost"</string>
<string name="wifi_shared" msgid="844142443226926070">"Deli sa drugim korisnicima uređaja"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nepromenjeno)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Izaberite"</string>
@@ -938,7 +946,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Otkaži"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Želite li da uređaj zaboravi mrežu?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Sve lozinke za ovu mrežu će biti izbrisane"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Sačuvane mreže"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d mreža</item>
<item quantity="few">%d mreže</item>
@@ -1118,8 +1125,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Osvetljenost"</string>
<string name="brightness_summary" msgid="838917350127550703">"Prilagođavanje osvetljenosti ekrana"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva osvetljenost"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Uključeno"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Isključeno"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Željena osvetljenost je veoma niska"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Željena osvetljenost je niska"</string>
@@ -1215,6 +1221,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Nije moguće promeniti PIN.\nMoguće je da je PIN netačan."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN je uspešno promenjen"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Nije moguće promeniti stanje zaključavanja SIM kartice.\nMoguće je da je PIN netačan."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Onemogućavanje PIN-a nije uspelo."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Omogućavanje PIN-a nije uspelo."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Potvrdi"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Otkaži"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Pronađeno je više SIM kartica"</string>
@@ -1291,7 +1299,7 @@
<string name="memory_media_usage" msgid="3738830697707880405">"Mediji"</string>
<string name="memory_downloads_usage" msgid="3755173051677533027">"Preuzimanja"</string>
<string name="memory_dcim_usage" msgid="558887013613822577">"Slike, video snimci"</string>
- <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzika, zvukovi zvona, potkastovi itd.)"</string>
+ <string name="memory_music_usage" msgid="1363785144783011606">"Audio (muzika, zvukovi zvona, potkasti itd.)"</string>
<string name="memory_media_misc_usage" msgid="6094866738586451683">"Druge datoteke"</string>
<string name="memory_media_cache_usage" msgid="6704293333141177910">"Keširani podaci"</string>
<string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Isklj. deljene memorije"</string>
@@ -1389,7 +1397,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"To zahteva da se <xliff:g id="NAME_0">^1</xliff:g> formatira. \n\n"<b>"Formatiranjem se brišu svi podaci koje trenutno sadrži <xliff:g id="NAME_1">^1</xliff:g>."</b>" Da ne biste izgubili podatke, razmislite o pravljenju rezervne kopije."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Obriši i formatiraj"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> se formatira…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Ne uklanjajte uređaj <xliff:g id="NAME">^1</xliff:g> dok se formatira."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Ne uklanjajte uređaj <xliff:g id="NAME">^1</xliff:g> dok se formatira."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Prenesite podat. u novu memoriju"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Slike, datoteke i neke aplikacije možete da prenesete na ovaj novi uređaj <xliff:g id="NAME">^1</xliff:g>. \n\nPrenos traje <xliff:g id="TIME">^2</xliff:g> čime se oslobađa <xliff:g id="SIZE">^3</xliff:g> interne memorije. Neke aplikacije neće funkcionisati tokom prenosa."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Prenesi odmah"</string>
@@ -1772,9 +1780,6 @@
<string name="installed" msgid="3070865169422600098">"Instalirana"</string>
<string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
<string name="internal_storage" msgid="1584700623164275282">"Interno skladište"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"interna memorija"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB memorija"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD kartica"</string>
<string name="recompute_size" msgid="7722567982831691718">"Ponovno izračunavanje veličine..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Želite li da izbrišete podatke o aplikaciji?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Svi podaci ove aplikacije biće trajno izbrisani. To obuhvata sve datoteke, podešavanja, naloge, baze podataka itd."</string>
@@ -1783,24 +1788,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikacija nije pronađena na listi instaliranih aplikacija."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Brisanje memorijskog prostora za aplikaciju nije uspelo."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ova aplikacija može da pristupa sledećim stavkama na tabletu:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ova aplikacija može da pristupa sledećim stavkama na telefonu:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ova aplikacija može da pristupa sledećim informacijama na tabletu. Da bi se poboljšao učinak i smanjilo korišćenje memorije, neke od ovih dozvola su dostupne aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> zato što se koristi u istom procesu kao i aplikacije <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ova aplikacija može da pristupa sledećim informacijama na telefonu. Da bi se poboljšao učinak i smanjilo korišćenje memorije, neke od ovih dozvola su dostupne aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> zato što se koristi u istom procesu kao i aplikacije <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> i <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ova aplikacija će vam možda biti naplaćena:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Slanje premijum SMS poruka"</string>
<string name="computing_size" msgid="1599186977475211186">"Izračunavanje..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Nije moguće izračunati veličinu paketa."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Niste instalirali nijednu aplikaciju nezavisnog proizvođača."</string>
<string name="version_text" msgid="9189073826278676425">"verzija <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Premesti"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Premesti na tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Premesti u telefon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Premesti u USB memoriju"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Premesti u SD karticu"</string>
- <string name="moving" msgid="6431016143218876491">"Premeštanje"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Drugi prenos je već u toku."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nema dovoljno prostora u memoriji."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplikacija ne postoji."</string>
@@ -1810,17 +1807,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Aplikacija za administratora uređaja ne može da se instalira na spoljnim medijima"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Želite li da prinudno zaustavite?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ako prinudno zaustavite aplikaciju, možda će se ponašati neočekivano."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Nije moguće premestiti aplikaciju. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Željena lokacija instalacije"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Menjanje željene lokacije za instalaciju novih aplikacija"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Želite da onemogućite ugrađenu apl.?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Onemogući aplikaciju"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ako onemogućite ovu aplikaciju, Android i druge aplikacije možda više neće funkcionisati ispravno."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Želite li da izbrišete podatke i onemogućite aplikaciju?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ako onemogućite ovu aplikaciju, Android i druge aplikacije možda više neće funkcionisati ispravno. Osim toga, podaci će biti izbrisani."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Želite li da isklj. obaveštenja?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obaveštenja za ovu aplikaciju, možete da propustite važna obaveštenja i ažuriranja."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Prodavnica"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detalji o aplikaciji"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija je instalirana iz prodavnice <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1989,7 +1982,7 @@
<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="1996584694050087161">"Kada je uvećanje uključeno, koristite dugme za pristupačnost u dnu ekrana da biste brzo uvećali prikaz.\n\n"<b>"Da biste zumirali"</b>", dodirnite dugme za pristupačnost, pa pritisnite 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>" dodirnite dugme za pristupačnost, 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_screen_magnification_navbar_configuration_warning" msgid="70533120652758190">"Dugme za pristupačnost je podešeno na <xliff:g id="SERVICE">%1$s</xliff:g>. Da biste koristili uvećanje, dodirnite i zadržite dugme za pristupačnost, pa izaberite uvećanje."</string>
- <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Prečica za taster za jačinu zvuka"</string>
+ <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Taster jačine zvuka kao prečica"</string>
<string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Usluga prečice"</string>
<string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Omogući na zaključanom ekranu"</string>
<string name="accessibility_shortcut_description" msgid="1765853731190717372">"Kada je prečica uključena, možete da pritisnete oba tastera za jačinu zvuka i zadržite ih 3 sekunde da biste pokrenuli funkciju pristupačnosti."</string>
@@ -2013,6 +2006,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Koristi uslugu"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Koristi korekciju boja"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Koristi natpise"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Nastavi"</string>
<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="6371077608778830020">"Dodajte slušni aparat"</string>
@@ -2164,8 +2158,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ako ograničite aktivnosti aplikacije u pozadini, možda će se ponašati neočekivano."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Apl. nije podešena za optimizaciju baterije, pa ne možete da je ograničite. \n\nZa ogr. apl. uključite optimizaciju baterije."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Korišćenje ekrana od potpunog punjenja"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za ekran"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilnih mreža"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Korišćenje baterije od potpunog punjenja"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Količina vremena tokom kojeg je ekran bio uključen od potpunog punjenja"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Korišćenje uređaja od potpunog punjenja"</string>
@@ -2192,11 +2184,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Korišćenje detalja"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Prilagođavanje korišćenja napajanja"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Sadržani paketi"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacije mnogo troše bateriju"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Ne dozvoljavamo da uređaj pređe u stanje spavanja"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Budimo uređaj u pozadini"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Često traži lokaciju"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Neke aplikacije (<xliff:g id="NUMBER">%1$d</xliff:g>) se čudno ponašaju"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikacije rade uobičajeno"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon troši tipičnu količinu baterije u pozadini"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet troši tipičnu količinu baterije u pozadini"</string>
@@ -2266,6 +2253,7 @@
<item quantity="few">Ograničite potrošnju baterije za %1$d aplikacije</item>
<item quantity="other">Ograničite potrošnju baterije za %1$d aplikacija</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Ograničena <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Ove aplikacije su trošile bateriju u pozadini. Ograničene aplikacije možda neće raditi kako treba i obaveštenja mogu da kasne."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Koristite menadžer baterije"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Otkrijte kada aplikacije isprazne bateriju"</string>
@@ -2444,23 +2432,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Otkaži"</string>
<string name="tts_reset" msgid="2661752909256313270">"Resetuj"</string>
<string name="tts_play" msgid="2628469503798633884">"Pusti"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Kontrola napajanja"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ažuriranje Wi-Fi podešavanja"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ažuriranje Bluetooth podešavanja"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"uključeno"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"isključeno"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"uključivanje"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"isključivanje"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Lokacija"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinhronizacija"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Osvetljenje: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatsko"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"puno"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"polovično"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"isključeno"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Skladište akreditiva"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instaliranje iz memorije"</string>
@@ -2618,7 +2589,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Izaberi sve"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Korišćenje podataka"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Korišćenje podataka aplik."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobilni podaci i Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Obračun podataka kod mobilnog operatera se možda razlikuje od vašeg uređaja."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Korišćenje aplikacije"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIJE O APLIKACIJI"</string>
@@ -3000,7 +2971,6 @@
<item quantity="few">Prikaži %d skrivene stavke</item>
<item quantity="other">Prikaži %d skrivenih stavki</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Skupi"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Mreža i internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilna mreža"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"potrošnja podataka"</string>
@@ -3012,12 +2982,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obaveštenja"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dozvole, podrazumevane aplikacije"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Pristup obaveštenjima nije dostupan za aplikacije na radnom profilu."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Nalozi"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nijedan nalog nije dodat"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Podrazumevane aplikacije"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Jezici, vreme, rezervne kopije, ažuriranja"</string>
<string name="search_results_title" msgid="1796252422574886932">"Podešavanja"</string>
- <string name="search_menu" msgid="6283419262313758339">"Pretražite podešavanja"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, veza sa mrežom, internet, bežično, podaci, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, uključi/isključi, kontrola"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, slanje SMS-ova, poruke, razmena poruka, podrazumevano"</string>
@@ -3062,6 +3032,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"platite, dodirnite, plaćanja"</string>
<string name="keywords_backup" msgid="470070289135403022">"rezervna kopija, praviti rezervnu kopiju"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"pokret"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"lice, otključavanje, potvrda identiteta, prijavljivanje"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, verzija prl-a, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"mreža, stanje mobilne mreže, stanje usluge, jačina signala, tip mobilne mreže, roming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serijski broj, verzija hardvera"</string>
@@ -3069,6 +3040,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tamna tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"greška"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambijentalni ekran, prikaz na zaključanom ekranu"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"obaveštenje na zaključanom ekranu"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"lice"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"digitalni otisak"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"zatamniti ekran, dodirni ekran, baterija, pametna svetlina, dinamička svetlina"</string>
@@ -3510,7 +3482,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Kada unesete PIN da biste pokrenuli ovaj uređaj, usluge pristupačnosti, kao što je <xliff:g id="SERVICE">%1$s</xliff:g>, neće još uvek biti dostupne."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Kada unesete šablon da biste pokrenuli ovaj uređaj, usluge pristupačnosti, kao što je <xliff:g id="SERVICE">%1$s</xliff:g>, neće još uvek biti dostupne."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Kada unesete lozinku da biste pokrenuli ovaj uređaj, usluge pristupačnosti, kao što je <xliff:g id="SERVICE">%1$s</xliff:g>, neće još uvek biti dostupne."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Napomena: Posle restartovanja ova aplikacija ne može da se pokrene dok ne otključate telefon"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Napomena: Ako restartujete telefon i podesili ste zaključavanje ekrana, ova aplikacija ne može da se pokrene dok ne otključate telefon"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informacije za IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Relativne informacije za IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Otvor <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3568,12 +3540,12 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Lične"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Posao"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: sve"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacije: isključeno"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Isključeno"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorije: visok prioritet"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorije: nizak prioritet"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorije: isključeno"</string>
<string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Kategorije: menja režim „Ne uznemiravaj“"</string>
- <string name="advanced_apps" msgid="4812975097124803873">"Napredna"</string>
+ <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
<string name="configure_apps" msgid="6685680790825882528">"Konfigurišite aplikacije"</string>
<string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
<string name="app_permissions" msgid="4148222031991883874">"Dozvole za aplikacije"</string>
@@ -3630,7 +3602,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Obaveštenja o korišćenju"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Prikaži korišćenje baterije"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži korišćenje aplikacije"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Intenzivno korišćenje"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija se ponaša na neuobičajen način</item>
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacije se ponašaju na neuobičajen način</item>
@@ -3798,6 +3769,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Interna memorija: <xliff:g id="PERCENTAGE">%1$s</xliff:g> je iskorišćeno – <xliff:g id="FREE_SPACE">%2$s</xliff:g> je slobodno"</string>
<string name="display_summary" msgid="6737806235882127328">"Pređi u režim spavanja posle <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Pozadina, režim spavanja, veličina fonta"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Prelazak u režim spavanja posle 10 minuta neaktivnosti"</string>
<string name="memory_summary" msgid="8080825904671961872">"U proseku je korišćeno <xliff:g id="USED_MEMORY">%1$s</xliff:g> od <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memorije"</string>
<string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kao <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3813,7 +3786,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-ovi nisu dozvoljeni"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kamera nije dozvoljena"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Pravljenje snimaka ekrana nije dozvoljeno"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Ne možete da isključite rezervne kopije"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Ne možete da otvorite ovu aplikaciju"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Ako imate pitanja, obratite se IT administratoru"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Još detalja"</string>
@@ -3982,9 +3954,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simuliraj prikaz sa obrezanom slikom"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ništa"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Podrazumevano podešavanje za uređaj"</string>
<string name="special_access" msgid="3458780842491881155">"Poseban pristup aplikaciji"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može da koristi neograničenu količinu podataka</item>
@@ -4007,11 +3979,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan je sa uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan je sa više uređaja"</string>
<string name="demo_mode" msgid="2798762752209330277">"Režim demonstracije za korisnički interfejs sistema"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Noćni režim"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Podesi Noćni režim"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Tamni režim"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Podesite tamni režim"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice programera za brza podešavanja"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope trag"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Podešavanja poslovnog profila"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pretraga kontakata"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Dozvolite da pretraživanje kontakata od strane vaše organizacije identifikuje pozivaoce i kontakte."</string>
@@ -4055,13 +4026,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dvaput dodirnite tel. da ga proverite"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dvaput dodirnite tablet da biste ga proverili"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvaput dodirnite uređaj da biste ga proverili"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Da biste proverili vreme, ikone obaveštenja i druge informacije, dvaput dodirnite ekran."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Da biste proverili vreme, obaveštenja i druge informacije, dvaput dodirnite ekran."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite telefon da ga proverite"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite tablet da biste ga proverili"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite uređaj da biste ga proverili"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Da biste proverili vreme, ikone obaveštenja i druge informacije, uzmite telefon."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Da biste proverili vreme, ikone obaveštenja i druge informacije, uzmite tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Da biste proverili vreme, ikone obaveštenja i druge informacije, uzmite uređaj."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Probudite ekran"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Da biste proverili vreme, obaveštenja i druge informacije, uzmite telefon."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Da biste proverili vreme, obaveštenja i druge informacije, uzmite tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Da biste proverili vreme, obaveštenja i druge informacije, uzmite uređaj."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Pokret za buđenje zaključanog ekrana"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Prevucite prstom za obaveštenja"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Prevucite prstom"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani telefona."</string>
@@ -4145,7 +4120,6 @@
<item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> pokušaja</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pokušaja</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Pravi se rezervna kopija podataka sa ovog uređaja"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Ovim uređajem upravlja organizacija."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4189,6 +4163,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Uverite se da je ova aplikacija pouzdana</b> <br/> <br/> <xliff:g id=app_name example=Google automatsko popunjavanje>%1$s</xliff:g> koristi sadržaj ekrana za utvrđivanje podataka koji mogu automatski da se popune."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automatsko popunjavanje"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Nivo evidentiranja"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maksimalni broj zahteva po sesiji"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maksimalni broj vidljivih skupova podataka"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Resetuj na podrazumevane vrednosti"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Opcije za programera za automatsko popunjavanje su resetovane"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
<string name="default_theme" msgid="7085644992078579076">"Podrazumevana"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Naziv mreže"</string>
@@ -4203,15 +4183,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje dodele mobilnog operatera"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Ažurirajte režim Ne uznemiravaj"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pauzirajte obaveštenja radi bolje koncentracije"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Šta je novo i uzbudljivo?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte novi telefon"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte novi tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte novi uređaj"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova funkcija nije dostupna na ovom uređaju."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Prinudno pokreni puna GNSS merenja"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Prati sve GNSS konstalacije i frekvencije bez ciklusa rada"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Uvek prikazuj dijalog o otkazivanju"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Prikaži dijalog svaki put kada aplikacija otkaže"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Izaberi aplikaciju omogućenu za ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nije podešena aplikacija omogućena za ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplikacija omogućena za ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Pristup direktorijumima"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"pristup direktorijumima"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4252,4 +4231,86 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalji o mreži"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Ime uređaja vide aplikacije na telefonu. Mogu da ga vide i drugi ljudi kad se povežete sa Bluetooth uređajima ili podesite Wi-Fi hotspot."</string>
<string name="devices_title" msgid="7701726109334110391">"Uređaji"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Sva podešavanja"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Predlozi"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS podaci"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS podaci"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Odaberite mrežu"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Veza je prekinuta"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Povezano"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Povezuje se…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Povezivanje nije uspelo"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nije pronađena nijedna mreža."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nismo uspeli da pronađemo mreže. Probajte ponovo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(zabranjeno)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Nema SIM kartice"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Napredno pozivanje"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Željeni režim mreže: WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Željeni režim mreže: samo GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Željeni režim mreže: samo WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Željeni režim mreže: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Željeni režim mreže: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Željeni režim mreže: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Željeni režim mreže: samo CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Željeni režim mreže: samo EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Željeni režim mreže: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Željeni režim mreže: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Željeni režim mreže: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Željeni režim mreže: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Željeni režim mreže: Globalno"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Željeni režim mreže: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Željeni mrežni režim: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Željeni režim mreže: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Željeni režim mreže: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Željeni režim mreže: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Željeni režim mreže: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Željeni režim mreže: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Željeni režim mreže: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Željeni režim mreže: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Željeni režim mreže: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Željeni režim mreže: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Željeni režim mreže: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Željeni režim mreže: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (preporučeno)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (preporučeno)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globalna"</string>
+ <string name="label_available" msgid="1731547832803057893">"Dostupne mreže"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Pretražuje se…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registrujete se na mrežu <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM kartica ne dozvoljava vezu sa ovom mrežom."</string>
+ <string name="connect_later" msgid="978991102125216741">"Trenutno nije moguće povezati se sa ovom mrežom. Probajte ponovo kasnije."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registrovano na mreži."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automatski izaberi mrežu"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Podešavanja operatera"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Podesite usl. prenosa podataka"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobilni podaci"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Koristi podatke preko mobilne mreže"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Željeni tip mreže"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Promena režima rada mreže"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Željeni tip mreže"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Mobilni operater"</string>
+ <string name="call_category" msgid="8108654745239563833">"Pozivanje"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Video pozivanje preko operatera"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Izbor sistema"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Promena režima CDMA rominga"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Izbor sistema"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Mreža"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Mreža"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA prijava"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Promenite mrežu sa RUIM/SIM na NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"prijava"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatska registracija..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Želite li da dozvolite prenos podataka u romingu?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Cene proverite kod mobilnog operatera."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Potrošnja podataka aplikacije"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Nevažeći režim mreže <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorišite."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Nedostupno kada je uspostavljena veza sa operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Prikaži još"</string>
+ <string name="see_less" msgid="1250265310929558370">"Prikaži manje"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ <item quantity="other">Povezano je <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> uređaja</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nema povezanih uređaja"</string>
</resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index fe67c00..fdb8363 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Лімітная"</item>
<item msgid="2266114985518865625">"Безлімітная"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Стандартны (пры выкарыстанні выпадковага MAC-адрасу)"</item>
+ <item msgid="5398461510512959597">"Давераны"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Не"</item>
<item msgid="3863157480502955888">"Так"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Заўсёды ўключана"</item>
<item msgid="6385301106124765323">"Заўсёды выключана"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Адключана"</item>
+ <item msgid="2182686878828390312">"Наладзіць"</item>
+ <item msgid="5286514712714822064">"Падрабязна"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Толькі дамашнія сеткі"</item>
+ <item msgid="5034813753274486448">"Аўтаматычна"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Прыярытэт GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Толькі GSM"</item>
+ <item msgid="488474605709912156">"Толькі WCDMA"</item>
+ <item msgid="1912421096218750039">"Аўтаматычны выбар GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Аўтаматычны выбар CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA без EvDo"</item>
+ <item msgid="4678789463133969294">"Толькі EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Глабальная"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Толькі TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"R-UIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Глабальная"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 29ce0dd..85ef12b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Стварыць"</string>
<string name="allow" msgid="3349662621170855910">"Дазволіць"</string>
<string name="deny" msgid="6947806159746484865">"Адмовіць"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Закрыць"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Пераключыць"</string>
<string name="device_info_default" msgid="7847265875578739287">"Невядома"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Зараз вы ў <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кроку ад таго, каб стаць распрацоўшчыкам.</item>
@@ -34,10 +32,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Не трэба, вы ўжо з\'яўляецеся распрацоўшчыкам."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Спачатку ўключыце параметры распрацоўшчыка."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Бесправадныя сеткі"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Сувязi"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Прылада"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Асабістае"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Доступ"</string>
<string name="header_category_system" msgid="2816866961183068977">"Сістэма"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Уключыць злучэнне для перадачы даных"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Адключыць перадачу даных"</string>
@@ -123,7 +117,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Адрас Bluetooth прылады: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Адлучыць <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Перадача даных"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Безназоўная прылада Bluetooth"</string>
<string name="progress_scanning" msgid="192587958424295789">"Пошук"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Прылады Bluetooth побач не знойдзены."</string>
@@ -155,7 +148,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Праграма хоча ўключыць Bluetooth і зрабіць ваш тэлефон бачным для іншых прылад. Вы можаце змяніць гэта пазней у наладах Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Уключэнне Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Адключэнне Bluetooth..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Аўтаматычнае падключэнне"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Запыт злучэння Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Краніце, каб падлучыцца да прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Падлучыцца да прылады \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -183,12 +175,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Даступныя прылады для выклікаў"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Зараз падключана"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Захаваныя прылады"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Дадаць прыладу"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth уключыцца, каб выканаць спалучэнне"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Параметры падключэння"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Раней падключаныя прылады"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Раней падключаныя"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth уключаны"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Паказаць усе"</string>
<string name="date_and_time" msgid="9062980487860757694">"Дата і час"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Вылучыце гадзінны пояс"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -271,7 +263,6 @@
<string name="skip_label" msgid="47510779345218297">"Прапусціць"</string>
<string name="next_label" msgid="4693520878012668114">"Далей"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Мовы"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Моўныя параметры"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Выдаліць"</string>
<string name="add_a_language" msgid="2330538812283783022">"Дадаць мову"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -307,7 +298,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Налады"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Ярлык налад"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Рэжым самалёту"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Яшчэ"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бесправадныя і правадныя сеткі"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Кіраванне Wi-Fi, Bluetooth, рэжымам палёту, мабільнымі сеткамі і VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Мабільная перадача даных"</string>
@@ -392,6 +382,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Прыватнасць"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Адключана адміністратарам"</string>
<string name="security_status_title" msgid="5848766673665944640">"Стан бяспекі"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Блакіроўка экрана, распазнаванне твару"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Блакіроўка экрана, лічбавы адбітак"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Блакіроўка экрана"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Твар дададзены"</string>
@@ -401,11 +392,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Разблакіруйце праз твар"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Выкарыстоўвайце твар для аўтэнтыфікацыі"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Выкарыстоўвайце функцыю распазнавання твару для разблакіроўкі тэлефона, аўтарызацыі купляў і ўваходу ў праграмы."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Выкарыстоўвайце"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Для ўхвалення куплі ці разблакіроўкі тэлефона можна карыстацца функцыяй распазнавання твару.\n\nЗаўвага. Вы не можаце выкарыстоўваць твар для разблакіроўкі гэтай прылады. Для атрымання дадатковай інфармацыі звяжыцеся з адміністратарам арганізацыі."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Выкарыстоўвайце функцыю распазнавання твару для разблакіроўкі тэлефона, аўтарызацыі купляў і ўваходу ў праграмы"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Вы можаце дадаць да <xliff:g id="COUNT">%d</xliff:g> адбіткаў пальцаў"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Размясціце твар у цэнтры круга"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Пазней"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Можна дадаць да <xliff:g id="COUNT">%d</xliff:g> твараў"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Вы дадалі максімальную колькасць твараў"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Не ўдалося дадаць больш твараў"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Рэгістрацыя не завершана"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ОК"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Час рэгістрацыі твару скончыўся. Паспрабуйце яшчэ раз."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Не ўдалося выканаць рэгістрацыю твару."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Усё гатова."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Гатова"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Прымяняць твар, каб"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Разблакіраваць прыладу"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Уваход у праграму і плацяжы"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Адкрыць вочы для разблакіроўкі"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Калі адбываецца распазнаванне твару, вочы павінны быць адкрыты"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Выдаліць даныя твару"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Палепшыць даныя твару"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Вы можаце выкарыстоўваць свой твар для разблакіроўкі прылады і атрымання доступу да праграм. "<annotation id="url">"Даведайцеся больш"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Адбітак пальца"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Кірав. адбіт. пальцаў"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Выкарыст. адбітак для"</string>
@@ -914,6 +921,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 ГГц"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Выберыце як мінімум адзін дыяпазон для хот-спота Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Налады IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Прыватнасць"</string>
<string name="wifi_shared" msgid="844142443226926070">"Падзяліцца з іншымі карыстальнікамі прылады"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(не зменена)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Калі ласка, выберыце"</string>
@@ -953,7 +961,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Скасаваць"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Выдаліць сетку?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Усе паролі для гэтай сеткі будуць выдалены"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Захаваныя сеткі"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d сетка</item>
<item quantity="few">%d сеткі</item>
@@ -1023,7 +1030,7 @@
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-тэлефанія"</string>
<string name="wifi_calling_suggestion_title" msgid="5702964371483390024">"Выклікі па Wi‑Fi"</string>
<string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"Званіце па сетцы Wi‑Fi, калі няма сотавай сувязі"</string>
- <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Перавагі выклікаў"</string>
+ <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Прыярытэт выклікаў"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Рэжым Wi-Fi-тэлефаніі"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Налады роўмінгу"</string>
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
@@ -1135,8 +1142,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Яркасць"</string>
<string name="brightness_summary" msgid="838917350127550703">"Выбраць яркасць экрану"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Адаптыўная яркасць"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Уключана"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Адключана"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Упадабаная яркасць – вельмі нізкая"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Упадабаная яркасць – нізкая"</string>
@@ -1232,6 +1238,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Немагчыма змян. PIN.\nМагч., няправ. PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-код SIM-карты паспяхова зменены"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Немагч. разблак. SIM.\nМагч., няправ. PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Не ўдалося выключыць PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Не ўдалося ўключыць PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ОК"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Скасаваць"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Знойдзена некалькі SIM-карт"</string>
@@ -1259,7 +1267,7 @@
<string name="hardware_revision" msgid="8893547686367095527">"Версія апаратнага забеспячэння"</string>
<string name="fcc_equipment_id" msgid="149114368246356737">"Iдэнтыфiкатар абсталявання"</string>
<string name="baseband_version" msgid="1848990160763524801">"Версія baseband"</string>
- <string name="kernel_version" msgid="9192574954196167602">"Вэрсія ядра"</string>
+ <string name="kernel_version" msgid="9192574954196167602">"Версія ядра"</string>
<string name="build_number" msgid="3075795840572241758">"Нумар зборкі"</string>
<string name="device_info_not_available" msgid="8062521887156825182">"Недаступны"</string>
<string name="device_status_activity_title" msgid="1411201799384697904">"Стан"</string>
@@ -1407,7 +1415,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Для гэтага трэба адфарматаваць <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"Падчас фарматавання выдаляюцца ўсе даныя, якія ў цяперашні час захоўваюцца на <xliff:g id="NAME_1">^1</xliff:g>."</b>" Каб пазбегнуць страты даных, магчыма, вам спатрэбіцца стварыць іх рэзервовыя копіі."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ачысціць і фарматаваць"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Фарматаванне <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Не вымайце прыладу \"<xliff:g id="NAME">^1</xliff:g>\" падчас фармаціравання."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Не вымайце прыладу \"<xliff:g id="NAME">^1</xliff:g>\" падчас фармаціравання."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Перамясціць даныя ў новае схов."</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Вы можаце перамясціць свае фатаграфіі, файлы і некаторыя дадаткі на гэту новую <xliff:g id="NAME">^1</xliff:g>. \n\nПерамяшчэнне зойме прыблізна <xliff:g id="TIME">^2</xliff:g> і вызваліць <xliff:g id="SIZE">^3</xliff:g> унутранай памяці. Пэўныя дадаткі не будуць працаваць падчас гэтага працэсу."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Перамясціць зараз"</string>
@@ -1791,9 +1799,6 @@
<string name="installed" msgid="3070865169422600098">"Усталявана"</string>
<string name="no_applications" msgid="7336588977497084921">"Няма праграм."</string>
<string name="internal_storage" msgid="1584700623164275282">"Унутраная памяць"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"унутраная памяць"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-назапашвальнік"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Сховішча на SD-карце"</string>
<string name="recompute_size" msgid="7722567982831691718">"Пераразлік памеру..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Выдаліць дадзеныя прыкладання?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Усе даныя гэтага дадатку будуць назаўсёды выдаленыя. Гэта датычыцца ўсiх файлаў, налад, уліковых запісаў, баз даных і г. д."</string>
@@ -1802,24 +1807,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Дадатак не знойдзены ў спісе ўсталяваных дадаткаў."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Немагчыма ачысціць сховішча для праграмы."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Гэта прыкладанне можа атрымаць на планшэце доступ да наступных дадзеных:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Гэта прыкладанне можа атрымаць на тэлефоне доступ да наступных дадзеных:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Гэта прыкладанне можа атрымліваць доступ да наступных элементаў на вашым тэлефоне. Каб павысіць прадукцыйнасць і зменшыць выкарыстанне памяці, некаторыя з гэтых дазволаў даступныя для прыкладання <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, таму што яно выкарыстоўвае той жа працэс, што і прыкладанні <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Гэта прыкладанне можа атрымліваць доступ да наступных элементаў на вашым тэлефоне. Каб павысіць прадукцыйнасць і зменшыць выкарыстанне памяці, некаторыя з гэтых дазволаў даступныя для прыкладання <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, таму што яно выкарыстоўвае той жа працэс, што і прыкладанні <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> і <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Гэта прыкладанне можа спаганяць з вас сродкi:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Адправiць платную SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Вылічэнне..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Не атрымалася вызначыць памер пакета."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"У вас няма ўсталяваных дадаткаў ад іншых пастаўшчыкоў."</string>
<string name="version_text" msgid="9189073826278676425">"версія <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Перамясціць"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Перанесці ў планшэт"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Перамясціць у тэлефон"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Перах. да USB-назап."</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Перамясціць на SD-карту"</string>
- <string name="moving" msgid="6431016143218876491">"Перамяшчэнне"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Іншы перанос ужо выконваецца."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Не хапае месца для захоўвання."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Праграма не існуе."</string>
@@ -1829,17 +1826,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Праграму адміністратара прылады нельга ўсталёўваць на знешнія носьбіты"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Спынiць прымусова?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Прымусовае спыненне дзейнасці праграмы можа прывесці да збою."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Не атрымалася перамясціць дадатак. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Пераважнае месца ўсталявання"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Змяніць пераважнае месца ўсталявання новых прыкладанняў"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Адключыць убудаванае прыкладанне?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Адключыць праграму"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Калі вы адключыце гэту праграму, іншыя праграмы могуць працаваць неналежным чынам."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Выдаліць дадзеныя і адключыць прыкладанне?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Калі вы адключыце гэту праграму, Android і іншыя праграмы могуць працаваць неналежным чынам. Вашы даныя таксама будуць выдалены."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Выключыць апавяшчэнні?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Калі адключыць паведамлення для гэтага прыкладання, вы можаце прапусціць важныя сігналы і абнаўленні."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Крама"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Звесткi пра праграму"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Праграма ўсталявана з <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2032,6 +2025,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Карыстанне сэрвісам"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Карыстанне карэкцыяй колераў"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Карыстанне цітрамі"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Далей"</string>
<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="6371077608778830020">"Дадаць слыхавы апарат"</string>
@@ -2191,8 +2185,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Абмежаванне фонавай дзейнасці праграмы можа прывесці да збояў"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Паколькі ў гэтай праграме не наладжана аптымізацыя выкарыстання зараду акумулятара, вы не можаце абмежаваць яе працу. \n\n Для гэтага спачатку ўключыце аптымізацыю акумулятара."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Выкарыстанне экрана пасля поўнай зарадкі"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Расход зараду на падсвечванне экрана"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Сканіраванне мабільнай сеткі"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Выкарыстанне акумулятара з моманту поўнай зарадкі"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Колькасць часу, калі экран быў уключаны, з моманту поўнай зарадкі"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Выкарыстанне прылады з моманту поўнай зарадкі"</string>
@@ -2219,11 +2211,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Падрабязнасці выкарыстання"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Адрэгуляваць спажыванне энергіі"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Уключаныя пакеты"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Праграмы, якія разраджаюць акумулятар"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Падтрымлівае прыладу ў актыўным рэжыме"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Выводзіць прыладу з рэжыму сну ў фонавым рэжыме"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Запытвае месцазнаходжанне занадта часта"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> праграм паводзяць сябе незвычайна"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Праграмы працуюць нармальна"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Акумулятар тэлефона разраджаецца нармальна ў фонавым рэжыме"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Акумулятар планшэта разраджаецца нармальна ў фонавым рэжыме"</string>
@@ -2299,6 +2286,7 @@
<item quantity="many">Абмежаванае выкарыстанне зараду для %1$d праграм</item>
<item quantity="other">Абмежаванае выкарыстанне зараду для %1$d праграмы</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Абмежавана <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Гэтыя праграмы выкарыстоўваюць энергію ў фонавым рэжыме. Праграмы з абмежаваннямі могуць працаваць павольна, і апавяшчэнні могуць прыходзіць з затрымкай."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Уключыць менеджар акумулятара"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Выяўляць праграмы, якія разраджаюць акумулятар"</string>
@@ -2478,23 +2466,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Скасаваць"</string>
<string name="tts_reset" msgid="2661752909256313270">"Выканаць скід"</string>
<string name="tts_play" msgid="2628469503798633884">"Прайграць"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Кіраванне сілкаваннем"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Абнаўленне налад Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Абнаўленне налад Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"укл."</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"выкл."</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"уключэнне"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"выключэнне"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Месцазнаходжанне"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Сінхранiзацыя"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Яркасць: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"аўта"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"поўная"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"палова"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"выкл."</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Сховішча ўліковых даных"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Усталяваць са сховішча"</string>
@@ -2652,7 +2623,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Выбраць усё"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Выкарыстанне трафіка"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Трафік праграм"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Мабільныя даныя і Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Улік даных аператара можа адрознівацца ад уліку вашай прылады."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Выкарыстанне памяці"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ЗВЕСТКІ ПРА ПРАГРАМЫ"</string>
@@ -3039,7 +3010,6 @@
<item quantity="many">Паказаць %d схаваных элементаў</item>
<item quantity="other">Паказаць %d схаванага элемента</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Згарнуць"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Сетка і інтэрнэт"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мабільная сетка"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"выкарыстанне трафіка"</string>
@@ -3051,12 +3021,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Праграмы і апавяшчэнні"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дазволы, стандартныя праграмы"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Праграмы ў працоўным профілі не маюць доступу да апавяшчэнняў."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Уліковыя запісы"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Няма ўліковых запісаў"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Стандартныя праграмы"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Мовы, час, рэзервовае капіраванне, абнаўленні"</string>
<string name="search_results_title" msgid="1796252422574886932">"Налады"</string>
- <string name="search_menu" msgid="6283419262313758339">"Пошук налад"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, злучэнне, інтэрнэт, бесправадны, даныя, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, пераключэнне, кіраванне"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"тэкставае паведамленне, адпраўка тэкставых паведамленняў, паведамленні, абмен паведамленнямі, стандартны"</string>
@@ -3101,6 +3071,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"плаціць, дакранацца, плацяжы"</string>
<string name="keywords_backup" msgid="470070289135403022">"рэзервовае капіраванне, стварыць рэзервовую копію"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"жэст"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"твар, распазнаванне, аўтарызацыя, уваход"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, мін, версія prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"сетка, стан мабільнай сеткі, рабочы стан, моц сігналу, тып мабільнай сеткі, роўмінг, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"серыйны нумар, версія апаратнага забеспячэння"</string>
@@ -3108,6 +3079,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"цёмная тэма"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"памылка"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Аўтаматычнае ўключэнне экрана, экран блакіроўкі"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"апавяшчэнне экрана блакіроўкі"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"твар"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"адбітак пальца"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"зацямненне экрана, сэнсарны экран, акумулятар, разумная яркасць, дынамічная яркасць"</string>
@@ -3559,7 +3531,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Калі вы ўводзіце свой PIN-код для загрузкі прылады, службы доступу, такія як <xliff:g id="SERVICE">%1$s</xliff:g>, яшчэ не будуць даступнымі."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Калі вы ўводзіце свой графічны ключ для загрузкі прылады, службы доступу, такія як <xliff:g id="SERVICE">%1$s</xliff:g>, яшчэ не будуць даступнымі."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Калі вы ўводзіце свой пароль для загрузкі прылады, службы доступу, такія як <xliff:g id="SERVICE">%1$s</xliff:g>, яшчэ не будуць даступнымі."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Заўвага. Пасля перазагрузкі гэта праграма не зможа запусціцца, пакуль вы не разблакіруеце тэлефон"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Заўвага. Калі перазапусціць тэлефон з наладжанай блакіроўкай экрана, праграма не запусціцца, пакуль тэлефон не будзе разблакіраваны"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Інфармацыя IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Інфармацыя, звязаная з IMEI (міжнародным ідэнтыфікатарам мабільнага абсталявання)"</string>
<string name="slot_number" msgid="3762676044904653577">"(Слот<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3622,7 +3594,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Персанальныя"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Працоўныя"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Праграмы: усе"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Праграмы: выключаныя"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Адключаны"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Катэгорыі: тэрміновыя"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Катэгорыі: не вельмі важныя"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Катэгорыі: выключаныя"</string>
@@ -3685,7 +3657,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Абвесткі аб выкарыстанні"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Уся інфармацыя пра выкарыстанне"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Паказаць спажыванне праграмамі"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Высокае спажыванне"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> праграма працуе няправільна</item>
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> праграмы працуюць няправільна</item>
@@ -3780,8 +3751,8 @@
<string name="running_frequency" msgid="6622624669948277693">"Частата"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Максімальнае выкарыстанне"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Даныя не выкарыстоўваюцца"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Адкрыць доступ да рэжыму «Не турбаваць» для <xliff:g id="APP">%1$s</xliff:g>?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Дадатак зможа уключаць/выключаць рэжым «Не турбаваць» і змяняць звязаныя з ім налады."</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Даць праграме \"<xliff:g id="APP">%1$s</xliff:g>\" доступ да рэжыму \"Не турбаваць\"?"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Праграма зможа уключаць і выключаць рэжым «Не турбаваць» і змяняць адпаведныя налады."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Павінен заставацца ўключаным, таму што ўключаны доступ да апавяшчэнняў"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Адклікаць доступ да рэжыму «Не турбаваць» для <xliff:g id="APP">%1$s</xliff:g>?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Усе правілы рэжыму «Не турбаваць», створаныя гэтай праграмай, будуць выдалены."</string>
@@ -3857,6 +3828,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Унутранае сховішча: <xliff:g id="PERCENTAGE">%1$s</xliff:g> занята – <xliff:g id="FREE_SPACE">%2$s</xliff:g> свабодна"</string>
<string name="display_summary" msgid="6737806235882127328">"Пераходзіць у рэжым сну пасля бяздзейнасці на працягу <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Шпалеры, рэжым сну, памер шрыфту"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Пераход у рэжым сну пасля бяздзейнасці на працягу 10 хвілін"</string>
<string name="memory_summary" msgid="8080825904671961872">"У сярэднім <xliff:g id="USED_MEMORY">%1$s</xliff:g> з <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> памяці выкарыстана"</string>
<string name="users_summary" msgid="1674864467098487328">"Вы ўвайшлі як <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3872,7 +3845,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Адпраўка SMS забаронена"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Выкарыстанне камеры забаронена"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Здымкі экрана забаронены"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Не ўдалося выключыць стварэнне рэзервовых копій"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Не ўдалося адкрыць праграму"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Калі ў вас ёсць пытанні, звярніцеся да IT-адміністратара"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Дадатковая інфармацыя"</string>
@@ -4046,9 +4018,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Сімуляцыя дысплэя з выразам для камеры"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Выраз на экране"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"выраз дысплея, выемка"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Няма"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Стандартная прылада"</string>
<string name="special_access" msgid="3458780842491881155">"Спецыяльны доступ"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> праграма можа выкарыстоўваць даныя без абмежаванняў</item>
@@ -4072,11 +4044,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Падключана да <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Падключана да некалькіх прылад"</string>
<string name="demo_mode" msgid="2798762752209330277">"Рэжым дэманстрацыі сістэмнага інтэрфейсу карыстальніка"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Начны рэжым"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Задаць начны рэжым"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Цёмны рэжым"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Выкарыстоўваць цёмны рэжым"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Пліткі хуткіх налад для распрацоўшчыкаў"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Трасіроўка Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Налады працоўнага профілю"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пошук кантактаў"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дазволіць вашай арганізацыі пошук кантактаў, каб вызначаць абанентаў і кантакты"</string>
@@ -4123,13 +4094,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двойчы дакраніцеся, каб праверыць апавяшчэнні"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Двойчы дакраніцеся, каб праверыць планшэт"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Двойчы дакраніцеся, каб праверыць прыладу"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Каб праверыць час, значкі паведамленняў і іншыя даныя, двойчы націсніце на экран."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Каб праверыць час, апавяшчэнні і іншую інфармацыю, двойчы дакраніцеся да экрана."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Падняць тэлефон, каб праверыць апавяшчэнні"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Падніміце планшэт, каб праверыць яго"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Падніміце прыладу, каб праверыць яе"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Каб праверыць час, значкі паведамленняў і іншыя даныя, вазьміце свой тэлефон у рукі."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Каб праверыць час, значкі паведамленняў і іншыя даныя, вазьміце свой планшэт у рукі."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Каб праверыць час, значкі паведамленняў і іншыя даныя, вазьміце сваю прыладу ў рукі."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Абудзіць экран"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Каб праверыць час, апавяшчэнні і іншую інфармацыю, вазьміце тэлефон у рукі."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Каб праверыць час, апавяшчэнні і іншую інфармацыю, вазьміце планшэт у рукі."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Каб праверыць час, апавяшчэнні і іншую інфармацыю, вазьміце прыладу ў рукі."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Жэст абуджэння экрана блакіроўкі"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Правядзіце пальцам, каб убачыць апавяшчэнні"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Правесці адбітак пальца"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку тэлефона."</string>
@@ -4217,7 +4192,6 @@
<item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> спроб</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> спробы</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Выконваецца рэзервовае капіраванне даных гэтай прылады"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Гэта прылада знаходзіцца пад кіраваннем вашай арганізацыі."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Гэта прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4264,6 +4238,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Сэрвіс аўтазапаўнення"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"аўтаматычнае, запаўненне, аўтазапаўненне"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Упэўніцеся, што давяраеце гэтай праграме</b> <br/> <br/> <xliff:g id=app_name example=Аўтазапаўненне Google>%1$s</xliff:g> выкарыстоўвае тое, што знаходзіцца на вашым экране, каб вызначыць, што можна запоўніць аўтаматычна."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Аўтазапаўненне"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Узровень запісаў"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Максімальная колькасць запытаў за сеанс"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Максімальная колькасць бачных набораў даных"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Скінуць значэнні да стандартных"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Аўтазапаўненне параметраў распрацоўшчыка было скінута"</string>
<string name="device_theme" msgid="4571803018917608588">"Тэма прылады"</string>
<string name="default_theme" msgid="7085644992078579076">"Стандартная"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Імя сеткі"</string>
@@ -4278,15 +4258,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Уключыць/выключыць забеспячэнне аператарам"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Абнавіце рэжым \"Не турбаваць\""</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Прыпыніце апавяшчэнні, каб яны не адцягвалі ўвагу"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Што новага і цікавага?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Аглядны тур па новаму тэлефону"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Аглядны тур па новаму планшэту"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Аглядны тур па новай прыладзе"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Гэта функцыя недаступная на гэтай прыладзе"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Прымусова правесці поўныя вымярэнні GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Адсочваць усе групы і частоты GNSS з выключаным працоўным цыклам"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Заўсёды паказваць дыялогавыя вокны з памылкамі"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Паказваць дыялогавае акно кожны раз, калі адбываецца збой праграмы"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Выбраць праграму з падтрымкай ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Няма праграм з падтрымкай ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Праграма з падтрымкай ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Доступ да каталога"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"доступ да каталога"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4327,4 +4306,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Інфармацыя аб сетцы"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Назва вашай прылады даступная для праграм на вашым тэлефоне. Яе таксама будуць бачыць іншыя людзі, калі вы падключыцеся да прылад праз Bluetooth ці наладзіце хот-спот Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Прылады"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Усе налады"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Прапановы"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Даныя CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Даныя CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Выбраць сетку"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Адключана"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Падключана"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Ідзе падключэнне…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Не ўдалося падключыцца"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Сеткі не знойдзены."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Не ўдалося знайсці сеткі. Паўтарыце спробу."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(забаронена)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Няма SIM-карты"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Пашыраныя магчымасці выкліку"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Прыярытэтны рэжым сеткі: пераважна WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Прыярытэтны рэжым сеткі: толькі GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Прыярытэтны рэжым сеткі: толькі WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Прыярытэтны рэжым сеткі: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Прыярытэтны рэжым сеткі: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Прыярытэтны рэжым сеткі: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Прыярытэтны рэжым сеткі: толькі CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Прыярытэтны рэжым сеткі: толькі EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Прыярытэтны рэжым сеткі: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Прыярытэтны рэжым сеткі: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Прыярытэтны рэжым сеткі: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Прыярытэтны рэжым сеткі: CDMA+LTE/EvDo"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Прыярытэтны рэжым сеткі: глабальная"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Прыярытэтны рэжым сеткі: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Прыярытэтны рэжым сеткі: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Прыярытэтны рэжым сеткі: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Прыярытэтны рэжым сеткі: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Прыярытэтны рэжым сеткі: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Прыярытэтны рэжым сеткі: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Прыярытэтны рэжым сеткі: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Прыярытэтны рэжым сеткі: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Прыярытэтны рэжым сеткі: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Прыярытэтны рэжым сеткі: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Прыярытэтны рэжым сеткі: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Прыярытэтны рэжым сеткі: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Прыярытэтны рэжым сеткі: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (рэкамендуецца)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (рэкамендуецца)"</string>
+ <string name="network_global" msgid="959947774831178632">"Глабальная"</string>
+ <string name="label_available" msgid="1731547832803057893">"Даступныя сеткі"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Ідзе пошук…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Выконваецца рэгістрацыя ў сетцы <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Ваша SIM-карта не дазваляе падключацца да гэтай сеткі."</string>
+ <string name="connect_later" msgid="978991102125216741">"Не ўдалося падключыцца да гэтай сеткі. Паўтарыце спробу пазней."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Зарэгістравана ў сетцы."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Выбіраць сетку аўтаматычна"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Налады аператара"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Налады перадачы даных"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Мабільная перадача даных"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Доступ да даных па мабільнай сетцы"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Прыярытэтны тып сеткі"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Змяніць рэжым работы сеткі"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Прыярытэтны тып сеткі"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Аператар"</string>
+ <string name="call_category" msgid="8108654745239563833">"Выклік"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Відэавыклікі праз аператара"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Выбар сістэмы"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Змяніць рэжым роўмінгу CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Выбар сістэмы"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Сетка"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Сетка"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Падпіска CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Пераключацца паміж R-UIM/SIM і NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"падпіска"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Выконваецца аўтаматычная рэгістрацыя…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Дазволіць перадачу даных у роўмінгу?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Высветліце цану ў свайго інтэрнэт-правайдара."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Выкарыстанне трафіка"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Несапраўдны рэжым сеткі <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ігнараваць."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Недаступна праз аператара \"<xliff:g id="CARRIER">%1$s</xliff:g>\""</string>
+ <string name="see_more" msgid="5953815986207345223">"Паказаць больш"</string>
+ <string name="see_less" msgid="1250265310929558370">"Паказаць менш"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 4584e66..263561f 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Третиране като мрежа с отчитане"</item>
<item msgid="2266114985518865625">"Третиране като мрежа без отчитане"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"По подразбиране (използване на произволно генериран MAC адрес)"</item>
+ <item msgid="5398461510512959597">"Надеждно"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Не"</item>
<item msgid="3863157480502955888">"Да"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Винаги включено"</item>
<item msgid="6385301106124765323">"Винаги изключено"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Изкл."</item>
+ <item msgid="2182686878828390312">"Отстраняване на грешки"</item>
+ <item msgid="5286514712714822064">"Подробно"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Само домашни мрежи"</item>
+ <item msgid="5034813753274486448">"Автоматично"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Предпочита се GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Само GSM"</item>
+ <item msgid="488474605709912156">"Само WCDMA"</item>
+ <item msgid="1912421096218750039">"Авт. GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Авт. CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA без EvDo"</item>
+ <item msgid="4678789463133969294">"Само EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Глобална мрежа"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Само TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Глобална мрежа"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8fc51fd..082273b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Създаване"</string>
<string name="allow" msgid="3349662621170855910">"Разрешаване"</string>
<string name="deny" msgid="6947806159746484865">"Отказ"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Затваряне"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Превключване"</string>
<string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Вече сте на <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> стъпки от това, да бъдете програмист.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Не е необходимо – вече сте програмист."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Моля, първо активирайте опциите за програмисти."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Кабелни и безжични мрежи"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Връзки"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Устройство"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Лични"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Достъп"</string>
<string name="header_category_system" msgid="2816866961183068977">"Системни"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Активиране на връзката за данни"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Деактивиране на връзката за данни"</string>
@@ -119,9 +113,8 @@
<string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Bluetooth адрес на телефона: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Bluetooth адрес на таблета: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth адрес на устройството: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
- <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Да се прекрати ли връзката с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+ <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Да се прекрати ли връзката с(ъс) <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Излъчване"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Устройство с Bluetooth без име"</string>
<string name="progress_scanning" msgid="192587958424295789">"Търси се"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"В района няма намерени у-ва с Bluetooth."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Приложение иска да включи Bluetooth и да направи телефона ви видим за други устройства. Можете да промените това по-късно от настройките за Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth се включва..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth се изключва…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматично свързване"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Заявка за свързване чрез Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Докоснете за свързване с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Искате ли да се свържете с/ъс „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Налични устройства за обаждания"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Понастоящем свързано"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Запазени устройства"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Добавяне на устройство"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth ще се включи с цел сдвояване"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Предпочитания за свързването"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"По-рано свързвани устройства"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"По-рано свързвани"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Функцията за Bluetooth е включена"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Преглед на всички"</string>
<string name="date_and_time" msgid="9062980487860757694">"Дата и час"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Избор на часова зона"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Пропускане"</string>
<string name="next_label" msgid="4693520878012668114">"Напред"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Езици"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Езикови предпочитания"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Премахване"</string>
<string name="add_a_language" msgid="2330538812283783022">"Добавяне на език"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Пряк път за настройките"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Самолетен режим"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Още"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Кабелни и безжични мрежи"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Управлява Wi‑Fi, Bluetooth, самолетен режим, мобилни и VPN мрежи"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Мобилни данни"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Поверителност"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Деактивирано от администратора"</string>
<string name="security_status_title" msgid="5848766673665944640">"Състояние на сигурността"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Заключване на екрана, отключване с лице"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Опция за заключване на екрана, отпечатък"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Опция за заключване на екрана"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Добавено е лице"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Отключване с лицето ви"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Използване на лицето ви за удостов."</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Използвайте лицето си за отключване на телефона си, оторизиране на покупки или влизане в приложения."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Използване на лицето ви"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Използвайте лицето си, за да отключвате телефона си или да одобрявате покупки.\n\nЗабележка: Не можете да отключвате това устройство с лицето си. За повече информация се свържете с администратора на организацията си."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Използвайте лицето си за отключване на телефона си, оторизиране на покупки или влизане в приложения."</string>
- <string name="face_add_max" msgid="2342250989212694454">"Можете да добавите до <xliff:g id="COUNT">%d</xliff:g> отпечатъка"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Центрирайте лицето си в кръга"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"По-късно"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Можете да добавите до <xliff:g id="COUNT">%d</xliff:g> лица"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Добавихте максималния брой лица"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Не могат да се добавят още лица"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Регистрирането не бе завършено"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Времевото ограничение за регистриране на лице бе достигнато. Опитайте отново."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Регистрирането на лице не проработи."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Готово. Всичко изглежда наред."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Готово"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Ползв. на лицето ви за"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Устройство: Отключв."</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Вход в приложения и плащания"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"За отключване – с отворени очи"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"При ползване на удостоверяването с лице очите ви трябва да са отворени"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Премахване на лицето"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Актуализиране на лицето ви"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Лицето ви може да се използва за отключване на устройството ви и за достъп до приложения. "<annotation id="url">"Научете повече"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Отпечатък"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Отпечатъци: Управл."</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Oтпечатък: Ползване за"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 ГХц"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Изберете поне една честота за точката за достъп до Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Настройки за IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Поверителност"</string>
<string name="wifi_shared" msgid="844142443226926070">"Споделяне с другите потребители на устройството"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(непроменени)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Моля, изберете"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Отказ"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Да се забрави ли мрежата?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Всички пароли за тази мрежа ще бъдат изтрити"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Запазени мрежи"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d мрежи</item>
<item quantity="one">1 мрежа</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Яркост"</string>
<string name="brightness_summary" msgid="838917350127550703">"Наглася яркостта на екрана"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивна яркост"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Вкл."</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Изключено"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Предпочита се много ниска яркост"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Предпочита се ниска яркост"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"ПИН кодът не може да се промени.\nВъзможен неправилен ПИН."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Успешна промяна на PIN за SIM карта"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Не може да се промени състоянието на заключване на SIM картата.\nВъзможен неправилен ПИН."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"ПИН кодът не може да бъде деактивиран."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"ПИН кодът не може да бъде активиран."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Отказ"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Открити са няколко SIM карти"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Необходимо е да форматирате хранилището (<xliff:g id="NAME_0">^1</xliff:g>). \n\n"<b>"При форматирането се изтриват всички данни, които понастоящем се съхраняват в хранилището (<xliff:g id="NAME_1">^1</xliff:g>)"</b>". За да не ги загубите, е добре да създадете резервно копие."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Изтриване и форматиране"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>: Форматира се…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Не премахвайте хранилището (<xliff:g id="NAME">^1</xliff:g>), докато се форматира."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Не премахвайте хранилището (<xliff:g id="NAME">^1</xliff:g>), докато се форматира."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Премест. данните в новото хран."</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Можете да преместите в новото хранилище (<xliff:g id="NAME">^1</xliff:g>) снимките и файловете си и някои приложения. \n\nПроцесът отнема около <xliff:g id="TIME">^2</xliff:g> и ще освободи <xliff:g id="SIZE">^3</xliff:g> във вътрешното хранилище. През това време някои приложения няма да работят."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Преместване сега"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Инсталирано"</string>
<string name="no_applications" msgid="7336588977497084921">"Няма приложения."</string>
<string name="internal_storage" msgid="1584700623164275282">"Вътр. хранилище"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"вътрешно хранилище"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB хранилище"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Хранилище на SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Размерът се преизчислява..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Да се изтрият ли данните от приложенията?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Всички данни на това приложение ще бъдат изтрити за постоянно. Това включва всички файлове, настройки, профили и т.н."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Приложението не бе намерено в списъка с инсталирани приложения."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Изчистването на данните за приложението не бе успешно."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Това приложение има достъп до следното в таблета ви:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Това приложение има достъп до следното от телефона ви:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Това приложение има достъп до следното от таблета ви. За да се подобри ефективността и да се намали използването на паметта, някои от тези разрешения са налице за <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, защото се изпълнява в един и същ процес като <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Това приложение има достъп до следното от телефона ви. За да се подобри ефективността и да се намали използването на паметта, някои от тези разрешения са налице за <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, защото се изпълнява в един и същ процес като <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> и <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Това приложение може да ви таксува пари:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Изпращане на импулсен SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Изчислява се..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Размерът на пакета не можа да бъде изчислен."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Нямате никакви инсталирани приложения на трети страни."</string>
<string name="version_text" msgid="9189073826278676425">"версия <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Преместване"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Преместване в таблета"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Преместване на телефон"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Преместване в USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Преместване на SD карта"</string>
- <string name="moving" msgid="6431016143218876491">"В процес на преместване"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Вече се извършва друго мигриране."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Няма достатъчно място в хранилището."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Приложението не съществува."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Приложението за администриране на устройството не може да бъде инсталирано на външен носител"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Да се спре ли принудително?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ако принудително спрете приложение, то може да не функционира правилно."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Приложението не можа да бъде преместено. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Предпочитано място за инсталиране"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Промяна на предпочитаното място за инсталиране на нови приложения"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Да се деакт. ли вград. прил.?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Деактивиране на приложението"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ако деактивирате това приложение, Android и други приложения може да спрат да работят както трябва."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Да се изтрият ли данните и да се деактивира приложението?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ако деактивирате това приложение, Android и други приложения може да спрат да работят както трябва. Данните ви също ще бъдат изтрити."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Да се изключат ли известията?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ако изключите известията за това приложение, може да пропуснете важни сигнали и актуализации."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"App Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Подробности за прилож."</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Приложението е инсталирано от <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Използване на услугата"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Използване на корекция на цветовете"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Използване на надписи"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Напред"</string>
<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="6371077608778830020">"Добавяне на слухов апарат"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ако ограничите активността на заден за дадено приложение, то може да не функционира правилно"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Тъй като прил. не е зададено да оптимизира батерията, можете да го ограничите.\n\nЗа тази цел първо включете оптим. на батерията."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Ползване на екрана след пълно зареждане"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Консумация от екрана"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Сканиране за мобилни мрежи"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Използване на батерията след пълно зареждане"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Колко време е бил включен екранът след последното пълно зареждане"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Използване на устройството след пълно зареждане"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Подробности"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Настройване на захранването"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Включени пакети"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Приложения, които изтощават батерията"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Устройството се поддържа в активно състояние"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Устройството се активира на заден план"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Чести заявки за местоположение"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> приложения не функционират правилно"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Приложенията работят нормално"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Използването на батерията на заден план е в обичайните норми за телефона"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Използването на батерията на заден план е в обичайните норми за таблета"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Използването на батерията е ограничено за %1$d приложения</item>
<item quantity="one">Използването на батерията е ограничено за %1$d приложение</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Ограничено: <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Тези приложения използват батерията на заден план. Ограничените приложения може да не работят правилно и е възможно да има забавяне на известията."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Използване на мениджъра на батерията"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Установяване кога приложенията изразходват батерията"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Отказ"</string>
<string name="tts_reset" msgid="2661752909256313270">"Нулиране"</string>
<string name="tts_play" msgid="2628469503798633884">"Възпроизвеждане"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Контрол на захранването"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Актуализиране на настройките за Wi‑Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Актуализиране на настройките за Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"включено"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"изключено"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"включва се"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"изключва сe"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Местоположение"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Синхронизиране"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Яркост: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"автоматична"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"пълна"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"наполовина"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"изключена"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Хранилище за идент. данни"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Инсталиране от хранилището"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> от <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Избиране на всички"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Използване на данни"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Прилож.: Пренос на данни"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Мобилни данни и Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Отчетеният от оператора обем на данните може да се различава от показания на устройството ви."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Употреба на приложенията"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ИНФОРМАЦИЯ ЗА ПРИЛОЖЕНИЯТА"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Показване на %d скрити елемента</item>
<item quantity="one">Показване на %d скрит елемент</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Свиване"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Мрежа и интернет"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна мрежа"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"пренос на данни"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Приложения и известия"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Разрешения, приложения по подразбиране"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Достъпът до известията не е налице за приложенията в служебния потребителски профил."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Профили"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Няма добавени профили"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Приложения по подразбиране"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Езици, час, резервно копие, актуализации"</string>
<string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
- <string name="search_menu" msgid="6283419262313758339">"Търсете в настройките"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"Wi-Fi, Wi-Fi, връзка с мрежата, интернет, безжично, пренос на данни, Wi-Fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, превключване, контрола"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, изпращане на SMS, съобщения, изпращане на съобщения, по подразбиране"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"плащане, докосване, плащания"</string>
<string name="keywords_backup" msgid="470070289135403022">"резервно копие, създаване на резервно копие"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"жест"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"лице, отключване, удостоверяване, вход"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl версия, версия на софтуера на imei"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"мрежа, състояние на мобилната мрежа, състояние на услугата, сила на сигнала, тип мобилна мрежа, роуминг, идентификатор на карта с ИС"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериен номер, версия на хардуера"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"тъмна тема"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"програмна грешка"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Дисплей, открояващ важни неща, дисплей на заключения екран"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"известие на заключения екран"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"лице"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"отпечатък"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"затъмняване на екрана, сензорен екран, батерия, интелигентна яркост, динамична яркост"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Когато въведете ПИН кода си, за да стартирате това устройство, услугите за достъпност, като например <xliff:g id="SERVICE">%1$s</xliff:g>, още няма да бъдат налични."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Когато въведете фигурата си, за да стартирате това устройство, услугите за достъпност, като например <xliff:g id="SERVICE">%1$s</xliff:g>, още няма да бъдат налични."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Когато въведете паролата си, за да стартирате това устройство, услугите за достъпност, като например <xliff:g id="SERVICE">%1$s</xliff:g>, още няма да бъдат налични."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Забележка: След рестартиране това приложение не може да се стартира, докато не отключите телефона си"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Забележка: Ако рестартирате телефона си и сте задали опция за заключване на екрана, това приложение не може да стартира, докато не отключите устройството си"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Информация за IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Информация относно IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(слот <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Лични"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Служебни"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Приложения: Всички"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Приложения: Изключени"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Изключено"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категории: Неотложна важност"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категории: Малка важност"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категории: Изключени"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Сигнали за употребата"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Инф. за използване на у-вото"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Употреба на прилож.: Показване"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Висок разход"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other">Поведението на <xliff:g id="NUMBER">%2$d</xliff:g> приложения е необичайно</item>
<item quantity="one">Поведението на <xliff:g id="APP">%1$s</xliff:g> е необичайно</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Вътрешно хранилище: Използвано място: <xliff:g id="PERCENTAGE">%1$s</xliff:g> – свободно място: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Преминаване в спящ режим след неактивност в продължение на <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Тапет, спящ режим, размер на шрифта"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Преминаване в спящ режим след 10-минутна неактивност"</string>
<string name="memory_summary" msgid="8080825904671961872">"Използвана памет: Средно <xliff:g id="USED_MEMORY">%1$s</xliff:g> от <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Влезли сте като <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS съобщенията не са разрешени"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Използването на камерата не е разрешено"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Екранните снимки не са разрешени"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Функцията за резервни копия не може да се изключи"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Това приложение не може да бъде отворено"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Ако имате въпроси, свържете се със системния си администратор"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Още подробности"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Възпроизвеждане на екран с прорез"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Прорез на екрана"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"прорез на екрана, изрез"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Без"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Стандартна настройка за устройството"</string>
<string name="special_access" msgid="3458780842491881155">"Специален достъп за приложението"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> приложения могат да използват неограничено количество данни</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Установена е връзка с/ъс <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Установена е връзка с няколко устройства"</string>
<string name="demo_mode" msgid="2798762752209330277">"Демонстрационен режим на системния ПИ"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Нощен режим"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Задаване на нощен режим"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Тъмен режим"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Задаване на тъмен режим"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочки за бързи настройки за програмисти"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Трасиране на Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Настройки за служебния потребителски профил"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Търсене на контакт"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Разрешете търсене на контакти от организацията ви с цел идентифициране на обаждащите се и контактите"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двукратно докосване за проверка на телефона"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Двукратно докосване за проверка на таблета"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Двукратно докосване за проверка на устройството"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"За да проверите часа, иконите за известия и друга информация, докоснете екрана два пъти."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"За да проверите часа, известията и друга информация, докоснете екрана два пъти."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Повдигане на телефона за проверка"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Повдигане за проверка на таблета"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Повдигане за проверка на устройството"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"За да проверите часа, иконите за известия и друга информация, вземете телефона си в ръка."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"За да проверите часа, иконите за известия и друга информация, вземете таблета си в ръка."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"За да проверите часа, иконите за известия и друга информация, вземете устройството си в ръка."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Активиране на дисплея"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"За да проверите часа, известията и друга информация, вземете телефона си в ръка."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"За да проверите часа, известията и друга информация, вземете таблета си в ръка."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"За да проверите часа, известията и друга информация, вземете устройството си в ръка."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Жест за активиране на заключения екран"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Преглед на известията с плъзване през сензора за отпечатъци"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Плъзгане през сензора за отпечат."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"За да проверите известията си, плъзнете пръст надолу през сензора за отпечатъци на гърба на телефона си."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> опита</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> опит</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"За данните на това устройство се създава резервно копие"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Това устройство се управлява от организацията ви."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Това устройство се управлява от <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Услуга за автоматично попълване"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"автомативно, попълване, автоматично попълване"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Уверете се, че имате доверие на това приложение</b> <br/> <br/> <xliff:g id=app_name example=Функцията на Google за автоматично попълване>%1$s</xliff:g> използва това, което е на екрана ви, за да определи какво може да се попълни автоматично."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Автоматично попълване"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Ниво на регистриране"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Максимален брой заявки на сесия"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Максимален брой видими набори от данни"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Възстановяване на стандартните стойности"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Опциите за автоматично попълване за програмисти са нулирани"</string>
<string name="device_theme" msgid="4571803018917608588">"Тема на устройството"</string>
<string name="default_theme" msgid="7085644992078579076">"Стандартно"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Име на мрежата"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Задействане на обезпечаването от оператора"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Актуализиране на режима „Не безпокойте“"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Поставете известията на пауза, за да не ви разсейват"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Нови и вълнуващи неща"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Запознайте се с новия си телефон"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознайте се с новия си таблет"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Запознайте се с новото си устройство"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Тази функция не е налице на устройството"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Налагане на пълно проследяване на измерванията с GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Проследяване на всички констелации и честоти на GNSS без използване на коефициент на запълване"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Диалоговият прозорец за сривове да се показва винаги"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Диалоговият прозорец да се показва всеки път, когато дадено приложение претърпи срив"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Избиране на активирано за ANGLE приложение"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Няма зададено приложение, активирано за ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Активирано за ANGLE приложение: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Достъп до директорията"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"достъп до директорията"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Подробности за мрежата"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Името на устройството ви е видимо за приложенията на телефона ви. То може да се вижда и от други хора, когато се свържете с устройства с Bluetooth или настроите точка за достъп до Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Устройства"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Всички настройки"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Предложения"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Данни чрез CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Данни чрез CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Избиране на мрежа"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Връзката е прекратена"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Установена е връзка"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Установява се връзка…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Не можа да се установи връзка"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Няма намерени мрежи."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Не можаха да бъдат намерени мрежи. Опитайте отново."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(забранено)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Няма SIM карта"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Разширени обаждания"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Предпочитан режим на мрежата: Предпочита се WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Предпочитан режим на мрежата: Само GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Предпочитан режим на мрежата: Само WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Предпочитан режим на мрежата: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Предпочитан режим на мрежата: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Предпочитан режим на мрежата: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Предпочитан режим на мрежата: Само CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Предпочитан режим на мрежата: Само EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Предпочитан режим на мрежата: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Предпочитан режим на мрежата: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Предпочитан режим на мрежата: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Предпочитан режим на мрежата: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Предпочитан режим на мрежата: Глобална мрежа"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Предпочитан режим на мрежата: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Предпочитан мрежов режим: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Предпочитан режим на мрежата: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Предпочитан режим на мрежата: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Предпочитан режим на мрежата: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Предпочитан режим на мрежата: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Предпочитан режим на мрежата: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Предпочитан режим на мрежата: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Предпочитан режим на мрежата: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Предпочитан режим на мрежата: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Предпочитан режим на мрежата: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Предпочитан режим на мрежата: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Предпочитан режим на мрежата: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (препоръчително)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (препоръчително)"</string>
+ <string name="network_global" msgid="959947774831178632">"Глобална мрежа"</string>
+ <string name="label_available" msgid="1731547832803057893">"Налични мрежи"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Търси се…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Извършва се регистрация в(ъв) <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM картата ви не позволява връзка с тази мрежа."</string>
+ <string name="connect_later" msgid="978991102125216741">"В момента не може да се осъществи връзка с тази мрежа. Опитайте отново по-късно."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Извършена е регистрация в мрежа."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Автоматично избиране на мрежа"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Настройки за оператора"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Настройка на услугата за данни"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Мобилни данни"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Достъп до данните през мобилната мрежа"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Предпочитан тип мрежа"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Промяна на операционния режим на мрежата"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Предпочитан тип мрежа"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Оператор"</string>
+ <string name="call_category" msgid="8108654745239563833">"Обаждания"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Видеообаждания от оператора"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Избор на система"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Промяна на режима на роуминг на CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Избор на система"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Мрежа"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Мрежа"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Абонамент за CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Промяна между RUIM/SIM и NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"абонамент"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Регистрира се автоматично..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Да се разреши ли роуминг на данни?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"За цени се обърнете към оператора си."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Пренос на данни от приложенията"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Невалиден мрежов режим <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Пренебрегване."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Не е налице, когато е установена връзка с(ъс) <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Вижте още"</string>
+ <string name="see_less" msgid="1250265310929558370">"Преглед на по-малко"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <item quantity="other">Свързани са <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> устройства</item>
+ <item quantity="one">Свързано е <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> устройство</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Няма свързани устройства"</string>
</resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 169627c..5f6e72e 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -275,7 +275,7 @@
<item msgid="26109888160231211">"লোকেশন নিরীক্ষণ করুন"</item>
<item msgid="5753382310468855812">"উচ্চ ক্ষমতার লোকেশন নিরীক্ষণ করুন"</item>
<item msgid="3356591542543137332">"ব্যবহারের পরিসংখ্যান পান"</item>
- <item msgid="3073734345226842233">"মাইক্রোফোন নিঃশব্দ/সশব্দ করুন"</item>
+ <item msgid="3073734345226842233">"মাইক্রোফোন মিউট/সশব্দ করুন"</item>
<item msgid="2111767435887685265">"টোস্ট দেখান"</item>
<item msgid="1091168669714823370">"মিডিয়া প্রোজেক্ট করুন"</item>
<item msgid="485564189219029300">"VPN সক্রিয় করুন"</item>
@@ -342,7 +342,7 @@
<item msgid="8584357129746649222">"লোকেশন"</item>
<item msgid="7669257279311110599">"লোকেশন"</item>
<item msgid="3459320345690097795">"ব্যবহারের পরিসংখ্যান পান"</item>
- <item msgid="1312534577834048535">"মাইক্রোফোন নিঃশব্দ/সশব্দ করুন"</item>
+ <item msgid="1312534577834048535">"মাইক্রোফোন মিউট/সশব্দ করুন"</item>
<item msgid="427580389823724225">"টোস্ট দেখান"</item>
<item msgid="4992007785575926253">"মিডিয়াতে অভিক্ষেপ করুন"</item>
<item msgid="2482631530338029480">"VPN সক্রিয় করুন"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"মিটারিং চালু রাখুন"</item>
<item msgid="2266114985518865625">"মিটারিং এর দরকার নেই"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ডিফল্ট (র্যান্ডমাইজ করা MAC ব্যবহার করুন)"</item>
+ <item msgid="5398461510512959597">"বিশ্বস্ত"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"না"</item>
<item msgid="3863157480502955888">"হ্যাঁ"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"সবসময় চালু"</item>
<item msgid="6385301106124765323">"সবসময় বন্ধ"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"বন্ধ"</item>
+ <item msgid="2182686878828390312">"ডিবাগ"</item>
+ <item msgid="5286514712714822064">"ভার্বোস"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"শুধুমাত্র হোমে"</item>
+ <item msgid="5034813753274486448">"অটোমেটিক"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA ব্যবহার করতে চাই"</item>
+ <item msgid="807926878589867564">"শুধুমাত্র GSM"</item>
+ <item msgid="488474605709912156">"শুধুমাত্র WCDMA"</item>
+ <item msgid="1912421096218750039">"অটোমেটিক GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"অটোমেটিক CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"EvDo ছাড়া CDMA"</item>
+ <item msgid="4678789463133969294">"শুধুমাত্র EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"গ্লোবাল"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"শুধুমাত্র TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/সিম"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"০"</item>
+ <item msgid="8113210705878681550">"১"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"গ্লোবাল"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"১০"</item>
+ <item msgid="4187053702071521357">"৮"</item>
+ <item msgid="5461421967189969022">"৯"</item>
+ </string-array>
</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 2f6adc9..cce0a9c 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"তৈরি করুন"</string>
<string name="allow" msgid="3349662621170855910">"অনুমতি দিন"</string>
<string name="deny" msgid="6947806159746484865">"অস্বীকার করুন"</string>
- <string name="dlg_close" msgid="7471087791340790015">"বন্ধ করুন"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"পাল্টান"</string>
<string name="device_info_default" msgid="7847265875578739287">"অজানা"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">একজন ডেভেলপার হওয়া থেকে আপনি এখন <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> পদক্ষেপ দূরে রয়েছেন৷</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"কোনও প্রয়োজন নেই, আপনি ইতিমধ্যেই একজন ডেভেলপার।"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"প্রথমে ডেভেলপারের বিকল্পগুলি সক্রিয় করুন।"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"ওয়্যারলেস ও নেটওয়ার্ক"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"সংযোগগুলি"</string>
- <string name="header_category_device" msgid="4544026001618307754">"ডিভাইস"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ব্যক্তিগত"</string>
- <string name="header_category_access" msgid="7580499097416970962">"অ্যাক্সেস"</string>
<string name="header_category_system" msgid="2816866961183068977">"সিস্টেম"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ডেটা কানেকশন সক্রিয় আছে"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ডেটা কানেকশন নিষ্ক্রিয় আছে"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ডিভাইসের ব্লুটুথ ঠিকানা: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর ডিসকানেক্ট করবেন?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"সম্প্রচার করা হচ্ছে"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"নামবিহীন ব্লুটুথ ডিভাইস"</string>
<string name="progress_scanning" msgid="192587958424295789">"সার্চ করা হচ্ছে"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"কাছাকাছি কোনো ব্লুটুথ ডিভাইস পাওয়া যায়নি।"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"একটি অ্যাপ ব্লুটুথ চালু করতে চাইছে এবং অন্য ডিভাইসগুলির কাছে আপনার ফোনটিকে দৃশ্যমান করতে চাইছে। আপনি পরে ব্লুটুথ সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ব্লুটুথ চালু করা হচ্ছে..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ব্লুটুথ বন্ধ করা হচ্ছে..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"স্বতঃ-কানেক্ট"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ব্লুটুথ সংযোগের অনুরোধ"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" এ কানেক্ট করতে আলতো চাপুন।"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"আপনি কি \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" এ কানেক্ট করতে চান?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"কল করার জন্য উপলভ্য ডিভাইস"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"এখন কানেক্ট"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"সেভ করে রাখা ডিভাইস"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"ডিভাইস যোগ করুন"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"পেয়ার করার জন্য ব্লুটুথ চালু হবে"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"পছন্দের কানেকশন"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"আগে কানেক্ট করা ডিভাইস"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"আগে কানেক্ট করা"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ব্লুটুথ চালু হয়েছে"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"সবগুলি"</string>
<string name="date_and_time" msgid="9062980487860757694">"দিন ও তারিখ"</string>
<string name="choose_timezone" msgid="1362834506479536274">"সময় অঞ্চল বেছে নিন"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"এড়িয়ে যান"</string>
<string name="next_label" msgid="4693520878012668114">"পরবর্তী"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ভাষা"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ভাষা পছন্দগুলি"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"সরান"</string>
<string name="add_a_language" msgid="2330538812283783022">"একটি ভাষা যোগ করুন"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"সেটিংস"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"সেটিংস শর্টকাট"</string>
<string name="airplane_mode" msgid="8837269988154128601">"বিমান মোড"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"আরো"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"ওয়্যারলেস ও নেটওয়ার্ক"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"ওয়াই-ফাই, ব্লুটুথ, বিমান মোড, মোবাইল নেটওয়ার্কগুলি ও VPNs পরিচালনা করুন"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"মোবাইল ডেটা"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"গোপনীয়তা"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
<string name="security_status_title" msgid="5848766673665944640">"নিরাপত্তা স্থিতি"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"স্ক্রিন লক, মুখের সাহায্যে আনলক"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"স্ক্রিন লক, আঙ্গুলের ছাপ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"স্ক্রিন লক"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ফেস যোগ করা হয়েছে"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"আপনার ফেস দিয়ে আনলক করুন"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"যাচাইকরণ করতে আপনার ফেস ব্যবহার করুন"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"আপনার ফোন আনলক, কেনাকাটা অনুমোদন বা অ্যাপগুলিতে সাইন-ইন করতে আপনার ফেস ব্যবহার করুন।"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"আপনাকে ব্যবহার"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"আপনার ফোন আনলক বা কেনাকাটাগুলির অনুমোদন করতে আপনার ফেস ব্যবহার করুন। \n\nদ্রষ্টব্য: আপনি এই ডিভাইসটি আনলক করার জন্য আপনার ফেস ব্যবহার করতে পারবেন না। আরও তথ্যের জন্য, আপনার প্রতিষ্ঠানের অ্যাডমিনের সাথে যোগাযোগ করুন।"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"আপনার ফোন আনলক, কেনাকাটা অনুমোদন বা অ্যাপগুলিতে সাইন-ইন করতে আপনার ফেস ব্যবহার করুন"</string>
- <string name="face_add_max" msgid="2342250989212694454">"আপনি <xliff:g id="COUNT">%d</xliff:g>টি পর্যন্ত আঙ্গুলের ছাপ যোগ করতে পারেন"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"বৃত্তের মাঝে আপনার ফেসটি আনুন"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"এটি পরে করুন"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"আপনি <xliff:g id="COUNT">%d</xliff:g>টি পর্যন্ত ফেস যোগ করতে পারেন"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"আপনি অনুমোদিত সর্বোচ্চ সংখ্যক ফেস যোগ করেছেন"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"এর বেশি ফেস যোগ করা যাবে না"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"নথিভুক্ত করা যায়নি"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ঠিক আছে"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"ফেস নথিভুক্তের সময়সীমা শেষ হয়েছে। আবার চেষ্টা করুন৷"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ফেস নথিভুক্ত বিকল্প কাজ করেনি।"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"সমস্ত সেট আছে। সবকিছু ঠিক লাগছে।"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"হয়ে গেছে"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"আপনার মুখ ব্যবহার"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"আপনার ডিভাইস আনলক করুন"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"অ্যাপ সাইন-ইন ও পেমেন্ট"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"আনলক করার জন্য চোখ খুলে রাখা"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"ফেস যাচাইকরণ ব্যবহারের সময় আপনার চোখ খুলে রাখতে হবে"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"মুখের ডেটা সরান"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"আপনার মুখের ডেটা আরও ভাল করুন"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"আপনার মুখ ব্যবহার করে ডিভাইস আনলক এবং অ্যাপে অ্যাক্সেস করতে পারেন। "<annotation id="url">"আরও জানুন"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"আঙ্গুলের ছাপ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"আঙ্গুলের ছাপগুলি পরিচালনা করুন"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"এর জন্য আঙ্গুলের ছাপ ব্যবহার করুন"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"৫.০ GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"ওয়াই-ফাই হটস্পটের জন্য অন্তত একটি ব্যান্ড বেছে নিন:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP সেটিংস"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"গোপনীয়তা"</string>
<string name="wifi_shared" msgid="844142443226926070">"অন্য ডিভাইস ব্যবহারকারীদের সাথে শেয়ার করুন"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(অপরিবর্তিত)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"অনুগ্রহ করে বেছে নিন"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"বাতিল করুন"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"নেটওয়ার্ক ভুলে গেছেন?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"এই নেটওয়ার্কের সব পাসওয়ার্ড মুছে ফেলা হবে"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"সেভ করা নেটওয়ার্ক"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%dটি নেটওয়ার্ক</item>
<item quantity="other">%dটি নেটওয়ার্ক</item>
@@ -1039,7 +1046,7 @@
<string name="all_volume_title" msgid="4296957391257836961">"ভলিউম"</string>
<string name="musicfx_title" msgid="3415566786340790345">"সঙ্গীত প্রভাব"</string>
<string name="ring_volume_title" msgid="5592466070832128777">"রিং ভলিউম"</string>
- <string name="vibrate_in_silent_title" msgid="3897968069156767036">"নিঃশব্দ থাকাকালীন ভাইব্রেট"</string>
+ <string name="vibrate_in_silent_title" msgid="3897968069156767036">"মিউট থাকাকালীন ভাইব্রেট"</string>
<string name="notification_sound_title" msgid="5137483249425507572">"ডিফল্ট বিজ্ঞপ্তির সাউন্ড"</string>
<string name="incoming_call_volume_title" msgid="8073714801365904099">"রিংটোন"</string>
<string name="notification_volume_title" msgid="2012640760341080408">"বিজ্ঞপ্তি"</string>
@@ -1057,12 +1064,12 @@
<string name="audio_record_proc_title" msgid="4271091199976457534">"অপ্রয়োজনীয় আওয়াজ বাতিলকরণ"</string>
<string name="volume_media_description" msgid="7949355934788807863">"সঙ্গীত, ভিডিও, গেম্স, ও অন্যান্য মিডিয়া"</string>
<string name="volume_ring_description" msgid="5936851631698298989">"রিংটোন ও বিজ্ঞপ্তি"</string>
- <string name="volume_notification_description" msgid="5810902320215328321">"বিজ্ঞপ্তিগুলি"</string>
+ <string name="volume_notification_description" msgid="5810902320215328321">"বিজ্ঞপ্তি"</string>
<string name="volume_alarm_description" msgid="8322615148532654841">"অ্যালার্মগুলি"</string>
- <string name="volume_ring_mute" msgid="3018992671608737202">"রিংটোন ও বিজ্ঞপ্তি নিঃশব্দ করুন"</string>
- <string name="volume_media_mute" msgid="3399059928695998166">"সঙ্গীত ও অন্যান্য মিডিয়া নিঃশব্দ করুন"</string>
- <string name="volume_notification_mute" msgid="7955193480006444159">"নিঃশব্দ বিজ্ঞপ্তিগুলি"</string>
- <string name="volume_alarm_mute" msgid="4452239420351035936">"অ্যালার্ম নিঃশব্দ করুন"</string>
+ <string name="volume_ring_mute" msgid="3018992671608737202">"রিংটোন ও বিজ্ঞপ্তি মিউট করুন"</string>
+ <string name="volume_media_mute" msgid="3399059928695998166">"সঙ্গীত ও অন্যান্য মিডিয়া মিউট করুন"</string>
+ <string name="volume_notification_mute" msgid="7955193480006444159">"মিউট বিজ্ঞপ্তিগুলি"</string>
+ <string name="volume_alarm_mute" msgid="4452239420351035936">"অ্যালার্ম মিউট করুন"</string>
<string name="dock_settings" msgid="1820107306693002541">"ডক করুন"</string>
<string name="dock_settings_title" msgid="9161438664257429372">"ডক সেটিংস"</string>
<string name="dock_audio_settings_title" msgid="3324750259959570305">"অডিও"</string>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"উজ্জ্বলতা"</string>
<string name="brightness_summary" msgid="838917350127550703">"স্ক্রীনের উজ্জ্বলতা সামঞ্জস্য করুন"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"অভিযোজিত উজ্জ্বলতা"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"চালু আছে"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"বন্ধ আছে"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"পছন্দের উজ্জ্বলতার মান খুব কম"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"পছন্দের উজ্জ্বলতার মান কম"</string>
@@ -1122,7 +1128,7 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"উপলব্ধ আলোর জন্য মানানসই উজ্জ্বলতার স্তর। যখন এই বৈশিষ্ট্যটি চালু থাকবে, তখনও অস্থায়ীভাবে আপনি উজ্জ্বলতা নিয়ন্ত্রণ করতে পারবেন।"</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"আপনার পারিপার্শ্বিক অবস্থা এবং অ্যাক্টিভিটি অনুযায়ী স্ক্রিনের উজ্জ্বলতা নিজে থেকেই অ্যাডজাস্ট করে নেওয়া হবে। স্ক্রিন কতখানি উজ্জ্বল হলে আপনার সুবিধা হয়, তা আপনি স্লাইডারের মাধ্যমে নির্দিষ্ট করে দিতে পারেন।"</string>
<string name="night_display_title" msgid="2626451512200357686">"নাইট লাইট"</string>
- <string name="night_display_text" msgid="1837277457033025056">"নাইট লাইট আপনার স্ক্রিনকে হলুদাভ করে দেয়৷ এটি আপনাকে অল্প আলোয় স্ক্রিনের দিকে স্বচ্ছন্দে তাকানোর সুবিধা দেয় এবং খুব ঘুমিয়ে পড়তে সাহায্য করতে পারে৷"</string>
+ <string name="night_display_text" msgid="1837277457033025056">"নাইট লাইট আপনার স্ক্রিনকে হলুদাভ করে দেয়৷ এটি আপনাকে অল্প আলোয় স্ক্রিনের দিকে স্বচ্ছন্দে তাকানোর সুবিধা দেয় এবং সহজে ঘুমিয়ে পড়তে সাহায্য করে৷"</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"সময়সূচি"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"কোনো কিছুই নয়"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"কাস্টম সময়ে চালু করুন"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"পিন পরিবর্তন করা যাবে না।\nসম্ভবত ভুল পিন।"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"সিম পিন সফলভাবে পরিবর্তন করা হয়েছে"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"সিম কার্ড লক অবস্থা পরিবর্তন করা যাবে না।\nসম্ভবত ভুল পিন।"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"পিন বন্ধ করা যায়নি৷"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"পিন চালু করা যায়নি৷"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ঠিক আছে"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"বাতিল করুন"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"একাধিক সিম পাওয়া গেছে"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> ফর্ম্যাট করার প্রযোজন হবে৷ \n\n"<b>"ফর্ম্যাট করা হলে <xliff:g id="NAME_1">^1</xliff:g> এ বর্তমানে মজুত সমস্ত ডেটা মুছে যাবে৷"</b>" ডেটা যাতে হারিয়ে না যায় তার জন্য এটির ব্যাক-আপ নেওয়ার কথা বিবেচনা করুন৷"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"মুছুন এবং ফর্ম্যাট করুন"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ফর্ম্যাট করা হচ্ছে…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"ফরম্যাট করার সময় <xliff:g id="NAME">^1</xliff:g> সরাবেন না।"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"ফরম্যাট করার সময় <xliff:g id="NAME">^1</xliff:g> সরাবেন না।"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ডেটা নতুন সঞ্চয়স্থানে সরান"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"আপনি আপনার ফটো, ফাইল এবং কিছু অ্যাপ্লিকেশানকে এই নতুন <xliff:g id="NAME">^1</xliff:g> -এ স্থানান্তর করতে পারেন। \n\nএই স্থানান্তরণের জন্য প্রায় <xliff:g id="TIME">^2</xliff:g> সময় লাগবে এবং অভ্যন্তরীণ সঞ্চয়স্থানে <xliff:g id="SIZE">^3</xliff:g> খালি হবে। এই প্রক্রিয়া চলার সময়ে কিছু অ্যাপ্লিকেশান কাজ করবে না।"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"এখন সরান"</string>
@@ -1666,7 +1674,7 @@
<string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"শুধুমাত্র <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> দ্বারা আনলক করে রেখে দেওয়ার সময় ছাড়া"</string>
<string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"আনলক প্যাটার্ন সেট করুন"</string>
<string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"আনলক প্যাটার্ন পরিবর্তন করুন"</string>
- <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"কিভাবে একটি আনলক প্যাটার্ন আঁকবেন"</string>
+ <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"কীভাবে একটি আনলক প্যাটার্ন আঁকবেন"</string>
<string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"অনেকবার ভুল প্রচেষ্টা করা হয়েছে৷ <xliff:g id="NUMBER">%d</xliff:g> সেকেন্ডের মধ্যে আবার চেষ্টা করুন৷"</string>
<string name="activity_not_found" msgid="5551664692991605325">"আপনার ফোনে অ্যাপ্লিকেশান ইনস্টল করা নেই৷"</string>
<string name="lock_settings_profile_title" msgid="2121876391814535295">"কর্মস্থলের প্রোফাইলের নিরাপত্তা"</string>
@@ -1726,7 +1734,7 @@
<string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"আপনি এই অ্যাপ্লিকেশানটিকে উইজেটগুলিকে তৈরি করা এবং তাদের ডেটা অ্যাক্সেস করার মঞ্জুরি দেওয়া চয়ন করেছেন৷"</string>
<string name="auto_launch_disable_text" msgid="7800385822185540166">"কোনো ডিফল্ট সেট করা নেই৷"</string>
<string name="clear_activities" msgid="7408923511535174430">"ডিফল্টগুলি সাফ করুন"</string>
- <string name="screen_compatibility_text" msgid="1616155457673106022">"এই অ্যাপ্লিকেশানটি হয়ত আপনার স্ক্রীনের জন্য ডিজাইন করা হয়নি। আপনার স্ক্রীনে এটি কিভাবে সামঞ্জস্য করবে আপনি তা এখানে নিয়ন্ত্রণ করতে পারেন।"</string>
+ <string name="screen_compatibility_text" msgid="1616155457673106022">"এই অ্যাপ্লিকেশানটি হয়ত আপনার স্ক্রীনের জন্য ডিজাইন করা হয়নি। আপনার স্ক্রীনে এটি কীভাবে সামঞ্জস্য করবে আপনি তা এখানে নিয়ন্ত্রণ করতে পারেন।"</string>
<string name="ask_compatibility" msgid="7225195569089607846">"লঞ্চ করার সময় জিজ্ঞাসা করুন"</string>
<string name="enable_compatibility" msgid="5806819252068617811">"স্কেল অ্যাপ্লিকেশন"</string>
<string name="unknown" msgid="1592123443519355854">"অজানা"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ইনস্টল করা হয়েছে"</string>
<string name="no_applications" msgid="7336588977497084921">"কোনো অ্যাপ্লিকেশান নেই"</string>
<string name="internal_storage" msgid="1584700623164275282">"ইন্টারনাল স্টোরেজ"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ইন্টারনাল স্টোরেজ"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB স্টোরেজ"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD কার্ড স্টোরেজ"</string>
<string name="recompute_size" msgid="7722567982831691718">"আকার আবার গণনা করা হচ্ছে..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"অ্যাপ্লিকেশান ডেটা মুছবেন?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"এই অ্যাপ্লিকেশানের সমস্ত ডেটা স্থায়ীভাবে মুছে যাবে। সমস্ত ফাইল, সেটিংস, অ্যাকাউন্ট, ডেটাবেস ইত্যাদি সবই।"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"অ্যাপ্লিকেশানটি ইনস্টল থাকা অ্যাপ্লিকেশানগুলির তালিকায় পাওয়া যায়নি।"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"অ্যাপের জন্য স্টোরেজ সাফ করা যায়নি।"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"এই অ্যাপ্লিকেশানটি আপনার ট্যাবলেটের নিম্নলিখিত জিনিস অ্যাক্সেস করতে পারবে:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"এই অ্যাপ্লিকেশানটি আপনার ফোনের নিম্নলিখিত জিনিস অ্যাক্সেস করতে পারবে:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"এই অ্যাপ্লিকেশানটি আপনার ট্যাবলেট উপর নিম্নলিখিত জিনিসগুলি অ্যাক্সেস করবে। কার্য-সম্পাদনা উন্নত করতে এবং মেমরি ব্যবহার কমাতে, কিছু অনুমতি <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> এ উপলব্ধ কারণ এটি <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> এর সমরুপ প্রক্রিয়াতেই চলে।"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"আপনার ফোনে এই অ্যাপ্লিকেশানটি নিম্নলিখিত জিনিসগুলি অ্যাক্সেস করবে। কর্মক্ষমতা উন্নত করতে এবং মেমরি ব্যবহার কমাতে এইসবের কিছু অনুমতি <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> এ উপলব্ধ কারণ এটি <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> এর মত একই প্রক্রিয়ায় চলে:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> এবং <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"এই অ্যাপ্লিকেশানটি আপনাকে অর্থ ধার্য করতে পারে:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Premium SMS পাঠান"</string>
<string name="computing_size" msgid="1599186977475211186">"কম্পিউটিং..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"প্যাকেজের মাপ গণনা করা যায়নি"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"আপনার কোনো তৃতীয় পক্ষের অ্যাপ্লিকেশান ইনস্টল করা নেই।"</string>
<string name="version_text" msgid="9189073826278676425">"ভার্সন<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"সরান"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ট্যাবলেটে সরান"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ফোনে সরান"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB সঞ্চয়স্থানে সরান"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD কার্ডে সরান"</string>
- <string name="moving" msgid="6431016143218876491">"সরানো হচ্ছে"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"আরেকটি স্থানান্তরনের কাজ আগে থেকেই চলছে৷"</string>
<string name="insufficient_storage" msgid="481763122991093080">"পর্যাপ্ত স্টোরেজ নেই।"</string>
<string name="does_not_exist" msgid="1501243985586067053">"অ্যাপ্লিকেশানটি বিদ্যমান নেই।"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"ডিভাইস প্রশাসক অ্যাপটি এক্সটার্নাল মিডিয়াতে ইনস্টল করা যাবে না"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"জোর করে বন্ধ করবেন?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"আপনি একটি অ্যাপ্লিকেশানকে জোর করে বন্ধ করলে, তা অস্বাভাবিক ব্যবহার করতে পারে।"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"অ্যাপ্লিকেশান সরানো যায়নি। <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"পছন্দের ইনস্টল লোকেশন"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"নতুন অ্যাপ্লিকেশানগুলির জন্য পছন্দসই ইনস্টলেশানের লোকেশন পরিবর্তন করুন"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"অন্তর্ভুক্ত অ্যাপ্লিকেশান অক্ষম করবেন?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"অ্যাপ্লিকেশান অক্ষম করুন"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"আপনি এই অ্যাপটি অক্ষম করলে, Android এবং অন্যান্য অ্যাপ্লিকেশানকে যে কাজের উদ্দেশ্যে তৈরি করা হয়েছিল সেগুলি আর কাজ নাও করতে পারে৷"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ডেটা মুছে দেবেন এবং অ্যাপ্লিকেশন অক্ষম করবেন?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"আপনি যদি এই অ্যাপ্লিকেশানটিকে অক্ষম করেন, Android এবং অন্যান্য অ্যাপ্লিকেশানকে যে কাজের উদ্দেশ্যে তৈরি করা হয়েছিল সেগুলি আর কাজ নাও করতে পারে৷ আপনার ডেটাও মুছে যাবে।"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"বিজ্ঞপ্তিগুলি বন্ধ করবেন?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"আপনি যদি এই অ্যাপ্লিকেশানের জন্য বিজ্ঞপ্তিগুলিকে বন্ধ করনে তাহলে আপনি গুরুত্বপূর্ণ সতর্কতা এবং আপডেটগুলি নাও পেতে পারেন৷"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"স্টোর"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"অ্যাপের বিশদ বিবরণ"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"অ্যাপটিকে <xliff:g id="APP_STORE">%1$s</xliff:g> থেকে ইনস্টল করা হয়েছে"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"পরিষেবা ব্যবহার করুন"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"কালার কারেকশন ব্যবহার করুন"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ক্যাপশন ব্যবহার করুন"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"এগিয়ে যান"</string>
<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="6371077608778830020">"হিয়ারিং এড যোগ করুন"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"কোনও অ্যাপের ব্যাকগ্রাউন্ড অ্যাক্টিভিটি সীমিত করলে তা সঠিক ভাবে কাজ নাও করতে পারে"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"যেহেতু এই অ্যাপটিকে ব্যাটারি অপ্টিমাইজ করার জন্য সেট করা হয়নি, তাই আপনি এটির অ্যাক্টিভিটি সীমিত করতে পারবেন না।\n\nঅ্যাপের অ্যাক্টিভিটি সীমিত করতে আগে ব্যাটারি অপ্টিমাইজেশন চালু করুন।"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"সম্পূর্ণ চার্জ করার সময় থেকে স্ক্রিনের ব্যবহার"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"স্ক্রিনের জন্য ব্যবহার"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"মোবাইল নেটওয়ার্ক স্ক্যান করা"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"সম্পূর্ণ চার্জ দেওয়ার পর থেকে ব্যাটারির ব্যবহার"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"সম্পূর্ণ চার্জ হওয়ার সময় থেকে স্ক্রিন কত সময় চালু রয়েছে"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"সম্পূর্ণ চার্জ করার সময় থেকে ডিভাইসের ব্যবহার"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"বিবরণ ব্যবহার করুন"</string>
<string name="controls_subtitle" msgid="390468421138288702">"বিদ্যুতের ব্যবহার সামঞ্জস্য করুন"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"অন্তর্ভুক্ত প্যাকেজগুলি"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"অ্যাপ চলার কারণে ব্যাটারি কমে যাচ্ছে"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ডিভাইসটিকে সক্রিয় রাখা হচ্ছে"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ডিভাইসটিকে পটভূমিতে সক্রিয় করা হচ্ছে"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"বারবার অবস্থানের অনুরোধ করা হচ্ছে"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g>টি অ্যাপে অস্বাভাবিক অ্যাক্টিভিটি দেখা যাচ্ছে"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"অ্যাপগুলি স্বাভাবিকভাবে কাজ করছে"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ফোনের ব্যাকগ্রাউন্ডে স্বাভাবিক পরিমাণে ব্যাটারি ব্যবহার হচ্ছে"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ট্যাবলেটের ব্যাকগ্রাউন্ডে স্বাভাবিক পরিমাণে ব্যাটারি ব্যবহার হচ্ছে"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">%1$dটি অ্যাপ কতখানি ব্যাটারি ব্যবহার করবে তাতে সীমা নির্দিষ্ট করা হচ্ছে</item>
<item quantity="other">%1$dটি অ্যাপ কতখানি ব্যাটারি ব্যবহার করবে তাতে সীমা নির্দিষ্ট করা হচ্ছে</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> সীমাবদ্ধ করা হয়েছে"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"এই অ্যাপগুলি ব্যাকগ্রাউন্ডে ব্যাটারি ব্যবহার করে চলেছে। ব্যাটারির ব্যবহার সীমাবদ্ধ করা হয়েছে, এমন অ্যাপগুলি সঠিকভাবে নাও চলতে পারে এবং সেগুলির বিজ্ঞপ্তি আসতে দেরি হতে পারে।"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"ব্যাটারি ম্যানেজার ব্যবহার করুন"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"অ্যাপের জন্য বেশি ব্যাটারি খরচ হচ্ছে কিনা সেই দিকে নজর রাখুন"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"বাতিল করুন"</string>
<string name="tts_reset" msgid="2661752909256313270">"রিসেট করুন"</string>
<string name="tts_play" msgid="2628469503798633884">"চালান"</string>
- <string name="gadget_title" msgid="5519037532720577836">"পাওয়ার নিয়ন্ত্রণ"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"ওয়াই-ফাই সেটিং আপডেট করা হচ্ছে"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ব্লুটুথ সেটিং আপডেট করা হচ্ছে"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"এতে"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"বন্ধ"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"চালু করুন"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"বন্ধ করুন"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"ওয়াই-ফাই"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ব্লুটুথ"</string>
- <string name="gadget_location" msgid="2974757497945178165">"লোকেশন"</string>
- <string name="gadget_sync" msgid="858895763714222152">"সিঙ্ক করুন"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"উজ্জ্বলতা <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"স্বয়ং"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"পূর্ণ"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"অর্ধ"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"বন্ধ"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ক্রেডেনশিয়াল স্টোরেজ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"স্টোরেজ থেকে ইনস্টল করুন"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>টির মধ্যে <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"সবগুলি বেছে নিন"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ডেটা ব্যবহার"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"অ্যাপ ডেটা ব্যবহার"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"মোবাইল ডেটা এবং ওয়াই-ফাই"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"পরিষেবা প্রদানকারীর ডেটার হিসাব আপনার ডিভাইস থেকে ভিন্ন হতে পারে।"</string>
<string name="data_usage_app" msgid="4970478397515423303">"অ্যাপ্লিকেশান ব্যবহার"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"অ্যাপের তথ্য"</string>
@@ -2882,7 +2853,7 @@
<string name="amber_alerts_summary" msgid="4312984614037904489">"শিশু অপহরণ সম্পর্কে বুলেটিন পান"</string>
<string name="repeat_title" msgid="6473587828597786996">"পুনরাবৃত্তি করুন"</string>
<string name="call_manager_enable_title" msgid="7718226115535784017">"কল ম্যানেজার সক্ষম করুন"</string>
- <string name="call_manager_enable_summary" msgid="8458447798019519240">"আপনার কল কিভাবে করা হবে তা পরিচালনা করতে এই পরিষেবাকে অনুমতি দিন।"</string>
+ <string name="call_manager_enable_summary" msgid="8458447798019519240">"আপনার কল কীভাবে করা হবে তা পরিচালনা করতে এই পরিষেবাকে অনুমতি দিন।"</string>
<string name="call_manager_title" msgid="4479949569744516457">"কল ম্যানেজার"</string>
<!-- no translation found for call_manager_summary (5918261959486952674) -->
<skip />
@@ -2962,7 +2933,6 @@
<item quantity="one">%dটি লুকানো আইটেম দেখান</item>
<item quantity="other">%dটি লুকানো আইটেম দেখান</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"সঙ্কুচিত করুন"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"নেটওয়ার্ক ও ইন্টারনেট"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"মোবাইল"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ডেটার ব্যবহার"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ব্লুটুথ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"অ্যাপ ও বিজ্ঞপ্তি"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"অনুমতিগুলি, ডিফল্ট অ্যাপ্স"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"কাজের প্রোফাইলে অ্যাপের জন্য বিজ্ঞপ্তি অ্যাক্সেস উপলভ্য নয়।"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"অ্যাকাউন্ট"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"কোনও অ্যাকাউন্ট যোগ করা হয়নি"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ডিফল্ট অ্যাপ"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ভাষা, সময়, ব্যাকআপ, আপডেট"</string>
<string name="search_results_title" msgid="1796252422574886932">"সেটিংস"</string>
- <string name="search_menu" msgid="6283419262313758339">"সেটিংস খুঁজুন"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"ওয়াই-ফাই, ওয়াই-ফাই, নেটওয়ার্ক কানেকশন, ইন্টারনেট, ওয়্যারলেস, ডেটা, ওয়াই-ফাই"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"ওয়াইফাই, ওয়াই-ফাই, চালু বন্ধ, নিয়ন্ত্রণ"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"টেক্সট মেসেজ, টেক্সট মেসেজ পাঠানো, মেসেজ, মেসেজ পাঠানো, ডিফল্ট"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"অর্থপ্রদান, আলতো চাপা, পেমেন্ট"</string>
<string name="keywords_backup" msgid="470070289135403022">"ব্যাক-আপ, ব্যাক-আপ করুন"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ইঙ্গিত"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ফেস, আনলক, যাচাই, সাইন-ইন"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl ভার্সন, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"নেটওয়ার্ক, মোবাইল নেটওয়ার্কের অবস্থা, পরিষেবার অবস্থা, সিগন্যালের অবস্থা, মোবাইল নেটওয়ার্কের ধরন, রোমিং, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"সিরিয়াল নম্বর, হার্ডওয়্যার ভার্সন"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"গাঢ় থিম"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"বাগ"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"অ্যাম্বিয়েন্ট ডিসপ্লে, লক স্ক্রিন ডিসপ্লে"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"লক স্ক্রিন বিজ্ঞপ্তি"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ফেস"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"আঙ্গুলের ছাপ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"অনুজ্জ্বল স্ক্রিন, টাচস্ক্রিন, ব্যাটারি, স্মার্ট উজ্জ্বলতা, ডায়নামিক উজ্জ্বলতা"</string>
@@ -3219,11 +3191,11 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"সমস্ত বিজ্ঞপ্তির সামগ্রীগুলি দেখান"</string>
<string name="lock_screen_notifications_summary_hide" msgid="8301305044690264958">"সংবেদনশীল কন্টেন্ট লুকান"</string>
<string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"কোনও বিজ্ঞপ্তি দেখাবেন না"</string>
- <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে বিজ্ঞপ্তি প্রদর্শন করতে চান?"</string>
- <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"বিজ্ঞপ্তিগুলি"</string>
+ <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"আপনার ডিভাইস লক করা অবস্থায় আপনি কীভাবে বিজ্ঞপ্তি প্রদর্শন করতে চান?"</string>
+ <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"বিজ্ঞপ্তি"</string>
<string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"সমস্ত কর্মস্থলের বিজ্ঞপ্তির কন্টেন্ট দেখুন"</string>
<string name="lock_screen_notifications_summary_hide_profile" msgid="2005907007779384635">"কাজের সংবেদনশীল কন্টেন্ট লুকান"</string>
- <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"আপনার ডিভাইস লক করা অবস্থায় আপনি কিভাবে প্রোফাইল বিজ্ঞপ্তিগুলি প্রদর্শন করতে চান?"</string>
+ <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"আপনার ডিভাইস লক করা অবস্থায় আপনি কীভাবে প্রোফাইল বিজ্ঞপ্তিগুলি প্রদর্শন করতে চান?"</string>
<string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"প্রোফাইল বিজ্ঞপ্তিগুলি"</string>
<string name="notifications_title" msgid="8086372779371204971">"বিজ্ঞপ্তি"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"অ্যাপ বিজ্ঞপ্তি"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"এই ডিভাইসটি চালু করার জন্য যখন আপনি আপনার পিন লিখবেন, তখনও <xliff:g id="SERVICE">%1$s</xliff:g> এর মতো অ্যাক্সেসযোগ্যতা বিষয়ক পরিষেবাগুলি উপলব্ধ হবে না৷"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"এই ডিভাইসটি চালু করার জন্য যখন আপনি আপনার প্যাটার্ন আঁকবেন, তখনও <xliff:g id="SERVICE">%1$s</xliff:g> এর মতো অ্যাক্সেসযোগ্যতা বিষয়ক পরিষেবাগুলি উপলব্ধ হবে না৷"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"এই ডিভাইসটি চালু করার জন্য যখন আপনি আপনার পাসওয়ার্ড লিখবেন, তখনও <xliff:g id="SERVICE">%1$s</xliff:g> এর মতো অ্যাক্সেসযোগ্যতা বিষয়ক পরিষেবাগুলি উপলব্ধ হবে না৷"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"দ্রষ্টব্য: পুনরায় চালু করার পরে, আপনি আপনার ফোন আনলক না করা পর্যন্ত এই অ্যাপটিকে চালু করতে পারবেন না"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"দ্রষ্টব্য: আপনি যদি নিজের ফোন রিস্টার্ট করেন এবং স্ক্রিন লক সেট করা থাকে, তাহলে আপনার ফোন আনলক না করা পর্যন্ত আপনি এই অ্যাপটিকে চালু করতে পারবেন না"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI তথ্য"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI আপেক্ষিক তথ্য"</string>
<string name="slot_number" msgid="3762676044904653577">"(স্লট<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3480,12 +3452,12 @@
<string name="storage_used" msgid="7128074132917008743">"ব্যবহৃত সঞ্চয়স্থানের পরিমান"</string>
<string name="change" msgid="6657848623929839991">"পরিবর্তন করুন"</string>
<string name="change_storage" msgid="600475265207060436">"স্টোরেজ পরিবর্তন করুন"</string>
- <string name="notifications_label" msgid="2872668710589600731">"বিজ্ঞপ্তিগুলি"</string>
+ <string name="notifications_label" msgid="2872668710589600731">"বিজ্ঞপ্তি"</string>
<string name="notifications_enabled" msgid="6983396130566021385">"চালু আছে"</string>
<string name="notifications_enabled_with_info" msgid="5669544704839269901">"<xliff:g id="NOTIFICATIONS_SENT">%1$s</xliff:g> / <xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%2$s</xliff:g>"</string>
<string name="notifications_disabled" msgid="1262114548434938079">"বন্ধ"</string>
<string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%1$d</xliff:g>টি বিভাগ বন্ধ আছে"</string>
- <string name="notifications_silenced" msgid="4728603513072110381">"নিঃশব্দ করা হয়েছে"</string>
+ <string name="notifications_silenced" msgid="4728603513072110381">"মিউট করা হয়েছে"</string>
<string name="notifications_redacted" msgid="4493588975742803160">"সংবেদনশীল সামগ্রীকে লক স্ক্রীনে দেখানো হবে না"</string>
<string name="notifications_hidden" msgid="3619610536038757468">"লক স্ক্রীনে দেখানো হবে না"</string>
<string name="notifications_priority" msgid="1066342037602085552">"\'বিরক্ত করবেন না\' ওভাররাইড করা হয়েছে"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ব্যক্তিগত"</string>
<string name="filter_work_apps" msgid="24519936790795574">"কাজ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"অ্যাপ: সমস্ত"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"অ্যাপ: বন্ধ আছে"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"বন্ধ করা আছে"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"বিভাগগুলি: জরুরী গুরুত্বের"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"বিভাগগুলি: কম গুরুত্বের"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"বিভাগগুলি: বন্ধ আছে"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"ব্যবহারের সতর্কতা"</string>
<string name="show_all_apps" msgid="1512506948197818534">"সম্পূর্ণ ডিভাইসের ব্যবহার দেখান"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"অ্যাপের ব্যবহার দেখান"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"অনেক বেশি ব্যাটারি ব্যবহার করে"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g>টি অ্যাপে অস্বাভাবিক অ্যাক্টিভিটি দেখা যাচ্ছে</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g>টি অ্যাপে অস্বাভাবিক অ্যাক্টিভিটি দেখা যাচ্ছে</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"ইন্টারনাল স্টোরেজ: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ব্যবহৃত হয়েছে - <xliff:g id="FREE_SPACE">%2$s</xliff:g> খালি আছে"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ধরে নিষ্ক্রিয় থাকার পরে নিদ্রা মোডে যায়"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"ওয়ালপেপার, নিদ্রা মোড, হরফের আকার"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"১০ মিনিট ধরে নিষ্ক্রিয় থাকার পরে নিদ্রা মোডে যায়"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> এর মধ্যে <xliff:g id="USED_MEMORY">%1$s</xliff:g> মেমোরি ব্যবহৃত হয়েছে"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> হিসেবে প্রবেশ করেছেন"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"এসএমএস পাঠানোর অনুমতি নেই"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"ক্যামেরা ব্যবহারের অনুমতি নেই"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"স্ক্রিনশটের অনুমতি নেই"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"ব্যাক-আপ বন্ধ করা যাবে না"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"এই অ্যাপটি চালু করা যাবে না"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"আপনার যদি কোনও প্রশ্ন থাকে তাহলে আপনার আইটি অ্যাডমিনের সাথে যোগাযোগ করুন"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"আরো বিশদ বিবরণ"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"কাট-আউটের সাহায্যে ডিসপ্লে দেখুন"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ডিসপ্লে কাট-আউট"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ডিসপ্লে কাট-আউট, নচ"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"কোনওটিই নয়"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ডিভাইসের ডিফল্ট"</string>
<string name="special_access" msgid="3458780842491881155">"বিশেষ অ্যাপ অ্যাক্সেস করুন"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g>টি অ্যাপ অপরিমিত ডেটা ব্যবহার করতে পারে</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> এর সাথে কানেক্ট আছে"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"একাধিক ডিভাইসের সাথে কানেক্ট আছে"</string>
<string name="demo_mode" msgid="2798762752209330277">"সিস্টেম UI ডেমো মোড"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"রাতের মোড"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"রাতের মোড সেট করুন"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"গাঢ় মোড"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"গাঢ় মোড সেট করুন"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"দ্রুত সেটিংস ডেভেলপার টাইলস"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"উইনস্কোপ ট্রেস"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"কর্মস্থলের প্রোফাইলের সেটিংস"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"পরিচিতির সার্চ"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"কলারদের এবং পরিচিতিগুলিকে চিহ্নিত করতে আপনার প্রতিষ্ঠান দ্বারা পরিচিতি সার্চের অনুমতি দিন"</string>
@@ -3972,14 +3943,14 @@
<string name="deletion_helper_automatic_title" msgid="6605660435498272520">"অটোমেটিক"</string>
<string name="deletion_helper_manual_title" msgid="7947432164411214029">"ম্যানুয়াল"</string>
<string name="deletion_helper_preference_title" msgid="5271510052022285884">"এখনই জায়গা খালি করুন"</string>
- <string name="gesture_preference_title" msgid="5280023307132819052">"অঙ্গভঙ্গিগুলি"</string>
+ <string name="gesture_preference_title" msgid="5280023307132819052">"ইঙ্গিত"</string>
<string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"আপনার ফোন নিয়ন্ত্রণ করতে দ্রুত অঙ্গভঙ্গিগুলি"</string>
<string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"আপনার ট্যাবলেট নিয়ন্ত্রণ করার দ্রুত ইঙ্গিত"</string>
<string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"আপনার ডিভাইস নিয়ন্ত্রণ করার দ্রুত ইঙ্গিত"</string>
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ক্যামেরাতে সরাসরি যান"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ক্যামেরা দ্রুত খুলতে, পাওয়ার বোতাম দুবার প্রেস করুন৷ যেকোনও স্ক্রিনে কাজ করে৷"</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"ক্যামেরাটি তাড়াতাড়ি খুলুন"</string>
- <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ক্যামেরা ফ্লিপ করুন"</string>
+ <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ক্যামেরা ফ্লিপ করা"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"তাড়াতাড়ি সেলফি তুলুন"</string>
<string name="swipe_up_to_switch_apps_title" msgid="2513907834903543667">"হোম বোতামে উপরের দিকে সোয়াইপ করুন"</string>
@@ -3989,14 +3960,18 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ফোন চেক করতে ডাবল-ট্যাপ করুন"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ট্যাবলেট চেক করতে ডাবল-ট্যাপ করুন"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"ডিভাইস চেক করতে ডাবল-ট্যাপ করুন"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"সময়, বিজ্ঞপ্তির আইকন এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ডাবল-ট্যাপ করুন।"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ডবল-ট্যাপ করুন।"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"চেক করতে ফোনটিকে হাতে নিন"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"চেক করতে ট্যাবলেটটিকে হাতে নিন"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"চেক করতে ডিভাইসটিকে হাতে নিন"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার ফোনটি তুলে নিন।"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার ট্যাবলেটটি তুলে নিন।"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"সময়, বিজ্ঞপ্তির আইকন, এবং অন্যান্য তথ্য দেখতে আপনার ডিভাইসটি তুলে নিন।"</string>
- <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করুন"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ওয়েক-আপ ডিসপ্লে"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার ফোনটি তুলে ধরুন।"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার ট্যাবলেটটি তুলে ধরুন।"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার ডিভাইসটি তুলে ধরুন।"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"ওয়েক লক স্ক্রিন ইঙ্গিত"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
+ <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করা"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"আঙ্গুলের ছাপ সোয়াইপ করুন"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ফোনের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ট্যাবলেটের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g>টি প্রচেষ্টা</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>টি প্রচেষ্টা</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"এই ডিভাইসের ডেটার ব্যাক-আপ নেওয়া হয়েছে"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"আপনার প্রতিষ্ঠান এই ডিভাইসটি পরিচালনা করে।"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"এই ডিভাইসটি <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> দ্বারা পরিচালিত।"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4099,7 +4073,7 @@
<string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
<string name="storage_photos_videos" msgid="319854636702241898">"ফটো এবং ভিডিওগুলি"</string>
<string name="storage_music_audio" msgid="789779084825206838">"মিউজিক ও অডিও"</string>
- <string name="storage_games" msgid="7703159201697117621">"গেম্স"</string>
+ <string name="storage_games" msgid="7703159201697117621">"গেম"</string>
<string name="storage_other_apps" msgid="5524321740031718083">"অন্যান্য অ্যাপ্লিকেশান"</string>
<string name="storage_files" msgid="8581083146777364063">"ফাইল"</string>
<string name="storage_size_large_alternate" msgid="3395208658399637645">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">^2</xliff:g>"</font></small>""</string>
@@ -4108,7 +4082,7 @@
<string name="clear_instant_app_data" msgid="2004222610585890909">"অ্যাপের ডেটা সাফ করুন"</string>
<string name="clear_instant_app_confirmation" msgid="7451671214898856857">"আপনি কি এই ঝটপট অ্যাপটি সরাতে চান?"</string>
<string name="launch_instant_app" msgid="391581144859010499">"চালু করুন"</string>
- <string name="game_storage_settings" msgid="3410689937046696557">"গেম্স"</string>
+ <string name="game_storage_settings" msgid="3410689937046696557">"গেম"</string>
<string name="audio_files_title" msgid="4777048870657911307">"অডিও ফাইলগুলি"</string>
<string name="app_info_storage_title" msgid="5554719444625611987">"স্টোরেজ ব্যবহার হয়েছে"</string>
<string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য আনইনস্টল হয়েছে)"</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"আপনাআপনি পূরণ করার পরিষেবা"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"স্বতঃ, পূরণ, স্বতঃপূরণ"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>নিশ্চিত করুন যে এই অ্যাপটি বিশ্বাসযোগ্য</b> <br/> <br/> কোনও তথ্য নিজে থেকে পূরণ করা যাবে কি না, তা নির্ণয় করতে <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> অ্যাপটি আপনার স্ক্রিনে যা দেখা যাচ্ছে সেই অনুযায়ী সিদ্ধান্ত নেয়।"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"অটো-ফিল"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"লগ-ইন লেভেল"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"প্রতি সেশনের সবচেয়ে বেশি অনুরোধ"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"সবচেয়ে বেশিবার দেখা ডেটাসেট"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ডিফল্ট মানে রিসেট করুন"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"অটো-ফিল ডেভেলপার বিকল্প রিসেট করা হয়েছে"</string>
<string name="device_theme" msgid="4571803018917608588">"ডিভাইসের থিম"</string>
<string name="default_theme" msgid="7085644992078579076">"ডিফল্ট"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"নেটওয়ার্কের নাম"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ট্রিগার পরিষেবা প্রদানকারীর ব্যবস্থা"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\'বিরক্ত করবেন না\' মোডটি আপডেট করুন"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"যাতে বিরক্ত হতে না হয় তার জন্য বিজ্ঞপ্তি পজ করুন"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"নতুন এবং উত্তেজনাপূর্ণ আর কি আছে?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"আপনার নতুন ফোন চালিয়ে দেখুন"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"আপনার নতুন ট্যাবলেট চালিয়ে দেখুন"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"আপনার নতুন ডিভাইস চালিয়ে দেখুন"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"এই বৈশিষ্ট্যটি এই ডিভাইসে উপলব্ধ নেই"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GnssMeasurement সম্পূর্ণভাবে ট্র্যাক করুন"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ডিউটি-সাইক্লিং বাদে সমস্ত কন্সটেলেশন এবং ফ্রিকোয়েন্সি ট্র্যাক করুন"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"প্রত্যেকবার ক্র্যাশ ডায়ালগ দেখাতে দিন"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"কোনও অ্যাপ ক্র্যাশ করলে প্রত্যেকবার ডায়ালগ দেখাতে দিন"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE চালু আছে এমন অ্যাপ বেছে নিন"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE চালু আছে এমন কোনও অ্যাপ্লিকেশন সেট নেই"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE চালু আছে এমন অ্যাপ্লিকেশন: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ডিরেক্টরি অ্যাক্সেস"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ডিরেক্টরি অ্যাক্সেস"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"নেটওয়ার্কের বিবরণ"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"আপনার ডিভাইসের নাম আপনার ফোনে থাকা অ্যাপে দেখা যাবে। আপনি যখন এটিকে ব্লুটুথ ডিভাইসের সাথে কানেক্ট করেন বা ওয়াই-ফাই হটস্পট সেট-আপ করেন তখন এটি অন্যরাও দেখতে পেতে পারেন।"</string>
<string name="devices_title" msgid="7701726109334110391">"ডিভাইস"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"সমস্ত সেটিংস"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"সাজেশন"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ডেটা"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ডেটা"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"নেটওয়ার্ক বেছে নিন"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ডিসকানেক্ট আছে"</string>
+ <string name="network_connected" msgid="4943925032253989621">"কানেক্ট আছে"</string>
+ <string name="network_connecting" msgid="76404590784733557">"কানেক্ট হচ্ছে…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"কানেক্ট করা যায়নি"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"কোনও নেটওয়ার্ক পাওয়া যায়নি৷"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"নেটওয়ার্ক পাওয়া যায়নি। আবার চেষ্টা করুন।"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(নিষিদ্ধ)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"কোনও সিম কার্ড নেই"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"আরও ভাল কলিং"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"পছন্দের নেটওয়ার্ক মোড: বেছে নেওয়া WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"পছন্দের নেটওয়ার্ক মোড: শুধুমাত্র GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"পছন্দের নেটওয়ার্ক মোড: শুধুমাত্র WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"পছন্দের নেটওয়ার্ক মোড: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"পছন্দের নেটওয়ার্ক মোড: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"পছন্দের নেটওয়ার্ক মোড: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"পছন্দের নেটওয়ার্ক মোড: শুধুমাত্র CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"পছন্দের নেটওয়ার্ক মোড: শুধুমাত্র EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"পছন্দের নেটওয়ার্ক মোড: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"পছন্দের নেটওয়ার্ক মোড: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"পছন্দের নেটওয়ার্ক মোড: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"পছন্দের নেটওয়ার্ক মোড: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"পছন্দের নেটওয়ার্ক মোড: গ্লোবাল"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"পছন্দের নেটওয়ার্ক মোড: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"পছন্দের নেটওয়ার্ক মোড: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"পছন্দের নেটওয়ার্ক মোড: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"পছন্দের নেটওয়ার্ক মোড: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"পছন্দের নেটওয়ার্ক মোড: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"পছন্দের নেটওয়ার্ক মোড: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"পছন্দের নেটওয়ার্ক মোড: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"পছন্দের নেটওয়ার্ক মোড: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"পছন্দের নেটওয়ার্ক মোড: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"পছন্দের নেটওয়ার্ক মোড: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"পছন্দের নেটওয়ার্ক মোড: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"পছন্দের নেটওয়ার্ক মোড: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"পছন্দের নেটওয়ার্ক মোড: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (সাজেস্ট করা হয়েছে)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (সাজেস্ট করা হয়েছে)"</string>
+ <string name="network_global" msgid="959947774831178632">"গ্লোবাল"</string>
+ <string name="label_available" msgid="1731547832803057893">"উপলভ্য নেটওয়ার্ক"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"সার্চ করছে..."</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g>-এ রেজিস্টার করা হচ্ছে…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"আপনার সিম কার্ড এই নেটওয়ার্কে কানেক্ট করার অনুমতি দেয় না।"</string>
+ <string name="connect_later" msgid="978991102125216741">"এই মুহূর্তে এই নেটওয়ার্কে কনেক্ট করা যাচ্ছে না। পরে আবার চেষ্টা করুন।"</string>
+ <string name="registration_done" msgid="4573820010512184521">"নেটওয়ার্কে রেজিস্টার করা হয়েছে।"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"নিজের থেকে নেটওয়ার্ক বেছে নিন"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"পরিষেবা প্রদানকারীর সেটিং"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ডেটা পরিষেবা সেট-আপ করুন"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"মোবাইল ডেটা"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"মোবাইল নেটওয়ার্ক ব্যবহার করে ডেটা অ্যাক্সেস করুন"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"পছন্দের নেটওয়ার্ক"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"নেটওয়ার্ক অপারেটিং মোড পরিবর্তন করুন"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"পছন্দের নেটওয়ার্ক"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"পরিষেবা প্রদানকারী"</string>
+ <string name="call_category" msgid="8108654745239563833">"কল করা হচ্ছে"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"পরিষেবা প্রদানকারীর ভিডিও কলিং"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"সিস্টেমের বেছে নেওয়া"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA রোমিং মোডটি পরিবর্তন করুন"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"সিস্টেমের বেছে নেওয়া"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"নেটওয়ার্ক"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"নেটওয়ার্ক"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA সাবস্ক্রিপশন"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/সিম অথবা NV ব্যবহার করুন"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"সাবস্ক্রিপশন"</string>
+ <string name="register_automatically" msgid="518185886971595020">"অটেমেটিক রেজিস্ট্রেশন..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"ডেটা রোমিংয়ের অনুমতি দেবেন?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"দামের বিষয়ে জানতে নেটওয়ার্ক প্রদানকারীর সাথে যোগাযোগ করুন।"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"অ্যাপ ডেটার ব্যবহার"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"ভুল নেটওয়ার্ক মোড <xliff:g id="NETWORKMODEID">%1$d</xliff:g>। এড়িয়ে যান।"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g>-এ কনেক্ট থাকলে উপলভ্য থাকে না"</string>
+ <string name="see_more" msgid="5953815986207345223">"আরও দেখুন"</string>
+ <string name="see_less" msgid="1250265310929558370">"কম দেখুন"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 92d6be3..5c6a72d 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tretiraj kao vezu s ograničenjem"</item>
<item msgid="2266114985518865625">"Tretiraj kao vezu bez ograničenja"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Zadano (koristi nasumično određen MAC)"</item>
+ <item msgid="5398461510512959597">"Pouzdano"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ne"</item>
<item msgid="3863157480502955888">"Da"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Uvijek uključeno"</item>
<item msgid="6385301106124765323">"Uvijek isključeno"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Isključeno"</item>
+ <item msgid="2182686878828390312">"Otklanjanje grešaka"</item>
+ <item msgid="5286514712714822064">"Opširno"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Samo početna stranica"</item>
+ <item msgid="5034813753274486448">"Automatski"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Preferiraj GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Samo GSM"</item>
+ <item msgid="488474605709912156">"Samo WCDMA"</item>
+ <item msgid="1912421096218750039">"Automatski GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Automatski CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"Samo EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globalno"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Samo TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globalno"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 8cf4ed4..57d4bba 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Kreiraj"</string>
<string name="allow" msgid="3349662621170855910">"Dozvoli"</string>
<string name="deny" msgid="6947806159746484865">"Odbij"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Zatvori"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Prebaci"</string>
<string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak vas dijeli od toga da postanete programer.</item>
@@ -33,10 +31,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Nema potrebe, već ste programer."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Prvo omogućite opcije za programere."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Bežična veza i mreže"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Veze"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Uređaj"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Lično"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Pristup"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Omogućite vezu za prijenos podataka"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Onemogućite podatkovnu mrežu"</string>
@@ -122,7 +116,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth adresa uređaja: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li prekinuti vezu sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitovanje"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Neimenovani Bluetooth uređaj"</string>
<string name="progress_scanning" msgid="192587958424295789">"Pretraživanje"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nema Bluetooth uređaja u blizini."</string>
@@ -136,25 +129,24 @@
<string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth"</string>
<string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"Aplikacija želi uključiti Bluetooth"</string>
<string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"Aplikacija želi isključiti Bluetooth"</string>
- <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da vaš tablet bude vidljiv drugim uređajima sa Bluetoothom <xliff:g id="TIMEOUT">%2$d</xliff:g> sek."</string>
- <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da vaš telefon bude vidljiv drugim uređajima sa Bluetoothom <xliff:g id="TIMEOUT">%2$d</xliff:g> sek."</string>
- <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"Aplikacija želi da vaš tablet bude vidljiv drugim uređajima sa Bluetoothom <xliff:g id="TIMEOUT">%1$d</xliff:g> sek."</string>
- <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"Aplikacija želi da vaš telefon bude vidljiv drugim uređajima sa Bluetoothom <xliff:g id="TIMEOUT">%1$d</xliff:g> sek."</string>
+ <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da vaš tablet bude vidljiv drugim uređajima sa Bluetoothom <xliff:g id="TIMEOUT">%2$d</xliff:g> s."</string>
+ <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da vaš telefon bude vidljiv drugim uređajima sa Bluetoothom <xliff:g id="TIMEOUT">%2$d</xliff:g> s."</string>
+ <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"Aplikacija želi da vaš tablet bude vidljiv drugim uređajima sa Bluetoothom <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+ <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"Aplikacija želi da vaš telefon bude vidljiv drugim uređajima sa Bluetoothom <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
<string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da vaš tablet bude vidljiv drugim Bluetooth uređajima. Ovo možete promijeniti kasnije u postavkama za Bluetooth."</string>
<string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi da vaš telefon bude vidljiv drugim Bluetooth uređajima. Ovo možete promijeniti kasnije u postavkama za Bluetooth."</string>
<string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"Aplikacija želi da vaš tablet bude vidljiv drugim Bluetooth uređajima. Ovo možete kasnije promijeniti u postavkama za Bluetooth."</string>
<string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"Aplikacija želi da vaš telefon bude vidljiv drugim Bluetooth uređajima. Ovo možete promijeniti kasnije u postavkama za Bluetooth."</string>
- <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth te učiniti vaš tablet vidljivim drugim uređajima <xliff:g id="TIMEOUT">%2$d</xliff:g> sek."</string>
- <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth te učiniti vaš telefon vidljivim drugim uređajima <xliff:g id="TIMEOUT">%2$d</xliff:g> sek."</string>
- <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"Aplikacija želi uključiti Bluetooth te učiniti vaš tablet vidljivim drugim uređajima <xliff:g id="TIMEOUT">%1$d</xliff:g> sek."</string>
- <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"Aplikacija želi uključiti Bluetooth te učiniti vaš telefon vidljivim drugim uređajima <xliff:g id="TIMEOUT">%1$d</xliff:g> sek."</string>
+ <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth te učiniti vaš tablet vidljivim drugim uređajima <xliff:g id="TIMEOUT">%2$d</xliff:g> s."</string>
+ <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth te učiniti vaš telefon vidljivim drugim uređajima <xliff:g id="TIMEOUT">%2$d</xliff:g> s."</string>
+ <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"Aplikacija želi uključiti Bluetooth te učiniti vaš tablet vidljivim drugim uređajima <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
+ <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"Aplikacija želi uključiti Bluetooth te učiniti vaš telefon vidljivim drugim uređajima <xliff:g id="TIMEOUT">%1$d</xliff:g> s."</string>
<string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth i učiniti vaš tablet vidljivim drugim uređajima. Ovo možete kasnije promijeniti u postavkama za Bluetooth."</string>
<string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti Bluetooth i učiniti vaš telefon vidljivim drugim uređajima. Ovo možete kasnije promijeniti u postavkama za Bluetooth."</string>
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"Aplikacija želi uključiti Bluetooth i učiniti vaš tablet vidljivim drugim uređajima. Ovo možete kasnije promijeniti u postavkama za Bluetooth."</string>
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Aplikacija želi uključiti Bluetooth i učiniti vaš telefon vidljivim drugim uređajima. Ovo možete promijeniti kasnije u postavkama za Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Uključivanje funkcije Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Isključivanje funkcije Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatsko povezivanje"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Zahtjev za uspostavljanje Bluetooth veze"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Dodirnite za povezivanje s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Da li se želite povezati na \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -182,12 +174,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dostupni uređaji za pozivanje"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Trenutno povezani"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Sačuvani uređaji"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Dodajte uređaj"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth će se uključiti za uparivanje"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Postavke veze"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Prethodno povezani uređaji"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Prethodno povezani"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth je uključen"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Prikaži sve"</string>
<string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Odaberite vremensku zonu"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -270,7 +262,6 @@
<string name="skip_label" msgid="47510779345218297">"Preskoči"</string>
<string name="next_label" msgid="4693520878012668114">"Naprijed"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Jezici"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Postavke jezika"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Ukloni"</string>
<string name="add_a_language" msgid="2330538812283783022">"Dodaj jezik"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -305,7 +296,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Postavke"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Prečica za postavke"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Način rada u avionu"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Više"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bežična veza i mreže"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Upravljanje značajkama Wi-Fi, Bluetooth, način rada u zrakoplovu, mobilne mreže i VPN-ovi"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Prijenos podataka na mobilnoj mreži"</string>
@@ -390,6 +380,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Onemogućio administrator"</string>
<string name="security_status_title" msgid="5848766673665944640">"Sigurnosni status"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Zaključavanje ekrana, otključavanje licem"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Zaključavanje ekrana, otisak prsta"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zaključavanje ekrana"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Lice je dodano"</string>
@@ -399,11 +390,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Otključajte pomoću lica"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Koristite lice za autentifikaciju"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Koristite lice za otključavanje telefona, odobravanje kupovine ili prijavu u aplikacije."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Koristite lice"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Koristite lice za otključavanje telefona ili odobravanje kupovina.\n\nNapomena: ne možete koristiti lice za otključavanje ovog uređaja. Za više informacija obratite se administratoru svoje organizacije."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Koristite lice za otključavanje telefona, odobravanje kupovine ili prijavu u aplikacije."</string>
- <string name="face_add_max" msgid="2342250989212694454">"Najviše možete dodati sljedeći broj otisaka prstiju: <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Namjestite lice u centar kruga"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Uradit ću to kasnije"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Možete dodati najviše <xliff:g id="COUNT">%d</xliff:g> lica"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Dodali ste maksimalan broj lica"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Nije moguće dodati više lica"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registracija nije dovršena"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"UREDU"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Vrijeme za snimanje lica je isteklo. Pokušajte ponovo."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Upis lica nije uspio."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Sve je spremno. Izgleda dobro."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Gotovo"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Koristite lice za"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Otključavanje uređaja"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Prijava u aplikaciju i plaćanja"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Otvorite oči za otključavanje"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Pri korištenju autentifikacije licem morate držati oči otvorenim"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Ukloni podatke o licu"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Poboljšajte podatke o licu"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Možete koristiti lice da otključate uređaje i pristupite aplikacijama. "<annotation id="url">"Saznajte više"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisak prsta"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Upravljanje otiscima prstiju"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Koristi otisak za"</string>
@@ -899,6 +906,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Odaberite barem jedan frekvencijski pojas za Wi‑Fi pristupnu tačku:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP postavke"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privatnost"</string>
<string name="wifi_shared" msgid="844142443226926070">"Dijeli s ostalim korisnicima uređaja"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nepromijenjeno)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Odaberite"</string>
@@ -938,7 +946,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Otkaži"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Zaboraviti mrežu?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Sve lozinke za ovu mrežu će se izbrisati"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Sačuvane mreže"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d mreža</item>
<item quantity="few">%d mreže</item>
@@ -1004,11 +1011,11 @@
<string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK pristupna tačka"</string>
<string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"Android pristupna tačka"</string>
<string name="wifi_tether_disabled_by_airplane" msgid="414480185654767932">"Nije dostupno jer je uključen način rada u avionu"</string>
- <string name="wifi_calling_settings_title" msgid="4102921303993404577">"WiFi pozivanje"</string>
+ <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Pozivanje putem WiFi-ja"</string>
<string name="wifi_calling_suggestion_title" msgid="5702964371483390024">"Proširite mogućnost pozivanja s Wi‑Fi-jem"</string>
<string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"Uključite pozivanje putem Wi‑Fi-ja za veću pokrivenost"</string>
- <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Postavke za pozive"</string>
- <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Način pozivanja preko WiFi"</string>
+ <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Postavka poziva"</string>
+ <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Način pozivanja putem WiFi-ja"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Postavke rominga"</string>
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
@@ -1040,7 +1047,7 @@
<item msgid="2339246858001475047">"2"</item>
<item msgid="6200207341126893791">"1"</item>
</string-array>
- <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kada je opcija WiFi pozivanje uključena, telefon može preusmjeravati pozive preko WiFi mreža ili mreže vašeg operatera, u zavisnosti od toga kakve su vaše postavke i koji signal je jači. Prije nego što uključite ovu funkciju, raspitajte se o naknadi i drugim informacijama kod operatera."</string>
+ <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Kada je opcija pozivanje putem WiFi-ja uključena, telefon može preusmjeravati pozive preko WiFi mreža ili mreže vašeg operatera, u zavisnosti od toga kakve su vaše postavke i koji signal je jači. Prije nego što uključite ovu funkciju, raspitajte se o naknadi i drugim informacijama kod operatera."</string>
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<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>
@@ -1118,8 +1125,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Osvjetljenje"</string>
<string name="brightness_summary" msgid="838917350127550703">"Prilagodite osvjetljenje ekrana"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva osvijetljenost"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Uključeno"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Isključeno"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Preferirani nivo osvjetljenja je veoma nizak"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Preferirani nivo osvjetljenja je nizak"</string>
@@ -1215,6 +1221,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Nije moguće promijeniti PIN.\nMožda je PIN neispravan."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN za SIM uspješno promijenjen"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Ne možete otključati SIM.\nPIN je možda pogrešan."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Onemogućavanje PIN-a nije uspelo."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Omogućavanje PIN-a nije uspelo."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Uredu"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Otkaži"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Pronađeno više SIM-ova"</string>
@@ -1242,7 +1250,7 @@
<string name="fcc_equipment_id" msgid="149114368246356737">"ID opreme"</string>
<string name="baseband_version" msgid="1848990160763524801">"Verzija nemoduliranog opsega"</string>
<string name="kernel_version" msgid="9192574954196167602">"Verzija jezgre"</string>
- <string name="build_number" msgid="3075795840572241758">"Broj podverzije"</string>
+ <string name="build_number" msgid="3075795840572241758">"Broj verzije"</string>
<string name="device_info_not_available" msgid="8062521887156825182">"Nije dostupno"</string>
<string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
<string name="device_status" msgid="607405385799807324">"Status"</string>
@@ -1389,7 +1397,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Ovo zahtijeva da se <xliff:g id="NAME_0">^1</xliff:g> formatira. \n\n"<b>"Formatiranjem se brišu svi podaci trenutno pohranjeni na uređaju <xliff:g id="NAME_1">^1</xliff:g>."</b>" Da ne biste izgubili podatke, razmislite o kreiranju sigurnosne kopije."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Izbriši i formatiraj"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatiranje <xliff:g id="NAME">^1</xliff:g>..."</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Nemojte uklanjati pohranu <xliff:g id="NAME">^1</xliff:g> dok se formatira."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Nemojte uklanjati pohranu <xliff:g id="NAME">^1</xliff:g> dok se formatira."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Premjestite pod. u novu memoriju"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Možete premjestiti slike, fajlove i neke aplikacije na novi uređaj <xliff:g id="NAME">^1</xliff:g>. \n\nPremještanje traje otprilike <xliff:g id="TIME">^2</xliff:g> te će osloboditi <xliff:g id="SIZE">^3</xliff:g> unutrašnje memorije. Neke aplikacije neće funkcionirati dok je ovo u toku."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Premjesti sada"</string>
@@ -1524,7 +1532,7 @@
<string name="master_clear_final_button_text" msgid="5390908019019242910">"Izbriši sve"</string>
<string name="master_clear_failed" msgid="2503230016394586353">"Resetovanje nije izvršeno jer usluga Brisanje sistema nije dostupna."</string>
<string name="master_clear_confirm_title" msgid="7572642091599403668">"Ponovo pokrenuti?"</string>
- <string name="master_clear_not_available" msgid="1000370707967468909">"Ponovno postavljanje na fabričke postavke nije dostupno za ovog korisnika"</string>
+ <string name="master_clear_not_available" msgid="1000370707967468909">"Vraćanje na fabričke postavke nije dostupno za ovog korisnika"</string>
<string name="master_clear_progress_title" msgid="5194793778701994634">"Brisanje u toku"</string>
<string name="master_clear_progress_text" msgid="6559096229480527510">"Pričekajte..."</string>
<string name="call_settings_title" msgid="5188713413939232801">"Postavke poziva"</string>
@@ -1684,7 +1692,7 @@
<string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Postavi uzorak otključavanja"</string>
<string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Promijeni uzorak za otključavanje"</string>
<string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Kako nacrtati uzorak za otključavanje"</string>
- <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Previše pogrešnih pokušaja. Pokušajte ponovo za <xliff:g id="NUMBER">%d</xliff:g> sek."</string>
+ <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"Previše pogrešnih pokušaja. Pokušajte ponovo za <xliff:g id="NUMBER">%d</xliff:g> s."</string>
<string name="activity_not_found" msgid="5551664692991605325">"Aplikacija nije instalirana na vašem telefonu."</string>
<string name="lock_settings_profile_title" msgid="2121876391814535295">"Sigurnost radnog profila"</string>
<string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Zaključavanje ekrana radnog profila"</string>
@@ -1712,7 +1720,7 @@
<string name="advanced_settings_summary" msgid="4016682978071086747">"Omogućite više opcija postavki"</string>
<string name="application_info_label" msgid="5736524913065714880">"Informacije o aplikaciji"</string>
<string name="storage_label" msgid="8700867073480107253">"Pohrana"</string>
- <string name="auto_launch_label" msgid="2669236885531442195">"Zadano otvori"</string>
+ <string name="auto_launch_label" msgid="2669236885531442195">"Zadano otvaranje"</string>
<string name="auto_launch_label_generic" msgid="3230569852551968694">"Zadane vrijednosti"</string>
<string name="screen_compatibility_label" msgid="663250687205465394">"Kompatibilnost ekrana"</string>
<string name="permissions_label" msgid="2605296874922726203">"Odobrenja"</string>
@@ -1772,9 +1780,6 @@
<string name="installed" msgid="3070865169422600098">"Instalirano"</string>
<string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
<string name="internal_storage" msgid="1584700623164275282">"Interna pohrana"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"interna memorija"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB pohrana"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Pohrana na SD kartici"</string>
<string name="recompute_size" msgid="7722567982831691718">"Ponovno izračunavanje veličine…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Izbrisati podatke aplikacija?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Svi podaci ove aplikacije će biti trajno izbrisani. To uključuje sve fajlove, postavke, račune, baze podataka itd."</string>
@@ -1783,24 +1788,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikacija nije pronađena u listi instaliranih aplikacija."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Pohrana za aplikaciju nije obrisana."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ova aplikacija može pristupiti sljedećim stavkama na tabletu:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ova aplikacija može pristupiti sljedećim stavkama na telefonu:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ova aplikacija može pristupiti sljedećim stavkama na tabletu. U cilju poboljšanja performansi i smanjenja potrošnje memorije, neka od tih odobrenja su dostupna aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer je ona pokrenuta u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ova aplikacija može pristupiti sljedećim stavkama na telefonu. U cilju poboljšanja performansi i smanjenja potrošnje memorije, neka od tih odobrenja su dostupna aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer je ona pokrenuta u istom procesu kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> i <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ova aplikacija vam može naplatiti naknadu:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Pošalji premijum SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Računanje…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Nije bilo moguće izračunati veličinu paketa."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Nemate instalirane aplikacije treće strane."</string>
<string name="version_text" msgid="9189073826278676425">"verzija <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Premjesti"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Premjesti na tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Premjesti na telefon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Premjesti na USB pohranu"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Premjesti na SD karticu"</string>
- <string name="moving" msgid="6431016143218876491">"Premještanje"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Druga migracija je već u toku."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nema dovoljno prostora za pohranu."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplikacija ne postoji."</string>
@@ -1810,17 +1807,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Aplikaciju administratora uređaja nije moguće instalirati na vanjski medij"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Prisilno zaustaviti?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ako prisilno zaustavite aplikaciju, moguće je da će se ponašati nepredviđeno."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Aplikaciju nije bilo moguće premjestiti. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Željena lokacija za instaliranje"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Promijenite preferiranu lokaciju za instaliranje novih aplikacija"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Onemogućiti ugrađenu aplikaciju?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Onemogući aplikaciju"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ako onemogućite ovu aplikaciju, moguće je da Android i druge aplikacije više neće funkcionirati ispravno."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Želite li izbrisati podatke i onemogućiti aplikaciju?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ako onemogućite ovu aplikaciju, moguće je da Android i druge aplikacije više neće funkcionirati ispravno. Vaši podaci će se također izbrisati."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Isključiti obavještenja?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obavještenja za ovu aplikaciju, možete propustiti važna upozorenja i ažuriranja."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Trgovina"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detalji o aplikaciji"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija je instalirana iz trgovine: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2013,6 +2006,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Koristi uslugu"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Koristi ispravku boje"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Koristi natpise"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Nastavi"</string>
<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="6371077608778830020">"Dodajte slušni aparat"</string>
@@ -2127,7 +2121,7 @@
</plurals>
<string name="print_settings_title" msgid="3685449667822217816">"Usluge štampanja"</string>
<string name="print_no_services_installed" msgid="8443039625463872294">"Nema instaliranih usluga"</string>
- <string name="print_no_printers_found" msgid="989018646884973683">"Nije pronađen nijedan pisač"</string>
+ <string name="print_no_printers_found" msgid="989018646884973683">"Nije pronađen nijedan štampač"</string>
<string name="print_menu_item_settings" msgid="6591330373682227082">"Postavke"</string>
<string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodaj pisače"</string>
<string name="print_feature_state_on" msgid="8098901852502441048">"Uključeno"</string>
@@ -2164,8 +2158,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ako aplikaciji ograničite aktivnost u pozadini, može raditi nepravilno"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplikaciju ne možete ograničiti jer nije postavljena optimizacija baterije.\n\nDa je ograničite prvo uključite optimizaciju."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Korištenje ekrana od potpune napunjenosti"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja ekrana"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilne mreže"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Potrošnja baterije od posljednjeg potpunog punjenja"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Vrijeme koliko je ekran uključen od potpune napunjenosti"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Korištenje uređaja od potpune napunjenosti"</string>
@@ -2192,11 +2184,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Detalji o upotrebi"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Podesite potrošnju energije"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Uključeni paketi"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacije koje prazne bateriju"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Uređaj ne ulazi u stanje mirovanja"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Podizanje uređaja iz stanja mirovanja u pozadini"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Učestalo zahtijevanje lokacije"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Ukupno aplikacija koje se ne ponašaju kako treba: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikacije rade uobičajeno"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon ima uobičajenu potrošnju baterije u pozadini"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet ima uobičajenu potrošnju baterije u pozadini"</string>
@@ -2266,11 +2253,12 @@
<item quantity="few">Ograničavanje potrošnje baterije za %1$d aplikacije</item>
<item quantity="other">Ograničavanje potrošnje baterije za %1$d aplikacija</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Ograničeno <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Ove aplikacije koriste bateriju u pozadini. Moguće je da aplikacije s ograničenjem neće raditi pravilno i da će obavještenja kasniti."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Upotreba Upravitelja baterije"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Otkrij kada aplikacije troše bateriju"</string>
<string name="battery_manager_on" msgid="8643310865054362396">"Uključeno / Otkrivanje kada aplikacije troše bateriju"</string>
- <string name="battery_manager_off" msgid="5473135235710343576">"Isključi"</string>
+ <string name="battery_manager_off" msgid="5473135235710343576">"Isključeno"</string>
<plurals name="battery_manager_app_restricted" formatted="false" msgid="1026141135861471129">
<item quantity="one">Ograničena je %1$d aplikacija</item>
<item quantity="few">Ograničene su %1$d aplikacije</item>
@@ -2444,23 +2432,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Otkaži"</string>
<string name="tts_reset" msgid="2661752909256313270">"Vrati na zadano"</string>
<string name="tts_play" msgid="2628469503798633884">"Pokreni"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Upravljanje napajanjem"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ažuriranje WiFi postavke"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ažuriranje postavki za Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"uključeno"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"isključeno"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"uključivanje"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"isključivanje"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"WiFi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Lokacija"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinhroniziranje"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Osvjetljenje <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatski"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"maksimalno"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"napola"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"isključeno"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Pohrana akreditiva"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instaliranje iz pohrane"</string>
@@ -2618,7 +2589,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Označi sve"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Prijenos podataka"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Prijenos podat. u aplik."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Prijenos podataka na mobilnoj mreži i WiFi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Obračun podataka operatera može se razlikovati od obračuna vašeg uređaja."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Korištenje aplikacija"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIJE O APLIKACIJI"</string>
@@ -2908,7 +2879,7 @@
<string name="restriction_menu_change_pin" msgid="740081584044302775">"Promijeni PIN"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavještenja"</string>
<string name="help_label" msgid="6886837949306318591">"Pomoć i pov. inform."</string>
- <string name="support_summary" msgid="2705726826263742491">"Članci za pomoć, telefon i chat, započinjanje"</string>
+ <string name="support_summary" msgid="2705726826263742491">"Članci za pomoć, telefon i chat, početak"</string>
<string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
<string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
<string name="extreme_threats_title" msgid="6549541803542968699">"Ekstremne prijetnje"</string>
@@ -3000,7 +2971,6 @@
<item quantity="few">Prikaži %d skrivene stavke</item>
<item quantity="other">Prikaži %d skrivenih stavki</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Suzite"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Mreža i internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilna mreža"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"prijenos podataka"</string>
@@ -3012,12 +2982,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavještenja"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Odobrenja, zadane aplikacije"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Pristup obavještenjima nije dostupan za aplikacije u novom radnom profilu."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Računi"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nije dodan nijedan račun"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Zadane aplikacije"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Jezici, vrijeme, sigurnosna kopija, ažuriranja"</string>
<string name="search_results_title" msgid="1796252422574886932">"Postavke"</string>
- <string name="search_menu" msgid="6283419262313758339">"Pretražite postavke"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, veza s mrežom, internet, bežično, podaci, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, aktivacija/deaktivacija, kontrola"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, slanje SMS-ova, poruke, slanje poruka, zadano"</string>
@@ -3036,9 +3006,9 @@
<string name="keywords_voice_input" msgid="769778245192531102">"prepoznavač, ulaz, govor, govoriti, jezik, rad bez dodira, prepoznavanje, uvredljivo, riječ, zvuk, istorija, bluetooth slušalice"</string>
<string name="keywords_text_to_speech_output" msgid="5150660047085754699">"stopa, jezik, zadano, govori, govoriti, tts, pristupačnost, čitač ekrana, slijepi"</string>
<string name="keywords_date_and_time" msgid="758325881602648204">"sat, vojni"</string>
- <string name="keywords_network_reset" msgid="6024276007080940820">"resetirati, vratiti, fabričko podešenje"</string>
- <string name="keywords_factory_data_reset" msgid="2261491208836438871">"uništiti, izbrisati, vratiti, obrisati, ukloniti, vratiti na zadano"</string>
- <string name="keywords_printing" msgid="1701778563617114846">"pisač"</string>
+ <string name="keywords_network_reset" msgid="6024276007080940820">"resetirati, vratiti, fabričke postavke"</string>
+ <string name="keywords_factory_data_reset" msgid="2261491208836438871">"uništiti, izbrisati, vratiti, obrisati, ukloniti, vratiti na fabričke postavke"</string>
+ <string name="keywords_printing" msgid="1701778563617114846">"štampač"</string>
<string name="keywords_sounds" msgid="5633386070971736608">"zvuk sa zvučnika, zvučnik, jačina zvuka, isključenje zvuka, tišina, zvučni zapis, muzika"</string>
<string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ne ne uznemiravaj, prekinuti, prekidanje, pauza"</string>
<string name="keywords_app" msgid="6334757056536837791">"RAM"</string>
@@ -3062,6 +3032,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"plati, dodir, plaćanja"</string>
<string name="keywords_backup" msgid="470070289135403022">"sigurnosna kopija"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"pokret"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"lice, otključaj, autentifikacija, prijava"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl verzija, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"mreža, stanje mobilne mreže, stanje usluge, jačina signala, vrsta mobilne mreže, roming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serijski broj, verzija hardvera"</string>
@@ -3069,6 +3040,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema po mraku"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"greška"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambijentalni prikaz, Prikaz zaključavanja ekrana"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"obavještenje o zaključavanju ekrana"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"lice"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"otisak prsta"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"zatamnjenje ekrana, ekran osjetljiv na dodir, baterija, pametna osvijetljenost, dinamička osvijetljenost"</string>
@@ -3275,7 +3247,7 @@
<string name="notification_importance_blocked" msgid="7938180808339386300">"Nikad ne prikazuj obavještenja"</string>
<string name="notification_importance_min" msgid="9054819132085066824">"Prikaži bez zvuka i minimiziraj"</string>
<string name="notification_importance_low" msgid="2445139943005315690">"Prikaži bez zvuka"</string>
- <string name="notification_importance_default" msgid="5958338024601957516">"Pusti zvuk"</string>
+ <string name="notification_importance_default" msgid="5958338024601957516">"Reproduciraj zvuk"</string>
<string name="notification_importance_high" msgid="2082429479238228527">"Pusti zvuk i prikaži na ekranu"</string>
<string name="notification_importance_high_silent" msgid="2667033773703765252">"Prikaži na ekranu"</string>
<string name="notification_importance_min_title" msgid="6974673091137544803">"Niska"</string>
@@ -3284,9 +3256,9 @@
<string name="notification_importance_high_title" msgid="3058778300264746473">"Hitno"</string>
<string name="allow_interruption" msgid="7136150018111848721">"Dozvoli ometanja"</string>
<string name="allow_interruption_summary" msgid="7870159391333957050">"family link da aktivira zvuk, vibrira i/ili prikaže obavještenja na ekranu"</string>
- <string name="notification_channel_summary_min" msgid="5401718014765921892">"Manje važno"</string>
- <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednje važno"</string>
- <string name="notification_channel_summary_default" msgid="1111749130423589931">"Veoma važno"</string>
+ <string name="notification_channel_summary_min" msgid="5401718014765921892">"Niska važnost"</string>
+ <string name="notification_channel_summary_low" msgid="322317684244981244">"Srednja važnost"</string>
+ <string name="notification_channel_summary_default" msgid="1111749130423589931">"Visoka važnost"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"Hitno"</string>
<string name="notification_switch_label" msgid="6843075654538931025">"Prikaži obavještenja"</string>
<string name="default_notification_assistant" msgid="7631945224761430146">"Asistent za obavještenja"</string>
@@ -3510,11 +3482,11 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Prilikom unosa PIN-a za pokretanje uređaja, usluge za pristupačnost kao što je <xliff:g id="SERVICE">%1$s</xliff:g> još uvijek neće biti dostupne."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Prilikom unosa obrasca za pokretanje uređaja, usluge za pristupačnost kao što je <xliff:g id="SERVICE">%1$s</xliff:g> još uvijek neće biti dostupne."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Prilikom unosa lozinke za pokretanje uređaja, usluge za pristupačnost kao što je <xliff:g id="SERVICE">%1$s</xliff:g> još uvijek neće biti dostupne."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Napomena: Nakon ponovnog pokretanja, ova aplikacija se neće moći pokrenuti dok ne otključate telefon"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Napomena: Ako ponovo pokrenete telefon ili postavite zaključavanje ekrana, ova se aplikacija neće moći pokrenuti dok ne otključate telefon"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informacije za IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Relativne informacije za IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. slot)"</string>
- <string name="launch_by_default" msgid="1840761193189009248">"Zadano otvoriti"</string>
+ <string name="launch_by_default" msgid="1840761193189009248">"Zadano otvori"</string>
<string name="app_launch_domain_links_title" msgid="1160925981363706090">"Otvaranje linkova"</string>
<string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Otvori podržane linkove"</string>
<string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Otvori bez pitanja"</string>
@@ -3531,7 +3503,7 @@
<string name="notifications_label" msgid="2872668710589600731">"Obavještenja"</string>
<string name="notifications_enabled" msgid="6983396130566021385">"Uključeno"</string>
<string name="notifications_enabled_with_info" msgid="5669544704839269901">"<xliff:g id="NOTIFICATIONS_SENT">%1$s</xliff:g>/<xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%2$s</xliff:g>"</string>
- <string name="notifications_disabled" msgid="1262114548434938079">"Isključi"</string>
+ <string name="notifications_disabled" msgid="1262114548434938079">"Isključeno"</string>
<string name="notifications_partly_blocked" msgid="592071133950126656">"Isključene kategorije: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="notifications_silenced" msgid="4728603513072110381">"Bez zvuka"</string>
<string name="notifications_redacted" msgid="4493588975742803160">"Osjetljivi sadržaj nije na zaključanom ekranu."</string>
@@ -3568,7 +3540,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Lične"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: Sve"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacije: Isključene"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Isključeno"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorije: hitno"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorije: niska važnost"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorije: Isključene"</string>
@@ -3630,7 +3602,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Obavještenja o upotrebi"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Prikaži potpuno korištenje uređaja"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži korištenje aplikacije"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Visoka potrošnja"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija se ne ponaša kako treba</item>
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacije se ne ponašaju kako treba</item>
@@ -3798,6 +3769,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Unutrašnja pohrana: iskorišteno <xliff:g id="PERCENTAGE">%1$s</xliff:g> - slobodno <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Pokreni stanje mirovanja nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Pozadinska slika, mirovanje, veličina fonta"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Pokreni stanje mirovanja nakon 10 minuta neaktivnosti"</string>
<string name="memory_summary" msgid="8080825904671961872">"Iskorišteno prosječno <xliff:g id="USED_MEMORY">%1$s</xliff:g> od ukupno <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kao <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3813,7 +3786,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS poruka nije dozvoljena"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kamera nije dozvoljena"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Snimak ekrana nije dozvoljen"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Nije moguće isključiti sigurnosne kopije"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Nije moguće otvoriti aplikaciju"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Ukoliko imate pitanja, kontaktirajte svog IT administratora"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Više detalja"</string>
@@ -3982,9 +3954,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simuliraj ekran s obrezanom slikom"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Urez u ekranu"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"urez ekrana, urez"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nema"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Zadana postavka uređaja"</string>
<string name="special_access" msgid="3458780842491881155">"Poseban pristup aplikacijama"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može koristiti neograničen prijenos podataka</item>
@@ -4007,11 +3979,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan s uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan s više uređaja"</string>
<string name="demo_mode" msgid="2798762752209330277">"Način demonstracije Sistemskog UI-a"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Noćni način rada"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Postavi noćni način rada"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Način rada po mraku"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Postavi Način rada po mraku"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice programera za brze postavke"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope praćenje"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Postavke radnog profila"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pretraživanje kontakata"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Dozvolite svojoj organizaciji da pretražuje kontakte kako bi identificirala pozivaoce i kontakte"</string>
@@ -4045,7 +4016,7 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Prelazak na kameru"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Dodirnite dvaput dugme za uključivanje za brzo otvaranje kamere. Funkcionira na svakom ekranu."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Brzo otvorite kameru"</string>
- <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Okretanje kamere"</string>
+ <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Obrtanje kamere"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Snimajte selfije brže"</string>
<string name="swipe_up_to_switch_apps_title" msgid="2513907834903543667">"Prevucite prema gore na dugmetu za Početni ekran"</string>
@@ -4055,13 +4026,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Provjera telefona dvostrukim dodirom"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Provjera tableta dvostrukim dodirom"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Provjera uređaja dvostrukim dodirom"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Provjera vremena, ikona obavještenja i drugih informacija kad se dvaput dodirne ekran."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Da provjerite vrijeme, obavještenja i druge informacije, dva puta dodirnite ekran."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Provjera telefona kad se podigne"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite za provjeru tableta"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite za provjeru uređaja"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Provjera vremena, ikona obavještenja i drugih informacija kad se telefon podigne."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Provjera vremena, ikona obavještenja i drugih informacija kad se tablet podigne."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Provjera vremena, ikona obavještenja i drugih informacija kad se uređaj podigne."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Aktiviranje ekrana"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Da provjerite vrijeme, obavještenja i druge informacije, podignite telefon."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Da provjerite vrijeme, obavještenja i druge informacije, podignite tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Da provjerite vrijeme, obavještenja i druge informacije, podignite uređaj."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Pokret za prikaz mehanizma protiv stanja mirovanja"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Prevlačenje prstom za obavještenja"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Prevlačenje otiskom prsta"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da provjerite obavještenja, prevucite prstom prema dolje po senzoru za otisak prsta na poleđini uređaja."</string>
@@ -4145,7 +4120,6 @@
<item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> pokušaja</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pokušaja</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Sigurnosna kopija podataka ovog uređaja se pravi"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Ovim uređajem upravlja vaša organizacija."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4189,6 +4163,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Vodite računa da je to pouzdana aplikacija</b> <br/> <br/> <xliff:g id=app_name example=Google Automatsko popunjavanje>%1$s</xliff:g> koristi sadržaj na vašem ekranu da odredi šta se može automatski popuniti."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automatsko popunjavanje"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Nivo zapisivanja"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maksimalni broj zahtijeva po sesiji"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maksimalan broj vidljivih kompleta podataka"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Vraćanje na zadane vrijednosti"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Opcije za programere za automatsko popunjavanje su vraćene na zadane postavke"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
<string name="default_theme" msgid="7085644992078579076">"Zadano"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Naziv mreže"</string>
@@ -4203,15 +4183,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktiviranje dodjele resursa operatera"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Ažurirajte način rada Ne ometaj"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pauzirajte obavještenja da ostanete fokusirani"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Šta je novo i uzbudljivo?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte se s novim telefonom"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte se s novim tabletom"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte se s novim uređajem"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova funkcija nije dostupna na ovom uređaju"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Prisilno omogući potpuno GNSS mjerenje"</string>
- <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Prati sve povezane foto sfere i frekvencije GNSS-a bez ciklusa rada"</string>
+ <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Prati sve povezane panorame i frekvencije GNSS-a bez ciklusa rada"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Uvijek prikaži dijaloški okvir za pad aplikacije"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Prikaži dijaloški okvir pri svakom padu aplikacije"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Odaberite aplikaciju u kojoj je omogućen ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Aplikacija u kojoj je omogućen ANGLE nije postavljena"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplikacija u kojoj je omogućen ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Pristup direktorijima"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"pristup direktorijima"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4248,8 +4227,90 @@
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"Ne čini ništa"</string>
<string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"Uključeno (vibracija)"</string>
<string name="prevent_ringing_option_mute_summary" msgid="4472465110708640980">"Uključeno (isključen zvuk)"</string>
- <string name="prevent_ringing_option_none_summary" msgid="5013718946609276137">"Isključi"</string>
+ <string name="prevent_ringing_option_none_summary" msgid="5013718946609276137">"Isključeno"</string>
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalji o mreži"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Naziv uređaja mogu vidjeti aplikacije na telefonu. Mogu ga vidjeti i druge osobe kada se povežete na Bluetooth uređaje ili postavite WiFi pristupnu tačku."</string>
<string name="devices_title" msgid="7701726109334110391">"Uređaji"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Sve postavke"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Prijedlozi"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS podaci"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS podaci"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Odaberite mrežu"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Veza je prekinuta"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Povezano"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Povezivanje…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Povezivanje nije uspjelo"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nije pronađena nijedna mreža."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nisu pronađene mreže. Pokušajte ponovo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(zabranjeno)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Nema SIM kartice"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Napredno pozivanje"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Preferirani način rada mreže: preferiraj WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Preferirani način rada mreže: samo GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Preferirani način rada mreže: samo WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Preferirani način rada mreže: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Preferirani način rada mreže: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Preferirani način rada mreže: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Preferirani način rada mreže: samo CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Preferirani način rada mreže: samo EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferirani način rada mreže: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferirani način rada mreže: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferirani način rada mreže: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferirani način rada mreže: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferirani način rada mreže: globalno"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferirani način rada mreže: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Preferirani način rada mreže: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Preferirani način rada mreže: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferirani način rada mreže: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preferirani način rada mreže: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preferirani način rada mreže: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preferirani način rada mreže: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preferirani način rada mreže: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preferirani način rada mreže: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preferirani način rada mreže: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preferirani način rada mreže: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preferirani način rada mreže: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preferirani način rada mreže: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (preporučeno)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (preporučeno)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globalno"</string>
+ <string name="label_available" msgid="1731547832803057893">"Dostupne mreže"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Pretraživanje…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registriranje na mrežu <xliff:g id="NETWORK">%s</xliff:g> je u toku…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Vaša SIM kartica ne dozvoljava povezivanje na ovu mrežu."</string>
+ <string name="connect_later" msgid="978991102125216741">"Trenutno se nije moguće povezati na ovu mrežu. Pokušajte ponovo kasnije."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registrirano na mrežu."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automatski odaberi mrežu"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Postavke operatera"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Postavi prijenos podataka"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobilni podaci"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Pristup prijenosu podataka mobilnom mrežom"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Vrsta preferirane mreže"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Promijeni način rada mreže"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Vrsta preferirane mreže"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operater"</string>
+ <string name="call_category" msgid="8108654745239563833">"Pozivanje"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operater video pozivanja"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Odabir sistema"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Promijeni način rada CDMA rominga"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Odabir sistema"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Mreža"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Mreža"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA pretplata"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Promjena između RUIM/SIM i NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"pretplata"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatska registracija…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Dozvoliti roming podataka?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Raspitajte se kod svog mobilnog operatera za cijene."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Prijenos podataka za aplikaciju"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Mrežni način <xliff:g id="NETWORKMODEID">%1$d</xliff:g> nije važeći. Zanemarite."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Nedostupno kada ste povezani s operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Pogledajte više"</string>
+ <string name="see_less" msgid="1250265310929558370">"Vidi manje"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> povezani uređaj</item>
+ <item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> povezana uređaja</item>
+ <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> povezanih uređaja</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nema povezanih uređaja"</string>
</resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 351e838..8c88e70 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -267,7 +267,7 @@
<item msgid="2603878814882344450">"volum general"</item>
<item msgid="7136963238377062018">"volum de la veu"</item>
<item msgid="4270236897655923007">"volum del to"</item>
- <item msgid="6325739889222559394">"volum multimèdia"</item>
+ <item msgid="6325739889222559394">"volum de multimèdia"</item>
<item msgid="5762123934816216821">"volum de l\'alarma"</item>
<item msgid="785049718065337473">"volum de notificació"</item>
<item msgid="6700305533746877052">"volum del Bluetooth"</item>
@@ -275,7 +275,7 @@
<item msgid="26109888160231211">"supervisa la ubicació"</item>
<item msgid="5753382310468855812">"fes un seguiment de la precisió de la ubicació"</item>
<item msgid="3356591542543137332">"obtenir estadístiques d\'ús"</item>
- <item msgid="3073734345226842233">"activa/desactiva el micròfon"</item>
+ <item msgid="3073734345226842233">"silencia / deixa de silenciar el micròfon"</item>
<item msgid="2111767435887685265">"mostrar l\'avís"</item>
<item msgid="1091168669714823370">"projectar fitxers multimèdia"</item>
<item msgid="485564189219029300">"activar la VPN"</item>
@@ -342,7 +342,7 @@
<item msgid="8584357129746649222">"Ubicació"</item>
<item msgid="7669257279311110599">"Ubicació"</item>
<item msgid="3459320345690097795">"Obtenir estadístiques d\'ús"</item>
- <item msgid="1312534577834048535">"Activa/desactiva el micròfon"</item>
+ <item msgid="1312534577834048535">"Silencia / deixa de silenciar el micròfon"</item>
<item msgid="427580389823724225">"Mostrar l\'avís"</item>
<item msgid="4992007785575926253">"Projectar fitxers multimèdia"</item>
<item msgid="2482631530338029480">"Activar la VPN"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tracta com a Wi-Fi amb límit de dades"</item>
<item msgid="2266114985518865625">"Tracta com a Wi-Fi sense límit de dades"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Predeterminada (utilitza una adreça MAC aleatòria)"</item>
+ <item msgid="5398461510512959597">"De confiança"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"No"</item>
<item msgid="3863157480502955888">"Sí"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Sempre activat"</item>
<item msgid="6385301106124765323">"Sempre desactivat"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Desactivat"</item>
+ <item msgid="2182686878828390312">"Depura"</item>
+ <item msgid="5286514712714822064">"Detalla"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Només local"</item>
+ <item msgid="5034813753274486448">"Automàtic"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Mode GSM/WCDMA preferit"</item>
+ <item msgid="807926878589867564">"Només GSM"</item>
+ <item msgid="488474605709912156">"Només WCDMA"</item>
+ <item msgid="1912421096218750039">"Mode GSM/WCDMA automàtic"</item>
+ <item msgid="5072198667819683600">"Mode CDMA/EvDo automàtic"</item>
+ <item msgid="370391313511477301">"Mode CDMA sense EvDo"</item>
+ <item msgid="4678789463133969294">"Només EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Només TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 58e0d91..7c2dc9e 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Crea"</string>
<string name="allow" msgid="3349662621170855910">"Permet"</string>
<string name="deny" msgid="6947806159746484865">"Denega"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Tanca"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Canvia"</string>
<string name="device_info_default" msgid="7847265875578739287">"Desconegut"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Ara només et queden <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos per convertir-te en desenvolupador.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"No és necessari, ja ets un desenvolupador"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Primer activa les opcions per a desenvolupadors."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Connexions sense fil i xarxes"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Connexions"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Dispositiu"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Accés"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Activa la connexió de dades"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desactiva la connexió de dades"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adreça Bluetooth del dispositiu: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vols desconnectar el dispositiu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Emissió"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Dispositiu Bluetooth sense nom"</string>
<string name="progress_scanning" msgid="192587958424295789">"S\'està cercant"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No s\'ha trobat cap dispositiu Bluetooth a prop."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Una aplicació vol activar el Bluetooth i que el telèfon sigui visible per a altres dispositius. Pots canviar aquesta opció més endavant a la configuració del Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"S\'està activant el Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"S\'està desactivant el Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexió automàtica"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Sol·licitud de connexió de Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Toca per connectar-te al dispositiu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vols connectar-te a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositius de trucada disponibles"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Connectats actualment"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Dispositius desats"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Afegeix un dispositiu"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"El Bluetooth s\'activarà per vincular"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferències de connexió"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositius connectats prèviament"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Connectats prèviament"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"S\'ha activat el Bluetooth"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Mostra-ho tot"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data i hora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Selecció de la zona horària"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Omet"</string>
<string name="next_label" msgid="4693520878012668114">"Següent"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Idiomes"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferències d\'idioma"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Suprimeix"</string>
<string name="add_a_language" msgid="2330538812283783022">"Afegeix un idioma"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -283,7 +274,7 @@
<string name="action_drag_label_move_up" msgid="9052210023727612540">"Mou amunt"</string>
<string name="action_drag_label_move_down" msgid="7448713844582912157">"Mou avall"</string>
<string name="action_drag_label_move_top" msgid="557081389352288310">"Mou a la part superior"</string>
- <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"Mou al final"</string>
+ <string name="action_drag_label_move_bottom" msgid="2468642142414126482">"Mou a la part inferior"</string>
<string name="action_drag_label_remove" msgid="2861038147166966206">"Suprimeix l\'idioma"</string>
<string name="activity_picker_label" msgid="6295660302548177109">"Selecció de l\'activitat"</string>
<string name="device_info_label" msgid="6551553813651711205">"Informació del dispositiu"</string>
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Configuració"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Drecera de configuració"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Mode d\'avió"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Més"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Connexions sense fil i xarxes"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Gestiona la Wi-Fi, el Bluetooth, el mode d\'avió, les xarxes mòbils i les VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Dades mòbils"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privadesa"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desactivada per l\'administrador"</string>
<string name="security_status_title" msgid="5848766673665944640">"Estat de seguretat"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Bloqueig de pantalla, Desbloqueig facial"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueig de pantalla i empremta digital"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueig de pantalla"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Cara afegida"</string>
@@ -396,12 +387,28 @@
<string name="security_settings_face_enroll_introduction_cancel" msgid="4277182322482408514">"Cancel·la"</string>
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Desbloqueja amb la cara"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Utilitza l\'autenticació facial"</string>
- <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Fes servir l\'autenticació facial per desbloquejar el telèfon, autoritzar compres o iniciar la sessió a les aplicacions."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Fes servir l\'autenticació facial"</string>
- <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Fes servir l\'autenticació facial per desbloquejar el telèfon, autoritzar compres o iniciar la sessió a les aplicacions"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Pots afegir fins a <xliff:g id="COUNT">%d</xliff:g> empremtes digitals"</string>
+ <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Fes servir la cara per desbloquejar el telèfon, autoritzar compres o iniciar la sessió a les aplicacions."</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utilitza la cara per desbloquejar el telèfon o aprovar compres.\n\nNota: no pots fer servir la cara per desbloquejar aquest dispositiu. Per obtenir més informació, contacta amb l\'administrador de la teva organització."</string>
+ <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Fes servir la cara per desbloquejar el telèfon, autoritzar compres o iniciar la sessió a les aplicacions"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centra la cara dins del cercle"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Fes-ho més tard"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Pots afegir fins a <xliff:g id="COUNT">%d</xliff:g> cares"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Has afegit el nombre màxim de cares"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"No es poden afegir més cares"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"No s\'ha completat el registre"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"D\'ACORD"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"S\'ha esgotat el temps d\'espera per registrar la cara. Torna-ho a provar."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"El registre de la cara no ha funcionat."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Sembla que ha anat bé i ja està tot llest."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Fet"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Utilitza la cara per"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Desbloqueja el dispositiu"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Inici de sessió i pagaments"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Obre els ulls per desbloquejar"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Els ulls han d\'estar oberts durant l\'autenticació facial"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Suprimeix les dades facials"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Millora les dades facials"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Pots utilitzar la cara per desbloquejar el dispositiu i accedir a aplicacions. "<annotation id="url">"Més informació"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Empremta digital"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gest. empremtes digit."</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Util. empr. digit. per"</string>
@@ -431,7 +438,7 @@
<string name="lock_screen_intro_skip_dialog_text" product="device" msgid="1466238255429527112">"Les funcions de protecció del dispositiu no s\'activaran. Si perds el dispositiu o te\'l roben, no podràs evitar que altres persones l\'utilitzin."</string>
<string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3008526710555416125">"Les funcions de protecció del dispositiu no s\'activaran. Si perds el telèfon o te\'l roben, no podràs evitar que altres persones l\'utilitzin."</string>
<string name="skip_anyway_button_label" msgid="2323522873558834513">"Omet de totes maneres"</string>
- <string name="go_back_button_label" msgid="4745265266186209467">"Enrere"</string>
+ <string name="go_back_button_label" msgid="4745265266186209467">"Torna"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Toca el sensor"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Es troba a la part posterior del telèfon. Utilitza el dit índex."</string>
<string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Il·lustració amb la ubicació del sensor d\'empremtes digitals i de dispositiu"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Tria almenys una banda per al punt d\'accés Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Configuració IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privadesa"</string>
<string name="wifi_shared" msgid="844142443226926070">"Comparteix amb altres usuaris del dispositiu"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(sense canvis)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Selecciona"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancel·la"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Vols que s\'oblidi la xarxa?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Se suprimiran totes les contrasenyes d\'aquesta xarxa"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Xarxes desades"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d xarxes</item>
<item quantity="one">1 xarxa</item>
@@ -1082,7 +1089,7 @@
<string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
<string name="accessibility_category_work" msgid="4339262969083355720">"Comptes del perfil professional: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_category_personal" msgid="1263518850905945594">"Comptes del perfil personal"</string>
- <string name="accessibility_work_account_title" msgid="1231830766637939527">"Compte professional: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
+ <string name="accessibility_work_account_title" msgid="1231830766637939527">"Compte de la feina: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="accessibility_personal_account_title" msgid="2169071663029067826">"Compte personal: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
<string name="search_settings" msgid="1910951467596035063">"Cerca"</string>
<string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brillantor"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Brillantor automàtica"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Activat"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Desactivada"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"La brillantor preferida és molt baixa"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"La brillantor preferida és baixa"</string>
@@ -1122,10 +1128,10 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimitza la brillantor segons la llum. Quan aquesta funció està activada, pots ajustar la brillantor temporalment."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"La brillantor de la pantalla s\'ajustarà automàticament al teu entorn i a la teva activitat. Pots moure el control lliscant manualment perquè la brillantor automàtica aprengui les teves preferències."</string>
<string name="night_display_title" msgid="2626451512200357686">"Llum nocturna"</string>
- <string name="night_display_text" msgid="1837277457033025056">"La llum nocturna dona un to ambre a la pantalla. D\'aquesta manera, costa menys mirar-la o llegir-hi amb poca llum i és més fàcil adormir-se."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"La funció Llum nocturna dona un to ambre a la pantalla. D\'aquesta manera, costa menys mirar-la o llegir-hi amb poca llum i és més fàcil adormir-se."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programació"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Cap"</string>
- <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"S\'activa a una hora determinada"</string>
+ <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"S\'activa a una hora personalitzada"</string>
<string name="night_display_auto_mode_twilight" msgid="589042813708244059">"S\'activa del vespre a l\'alba"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"Hora d’inici"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalització"</string>
@@ -1142,7 +1148,7 @@
<string name="night_display_activation_on_manual" msgid="277343561277625826">"Activa ara"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"Desactiva ara"</string>
<string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Activa fins a l\'alba"</string>
- <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Desactiva fins a la posta de sol"</string>
+ <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Desactiva fins al vespre"</string>
<string name="night_display_activation_on_custom" msgid="5472029024427933598">"Activa fins a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"Desactiva fins a les <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Repòs després de"</string>
@@ -1172,7 +1178,7 @@
<string name="ambient_display_category_triggers" msgid="4359289754456268573">"Quan es mostra"</string>
<string name="doze_title" msgid="2375510714460456687">"Notificacions noves"</string>
<string name="doze_summary" msgid="3846219936142814032">"Activa la pantalla en rebre notificacions"</string>
- <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre activat"</string>
+ <string name="doze_always_on_title" msgid="1046222370442629646">"Sempre activada"</string>
<string name="doze_always_on_summary" msgid="6978257596231155345">"Mostra l\'hora, les icones de notificació i altres dades. Consumeix més bateria."</string>
<string name="title_font_size" msgid="4405544325522105222">"Mida de la lletra"</string>
<string name="short_summary_font_size" msgid="6819778801232989076">"Amplia o redueix el text"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"No es pot canviar el PIN.\nÉs possible que sigui incorrecte."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN de la SIM canviat correctament"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"No es pot canviar l\'estat de bloqueig de la targeta SD.\nÉs possible que el PIN sigui incorrecte."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"No es pot desactivar el PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"No es pot activar el PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"D\'acord"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel·la"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Diverses SIM detectades"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Has de formatar el dispositiu d\'emmagatzematge (<xliff:g id="NAME_0">^1</xliff:g>) per dur a terme aquesta acció. \n\n"<b>"En formatar <xliff:g id="NAME_1">^1</xliff:g>, se n\'esborraran totes les dades."</b>" Et recomanem que en facis una còpia de seguretat de les dades per no perdre-les."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Esborra i formata"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"S\'està formatant <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"No extreguis el suport extern (<xliff:g id="NAME">^1</xliff:g>) mentre s\'estigui formatant."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"No extreguis el suport extern (<xliff:g id="NAME">^1</xliff:g>) mentre s\'estigui formatant."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Desplaçar dades al nou emmagatz."</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Pots moure fotos, fitxers i algunes aplicacions a <xliff:g id="NAME">^1</xliff:g>. \n\nAquest procés pot tardar al voltant de <xliff:g id="TIME">^2</xliff:g> i alliberarà <xliff:g id="SIZE">^3</xliff:g> de l\'emmagatzematge intern. Mentrestant, algunes aplicacions no funcionaran."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Desplaça ara"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Instal·lada"</string>
<string name="no_applications" msgid="7336588977497084921">"No hi ha cap aplicació."</string>
<string name="internal_storage" msgid="1584700623164275282">"Emmagatzematge intern"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"emmagatzematge intern"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Emmagatzematge USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Emmag. targeta SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"S\'està tornant a calcular la mida..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Vols eliminar les dades de l\'aplicació?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"S\'eliminaran totes les dades d\'aquesta aplicació permanentment. Això inclou tots els fitxers, la configuració, els comptes, les bases de dades, etc."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"No s\'ha trobat l\'aplicació a la llista d\'aplicacions instal·lades."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"No s\'ha pogut esborrar l\'emmagatzematge de l\'aplicació."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Aquesta aplicació pot accedir a les dades següents de la teva tauleta:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Aquesta aplicació pot accedir als elements següents del telèfon:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Aquesta aplicació pot accedir als elements següents de la tauleta. Per tal de millorar el rendiment i reduir l\'ús de la memòria, alguns d\'aquests permisos estan disponibles per a <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> perquè s\'executa amb el mateix procés que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Aquesta aplicació pot accedir als elements següents del telèfon. Per millorar el rendiment i per reduir l\'ús de la memòria, alguns d\'aquests permisos estan disponibles per a <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> perquè s\'executa amb el mateix procés que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> i <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Pot ser que aquesta aplicació comporti càrrecs:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Envia SMS prèmium"</string>
<string name="computing_size" msgid="1599186977475211186">"S\'està calculant..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"No s\'ha pogut calcular la mida del paquet."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"No tens cap aplicació de tercers instal·lada."</string>
<string name="version_text" msgid="9189073826278676425">"versió <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Mou"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mou a la tauleta"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Desplaça al telèfon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mou a emmagatzematge USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mou a la targeta SD"</string>
- <string name="moving" msgid="6431016143218876491">"S\'està desplaçant"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Ja hi ha una migració en curs."</string>
<string name="insufficient_storage" msgid="481763122991093080">"No hi ha prou espai d\'emmagatzematge."</string>
<string name="does_not_exist" msgid="1501243985586067053">"L\'aplicació no existeix."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"No es poden instal·lar aplicacions d\'administració del dispositiu en suports externs"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Vols forçar l\'aturada?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Si forces l\'aturada d\'una aplicació, és possible que no funcioni correctament."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"No s\'ha pogut moure l\'aplicació. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Ubicació d\'instal·lació preferida"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Canvia la ubicació d\'instal·lació preferida per a les aplicacions noves"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desactivar aplicació integrada?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Desactiva l\'aplicació"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Si desactives aquesta aplicació, és possible que Android i altres aplicacions deixin de funcionar com és habitual."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vols eliminar les dades i desactivar l\'aplicació?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Si desactives aquesta aplicació, és possible que Android i altres aplicacions deixin de funcionar com és habitual. A més, se suprimiran les teves dades."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vols desactivar les notificacions?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactives les notificacions d\'aquesta aplicació, pots perdre\'t actualitzacions i alertes importants."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Botiga"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Informació de l\'aplicació"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"L\'aplicació s\'ha instal·lat des de: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilitza el servei"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utilitza la correcció del color"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilitza subtítols"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continua"</string>
<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="6371077608778830020">"Afegeix un audiòfon"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limites l\'activitat en segon pla d\'una aplicació, és possible que no funcioni correctament"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Com que aquesta aplicació no s\'ha configurat per optimitzar la bateria, no pots restringir-la.\n\nPer restringir l\'aplicació, activa l\'optimització de la bateria."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Consum de la pantalla des de l\'última càrrega completa"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consum de la pantalla"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Cerca de xarxes mòbils"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Ús de la bateria des de l\'última càrrega completa"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Temps que la pantalla ha estat activa des de l\'última càrrega completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Consum del dispositiu des de l\'última càrrega completa"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Detalls d\'ús"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Redueix el consum de la bateria"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Paquets inclosos"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicacions que consumeixen molta bateria"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"El dispositiu es manté actiu"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"S\'activa el dispositiu en segon pla"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Se sol·licita la ubicació massa sovint"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicacions no funcionen correctament"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Les aplicacions funcionen amb normalitat"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"El telèfon fa un ús normal de la bateria en segon pla"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"La tauleta fa un ús normal de la bateria en segon pla"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">S\'ha limitat el consum de la bateria per a %1$d aplicacions</item>
<item quantity="one">S\'ha limitat el consum de la bateria per a %1$d aplicació</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restringida (<xliff:g id="TIME">%1$s</xliff:g>)"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Aquestes aplicacions han estat consumint bateria en segon pla. És possible que les aplicacions restringides no funcionin correctament i que en rebis les notificacions amb retard."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Utilitza el gestor de bateria"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detecta quan les aplicacions consumeixen bateria"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancel·la"</string>
<string name="tts_reset" msgid="2661752909256313270">"Restableix"</string>
<string name="tts_play" msgid="2628469503798633884">"Reprodueix"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Control d\'energia"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"S\'està actualitzant la configuració Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"S\'està actualitzant la configuració del Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"activat"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"desactivat"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"s\'està activant..."</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"s\'està desactivant…"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Ubicació"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sincronització"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brillantor: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automàtic"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completa"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"mitjà"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"desactivat"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Emmagatzematge de credencials"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instal·la des de l\'emmagatzematge"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Selecciona-ho tot"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Ús de dades"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ús de dades de l\'aplicació"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Dades mòbils i Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Ús de l\'aplicació"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIÓ DE L\'APLICACIÓ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Mostra %d elements amagats</item>
<item quantity="one">Mostra %d element amagat</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Replega"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Xarxa i Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"xarxa mòbil"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ús de dades"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacions i notificacions"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicacions predeterminades"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Les aplicacions del perfil professional no tenen accés a les notificacions."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Comptes"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"No s\'ha afegit cap compte"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicacions predeterminades"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomes, hora, còpia de seguretat, actualitzacions"</string>
<string name="search_results_title" msgid="1796252422574886932">"Configuració"</string>
- <string name="search_menu" msgid="6283419262313758339">"Cerca a la configuració"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wi-fi, Wi-Fi, connexió de xarxa, Internet, sense fil, dades, wifi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, commutador, control"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"missatge de text, enviar missatges de text, missatges, enviar missatges, predeterminat"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"paga, toca, pagaments"</string>
<string name="keywords_backup" msgid="470070289135403022">"còpia de seguretat, crear una còpia de seguretat"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gest"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"cara, desbloquejar, autenticació, iniciar la sessió"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versió de prl, versió de software d\'imei"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"xarxa, estat de la xarxa mòbil, estat del servei, intensitat del senyal, tipus de xarxa mòbil, itinerància, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de sèrie, versió de maquinari"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema fosc"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"error"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Pantalla ambient, pantalla de bloqueig"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notificació en pantalla de bloqueig"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"cara"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"empremta digital"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"pantalla atenuada, pantalla tàctil, bateria, brillantor intel·ligent, brillantor dinàmica"</string>
@@ -3133,7 +3105,7 @@
<string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Quan la pantalla estigui desactivada"</string>
<string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"Silencia el so i la vibració"</string>
<string name="zen_mode_block_effect_intent" msgid="350764335391428447">"No activis la pantalla"</string>
- <string name="zen_mode_block_effect_light" msgid="8106976110224107316">"Desactiva la llum intermitent"</string>
+ <string name="zen_mode_block_effect_light" msgid="8106976110224107316">"Desactiva el llum intermitent"</string>
<string name="zen_mode_block_effect_peek" msgid="6836997464098657115">"No mostris les notificacions a la pantalla"</string>
<string name="zen_mode_block_effect_status" msgid="6642532634292373081">"Amaga les icones de la barra d\'estat"</string>
<string name="zen_mode_block_effect_badge" msgid="4656911773512844243">"Amaga els punts de notificació"</string>
@@ -3196,8 +3168,8 @@
<string name="sound_work_settings" msgid="6774324553228566442">"Sons del perfil professional"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utilitza sons del perfil pers."</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Els sons del perfil professional i personal són els mateixos"</string>
- <string name="work_ringtone_title" msgid="5806657896300235315">"So de trucada professional"</string>
- <string name="work_notification_ringtone_title" msgid="6081247402404510004">"So de notificació professional predeterminat"</string>
+ <string name="work_ringtone_title" msgid="5806657896300235315">"So de trucada de la feina"</string>
+ <string name="work_notification_ringtone_title" msgid="6081247402404510004">"So de notificació de la feina predeterminat"</string>
<string name="work_alarm_ringtone_title" msgid="1441926676833738891">"So d\'alarma de la feina predeterminat"</string>
<string name="work_sound_same_as_personal" msgid="3123383644475266478">"Igual que al perfil personal"</string>
<string name="work_sync_dialog_title" msgid="7123973297187354813">"Vols substituir els sons?"</string>
@@ -3217,7 +3189,7 @@
<string name="lock_screen_notifications_title" msgid="2583595963286467672">"A la pantalla de bloqueig"</string>
<string name="locked_work_profile_notification_title" msgid="8327882003361551992">"Si perfil professional bloquejat"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut de les notificacions"</string>
- <string name="lock_screen_notifications_summary_hide" msgid="8301305044690264958">"Amaga el contingut confidencial"</string>
+ <string name="lock_screen_notifications_summary_hide" msgid="8301305044690264958">"Amaga el contingut sensible"</string>
<string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"No mostris les notificacions"</string>
<string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Com vols que es mostrin les notificacions quan el dispositiu estigui bloquejat?"</string>
<string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notificacions"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Quan introdueixis el teu PIN per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara <xliff:g id="SERVICE">%1$s</xliff:g> encara no estaran disponibles."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Quan introdueixis el teu patró per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara <xliff:g id="SERVICE">%1$s</xliff:g> encara no estaran disponibles."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Quan introdueixis la teva contrasenya per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara <xliff:g id="SERVICE">%1$s</xliff:g> encara no estaran disponibles."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Nota: després de reiniciar, l\'aplicació no s\'iniciarà fins que no desbloquegis el telèfon"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Nota: si reinicies el telèfon i has definit un bloqueig de pantalla, l\'aplicació no s\'iniciarà fins que no desbloquegis el telèfon"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informació sobre l\'IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informació relativa a l\'IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Ranura <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personals"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Professionals"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplicacions: totes"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplicacions: desactivades"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Desactivades"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: urgents"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: importància baixa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: desactivades"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'ús"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Mostra l\'ús complet del dispositiu"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Mostra l\'ús de l\'aplicació"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Ús elevat"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicacions s\'estan comportant de manera anòmala</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> s\'està comportant de manera anòmala</item>
@@ -3667,7 +3638,7 @@
<string name="memory_maximum_usage" msgid="6513785462055278341">"Ús màxim"</string>
<string name="no_data_usage" msgid="9131454024293628063">"No s\'han fet servir dades"</string>
<string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Vols que <xliff:g id="APP">%1$s</xliff:g> tingui accés a No molestis?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"L\'aplicació podrà activar o desactivar No molestis i fer canvis en paràmetres relacionats."</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"L\'aplicació podrà activar o desactivar No molestis i fer canvis a les opcions de configuració relacionades."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Ha d\'estar activat perquè l\'accés a les notificacions també ho està"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Vols revocar l\'accés de l\'aplicació <xliff:g id="APP">%1$s</xliff:g> a No molestis?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Se suprimiran totes les regles del mode No molestis creades per aquesta aplicació."</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Emmagatzematge intern: <xliff:g id="PERCENTAGE">%1$s</xliff:g> utilitzat, <xliff:g id="FREE_SPACE">%2$s</xliff:g> lliure"</string>
<string name="display_summary" msgid="6737806235882127328">"Entra en repòs després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Fons de pantalla, repòs, mida de la lletra"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Entra en repòs després de 10 minuts d\'inactivitat"</string>
<string name="memory_summary" msgid="8080825904671961872">"Memòria mitjana utilitzada: <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Sessió iniciada com a <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"No està permès enviar SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"No està permès utilitzar la càmera"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"No està permès fer captures de pantalla"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"No es poden desactivar les còpies de seguretat"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"No es pot obrir aquesta aplicació"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Si tens cap dubte, contacta amb l\'administrador de TI"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Més detalls"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simula una pantalla amb un retall"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Cap"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Opció predeterminada del dispositiu"</string>
<string name="special_access" msgid="3458780842491881155">"Accés especial d\'aplicacions"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacions poden utilitzar dades sense restricció</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connectat a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connectat a diversos dispositius"</string>
<string name="demo_mode" msgid="2798762752209330277">"Mode de demostració de la IU del sistema"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Mode nocturn"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Activa el mode nocturn"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Mode fosc"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Activa el mode fosc"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaics de configuració ràpida per a desenvolupadors"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Traça de Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Configuració del perfil professional"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Cerca de contactes"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permet que la teva organització cerqui contactes per identificar els remitents i els contactes"</string>
@@ -3989,14 +3960,18 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Doble toc per consultar-lo"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Per consultar la tauleta, fes-hi doble toc"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Per consultar el dispositiu, fes-hi doble toc"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Per veure l\'hora, les icones de notificació i altres dades, fes doble toc a la pantalla."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Per veure l\'hora, les notificacions i altres dades, fes doble toc a la pantalla."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Aixeca per consultar-lo"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Per consultar la tauleta, aixeca-la"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Aixeca el dispositiu per consultar-lo"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Per veure l\'hora, les icones de notificació i altres dades, agafa el telèfon"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Per veure l\'hora, les icones de notificació i altres dades, agafa la tauleta"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Per veure l\'hora, les icones de notificació i altres dades, agafa el dispositiu."</string>
- <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Fes lliscar el sensor d\'empremtes per veure notificacions"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Activa la pantalla"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Per veure l\'hora, les notificacions i altres dades, agafa el telèfon."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Per veure l\'hora, les notificacions i altres dades, agafa la tauleta."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Per veure l\'hora, les notificacions i altres dades, agafa el dispositiu."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gest per activar la pantalla de bloqueig"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
+ <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Llisca al sensor d\'empremtes per consultar les notificacions"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Fes lliscar l\'empremta digital"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Per consultar les notificacions, llisca cap avall al sensor d\'empremtes digitals de la part posterior del telèfon."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Per consultar les notificacions, llisca cap avall al sensor d\'empremtes digitals situat a la part posterior de la tauleta."</string>
@@ -4033,7 +4008,7 @@
<string name="enterprise_privacy_exposure_category" msgid="7313392680107938517">"Tipus d\'informació que la teva organització pot veure"</string>
<string name="enterprise_privacy_exposure_changes_category" msgid="9079283547182933771">"Canvis fets per l\'administrador de la teva organització"</string>
<string name="enterprise_privacy_device_access_category" msgid="5423434164248819058">"El teu accés a aquest dispositiu"</string>
- <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Dades associades al teu compte professional, com ara el correu electrònic i el calendari"</string>
+ <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Dades associades al teu compte de la feina, com ara el correu electrònic i el calendari"</string>
<string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Llista de les aplicacions que hi ha al dispositiu"</string>
<string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"Temps dedicat i dades utilitzades en cada aplicació"</string>
<string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Registre del trànsit de xarxa més recent"</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> intents</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> intent</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"S\'està creant una còpia de seguretat de les dades d\'aquest dispositiu"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"La teva organització gestiona aquest dispositiu."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> gestiona aquest dispositiu."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Servei Emplenament automàtic"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automàtic, emplenament, emplenament automàtic"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Assegura\'t que confies en aquesta aplicació</b> <br/> <br/> <xliff:g id=app_name example=Emplenament automàtic de Google>%1$s</xliff:g> utilitza el contingut que es mostra a la pantalla per determinar què es pot emplenar automàticament."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Emplena automàticament"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Nivell de registre"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Nombre màxim de sol·licituds per sessió"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Nombre màxim de conjunts de dades visibles"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Restableix els valors predeterminats"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"S\'han restablert les opcions d\'emplenament automàtic per a desenvolupadors"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema del dispositiu"</string>
<string name="default_theme" msgid="7085644992078579076">"Predeterminat"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nom de la xarxa"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activa els serveis de l\'operador de telefonia mòbil"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Actualitza el mode No molestis"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Posa en pausa les notificacions per centrar l\'atenció"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Quines són les novetats més importants?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Dona una ullada al teu telèfon nou"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Dona una ullada a la teva tauleta nova"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Dona una ullada al teu dispositiu nou"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Aquesta funció no està disponible en aquest dispositiu"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Força els mesuraments de GNSS complets"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Fes un seguiment de totes les freqüències i constel·lacions de GNSS sense cicle de treball"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Mostra sempre el quadre de diàleg de bloqueig"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Mostra el quadre de diàleg cada vegada que una aplicació es bloquegi"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Selecciona l\'aplicació compatible amb ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"No s\'ha definit cap aplicació compatible amb ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplicació compatible amb ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Accés al directori"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"accés al directori"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalls de la xarxa"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"El nom del dispositiu és visible per a les aplicacions del telèfon. També el poden veure altres persones si el connectes a un dispositiu Bluetooth o si configures un punt d\'accés Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Dispositius"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Tota la configuració"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suggeriments"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dades CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dades CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Tria la xarxa"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desconnectada"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connectada"</string>
+ <string name="network_connecting" msgid="76404590784733557">"S\'està connectant…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"No s\'ha pogut connectar"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No s\'ha trobat cap xarxa."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"No s\'ha pogut trobar cap xarxa. Torna-ho a provar."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(prohibida)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"No hi ha cap targeta SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Trucades avançades"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Mode de xarxa preferit: WCDMA preferit"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Mode de xarxa preferit: només GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Mode de xarxa preferit: només WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Mode de xarxa preferit: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Mode de xarxa preferit: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Mode de xarxa preferit: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Mode de xarxa preferit: només CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Mode de xarxa preferit: només EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Mode de xarxa preferit: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Mode de xarxa preferit: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Mode de xarxa preferit: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Mode de xarxa preferit: CDMA+LTE/EvDo"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Mode de xarxa preferit: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Mode de xarxa preferit: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Mode de xarxa preferit: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Mode de xarxa preferit: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Mode de xarxa preferit: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Mode de xarxa preferit: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Mode de xarxa preferit: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Mode de xarxa preferit: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Mode de xarxa preferit: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Mode de xarxa preferit: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Mode de xarxa preferit: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Mode de xarxa preferit: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Mode de xarxa preferit: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Mode de xarxa preferit: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (opció recomanada)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (opció recomanada)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Xarxes disponibles"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"S\'està cercant…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"S\'està registrant a <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"La targeta SIM no et permet connectar-te a aquesta xarxa."</string>
+ <string name="connect_later" msgid="978991102125216741">"No es pot connectar a aquesta xarxa ara mateix. Torna-ho a provar més tard."</string>
+ <string name="registration_done" msgid="4573820010512184521">"S\'ha registrat a la xarxa."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Selecciona la xarxa automàticament"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Configuració de l\'operador"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Configura el servei de dades"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Dades mòbils"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Accedeix a les dades amb la xarxa mòbil"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tipus de xarxa preferit"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Canvia el mode de funcionament de la xarxa"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tipus de xarxa preferit"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operador de telefonia mòbil"</string>
+ <string name="call_category" msgid="8108654745239563833">"Trucades"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videotrucades amb l\'operador de telefonia mòbil"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Selecció del sistema"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Canvia el mode d\'itinerància CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Selecció del sistema"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Xarxa"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Xarxa"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Subscripció CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Canvia entre RUIM/SIM i NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"subscripció"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Registre automàtic…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Vols permetre la itinerància de dades?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Contacta amb el proveïdor de xarxa per saber els preus."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Ús de dades de l\'aplicació"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"El mode de xarxa <xliff:g id="NETWORKMODEID">%1$d</xliff:g> no és vàlid. Ignora."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"No està disponible quan està connectat a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Mostra\'n més"</string>
+ <string name="see_less" msgid="1250265310929558370">"Mostra\'n menys"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"No hi ha cap dispositiu connectat"</string>
</resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index b1b2771..45a3f1f 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -263,7 +263,7 @@
<item msgid="8374996688066472414">"číst obsah schránky"</item>
<item msgid="3045529469061083747">"upravit obsah schránky"</item>
<item msgid="5124443975763747838">"tlačítka médií"</item>
- <item msgid="4547883971364273343">"zaměření zvuku"</item>
+ <item msgid="4547883971364273343">"priorita přehrávání"</item>
<item msgid="2603878814882344450">"hlavní hlasitost"</item>
<item msgid="7136963238377062018">"hlasitost hlasu"</item>
<item msgid="4270236897655923007">"hlasitost vyzvánění"</item>
@@ -330,7 +330,7 @@
<item msgid="136815868796597058">"Číst obsah schránky"</item>
<item msgid="5238692940326972503">"Upravit obsah schránky"</item>
<item msgid="5753789168376302997">"Tlačítka médií"</item>
- <item msgid="3265262911688671938">"Zaměření zvuku"</item>
+ <item msgid="3265262911688671938">"Priorita přehrávání"</item>
<item msgid="2098976479485046797">"Hlavní hlasitost"</item>
<item msgid="5660213838861789350">"Hlasitost hlasu"</item>
<item msgid="7983336752371254444">"Hlasitost vyzvánění"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Považovat za měřenou síť"</item>
<item msgid="2266114985518865625">"Považovat za neměřenou síť"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Výchozí (použít náhodně vygenerovanou adresu MAC)"</item>
+ <item msgid="5398461510512959597">"Důvěryhodný"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ne"</item>
<item msgid="3863157480502955888">"Ano"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Vždy zapnuto"</item>
<item msgid="6385301106124765323">"Vždy vypnuto"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Vypnuto"</item>
+ <item msgid="2182686878828390312">"Ladění"</item>
+ <item msgid="5286514712714822064">"Podrobné"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Pouze plocha"</item>
+ <item msgid="5034813753274486448">"Automaticky"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA – preferováno"</item>
+ <item msgid="807926878589867564">"Pouze GSM"</item>
+ <item msgid="488474605709912156">"Pouze WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA – automaticky"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo – automaticky"</item>
+ <item msgid="370391313511477301">"CDMA bez EvDo"</item>
+ <item msgid="4678789463133969294">"Pouze EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globální"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Pouze TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globální"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index f41f63a..6bc77d3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Vytvořit"</string>
<string name="allow" msgid="3349662621170855910">"Povolit"</string>
<string name="deny" msgid="6947806159746484865">"Odmítnout"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Zavřít"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Přepnout"</string>
<string name="device_info_default" msgid="7847265875578739287">"Neznámé"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="few">Ještě <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroky a bude z vás vývojář.</item>
@@ -34,10 +32,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Není potřeba, již jste vývojář."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Nejprve prosím aktivujte možnosti pro vývojáře."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Bezdrátová připojení a sítě"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Připojení"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Zařízení"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Osobní"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Přístup"</string>
<string name="header_category_system" msgid="2816866961183068977">"Systém"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Povolit datové připojení"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Zakázat datové připojení"</string>
@@ -123,7 +117,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresa Bluetooth zařízení: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odpojit zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysílání"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Nepojmenované zařízení Bluetooth"</string>
<string name="progress_scanning" msgid="192587958424295789">"Hledání"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"V okolí nejsou žádná zařízení Bluetooth."</string>
@@ -155,7 +148,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Aplikace chce zapnout Bluetooth a zviditelnit telefon pro ostatní zařízení. Svoji volbu můžete později změnit v nastavení Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Zapínání Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Vypínání rozhraní Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatické připojení"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Požadavek na připojení zařízení Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Klepnutím se připojíte k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Chcete se připojit k zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
@@ -183,12 +175,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dostupná telefonní zařízení"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Momentálně připojeno"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Uložená zařízení"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Přidat zařízení"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Zapne se Bluetooth za účelem spárování"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Předvolby připojení"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dříve připojená zařízení"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Dříve připojeno"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth je zapnuto"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Zobrazit vše"</string>
<string name="date_and_time" msgid="9062980487860757694">"Datum a čas"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Vybrat časové pásmo"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -271,7 +263,6 @@
<string name="skip_label" msgid="47510779345218297">"Přeskočit"</string>
<string name="next_label" msgid="4693520878012668114">"Další"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Jazyky"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Nastavení jazyka"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Odstranit"</string>
<string name="add_a_language" msgid="2330538812283783022">"Přidat jazyk"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -307,7 +298,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Nastavení"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Zástupce nastavení"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Režim Letadlo"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Další"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrátová připojení a sítě"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Spravovat Wi-Fi, Bluetooth, režim Letadlo, mobilní sítě a sítě VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobilní data"</string>
@@ -367,7 +357,7 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Zpráva na zamčené obrazovce"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktivovat widgety"</string>
<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 zamknutí"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Zobrazit možnost uzamčení"</string>
<string name="lockdown_settings_summary" msgid="429230431748285997">"Zobrazí vypínač, který vypíná funkci Smart Lock, odemykání otiskem prstu a oznámení na obrazovce uzamčení."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Žádná"</string>
<string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
@@ -392,6 +382,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Ochrana soukromí"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Zakázáno administrátorem"</string>
<string name="security_status_title" msgid="5848766673665944640">"Stav zabezpečení"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Zámek obrazovky, odemknutí obličejem"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Zámek obrazovky, otisky prstů"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zámek obrazovky"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Obličej přidán"</string>
@@ -401,11 +392,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Odemykání pomocí obličeje"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Ověření pomocí obličeje"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Použijte"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Odemykejte telefon a schvalujte nákupy pomocí obličeje.\n\nPoznámka: Obličej nelze použít k odemykání tohoto zařízení. Další informace vám poskytne administrátor vaší organizace."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Odemykejte telefon, autorizujte nákupy a přihlašujte se do aplikací."</string>
- <string name="face_add_max" msgid="2342250989212694454">"Maximální počet otisků prstů, které lze přidat: <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Umístěte obličej do středu kruhu"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Později"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Maximální počet obličejů, které lze přidat: <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Přidali jste maximální počet obličejů"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Další obličeje přidat nelze"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registrace nebyla dokončena"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Při registraci obličeje bylo dosaženo časového limitu. Zkuste to znovu."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Registrace obličeje nefungovala."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Vše je nastaveno."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Hotovo"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Použití obličeje"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Odemknutí zařízení"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Přihlašování do aplikací a platby"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Mějte otevřené oči"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Při ověřování pomocí obličeje musíte mít otevřené oči"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Odstranit obličej"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Upřesnění údajů o obličeji"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Pomocí obličeje můžete odemykat zařízení a používat aplikace. "<annotation id="url">"Další informace"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisk prstu"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Správa otisků prstů"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"K čemu otisk používat"</string>
@@ -914,6 +921,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Vyberte alespoň jedno pásmo pro hotspot Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavení IP adresy"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Ochrana soukromí"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Vyberte"</string>
@@ -953,7 +961,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Zrušit"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Zapomenout síť?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Všechna hesla této sítě budou smazána"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Uložené sítě"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="few">%d sítě</item>
<item quantity="many">%d sítě</item>
@@ -1134,8 +1141,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Jas"</string>
<string name="brightness_summary" msgid="838917350127550703">"Nastavení jasu displeje"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Adaptivní jas"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Zapnuto"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Vypnuto"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Je preferován velmi nízký jas"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Je preferován nízký jas"</string>
@@ -1157,7 +1163,7 @@
<string name="night_display_text" msgid="1837277457033025056">"Noční režim obrazovku zbarví do oranžova. Čtení a sledování obrazovky při tlumeném osvětlení tak bude snazší a bude se vám lépe usínat."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Plán"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Žádný"</string>
- <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Zapne se ve zvoleném čas"</string>
+ <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Zapne se ve zvoleném čase"</string>
<string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Zapne se od soumraku do úsvitu"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"Čas zahájení"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"Čas ukončení"</string>
@@ -1231,6 +1237,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Kód PIN nelze změnit.\nMožná jste zadali nesprávný kód PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM karty byl úspěšně změněn."</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Stav zámku SIM karty nelze změnit.\nZřejmě jste zadali nesprávný kód PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN nelze deaktivovat."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN nelze aktivovat."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Zrušit"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Bylo nalezeno několik SIM karet"</string>
@@ -1406,7 +1414,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Tato akce vyžaduje, aby úložiště <xliff:g id="NAME_0">^1</xliff:g> bylo naformátováno. \n\n"<b>"Formátováním vymažete veškerá data z úložiště <xliff:g id="NAME_1">^1</xliff:g>."</b>" Chcete-li předejít ztrátě dat, doporučujeme je zálohovat."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Vymazat a naformátovat"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formátování úložiště <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Během formátování médium <xliff:g id="NAME">^1</xliff:g> neodpojujte."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Během formátování médium <xliff:g id="NAME">^1</xliff:g> neodpojujte."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Přesuňte data do nového úložiště"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Do tohoto nového úložiště <xliff:g id="NAME">^1</xliff:g> můžete přesunout fotky, soubory a některé aplikace. \n\nPřesun bude trvat <xliff:g id="TIME">^2</xliff:g> a v interním úložišti uvolní <xliff:g id="SIZE">^3</xliff:g>. Během přesunu nebudou některé aplikace fungovat."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Přesunout"</string>
@@ -1503,7 +1511,7 @@
<string name="restore_default_apn" msgid="8178010218751639581">"Obnovování výchozích nastavení přístupového bodu"</string>
<string name="menu_restore" msgid="8260067415075573273">"Obnovit výchozí"</string>
<string name="restore_default_apn_completed" msgid="2824775307377604897">"Výchozí nastavení přístupového bodu bylo obnoveno."</string>
- <string name="reset_dashboard_title" msgid="6254873816990678620">"Resetovat možnosti"</string>
+ <string name="reset_dashboard_title" msgid="6254873816990678620">"Možnosti resetu"</string>
<string name="reset_dashboard_summary" msgid="4851012632493522755">"Lze resetovat síť, aplikace nebo zařízení"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Resetovat Wi-Fi, data a Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Budou resetována nastavení všech sítí, včetně následujících:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobilní data"</li>\n<li>"Bluetooth"</li></string>
@@ -1790,9 +1798,6 @@
<string name="installed" msgid="3070865169422600098">"Nainstalováno"</string>
<string name="no_applications" msgid="7336588977497084921">"Žádné aplikace"</string>
<string name="internal_storage" msgid="1584700623164275282">"Interní úložiště"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"interní úložiště"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Úložiště USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Karta SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Přepočítávání velikosti..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Vymazat data aplikace?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Veškerá data (všechny soubory, nastavení, účty, databáze apod.) této aplikace budou trvale vymazána."</string>
@@ -1801,24 +1806,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikaci se nepodařilo najít na seznamu nainstalovaných aplikací."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Data aplikace v úložišti se nepodařilo vymazat."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Tato aplikace má přístup k následujícím funkcím tabletu:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Tato aplikace má přístup k následujícím funkcím telefonu:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Tato aplikace může ve vašem tabletu používat následující oprávnění. Chcete-li zvýšit výkon a snížit využití paměti, některá tato oprávnění jsou dostupná v aplikaci <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, která se spouští v rámci stejného procesu jako aplikace <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Tato aplikace může ve vašem telefonu používat následující oprávnění. Chcete-li zvýšit výkon a snížit využití paměti, některá tato oprávnění jsou dostupná v aplikaci <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, která se spouští v rámci stejného procesu jako aplikace <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> a <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Tato aplikace vám může účtovat poplatky:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Odesílání prémiových zpráv SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Probíhá výpočet…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Nepodařilo se určit velikost balíčku."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Žádné aplikace třetích stran nejsou nainstalovány."</string>
<string name="version_text" msgid="9189073826278676425">"verze <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Přesunout"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Přesunout do tabletu"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Přesunout do telefonu"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Přesunout do úlož. USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Přesunout na kartu SD"</string>
- <string name="moving" msgid="6431016143218876491">"Přesouvání"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Probíhá jiná migrace."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nedostatek místa v úložišti."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplikace neexistuje."</string>
@@ -1828,17 +1825,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Aplikaci pro správu zařízení nelze nainstalovat na externí média"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Chcete vynutit zastavení?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Vynucené zastavení může způsobit nepředvídatelné chování aplikace."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Přesunutí aplikace se nezdařilo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Preferované umístění pro instalaci"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Změna preferovaného umístění pro instalaci nových aplikací"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktivovat integrovanou aplikaci"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Deaktivovat aplikaci"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Pokud tuto aplikaci deaktivujete, systém Android a ostatní aplikace nemusejí fungovat správně."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vymazat data a deaktivovat aplikaci?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Pokud tuto aplikaci deaktivujete, systém Android a ostatní aplikace nemusejí fungovat správně. Také budou smazána data."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vypnout oznámení?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Pokud v této aplikaci vypnete oznámení, můžete přijít o důležitá upozornění a aktuality."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Obchod"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Podrobnosti o aplikaci"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplikace nainstalovaná z obchodu <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1982,14 +1975,14 @@
<string name="usage_time_label" msgid="295954901452833058">"Doba použití"</string>
<string name="accessibility_settings" msgid="3975902491934816215">"Přístupnost"</string>
<string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavení přístupnosti"</string>
- <string name="accessibility_settings_summary" msgid="981260486011624939">"Čtečky obrazovky, zobrazení, ovládací prvky interakce"</string>
+ <string name="accessibility_settings_summary" msgid="981260486011624939">"Čtečky obrazovky, zobrazení, interaktivní ovládací prvky"</string>
<string name="vision_settings_title" msgid="4204111425716868288">"Nastavení pro slabozraké"</string>
<string name="vision_settings_description" msgid="5679491180156408260">"Toto zařízení můžete přizpůsobit svým potřebám. Funkce přístupnosti lze později změnit v Nastavení."</string>
<string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Změňte velikost písma"</string>
<string name="screen_reader_category_title" msgid="7739154903913400641">"Čtečky obrazovky"</string>
<string name="audio_and_captions_category_title" msgid="3420727114421447524">"Zvuk a text na obrazovce"</string>
<string name="display_category_title" msgid="685461049938269166">"Zobrazení"</string>
- <string name="interaction_control_category_title" msgid="7836591031872839151">"Ovládací prvky interakce"</string>
+ <string name="interaction_control_category_title" msgid="7836591031872839151">"Interaktivní ovládací prvky"</string>
<string name="user_installed_services_category_title" msgid="6426376488922158647">"Stažené služby"</string>
<string name="experimental_category_title" msgid="5272318666666893547">"Experimentální"</string>
<string name="feature_flags_dashboard_title" msgid="778619522682769966">"Příznaky experimentálních funkcí"</string>
@@ -2031,6 +2024,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Používat službu"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Používat korekci barev"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Používat titulky"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Pokračovat"</string>
<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="6371077608778830020">"Přidat naslouchátko"</string>
@@ -2190,8 +2184,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Pokud u aplikace omezíte aktivitu na pozadí, může dojít k nepředvídatelnému chování"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplikace není nastavena k optimalizaci baterie, nelze ji tedy omezit.\n\nChcete-li ji omezit, nejprve zapněte optimalizaci."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Využití obrazovky od úplného nabití"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Spotřeba obrazovky"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Vyhledávání mobilních sítí"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Využití baterie od úplného nabití"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Doba, po kterou byla od úplného nabití zapnutá obrazovka"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Využití zařízení od úplného nabití"</string>
@@ -2218,11 +2210,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Podrobnosti využívání"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Upravit spotřebu energie"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Zahrnuté balíčky"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikace vybíjejí baterii"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Bránění přechodu do režimu spánku"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Buzení zařízen na pozadí"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Časté žádosti o polohu"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Počet aplikací, které se nechovají správně: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikace běží normálně"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"V telefonu dochází k běžnému využití baterie na pozadí"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"V tabletu dochází k běžnému využití baterie na pozadí"</string>
@@ -2298,6 +2285,7 @@
<item quantity="other">Omezení využití baterie u %1$d aplikací</item>
<item quantity="one">Omezení využití baterie u %1$d aplikace</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Omezeno <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Tyto aplikace využívají baterii na pozadí. Omezené aplikace nemusí fungovat správně a jejich oznámení se mohou zobrazovat se zpožděním."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Použít správce baterie"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Zjišťovat, zda aplikace vybíjejí baterii"</string>
@@ -2477,23 +2465,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Zrušit"</string>
<string name="tts_reset" msgid="2661752909256313270">"Obnovit"</string>
<string name="tts_play" msgid="2628469503798633884">"Přehrát"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Kontrola spotřeby energie"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Probíhá aktualizace nastavení Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Probíhá aktualizace nastavení Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"zapnuto"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"vypnuto"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"zapínání"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"vypínání"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Poloha"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synchronizace"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Jas <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automaticky"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"úplný"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"poloviční"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"vypnuto"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"Síť VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Úložiště pověření"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalovat z úložiště"</string>
@@ -2651,7 +2622,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Vybrat vše"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Využití dat"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Využití dat apl."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobilní data & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Účtování dat operátora se může lišit od údajů zařízení."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Využití aplikací"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"O APLIKACI"</string>
@@ -3038,7 +3009,6 @@
<item quantity="other">Zobrazit %d skrytých položek</item>
<item quantity="one">Zobrazit %d skrytou položku</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Sbalit"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Síť a internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilní síť"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"využití dat"</string>
@@ -3050,12 +3020,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikace a oznámení"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Oprávnění, výchozí aplikace"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Aplikace v pracovním profilu nemají přístup k oznámením."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Účty"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nebyly přidány žádné účty"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Výchozí aplikace"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Jazyky, čas, zálohování, aktualizace"</string>
<string name="search_results_title" msgid="1796252422574886932">"Nastavení"</string>
- <string name="search_menu" msgid="6283419262313758339">"Prohledat nastavení"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, síť, připojení, internet, bezdrátové, data"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, přepnout, ovládání"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"sms, zprávy, výchozí"</string>
@@ -3100,6 +3070,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"platit, klepnout, platby"</string>
<string name="keywords_backup" msgid="470070289135403022">"záloha, zálohování"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"obličej, odemknutí, autorizace, přihlášení"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, verze prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"síť, stav mobilní sítě, stav služby, síla signálu, typ mobilní sítě, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"sériové číslo, verze hardwaru"</string>
@@ -3107,6 +3078,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tmavý motiv"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"chyba"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambientní displej, displej zámku obrazovky"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"oznámení na obrazovce uzamčení"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"obličej"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"otisk prstu"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ztlumení obrazovky, dotyková obrazovka, baterie, chytrý jas, dynamický jas"</string>
@@ -3498,7 +3470,7 @@
<string name="zen_mode_when" msgid="2767193283311106373">"Automaticky zapnout"</string>
<string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
<string name="zen_mode_when_every_night" msgid="3122486110091921009">"Každou noc"</string>
- <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Víkendy"</string>
+ <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Pracovní dny (v noci)"</string>
<string name="zen_mode_start_time" msgid="8102602297273744441">"Čas zahájení"</string>
<string name="zen_mode_end_time" msgid="8774327885892705505">"Čas ukončení"</string>
<string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"Následující den v <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
@@ -3558,7 +3530,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Při zadávání kódu PIN ke spuštění zařízení ještě služby přístupnosti, jako je <xliff:g id="SERVICE">%1$s</xliff:g>, nebudou k dispozici."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Při zadávání gesta ke spuštění zařízení ještě služby přístupnosti, jako je <xliff:g id="SERVICE">%1$s</xliff:g>, nebudou k dispozici."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Při zadávání hesla ke spuštění zařízení ještě služby přístupnosti, jako je <xliff:g id="SERVICE">%1$s</xliff:g>, nebudou k dispozici."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Poznámka: Po restartování se tato aplikace nespustí, dokud telefon neodemknete."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Poznámka: Pokud restartujete telefon a máte nastavený zámek obrazovky, tato aplikace se nespustí, dokud telefon neodemknete."</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informace o kódu IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informace související s kódem IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3620,7 +3592,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Osobní"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Práce"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikace: Vše"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikace: vypnuto"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Vypnuto"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorie: Urgentní důležitost"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorie: Nízká důležitost"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorie: Vypnuto"</string>
@@ -3683,7 +3655,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Upozornění na využití"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Zobrazit úplné využití zařízení"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Zobrazit využití aplikace"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Vysoká spotřeba"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikace se chovají neobvykle</item>
<item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> aplikace se chová neobvykle</item>
@@ -3855,6 +3826,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Interní úložiště: využito <xliff:g id="PERCENTAGE">%1$s</xliff:g> – volné místo: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti přejít do režimu spánku"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Tapeta, režim spánku, velikost písma"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Po 10 minutách nečinnosti přejít do režimu spánku"</string>
<string name="memory_summary" msgid="8080825904671961872">"Přibližné využití paměti: <xliff:g id="USED_MEMORY">%1$s</xliff:g> z <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Jste přihlášeni jako <xliff:g id="USER_NAME">%1$s</xliff:g>."</string>
@@ -3870,7 +3843,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Zprávy SMS nejsou povoleny"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Použití fotoaparátu není povoleno"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Uložení snímku obrazovky není povoleno"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Zálohy nelze vypnout"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Tuto aplikaci nelze otevřít"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Máte-li nějaké otázky, obraťte se na svého administrátora IT"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Další podrobnosti"</string>
@@ -4044,9 +4016,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulovat displej s výřezem"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Výřez displeje"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"výřez displeje"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Žádné"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Výchozí nastavení zařízení"</string>
<string name="special_access" msgid="3458780842491881155">"Přístup ke spec. aplikacím"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikace mohou využívat neomezená data</item>
@@ -4070,11 +4042,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Připojeno k zařízení <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Připojeno k několika zařízením"</string>
<string name="demo_mode" msgid="2798762752209330277">"Ukázkový režim uživatelského rozhraní systému"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Noční režim"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Nastavit noční režim"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Tmavý režim"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Nastavit Tmavý režim"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Dlaždice rychlého nastavení pro vývojáře"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Trasování Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Nastavení pracovního profilu"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Vyhledávání kontaktů"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Povolit vyhledávání kontaktů organizací za účelem identifikace volajících a kontaktů"</string>
@@ -4121,13 +4092,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Kontrola telefonu dvojitým klepnutím"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Kontrola tabletu dvojitým klepnutím"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Kontrola zařízení dvojitým klepnutím"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Chcete-li zobrazit čas, ikony oznámení a další informace, dvakrát klepněte na obrazovku."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Chcete-li zobrazit čas, oznámení a další informace, dvakrát klepněte na obrazovku."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Kontrola telefonu zvednutím"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Kontrola tabletu zvednutím"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Kontrola zařízení zvednutím"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Chcete-li zobrazit čas, ikony oznámení a další informace, zvedněte telefon."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Chcete-li zobrazit čas, ikony oznámení a další informace, zvedněte tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Chcete-li zobrazit čas, ikony oznámení a další informace, zvedněte zařízení."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Zobrazení po probuzení"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Chcete-li zobrazit čas, oznámení a další informace, zvedněte telefon."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Chcete-li zobrazit čas, oznámení a další informace, zvedněte tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Chcete-li zobrazit čas, oznámení a další informace, zvedněte zařízení."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gesto blokování přechodu do režimu spánku"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Otisk prstu pro oznámení"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Přejeďte po otisku"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně telefonu."</string>
@@ -4215,7 +4190,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pokusů</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> pokus</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Data v tomto zařízení jsou zálohována"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Toto zařízení spravuje vaše organizace."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Toto zařízení je spravováno organizací <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4262,6 +4236,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Služba automatického vyplňování"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatické vyplňování, vyplňování"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Zkontrolujte, zda se jedná o důvěryhodnou aplikaci</b> <br/> <br/> <xliff:g id=app_name example=Automatické doplňování Google>%1$s</xliff:g> určuje na základě obsahu obrazovky, co lze automaticky vyplnit."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automatické vyplňování"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Úroveň protokolování"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maximální počet žádosti na relaci"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Max. viditelných datových sad"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Resetovat na výchozí hodnoty"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Možnosti automatického vyplňování pro vývojáře byly resetovány"</string>
<string name="device_theme" msgid="4571803018917608588">"Motiv zařízení"</string>
<string name="default_theme" msgid="7085644992078579076">"Výchozí"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Název sítě"</string>
@@ -4276,15 +4256,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustit zprovoznění služby u operátora"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Aktualizujte režim Nerušit"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pokud nechcete být rušeni, oznámení pozastavte"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Co je nové a zajímavé?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Prohlédněte si svůj nový telefon"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Prohlédněte si svůj nový tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Prohlédněte si své nové zařízení"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Funkce v tomto zařízení není k dispozici"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Vynutit úplné měření GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Sledovat všechny konstelace a frekvence GNSS bez cyklického vypínání a zapínání"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Vždy zobrazit dialog o pádu"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Zobrazit dialog při každém pádu aplikace"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Vyberte aplikaci podporující ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Není nastavena žádná aplikace podporující ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplikace podporující ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Přístup k adresářům"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"přístup k adresářům"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4325,4 +4304,87 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Podrobnosti sítě"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Název vašeho zařízení je viditelný pro aplikace v telefonu. Mohou ho vidět také ostatní uživatelé, když se připojíte k zařízení Bluetooth nebo hotspotu Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Zařízení"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Všechna nastavení"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Návrhy"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Vybrat síť"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Odpojeno"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Připojeno"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Připojování…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nelze se připojit"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Žádná síť nebyla nalezena."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nebyla nalezena žádná síť. Zkuste to znovu."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(zakázáno)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Není vložena SIM karta"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Rozšířené volání"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Preferovaný režim sítě: preferováno WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Preferovaný režim sítě: pouze GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Preferovaný režim sítě: pouze WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Preferovaný režim sítě: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Preferovaný režim sítě: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Preferovaný režim sítě: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Preferovaný režim sítě: pouze CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Preferovaný režim sítě: pouze EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferovaný režim sítě: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferovaný režim sítě: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferovaný režim sítě: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferovaný režim sítě: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferovaný režim sítě: Globální"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferovaný režim sítě: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Preferovaný režim sítě: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Preferovaný režim sítě: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferovaný režim sítě: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preferovaný režim sítě: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preferovaný režim sítě: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preferovaný režim sítě: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preferovaný režim sítě: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preferovaný režim sítě: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preferovaný režim sítě: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preferovaný režim sítě: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preferovaný režim sítě: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preferovaný režim sítě: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (doporučeno)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (doporučeno)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globální"</string>
+ <string name="label_available" msgid="1731547832803057893">"Dostupné sítě"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Vyhledávání…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Probíhá registrace v síti <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Vaše SIM karta nepovoluje připojení k této síti."</string>
+ <string name="connect_later" msgid="978991102125216741">"K této síti se momentálně nelze přihlásit. Zkuste to znovu později."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Přihlášení k síti bylo úspěšné."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Vybírat síť automaticky"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Nastavení operátora"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Nastavit datovou službu"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobilní data"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Přistupovat k datům přes mobilní síť"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Preferovaný typ sítě"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Změnit provozní režim sítě"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Preferovaný typ sítě"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operátor"</string>
+ <string name="call_category" msgid="8108654745239563833">"Volání"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videohovory přes operátora"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Výběr systému"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Změnit režim roamingu CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Výběr systému"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Síť"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Síť"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Odběr CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Přepnout mezi RUIM/SIM a NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"odběr"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatická registrace…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Povolit datový roaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Ceny vám sdělí poskytovatel datových služeb."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Využití dat aplikací"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Neplatný režim sítě <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorovat."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Při připojení k operátorovi <xliff:g id="CARRIER">%1$s</xliff:g> nedostupné"</string>
+ <string name="see_more" msgid="5953815986207345223">"Zobrazit další"</string>
+ <string name="see_less" msgid="1250265310929558370">"Zobrazit méně"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> připojených zařízení</item>
+ <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> připojené zařízení</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nejsou připojena žádná zařízení"</string>
</resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 6d062c9..ebf8719 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Håndter som forbrugsbaseret netværk"</item>
<item msgid="2266114985518865625">"Håndter som ubegrænset netværk"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Standard (anvend en tilfældig MAC-adresse)"</item>
+ <item msgid="5398461510512959597">"Betroet"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nej"</item>
<item msgid="3863157480502955888">"Ja"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Altid aktiveret"</item>
<item msgid="6385301106124765323">"Altid deaktiveret"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Fra"</item>
+ <item msgid="2182686878828390312">"Fejlretning"</item>
+ <item msgid="5286514712714822064">"Omfattende"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Kun hjemme"</item>
+ <item msgid="5034813753274486448">"Automatisk"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA foretrækkes"</item>
+ <item msgid="807926878589867564">"Kun GSM"</item>
+ <item msgid="488474605709912156">"Kun WCDMA"</item>
+ <item msgid="1912421096218750039">"Automatisk GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Automatisk CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA uden EvDo"</item>
+ <item msgid="4678789463133969294">"Kun EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA+LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Kun TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c7722cd..7ea31af 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Opret"</string>
<string name="allow" msgid="3349662621170855910">"Tillad"</string>
<string name="deny" msgid="6947806159746484865">"Afvis"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Luk"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Skift"</string>
<string name="device_info_default" msgid="7847265875578739287">"Ukendt"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Du er nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skridt fra at være udvikler.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Det behøver du ikke. Du er allerede udvikler."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Aktivér Indstillinger for udviklere først."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Trådløs og netværk"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Forbindelser"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Enhed"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personlig"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Adgang"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Aktivér dataforbindelse"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Deaktiver dataforbindelse"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Enhedens Bluetooth-adresse: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vil du afbryde <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Dataudveksling"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Unavngiven Bluetooth-enhed"</string>
<string name="progress_scanning" msgid="192587958424295789">"Søger"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Der blev ikke fundet Bluetooth-enheder."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"En app ønsker at aktivere Bluetooth og gøre din telefon synlig for andre enheder. Du kan ændre dette senere i Bluetooth-indstillinger."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Aktiverer Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth slukker??"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Opret automatisk forbindelse"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Anmodning om Bluetooth-forbindelse"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tryk for at oprette forbindelse til \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ønsker du at oprette forbindelse til \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Tilgængelige opkaldsenheder"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Forbundet lige nu"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Gemte enheder"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Tilføj enhed"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth aktiveres for at parre"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Forbindelsesindstillinger"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Tidligere forbundne enheder"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Tidligere forbindelser"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth er aktiveret"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Se alle"</string>
<string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslæt"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Vælg tidszone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Spring over"</string>
<string name="next_label" msgid="4693520878012668114">"Næste"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Sprog"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Sprogpræferencer"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Fjern"</string>
<string name="add_a_language" msgid="2330538812283783022">"Tilføj et sprog"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Indstillinger"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Genvej til Indstillinger"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Flytilstand"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Mere"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådløs og netværk"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Administrer Wi-Fi, Bluetooth, flytilstand, mobilnetværk og VPN-netværk"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobildata"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privatliv"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Deaktiveret af administratoren"</string>
<string name="security_status_title" msgid="5848766673665944640">"Sikkerhedsstatus"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Skærmlås, Ansigtslås"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Skærmlås, fingeraftryk"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Skærmlås"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Ansigtet blev tilføjet"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Lås op med dit ansigt"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Brug dit ansigt til godkendelse"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Brug dit ansigt til at låse din telefon op, godkende køb og logge ind i apps."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Brug dit ansigt"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Lås din telefon op eller godkend køb ved hjælp af dit ansigt.\n\nBemærk! Du kan ikke bruge dit ansigt til at låse denne enhed op. Kontakt administratoren for din organisation for at få flere oplysninger."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Brug dit ansigt til at låse din telefon op, godkende køb og logge ind i apps"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Du kan tilføje op til <xliff:g id="COUNT">%d</xliff:g> ansigter"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrer dit ansigt i cirklen"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Gør det senere"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Du kan tilføje op til <xliff:g id="COUNT">%d</xliff:g> ansigter"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Du har tilføjet det maksimale antal ansigter"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Der kan ikke tilføjes flere ansigter"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registreringen kunne ikke gennemføres"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Tidsgrænsen for registrering af ansigt blev overskredet. Prøv igen."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Registrering af ansigt mislykkedes."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Så er du klar. Godt gået."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Udfør"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Brug ansigtet til at"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Låse din enhed op"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Applogin og betaling"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Åbn øjnene for at låse op"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Dine øjne skal være åbne, når du bruger ansigtsgodkendelse"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Fjern ansigtsdata"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Gør dine ansigtsdata bedre"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Du kan låse din enhed op og få adgang til apps ved hjælp af dit ansigt. "<annotation id="url">"Få flere oplysninger"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeraftryk"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Adm. fingeraftryk"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Brug fingeraftryk til"</string>
@@ -707,7 +714,7 @@
<string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"Parret enhed"</string>
<string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"Internetforbindelse"</string>
<string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"Tastatur"</string>
- <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"Kontaktpersoner og opkaldshistorik"</string>
+ <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"Kontakter og opkaldshistorik"</string>
<string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"Vil du parre med denne enhed?"</string>
<string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Vil du dele telefonbogen?"</string>
<string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil gerne have adgang til dine kontaktpersoner og din opkaldshistorik."</string>
@@ -784,7 +791,7 @@
<string name="android_beam_off_summary" msgid="4663095428454779138">"Fra"</string>
<string name="android_beam_disabled_summary" msgid="1737782116894793393">"Utilgængelig, fordi NFC er slukket"</string>
<string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
- <string name="android_beam_explained" msgid="1810540319385192758">"Når denne funktion er slået til, kan du overføre appindhold til en anden NFC-kompatibel enhed ved at placere enhederne tæt på hinanden. Du kan f.eks. overføre websider, YouTube-videoer, kontaktpersoner og meget mere.\n\nDu skal blot placere enhederne tæt på hinanden (normalt bagside mod bagside) og derefter trykke på din skærm. Appen bestemmer, hvad der overføres."</string>
+ <string name="android_beam_explained" msgid="1810540319385192758">"Når denne funktion er slået til, kan du overføre appindhold til en anden NFC-kompatibel enhed ved at placere enhederne tæt på hinanden. Du kan f.eks. overføre websider, YouTube-videoer, kontakter og meget mere.\n\nDu skal blot placere enhederne tæt på hinanden (normalt bagside mod bagside) og derefter trykke på din skærm. Appen bestemmer, hvad der overføres."</string>
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Slå Wi-Fi til"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Vælg mindst ét frekvensbånd til Wi‑Fi-hotspottet:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP-indstillinger"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privatliv"</string>
<string name="wifi_shared" msgid="844142443226926070">"Del med andre enhedsbrugere"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(uændret)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Vælg"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Annuller"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Vil du glemme netværket?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Alle adgangskoder til dette netvæk slettes"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Gemte netværk"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d netværk</item>
<item quantity="other">%d netværk</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Lysstyrke"</string>
<string name="brightness_summary" msgid="838917350127550703">"Juster skærmens lysstyrke"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Automatisk lysstyrke"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Til"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Fra"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Den foretrukne lysstyrke er meget lav"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Den foretrukne lysstyrke er lav"</string>
@@ -1122,7 +1128,7 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimer lysstyrken til det omgivende lys. Når denne funktion er slået til, kan du stadig justere lysstyrken midlertidigt."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"Skærmens lysstyrke tilpasses automatisk på baggrund af dine omgivelser og dine aktiviteter. Du kan flytte skyderen manuelt for at hjælpe Automatisk lysstyrke med at lære dine præferencer."</string>
<string name="night_display_title" msgid="2626451512200357686">"Nattelys"</string>
- <string name="night_display_text" msgid="1837277457033025056">"Med Nattelys er farvetonen på skærmen gul. Det gør din skærm mere behagelig at se på i svag belysning og kan gøre det nemmere at falde i søvn."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"Nattelys gør farverne på din skærm mere gullige. Det gør din skærm mere behagelig at se på i svag belysning og kan gøre det nemmere at falde i søvn."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Planlæg"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ingen"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Aktiveres på valgt tidspunkt"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Pinkoden kan ikke ændres.\nPinkoden er muligvis forkert."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-koden til SIM-kortet er ændret"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM-kortets tilstand kan ikke ændres.\nMuligvis pga. en forkert pinkode."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Pinkoden kan ikke deaktiveres."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Pinkoden kan ikke aktiveres."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Annuller"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Der blev fundet flere SIM-kort"</string>
@@ -1217,7 +1225,7 @@
<string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
<string name="firmware_version" msgid="4801135784886859972">"Android-version"</string>
<string name="firmware_title" msgid="5203122368389157877">"Android"</string>
- <string name="security_patch" msgid="8438384045870296634">"Niveau for sikkerhedsrettelse på Android"</string>
+ <string name="security_patch" msgid="8438384045870296634">"Seneste sikkerhedsopdatering i Android"</string>
<string name="model_info" msgid="1952009518045740889">"Model"</string>
<string name="model_summary" msgid="8306235877567782987">"Model: %1$s"</string>
<string name="hardware_info" msgid="2605080746512527805">"Model og hardware"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Dette kræver, at <xliff:g id="NAME_0">^1</xliff:g> formateres. \n\n"<b>"Ved formatering slettes alle data, der i øjeblikket er gemt på <xliff:g id="NAME_1">^1</xliff:g>."</b>" Overvej at tage en sikkerhedskopi for at undgå at miste dine data."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Slet og formatér"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formaterer <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Undlad at fjerne dit <xliff:g id="NAME">^1</xliff:g> under formateringen."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Undlad at fjerne dit <xliff:g id="NAME">^1</xliff:g> under formateringen."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Flyt data til ny lagerplads"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Du kan flytte dine billeder, filer og visse apps til dette nye <xliff:g id="NAME">^1</xliff:g>. \n\nFlytningen tager cirka <xliff:g id="TIME">^2</xliff:g> og vil frigøre <xliff:g id="SIZE">^3</xliff:g> intern lagerplads. Nogle apps fungerer ikke under flytningen."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Flyt nu"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installeret"</string>
<string name="no_applications" msgid="7336588977497084921">"Ingen apps."</string>
<string name="internal_storage" msgid="1584700623164275282">"Intern lagerplads"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"intern lagerplads"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lager"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortlager"</string>
<string name="recompute_size" msgid="7722567982831691718">"Beregner størrelse igen..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Vil du slette appdata?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Alle data i denne app slettes permanent. Det omfatter alle filer, indstillinger, konti, databaser osv."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Appen blev ikke fundet på listen over installerede apps."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Appens lagerplads kunne ikke ryddes."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Denne app har adgang til følgende på din tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Denne app har adgang til følgende på din telefon:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Denne app har adgang til følgende på din tablet. Med henblik på at forbedre ydeevnen og reducere hukommelsesbrug, er nogle af disse tilladelser tilgængelige for <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, fordi den kører i samme proces som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Denne app har adgang til følgende på din telefon. Med henblik på at forbedre ydeevnen og reducere hukommelsesbrug, er nogle af disse tilladelser tilgængelige for <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, fordi den kører i samme proces som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> og <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Denne app kan koste penge:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send en overtakseret sms"</string>
<string name="computing_size" msgid="1599186977475211186">"Beregner..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Pakkestørrelsen kunne ikke beregnes."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Du har ikke installeret nogen apps fra tredjepart."</string>
<string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Flyt"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Flyt til tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Flyt til telefon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Flyt til USB-lager"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Flyt til SD-kort"</string>
- <string name="moving" msgid="6431016143218876491">"Flytter"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"En anden migrering er allerede i gang."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Ikke nok lagerplads."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Appen findes ikke."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Appen til enhedsadministration kan ikke installeres på eksterne medier"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Tving til at standse?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Hvis du tvinger en app til at standse, kan det medføre, at den ikke fungerer korrekt."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Appen kunne ikke flyttes. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Foretrukken installationsplacering"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Skift den foretrukne installationsplacering for nye apps"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktiver indbygget app?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Deaktiver appen"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Hvis du deaktiverer denne app, kan Android-apps og andre apps forhindres i at fungere korrekt."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vil du slette data og deaktivere appen?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Hvis du deaktiverer denne app, kan Android-apps og andre apps forhindres i at fungere korrekt. Dine data slettes også."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vil du deaktivere underretninger?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Hvis du deaktiverer underretninger for denne app, kan du gå glip af vigtige beskeder og opdateringer."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Butik"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Oplysninger om appen"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Appen er installeret fra <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Brug tjenesten"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Brug farvekorrigering"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Brug tekster"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Fortsæt"</string>
<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="6371077608778830020">"Tilføj høreapparat"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Hvis du begrænser en apps baggrundsaktivitet, kan det medføre, at den ikke fungerer korrekt"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Appen kan ikke begrænses, da batterioptimering er deaktiveret.\n\nAktivér batterioptimering for at begrænse appen."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Brug af skærmen siden fuld opladning"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Skærmens strømforbrug"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Scanning af mobilnetværk"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Batteriforbrug siden sidste fulde opladning"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Hvor lang tid skærmen har været tændt siden fuld opladning"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Brug af enheden siden fuld opladning"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Brugsdetaljer"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Juster strømforbrug"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Inkluderede pakker"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps, der dræner batteriet"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Holder enheden aktiv"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Aktiverer enheden i baggrunden"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Anmoder ofte om placering"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps fungerer ikke korrekt"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Apps kører normalt"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefonen har et normalt batteriforbrug i baggrunden"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Din tablet har et normalt batteriforbrug i baggrunden"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">Begræns batteriforbruget for %1$d app</item>
<item quantity="other">Begræns batteriforbruget for %1$d apps</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Blev begrænset <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Disse apps har brugt batteri i baggrunden. Begrænsede apps fungerer muligvis ikke korrekt, og underretninger kan være forsinkede."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Brug batteriadministration"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Registrer, nå apps dræner batteriet"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Annuller"</string>
<string name="tts_reset" msgid="2661752909256313270">"Nulstil"</string>
<string name="tts_play" msgid="2628469503798633884">"Afspil"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Strømkontrol"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Opdaterer indstillinger for Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Opdaterer Bluetooth-indstilling"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"til"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"fra"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"aktiverer"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"deaktiverer"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Placering"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synkroniser"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Lysstyrke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisk"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"fuld"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"halv"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"fra"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Lager for loginoplysninger"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer fra lager"</string>
@@ -2472,7 +2443,7 @@
<string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
<string name="backup_erase_dialog_message" msgid="5221011285568343155">"Vil du stoppe sikkerhedskopieringen af dine Wi-Fi-adgangskoder, bogmærker, andre indstillinger og appdata samt slette alle kopier på Googles servere?"</string>
<string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Vil du stoppe med at sikkerhedskopiere enhedsdata (f.eks. Wi-Fi-adgangskoder og opkaldshistorik) og appdata (f.eks. indstillinger og filer, som apps har gemt) og slette alle kopier på fjernservere?"</string>
- <string name="fullbackup_data_summary" msgid="960850365007767734">"Foretag automatisk ekstern backup af enhedsdata (f.eks. Wi-Fi-adgangskoder og opkaldshistorik) og appdata (f.eks. indstillinger og filer, der er gemt i apps).\n\n Når du slår automatisk backup til, gemmes enheds- og appdata med jævne mellemrum eksternt. Appdata kan være alle former for data, som en app har gemt (afhængigt af udviklerens indstillinger), f.eks. potentielt følsomme data, såsom kontaktpersoner, beskeder og billeder."</string>
+ <string name="fullbackup_data_summary" msgid="960850365007767734">"Foretag automatisk ekstern backup af enhedsdata (f.eks. Wi-Fi-adgangskoder og opkaldshistorik) og appdata (f.eks. indstillinger og filer, der er gemt i apps).\n\n Når du slår automatisk backup til, gemmes enheds- og appdata med jævne mellemrum eksternt. Appdata kan være alle former for data, som en app har gemt (afhængigt af udviklerens indstillinger), f.eks. potentielt følsomme data, såsom kontakter, beskeder og billeder."</string>
<string name="device_admin_settings_title" msgid="4960761799560705902">"Indstillinger for enhedsadministrator"</string>
<string name="active_device_admin_msg" msgid="578748451637360192">"App til enhedsadministration"</string>
<string name="remove_device_admin" msgid="9207368982033308173">"Deaktiver denne app til enhedsadministration"</string>
@@ -2556,7 +2527,7 @@
%1$s</xliff:g>"</string>
<string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
<string name="sync_calendar" msgid="9056527206714733735">"Kalender"</string>
- <string name="sync_contacts" msgid="9174914394377828043">"Kontaktpersoner"</string>
+ <string name="sync_contacts" msgid="9174914394377828043">"Kontakter"</string>
<string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Velkommen til Google Synkroniser!"</font>\n"Googles tilgang til synkronisering af data giver dig adgang til dine kontaktpersoner, aftaler og meget mere, uanset hvor du er."</string>
<string name="header_application_sync_settings" msgid="6205903695598000286">"Indstillinger for synkronisering af app"</string>
<string name="header_data_and_synchronization" msgid="5165024023936509896">"Data og synkronisering"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Markér alle"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Dataforbrug"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataforbrug"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobildata og Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Mobilselskabets dataopgørelse kan variere afhængigt af din enhed."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Appforbrug"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APPINFO"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">Vis %d skjult element</item>
<item quantity="other">Vis %d skjulte elementer</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Skjul"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Netværk og internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilnetværk"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"dataforbrug"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps og underretninger"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Tilladelser, standardapps"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Apps i arbejdsprofilen har ikke adgang til underretningsindstillingerne."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Konti"</string>
- <string name="account_dashboard_default_summary" msgid="3998347400161811075">"Der blev ikke tilføjet nogen konti"</string>
+ <string name="account_dashboard_default_summary" msgid="3998347400161811075">"Ingen konti er tilføjet"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Standardapps"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Sprog, tid, sikkerhedskopiering, opdateringer"</string>
<string name="search_results_title" msgid="1796252422574886932">"Indstillinger"</string>
- <string name="search_menu" msgid="6283419262313758339">"Søg indstillinger"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, netværksforbindelse, internet, trådløs, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, skift, styring"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"sms, sende sms-beskeder, beskeder, sende beskeder, standard"</string>
@@ -3024,13 +2994,15 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"betal, tryk, betalinger"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, sikkerhedskopiér"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"bevægelse"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ansigt, oplåsning, godkendelse, log ind"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl version, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"netværk, mobilnetværkstilstand, netværkstilstand, signalstyrke, type mobilnetværk, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serienummer, hardwareversion"</string>
- <string name="keywords_android_version" msgid="9069747153590902819">"niveau for programrettelse i Android, basebandversion, kernesystem"</string>
+ <string name="keywords_android_version" msgid="9069747153590902819">"seneste sikkerhedsopdatering i Android, basebandversion, kernesystem"</string>
<string name="keywords_systemui_theme" msgid="9112852512550404882">"mørkt tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"fejl"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Aktiv låseskærm, visning af låseskærm"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"underretning på låseskærm"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ansigt"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingeraftryk"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"dæmp skærmlys, touchskærm, batteri, intelligent lysstyrke, dynamisk klarhed"</string>
@@ -3190,7 +3162,7 @@
<string name="zen_onboarding_settings" msgid="9046451821239946868">"Indstillinger"</string>
<string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Ingen lyd eller visuelle signaler fra underretninger"</string>
<string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Ingen lyd fra underretninger"</string>
- <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Underretninger kan ikke ses eller høres. Opkald fra stjernemarkerede kontaktpersoner og gentagne opkald er tilladt."</string>
+ <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Underretninger kan ikke ses eller høres. Opkald fra stjernemarkerede kontakter og gentagne opkald er tilladt."</string>
<string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(aktuel indstilling)"</string>
<string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Vil du ændre underretningsindstillingerne for Forstyr ikke?"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Lyde for arbejdsprofil"</string>
@@ -3261,7 +3233,7 @@
</plurals>
<string name="no_notification_listeners" msgid="3487091564454192821">"Ingen installerede apps har anmodet om adgang til underretninger."</string>
<string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Tillad adgang til underretninger for <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
- <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Den kan også afvise underretninger eller aktivere handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger."</string>
+ <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontakter og teksten i de meddelelser, du modtager. Den kan også afvise underretninger eller aktivere handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger."</string>
<string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Hvis du slår adgang til underretninger fra for <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, slås adgangen til Forstyr ikke muligvis også fra."</string>
<string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Slå fra"</string>
<string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Annuller"</string>
@@ -3363,7 +3335,7 @@
<string name="zen_mode_calls" msgid="7051492091133751208">"Opkald"</string>
<string name="zen_mode_calls_title" msgid="623395033931747661">"Tillad opkald"</string>
<string name="zen_mode_calls_footer" msgid="3618700268458237781">"Når Forstyr ikke er aktiveret, blokeres indgående opkald. Du kan ændre indstillingerne, så dine venner, dine familie eller andre kontaktpersoner kan få fat i dig."</string>
- <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Stjernemarkerede kontaktpersoner"</string>
+ <string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Stjernemarkerede kontakter"</string>
<plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="500105380255018671">
<item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> anden</item>
<item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> andre</item>
@@ -3376,8 +3348,8 @@
<string name="zen_mode_selected_messages_list" msgid="5309288435815759102">"nogle beskeder"</string>
<string name="zen_mode_from_anyone" msgid="2638322015361252161">"Fra hvem som helst"</string>
<string name="zen_mode_from_contacts" msgid="2232335406106711637">"Kun fra kontaktpersoner"</string>
- <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kun fra stjernemarkerede kontaktpersoner"</string>
- <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Fra stjernemarkerede kontaktpersoner og ved gentagne opkald"</string>
+ <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kun fra stjernemarkerede kontakter"</string>
+ <string name="zen_calls_summary_starred_repeat" msgid="4046151920710059778">"Fra stjernemarkerede kontakter og ved gentagne opkald"</string>
<string name="zen_calls_summary_contacts_repeat" msgid="1528716671301999084">"Fra kontaktpersoner og ved gentagne opkald"</string>
<string name="zen_calls_summary_repeat_only" msgid="7105261473107715445">"Kun ved gentagne opkald"</string>
<string name="zen_mode_from_none" msgid="8219706639954614136">"Ingen"</string>
@@ -3395,7 +3367,7 @@
<string name="zen_mode_events_title" msgid="5597241655883329085">"Tillad begivenheder"</string>
<string name="zen_mode_all_callers" msgid="2378065871253871057">"alle"</string>
<string name="zen_mode_contacts_callers" msgid="5569804103920394175">"kontaktpersoner"</string>
- <string name="zen_mode_starred_callers" msgid="1023167821338514140">"stjernemarkerede kontaktpersoner"</string>
+ <string name="zen_mode_starred_callers" msgid="1023167821338514140">"stjernemarkerede kontakter"</string>
<string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gentagne opkald"</string>
<string name="zen_mode_repeat_callers_list" msgid="2529895519653237330">"gentagne opkald"</string>
<string name="zen_mode_repeat_callers_title" msgid="8553876328249671783">"Tillad gentagne opkald"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Når du angiver din pinkode for at starte denne enhed, er tilgængelighedstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> endnu ikke tilgængelige."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Når du angiver dit mønster for at starte denne enhed, er tilgængelighedstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> endnu ikke tilgængelige."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Når du angiver din adgangskode for at starte denne enhed, er tilgængelighedstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> endnu ikke tilgængelige."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Bemærk! Efter en genstart kan denne app ikke starte, før du låser din telefon op"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Bemærk! Hvis du genstarter din telefon og har indstillet en skærmlås, kan denne app ikke starte, før du låser telefonen op"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI-oplysninger"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Relative IMEI-oplysninger"</string>
<string name="slot_number" msgid="3762676044904653577">"(Port <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Arbejde"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: Alle"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Slået fra"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Slået fra"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorier: Stor vigtighed"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorier: Lav vigtighed"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorier: Slået fra"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Underretninger om forbrug"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Vis brug af enheden siden fuld opladning"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Vis appforbrug"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Højt forbrug"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> app opfører sig unormalt</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps opfører sig unormalt</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Intern lagerplads: <xliff:g id="PERCENTAGE">%1$s</xliff:g> er anvendt – <xliff:g id="FREE_SPACE">%2$s</xliff:g> ledig plads"</string>
<string name="display_summary" msgid="6737806235882127328">"Gå i dvale efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> uden aktivitet"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Baggrund, dvale, skriftstørrelse"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Gå i dvale efter 10 minutters inaktivitet"</string>
<string name="memory_summary" msgid="8080825904671961872">"I gennemsnit er <xliff:g id="USED_MEMORY">%1$s</xliff:g> ud af <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> hukommelse anvendt"</string>
<string name="users_summary" msgid="1674864467098487328">"Logget ind som <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Sms er ikke tilladt"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Adgang til kameraet er ikke tilladt"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshots er ikke tilladt"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Backups kan ikke deaktiveres"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Denne app kan ikke åbnes"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Kontakt din it-administrator, hvis du har spørgsmål"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Flere oplysninger"</string>
@@ -3865,7 +3837,7 @@
<string name="launch_mdp_app_text" msgid="6751296320061773169">"Se abonnement"</string>
<string name="launch_wifi_text" msgid="2311424914664372687">"Se yderligere oplysninger"</string>
<string name="data_saver_title" msgid="8034286939200289826">"Datasparefunktion"</string>
- <string name="unrestricted_data_saver" msgid="952796077540228711">"Ubegrænset dataadgang"</string>
+ <string name="unrestricted_data_saver" msgid="952796077540228711">"Ubegrænset data"</string>
<string name="restrict_background_blacklisted" msgid="3995443391711013068">"Baggrundsdata er slået fra"</string>
<string name="data_saver_on" msgid="6774217590237934709">"Til"</string>
<string name="data_saver_off" msgid="6892309031162738794">"Fra"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Efterlign en skærm med en udskæring"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ingen"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Enhedens standardindstilling"</string>
<string name="special_access" msgid="3458780842491881155">"Særlig appadgang"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app kan anvende ubegrænset data</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Forbundet med <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Forbundet med flere enheder"</string>
<string name="demo_mode" msgid="2798762752209330277">"Demotilstand for systemets brugerflade"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Natfunktion"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Angiv natfunktion"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Mørk tilstand"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Indstil Mørk tilstand"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Felter for udviklere til Hurtige indstillinger"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Sporing af Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Indstillinger for arbejdsprofil"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Søgning efter kontaktpersoner"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Tillad søgninger efter kontaktpersoner efter din organisation for at identificere kontaktpersoner og personer, der ringer"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tryk to gange for at tjekke telefonen"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tryk to gange for at tjekke din tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tryk to gange for at tjekke enheden"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Tryk to gange på skærmen for at se klokkeslæt, underretningsikoner og andre oplysninger."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Tryk to gange på skærmen for at se klokkeslæt, underretninger og andre oplysninger."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Løft for at tjekke telefon"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Løft for at tjekke din tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Løft for at tjekke enheden"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Se klokkeslæt, underretningsikoner og andre oplysninger, når du samler din telefon op."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Se klokkeslæt, underretningsikoner og andre oplysninger, når du samler din tablet op."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Se klokkeslæt, underretningsikoner og andre oplysninger, når du samler din enhed op."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Aktivering af skærm"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Se klokkeslæt, underretninger og andre oplysninger, når du samler din telefon op."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Se klokkeslæt, underretninger og andre oplysninger, når du samler din tablet op."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Se klokkeslæt, underretninger og andre oplysninger, når du samler din enhed op."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Bevægelse til aktivering af låseskærm"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Stryg over fingeraftrykslæser for at se underretninger"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Stryg fingeraftrykslæser"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af telefonen."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> forsøg</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> forsøg</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Denne enheds data sikkerhedskopieres"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Denne enhed administreres af din organisation."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Denne enhed administreres af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4085,7 +4059,7 @@
<item quantity="other">Kameraapps</item>
</plurals>
<string name="default_calendar_app_title" msgid="3545972964391065220">"Kalenderapp"</string>
- <string name="default_contacts_app_title" msgid="3497370557378660098">"App til kontaktpersoner"</string>
+ <string name="default_contacts_app_title" msgid="3497370557378660098">"App til kontakter"</string>
<plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
<item quantity="one">Mailklientapp</item>
<item quantity="other">Mailklientapps</item>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"AutoFyld-tjenesten"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatisk, udfyld, autofyld"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Sørg for, at du har tillid til denne app</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> anvender indholdet af din skærm til at fastslå, hvad der kan udfyldes automatisk."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Autofyld"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Logningsniveau"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maks. antal anmodninger pr. session"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Højeste antal synlige datasæt"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Nulstil til standardværdierne"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Udviklerindstillingerne for autofyld blev nulstillet"</string>
<string name="device_theme" msgid="4571803018917608588">"Enhedstema"</string>
<string name="default_theme" msgid="7085644992078579076">"Standard"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Netværksnavn"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivér mobilselskab"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Opdater Forstyr ikke"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Sæt underretninger på pause, så du kan koncentrere dig"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvad er nyt og spændende?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en rundvisning på din nye telefon"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en rundvisning på din nye tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Få en rundvisning på din nye enhed"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funktion er ikke tilgængelig på denne enhed"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Gennemtving fuld GNSS-måling"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Registrer alle GNSS-konstellationer og -frekvenser uden opgavegennemløb"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Vis altid dialogboks med nedbrud"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Vis dialogboks, hver gang en app går ned"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Vælg ANGLE-aktiveret app"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Der er ikke angivet nogen ANGLE-aktiveret app"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE-aktiveret app: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Mappeadgang"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"mappeadgang"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4149,7 +4128,7 @@
<string name="disabled_dependent_setting_summary" msgid="8291322239940946902">"Er afhængig af en anden indstilling"</string>
<string name="unknown_unavailability_setting_summary" msgid="4589584678033059435">"Indstillingen er ikke tilgængelig"</string>
<string name="my_device_info_account_preference_title" msgid="342933638925781861">"Konto"</string>
- <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Enhedsnavn"</string>
+ <string name="my_device_info_device_name_preference_title" msgid="7104085224684165324">"Enhedens navn"</string>
<string name="bluetooth_on_while_driving_pref" msgid="2460847604498343330">"Brug Bluetooth, når du kører"</string>
<string name="bluetooth_on_while_driving_summary" msgid="3196190732516898541">"Aktivér Bluetooth automatisk, når du kører"</string>
<string name="change_wifi_state_title" msgid="3261945855372885427">"Styring af Wi-Fi"</string>
@@ -4167,7 +4146,7 @@
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"Forlæng enhedens batteritid"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Forlæng telefonens batteritid"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
- <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Stop med at ringe"</string>
+ <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Deaktiver ringetoner"</string>
<string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Tryk på afbryderknappen og Lydstyrke op på samme tid"</string>
<string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Genvej til at stoppe ringelyd"</string>
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Vibrer"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Netværksoplysninger"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Navnet på din enhed er synligt for apps på din telefon. Det kan muligvis også ses af andre, når du opretter forbindelse til Bluetooth-enheder eller konfigurerer et Wi-Fi-hotspot."</string>
<string name="devices_title" msgid="7701726109334110391">"Enheder"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Alle indstillinger"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Forslag"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Vælg netværk"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Afbrudt"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Tilsluttet"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Opretter forbindelse…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Der kunne ikke oprettes forbindelse"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Der blev ikke fundet nogen netværk."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Der kunne ikke findes nogen netværk. Prøv igen."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbudt)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Intet SIM-kort"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Avancerede opkald"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Foretrukken netværkstilstand: WCDMA foretrækkes"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Foretrukken netværkstilstand: Kun GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Foretrukken netværkstilstand: Kun WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Foretrukken netværkstilstand: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Foretrukken netværkstilstand: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Foretrukken netværkstilstand: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Foretrukken netværkstilstand: Kun CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Foretrukken netværkstilstand: Kun EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Foretrukken netværkstilstand: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Foretrukken netværkstilstand: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Foretrukken netværkstilstand: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Foretrukken netværkstilstand: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Foretrukken netværkstilstand: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Foretrukken netværkstilstand: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Foretrukket netværkstilstand: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Foretrukken netværkstilstand: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Foretrukken netværkstilstand: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Foretrukken netværkstilstand: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Foretrukken netværkstilstand: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Foretrukken netværkstilstand: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Foretrukken netværkstilstand: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Foretrukken netværkstilstand: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Foretrukken netværkstilstand: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Foretrukken netværkstilstand: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Foretrukken netværkstilstand: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Foretrukken netværkstilstand: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (anbefalet)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (anbefalet)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Tilgængelige netværk"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Søger…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registrerer på <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Dit SIM-kort tillader ikke en forbindelse til dette netværk."</string>
+ <string name="connect_later" msgid="978991102125216741">"Der kan ikke oprettes forbindelse til dette netværk lige nu. Prøv igen senere."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registreret på netværket."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Vælg netværk automatisk"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Indst. for mobilselskab"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Konfiguration af datatjeneste"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobildata"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Få adgang til data via mobilnetværk"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Foretrukken netværkstype"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Skift driftstilstand for netværket"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Foretrukken netværkstype"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Mobilselskab"</string>
+ <string name="call_category" msgid="8108654745239563833">"Opkald"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videoopkald via mobilselskab"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Systemvalg"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Skift CDMA-roamingtilstand"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Systemvalg"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Netværk"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Netværk"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA-abonnement"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Skift mellem RUIM/SIM og NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"abonnement"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatisk registrering…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Vil du tillade dataroaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Kontakt din netværksudbyder for at få oplyst priser."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Dataforbrug for apps"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Ugyldig netværkstilstand <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorer."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Utilgængelig ved forbindelse til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Se mere"</string>
+ <string name="see_less" msgid="1250265310929558370">"Se mindre"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 5a192ec..d181334 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -181,7 +181,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Keiner"</item>
<item msgid="8673874894887358090">"Manuell"</item>
- <item msgid="168893341855953140">"Autom. Proxy-Konfig."</item>
+ <item msgid="168893341855953140">"Autom. Proxykonfiguration"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Keiner"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Als \"kostenpflichtig\" markieren"</item>
<item msgid="2266114985518865625">"Als \"nicht kostenpflichtig\" markieren"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Standard (zufällig festgelegte MAC-Adresse verwenden)"</item>
+ <item msgid="5398461510512959597">"Vertrauenswürdig"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nein"</item>
<item msgid="3863157480502955888">"Ja"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Immer an"</item>
<item msgid="6385301106124765323">"Immer aus"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Aus"</item>
+ <item msgid="2182686878828390312">"Fehler beheben"</item>
+ <item msgid="5286514712714822064">"Ausführlich"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Nur Heimatnetz"</item>
+ <item msgid="5034813753274486448">"Automatisch"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA bevorzugt"</item>
+ <item msgid="807926878589867564">"Nur GSM"</item>
+ <item msgid="488474605709912156">"Nur WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA (automatisch)"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo (automatisch)"</item>
+ <item msgid="370391313511477301">"CDMA ohne EvDo"</item>
+ <item msgid="4678789463133969294">"Nur EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Nur TD-SCDMA"</item>
+ <item msgid="8373504428469988469">"TD-SCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TD-SCDMA"</item>
+ <item msgid="2272560096982726294">"TD-SCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TD-SCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TD-SCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TD-SCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TD-SCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TD-SCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TD-SCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 21809c9..e960588 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Erstellen"</string>
<string name="allow" msgid="3349662621170855910">"Zulassen"</string>
<string name="deny" msgid="6947806159746484865">"Ablehnen"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Schließen"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Wechseln"</string>
<string name="device_info_default" msgid="7847265875578739287">"Unbekannt"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">In <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> Schritten bist du Entwickler.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Okay, du bist bereits Entwickler."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Bitte aktiviere die Entwickleroptionen zuerst."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Drahtlos & Netzwerke"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Verbindungen"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Gerät"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Nutzer"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Zugriff"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Datenverbindung aktivieren"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Datenverbindung deaktivieren"</string>
@@ -120,7 +114,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth-Adresse des Geräts: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Verbindung mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> trennen?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Übertragung"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Unbenanntes Bluetooth-Gerät"</string>
<string name="progress_scanning" msgid="192587958424295789">"Suche läuft"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Kein Bluetooth-Gerät in der Nähe gefunden"</string>
@@ -152,7 +145,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Eine App fordert die Berechtigung, Bluetooth zu aktivieren und dein Smartphone für andere Geräte sichtbar zu machen. Du kannst diese Option später in den Bluetooth-Einstellungen ändern."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth wird aktiviert..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth wird deaktiviert..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatische Verbindung"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-Verbindungsanfrage"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Zum Verbinden mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" tippen."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Möchtest du eine Verbindung mit \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" herstellen?"</string>
@@ -180,12 +172,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Verfügbare Anrufgeräte"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Derzeit verbunden"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Gespeicherte Geräte"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Gerät hinzufügen"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth wird aktiviert, um das Koppeln zu ermöglichen"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Verbindungseinstellungen"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Zuvor verbundene Geräte"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Zuvor verbundene Geräte"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth aktiviert"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Alle ansehen"</string>
<string name="date_and_time" msgid="9062980487860757694">"Datum & Uhrzeit"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Zeitzone wählen"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -209,7 +201,7 @@
<string name="proxy_error_empty_port" msgid="5539106187558215246">"Du musst das Feld für den Port ausfüllen."</string>
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Das Feld für den Port muss leer sein, wenn das Feld für den Host leer ist."</string>
<string name="proxy_error_invalid_port" msgid="5988270202074492710">"Der eingegebene Port ist ungültig."</string>
- <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, möglicherweise aber nicht von anderen Apps."</string>
+ <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, eventuell aber nicht von anderen Apps."</string>
<string name="proxy_url_title" msgid="7185282894936042359">"PAC-URL: "</string>
<string name="radio_info_dl_kbps" msgid="6894556071523815984">"DL-Bandbreite (kbit/s):"</string>
<string name="radio_info_ul_kbps" msgid="946464073571185678">"UL-Bandbreite (kbit/s):"</string>
@@ -268,7 +260,6 @@
<string name="skip_label" msgid="47510779345218297">"Überspringen"</string>
<string name="next_label" msgid="4693520878012668114">"Weiter"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Sprachen"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Spracheinstellungen"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Entfernen"</string>
<string name="add_a_language" msgid="2330538812283783022">"Sprache hinzufügen"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -302,7 +293,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Einstellungen"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Einstellungsverknüpfung"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Flugmodus"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Mehr"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Drahtlos & Netzwerke"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"WLAN, Bluetooth, Flugmodus, Mobilfunknetze und VPNs verwalten"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobile Daten"</string>
@@ -387,6 +377,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Datenschutz"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Vom Administrator deaktiviert"</string>
<string name="security_status_title" msgid="5848766673665944640">"Sicherheitsstatus"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Displaysperre, Face Unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Displaysperre und Fingerabdruck"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Displaysperre"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Gesicht hinzugefügt"</string>
@@ -396,11 +387,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Per Gesicht entsperren"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Per Gesichtserkennung authentifizieren"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Verwende die Gesichtserkennung, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Verwende die Gesichtserkennung"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Du kannst die Gesichtserkennung verwenden, um dein Smartphone zu entsperren oder Käufe zu autorisieren.\n\nHinweis: Dieses Gerät kannst du nicht per Gesichtserkennung entsperren. Weitere Informationen erhältst du vom Administrator deiner Organisation."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Verwende die Gesichtserkennung, um dein Smartphone zu entsperren, Käufe zu autorisieren oder dich in Apps anzumelden"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Du kannst bis zu <xliff:g id="COUNT">%d</xliff:g> Fingerabdrücke hinzufügen"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Gesicht in den Kreis halten"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Später"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Du kannst bis zu <xliff:g id="COUNT">%d</xliff:g> Gesichter hinzufügen"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Du hast die maximale Anzahl an Gesichtern hinzugefügt"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Es können keine weiteren Gesichter hinzugefügt werden"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Anmeldung wurde nicht abgeschlossen"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Zeitüberschreitung bei der Anmeldung per Gesichtserkennung. Versuch es noch einmal."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Anmeldung per Gesichtserkennung ist fehlgeschlagen."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Sieht gut aus. Du bist fertig."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Fertig"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Gesichtserkennung nutzen"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Gerät entsperren"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"App-Anmeldung & Zahlungen"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Bei offenen Augen entsperren"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Zur Verwendung der Gesichtserkennung müssen deine Augen geöffnet sein"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Gesichtsdaten entfernen"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Gesichtsdaten verbessern"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Du kannst dein Gerät per Gesichtserkennung entsperren und auf deine Apps zugreifen. "<annotation id="url">"Weitere Informationen"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerabdruck"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Fingerabdrücke verwalten"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Abdruck nutzen für"</string>
@@ -451,7 +458,7 @@
<string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Das ist nicht der Sensor"</string>
<string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Sensor auf Rückseite mit Zeigefinger berühren."</string>
<string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registrierung wurde nicht abgeschlossen."</string>
- <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Zeitüberschreitung bei Fingerabdruckregistrierung. Versuche es erneut."</string>
+ <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Zeitüberschreitung bei Fingerabdruckregistrierung. Bitte versuche es noch einmal."</string>
<string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Fehler bei Fingerabdruckregistrierung. Versuche es erneut oder verwende einen anderen Finger."</string>
<string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Weitere hinzufügen"</string>
<string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Weiter"</string>
@@ -476,8 +483,8 @@
<string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Du kannst deine Konten, Einstellungen, heruntergeladenen Apps und die zugehörigen Daten, Medienelemente und andere Dateien verschlüsseln. Nachdem du dein Smartphone verschlüsselt hast, musst du, sofern du eine Displaysperre eingerichtet hast (also ein Muster, eine numerische PIN oder ein Passwort), bei jedem Einschalten des Smartphones das Display entsperren, um das Smartphone zu entschlüsseln. Der einzige andere Weg zur Entschlüsselung ist das Zurücksetzen auf die Werkseinstellungen. Hierdurch werden alle deine Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Bei Beginn muss der Akku aufgeladen sein und das Smartphone muss sich während des gesamten Vorgangs im Netzbetrieb befinden. Wenn du den Vorgang unterbrichst, gehen einige oder alle deine Daten verloren."</string>
<string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet verschlüsseln"</string>
<string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Smartphone verschlüsseln"</string>
- <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lade den Akku auf und versuche es erneut."</string>
- <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Schließe dein Ladegerät an und versuche es erneut."</string>
+ <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lade den Akku auf und versuche es noch einmal."</string>
+ <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Schließe dein Ladegerät an und versuche es noch einmal."</string>
<string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Keine PIN oder kein Passwort für Displaysperre"</string>
<string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Du musst eine PIN oder ein Passwort für die Displaysperre festlegen, bevor du die Verschlüsselung starten kannst."</string>
<string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Verschlüsseln?"</string>
@@ -691,8 +698,8 @@
<string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"Die PIN enthält Buchstaben oder Symbole."</string>
<string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"In der Regel 0000 oder 1234"</string>
<string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"Muss aus 16 Ziffern bestehen"</string>
- <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Möglicherweise musst du diese PIN auch auf dem anderen Gerät eingeben."</string>
- <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Möglicherweise musst du diesen Zugangscode auch auf dem anderen Gerät eingeben."</string>
+ <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Eventuell musst du diese PIN auch auf dem anderen Gerät eingeben."</string>
+ <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Eventuell musst du diesen Zugangscode auch auf dem anderen Gerät eingeben."</string>
<!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:240 in <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Zur Kopplung mit:><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>Vergewissere dich, dass folgender Zugangscode angezeigt wird:<<br><b>P<xliff:g id="PASSKEY">%2$s</xliff:g></b>."</string>
) -->
<string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Von:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br> Mit diesem Gerät koppeln?"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Bitte für den WLAN-Hotspot mindestens eine Bandbreite auswählen:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP-Einstellungen"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Datenschutz"</string>
<string name="wifi_shared" msgid="844142443226926070">"Für andere Gerätenutzer freigeben"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nicht geändert)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Auswählen"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Abbrechen"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Netzwerk entfernen?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Alle Passwörter für dieses Netzwerk werden gelöscht"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Gespeicherte Netzwerke"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d Netzwerke</item>
<item quantity="one">1 Netzwerk</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Helligkeit"</string>
<string name="brightness_summary" msgid="838917350127550703">"Helligkeit des Bildschirms anpassen"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Automatische Helligkeit"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"An"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Deaktiviert"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Bevorzugte Helligkeit ist sehr niedrig"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Bevorzugte Helligkeit ist niedrig"</string>
@@ -1196,9 +1202,11 @@
<string name="sim_change_pin" msgid="7328607264898359112">"PIN für SIM-Karte"</string>
<string name="sim_bad_pin" msgid="2345230873496357977">"Falsche PIN"</string>
<string name="sim_pins_dont_match" msgid="1695021563878890574">"Die PINs stimmen nicht überein."</string>
- <string name="sim_change_failed" msgid="3602072380172511475">"PIN kann nicht geändert werden.\nMöglicherweise ist es die falsche PIN."</string>
+ <string name="sim_change_failed" msgid="3602072380172511475">"PIN kann nicht geändert werden.\nEventuell ist es die falsche PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-PIN erfolgreich geändert"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Status der SIM-Kartensperrung kann nicht geändert werden.\nMöglicherweise falsche PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN kann nicht deaktiviert werden."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN kann nicht aktiviert werden."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Abbrechen"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Mehrere SIM-Karten gefunden"</string>
@@ -1300,8 +1308,8 @@
<string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Wenn du die SD-Karte entfernst, werden einige von dir verwendete Apps angehalten und sind nicht mehr verfügbar, bis du die SD-Karte wieder einsetzt."</string>
<string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
<string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
- <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"USB-Speicher kann nicht getrennt werden. Bitte versuche es später erneut."</string>
- <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"SD-Karte kann nicht entfernt werden. Bitte versuche es später erneut."</string>
+ <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"USB-Speicher kann nicht getrennt werden. Bitte versuche es später noch einmal."</string>
+ <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"SD-Karte kann nicht entfernt werden. Bitte versuche es später noch einmal."</string>
<string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-Speicher wird getrennt."</string>
<string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-Karte wird getrennt."</string>
<string name="sd_ejecting_title" msgid="8824572198034365468">"Trennen..."</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Hierzu muss die <xliff:g id="NAME_0">^1</xliff:g> formatiert werden. \n\n"<b>"Durch die Formatierung werden alle derzeit auf der <xliff:g id="NAME_1">^1</xliff:g> gespeicherten Daten gelöscht."</b>" Um den Verlust von Daten zu verhindern, sichere sie vor der Formatierung."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Löschen und formatieren"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> wird formatiert…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Entferne das Speichergerät (<xliff:g id="NAME">^1</xliff:g>) nicht, solange die Formatierung nicht abgeschlossen ist."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Entferne das Speichergerät (<xliff:g id="NAME">^1</xliff:g>) nicht, solange die Formatierung nicht abgeschlossen ist."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Daten in neuen Speicher verschieben"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Du kannst deine Fotos, Dateien und manche Apps jetzt auf den neuen Datenträger <xliff:g id="NAME">^1</xliff:g> verschieben.\n\nDieser Vorgang dauert etwa <xliff:g id="TIME">^2</xliff:g>. Dabei wird <xliff:g id="SIZE">^3</xliff:g> interner Speicherplatz freigegeben. Einige Apps funktionieren während des Vorgangs nicht."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Jetzt verschieben"</string>
@@ -1381,7 +1389,7 @@
<string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"Das Verschieben dauert etwa <xliff:g id="TIME">^1</xliff:g>. Dabei werden <xliff:g id="SIZE">^2</xliff:g> auf <xliff:g id="NAME">^3</xliff:g> freigegeben."</b></string>
<string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Verschieben"</string>
<string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Daten werden verschoben…"</string>
- <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"Beachte beim Verschieben deiner Daten Folgendes: \n• Entferne nicht den Datenspeicher (<xliff:g id="NAME">^1</xliff:g>). \n• Einige Apps funktionieren möglicherweise nicht. \n• Achte darauf, dass das Gerät dabei stets geladen wird."</string>
+ <string name="storage_wizard_migrate_details" msgid="3709728824651136227">"Beachte beim Verschieben deiner Daten Folgendes: \n• Entferne nicht den Datenspeicher (<xliff:g id="NAME">^1</xliff:g>). \n• Einige Apps funktionieren eventuell nicht. \n• Achte darauf, dass das Gerät dabei immer geladen wird."</string>
<string name="storage_wizard_ready_title" msgid="6553867088682695655">"<xliff:g id="NAME">^1</xliff:g> kann nun verwendet werden"</string>
<string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Du kannst deine <xliff:g id="NAME">^1</xliff:g> nun zum Speichern von Fotos und anderen Medien einsetzen."</string>
<string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Deine neue <xliff:g id="NAME">^1</xliff:g> steht nun für dich bereit. \n\nWenn du Fotos, Dateien und App-Daten auf dieses Gerät verschieben möchtest, gehe zu \"Einstellungen\" > \"Speicher\"."</string>
@@ -1648,7 +1656,7 @@
<string name="lockpattern_recording_intro_header" msgid="308287052221942814">"Zeichne ein Entsperrungsmuster."</string>
<string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Menütaste drücken, um die Hilfe aufzurufen"</string>
<string name="lockpattern_recording_inprogress" msgid="6667844062721656773">"Lass die Tasten los, wenn du fertig bist."</string>
- <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Verbinde mindestens <xliff:g id="NUMBER">%d</xliff:g> Punkte. Bitte versuche es erneut."</string>
+ <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"Verbinde mindestens <xliff:g id="NUMBER">%d</xliff:g> Punkte. Bitte versuche es noch einmal."</string>
<string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"Muster wurde aufgezeichnet."</string>
<string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"Zeichne das Muster zur Bestätigung erneut."</string>
<string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"Dein neues Entsperrungsmuster:"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installiert"</string>
<string name="no_applications" msgid="7336588977497084921">"Keine Apps"</string>
<string name="internal_storage" msgid="1584700623164275282">"Interner Speicher"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"interner Speicher"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-Speicher"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-Kartensp."</string>
<string name="recompute_size" msgid="7722567982831691718">"Größe wird neu berechnet..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"App-Daten löschen?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Alle Daten dieser App werden endgültig gelöscht. Dazu zählen alle Dateien, Einstellungen, Konten, Datenbanken."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Die App wurde nicht in der Liste der installierten Apps gefunden."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Speicherinhalt der App konnte nicht gelöscht werden."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Diese App kann auf die folgenden Funktionen deines Tablets zugreifen:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Diese App kann auf die folgenden Funktionen deines Telefons zugreifen:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Diese App kann auf Folgendes auf deinem Tablet zugreifen. Um die Leistung zu verbessern und die Speicherauslastung zu verringern, hat <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> einige dieser Berechtigungen, weil es im selben Prozess wie <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ausgeführt wird:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Diese App kann auf Folgendes auf deinem Telefon zugreifen. Um die Leistung zu verbessern und die Speicherauslastung zu verringern, hat <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> einige dieser Berechtigungen, weil es im selben Prozess wie <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ausgeführt wird:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> und <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Für diese App können Gebühren anfallen:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Premium-SMS senden?"</string>
<string name="computing_size" msgid="1599186977475211186">"Berechnung..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Paketgröße konnte nicht berechnet werden."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Du hast keine Apps von Drittanbietern installiert."</string>
<string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Verschieben"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Auf Tablet verschieben"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Auf Telefon verschieben"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"In USB-Speicher verschieben"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Auf SD-Karte verschieben"</string>
- <string name="moving" msgid="6431016143218876491">"Verschieben"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Es wird schon eine andere Migration durchgeführt."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nicht genügend Speicherplatz"</string>
<string name="does_not_exist" msgid="1501243985586067053">"App ist nicht vorhanden."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Die App zur Geräteverwaltung kann nicht auf externen Medien installiert werden"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Beenden erzwingen?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Das Beenden der App zu erzwingen kann zu unerwünschtem Verhalten führen."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"App kann nicht verschoben werden. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Bevorzugter Installationspfad"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Bevorzugten Installationspfad für neue Apps ändern"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Integrierte App deaktivieren?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"App deaktivieren"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Bei Deaktivierung dieser App funktionieren Android und andere Apps möglicherweise nicht mehr ordnungsgemäß."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Daten löschen und App deaktivieren?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Bei Deaktivierung dieser App funktionieren Android und andere Apps möglicherweise nicht mehr ordnungsgemäß. Außerdem werden deine Daten gelöscht."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Benachrichtigungen deaktivieren?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Wenn du die Benachrichtigungen für diese App deaktivierst, verpasst du eventuell wichtige Warnmeldungen und Updates."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"App-Details"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App installiert vom <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Dienst aktivieren"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Farbkorrektur aktivieren"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Untertitel aktivieren"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Weiter"</string>
<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="6371077608778830020">"Hörhilfe hinzufügen"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Wenn du die Hintergrundaktivität einer App einschränkst, kann dies zu unerwünschtem Verhalten führen"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Da bei dieser App der Akkuverbrauch nicht optimiert wird, kannst du sie nicht einschränken.\n\nDazu musst du zuerst die Akkuoptimierung aktivieren."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Displaynutzung seit letzter vollständiger Aufladung"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Displayverbrauch"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobilfunknetzsuche"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Akkunutzung seit der letzten vollständigen Aufladung"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Aktivierungsdauer des Displays seit letzter vollständiger Aufladung"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Gerätenutzung seit letzter vollständiger Aufladung"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Details"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Energieverbrauch anpassen"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Enthaltene Pakete"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps mit hohem Akkuverbrauch"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Gerät bleibt aktiv"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Gerät wird im Hintergrund aktiviert"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Häufige Standortabfrage"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> fehlerhafte Apps"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Apps funktionieren normal"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Der Akkuverbrauch im Hintergrund des Smartphones ist normal"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Der Akkuverbrauch im Hintergrund des Tablets ist normal"</string>
@@ -2184,7 +2171,7 @@
<string name="battery_tip_early_heads_up_title" msgid="5788492366387119807">"Energiesparmodus aktivieren"</string>
<string name="battery_tip_early_heads_up_summary" msgid="1639271439914224547">"Der Akku könnte früher als üblich leer sein"</string>
<string name="battery_tip_early_heads_up_done_title" msgid="4294083319255926811">"Energiesparmodus ist aktiviert"</string>
- <string name="battery_tip_early_heads_up_done_summary" msgid="7054036010928794364">"Einige Funktionen sind möglicherweise eingeschränkt"</string>
+ <string name="battery_tip_early_heads_up_done_summary" msgid="7054036010928794364">"Einige Funktionen sind eventuell eingeschränkt"</string>
<string name="battery_tip_high_usage_title" product="default" msgid="1282187115295901930">"Smartphone mehr als üblich genutzt"</string>
<string name="battery_tip_high_usage_title" product="tablet" msgid="7422137233845959351">"Tablet mehr als üblich genutzt"</string>
<string name="battery_tip_high_usage_title" product="device" msgid="5483320224273724068">"Gerät mehr als üblich genutzt"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Akkunutzung wird für %1$d Apps eingeschränkt</item>
<item quantity="one">Akkunutzung wird für %1$d App eingeschränkt</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> eingeschränkt"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Diese Apps verbrauchen im Hintergrund Strom. Durch Einschränken der Apps funktionieren sie möglicherweise nicht mehr richtig und Benachrichtigungen können verzögert angezeigt werden."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Funktion \"Akku-Manager\" verwenden"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Starke Beanspruchung des Akkus durch Apps erkennen"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Abbrechen"</string>
<string name="tts_reset" msgid="2661752909256313270">"Zurücksetzen"</string>
<string name="tts_play" msgid="2628469503798633884">"Wiedergeben"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Energiesteuerung"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"WLAN-Einstellung wird aktualisiert..."</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualisieren der Bluetooth-Einstellung"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"an"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"aus"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"Wird aktiviert..."</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"Wird deaktiviert..."</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"WLAN"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Standort"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synchronisierung"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Helligkeit <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisch"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"voll"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"halb"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"aus"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Anmeldedatenspeicher"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Von Speicher installieren"</string>
@@ -2465,7 +2436,7 @@
<string name="backup_configure_account_title" msgid="3790872965773196615">"Sicherungskonto"</string>
<string name="backup_data_management_title" msgid="4059093462647090064">"Sicherungskonto verwalten"</string>
<string name="include_app_data_title" msgid="2829970132260278394">"App-Daten einschließen"</string>
- <string name="auto_restore_title" msgid="5397528966329126506">"Autom. Wiederherstellung"</string>
+ <string name="auto_restore_title" msgid="5397528966329126506">"Automatische Wiederherstellung"</string>
<string name="auto_restore_summary" msgid="4235615056371993807">"Nach der Neuinstallation einer App gesicherte Einstellungen und Daten wiederherstellen"</string>
<string name="backup_inactive_title" msgid="685838037986644604">"Sicherungsdienst ist nicht aktiv"</string>
<string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Zurzeit werden in keinem Konto gesicherte Daten gespeichert."</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Alles auswählen"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Datennutzung"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Datennutzung durch Apps"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobile Daten & WLAN"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät."</string>
<string name="data_usage_app" msgid="4970478397515423303">"App-Nutzung"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"Informationen zur App"</string>
@@ -2727,7 +2698,7 @@
<string name="vpn_menu_delete" msgid="8098021690546891414">"Profil löschen"</string>
<string name="vpn_menu_lockdown" msgid="7863024538064268139">"Durchgehend aktives VPN"</string>
<string name="vpn_no_vpns_added" msgid="5002741367858707244">"Keine VPNs hinzugefügt"</string>
- <string name="vpn_always_on_summary" msgid="2821344524094363617">"Verbindung zu VPN stets beibehalten"</string>
+ <string name="vpn_always_on_summary" msgid="2821344524094363617">"Verbindung zu VPN immer beibehalten"</string>
<string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Von dieser App nicht unterstützt"</string>
<string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Always-On-Modus aktiviert"</string>
<string name="vpn_require_connection" msgid="8388183166574269666">"Verbindungen ohne VPN blockieren"</string>
@@ -2735,7 +2706,7 @@
<string name="vpn_lockdown_summary" msgid="2200032066376720339">"Wähle ein VPN-Profil für eine durchgehende Verbindung aus. Netzwerkverkehr ist nur möglich, wenn eine Verbindung zu diesem VPN besteht."</string>
<string name="vpn_lockdown_none" msgid="9214462857336483711">"Keines"</string>
<string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Für ein durchgehend aktives VPN ist eine IP-Adresse für den Server und für das DNS erforderlich."</string>
- <string name="vpn_no_network" msgid="3050233675132726155">"Es ist keine Netzwerkverbindung verfügbar. Bitte versuche es später erneut."</string>
+ <string name="vpn_no_network" msgid="3050233675132726155">"Es ist keine Netzwerkverbindung verfügbar. Bitte versuche es später noch einmal."</string>
<string name="vpn_disconnected" msgid="280531508768927471">"Verbindung mit VPN getrennt"</string>
<string name="vpn_disconnected_summary" msgid="3082851661207900606">"Keine"</string>
<string name="vpn_missing_cert" msgid="5357192202207234745">"Ein Zertifikat fehlt. Versuche, das Profil zu ändern."</string>
@@ -2763,7 +2734,7 @@
<string name="backup_pw_set_button_text" msgid="2387480910044648795">"Passwort festlegen"</string>
<string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Abbrechen"</string>
<string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Zusätzliche Systemupdates"</string>
- <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Das Netzwerk wird möglicherweise überwacht."</string>
+ <string name="ssl_ca_cert_warning" msgid="2045866713601984673">"Das Netzwerk wird eventuell überwacht."</string>
<string name="done_button" msgid="1991471253042622230">"Fertig"</string>
<plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="7145092748045794650">
<item quantity="other">Zertifikaten vertrauen oder sie entfernen</item>
@@ -2812,8 +2783,8 @@
<string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Profil jetzt einrichten?"</string>
<string name="user_setup_button_setup_now" msgid="3391388430158437629">"Jetzt einrichten"</string>
<string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nicht jetzt"</string>
- <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Nur der Besitzer des Tablets kann Nutzer verwalten."</string>
- <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Nur der Besitzer des Telefons kann Nutzer verwalten."</string>
+ <string name="user_cannot_manage_message" product="tablet" msgid="7153048188252553320">"Nur der Eigentümer des Tablets kann Nutzer verwalten."</string>
+ <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Nur der Eigentümer des Telefons kann Nutzer verwalten."</string>
<string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"In eingeschränkten Profilen können keine Konten hinzugefügt werden."</string>
<string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> vom Gerät löschen"</string>
<string name="user_lockscreen_settings" msgid="4965661345247084878">"Einstellungen für den Sperrbildschirm"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">%d ausgeblendete Elemente anzeigen</item>
<item quantity="one">%d ausgeblendetes Element anzeigen</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Minimieren"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Netzwerk & Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobilfunknetz"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Datennutzung"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps & Benachrichtigungen"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Berechtigungen, Standard-Apps"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Für Apps im Arbeitsprofil ist der Benachrichtigungszugriff nicht verfügbar."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Konten"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Keine Konten hinzugefügt"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Standard-Apps"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Sprachen, Zeit, Sicherung und Updates"</string>
<string name="search_results_title" msgid="1796252422574886932">"Einstellungen"</string>
- <string name="search_menu" msgid="6283419262313758339">"Einstellungen durchsuchen"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wlan, wi-fi, netzwerkverbindung, internet, kabellos, daten, wifi, wi-fi, w-lan"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wlan, umschalten, steuern"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"textnachricht, sms, nachrichten, messaging, standard"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"Bezahlen, tippen, Zahlungen"</string>
<string name="keywords_backup" msgid="470070289135403022">"Sicherung, sicherung"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"Bewegung"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"Face, Unlock, Gesichtserkennung, Anmeldung"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl version, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"netzwerk, status des mobilfunknetz, servicestatus, signalstärke, art des mobilfunknetzes, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"seriennummer, hardwareversion"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"Dunkles Design"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"Fehler"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Inaktivitätsdisplay, Sperrbildschirm"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"benachrichtigung auf dem sperrbildschirm"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"Gesicht"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"Fingerabdruck"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"display dimmen, touchscreen, akku, intelligente helligkeit, dynamische helligkeit"</string>
@@ -3052,7 +3024,7 @@
<string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"WLAN-NFC-Tag einrichten"</string>
<string name="write_tag" msgid="8571858602896222537">"Schreiben"</string>
<string name="status_awaiting_tap" msgid="2130145523773160617">"Zum Schreiben auf ein Tag tippen…"</string>
- <string name="status_invalid_password" msgid="2575271864572897406">"Ungültiges Passwort. Bitte versuche es erneut."</string>
+ <string name="status_invalid_password" msgid="2575271864572897406">"Ungültiges Passwort. Bitte versuche es noch einmal."</string>
<string name="status_write_success" msgid="5228419086308251169">"Erfolgreich ausgeführt!"</string>
<string name="status_failed_to_write" msgid="8072752734686294718">"Es können keine Daten in das NFC-Tag geschrieben werden. Sollte das Problem weiterhin bestehen, versuche es mit einem anderen Tag."</string>
<string name="status_tag_not_writable" msgid="2511611539977682175">"In das NFC-Tag kann nicht geschrieben werden. Bitte verwende ein anderes Tag."</string>
@@ -3119,7 +3091,7 @@
<string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Kein akustisches Signal bei Benachrichtigungen"</string>
<string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Benachrichtigungen werden angezeigt"</string>
<string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Wenn auf deinem Smartphone neue Benachrichtigungen eingehen, ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren."</string>
- <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Keine optisches oder akustisches Signal bei Benachrichtigungen"</string>
+ <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Kein optisches oder akustisches Signal bei Benachrichtigungen"</string>
<string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Du siehst und hörst keine Benachrichtigungen"</string>
<string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Auf deinem Smartphone werden keine neuen oder vorhandenen Benachrichtigungen angezeigt. Es ist weder ein akustisches Signal zu hören noch eine Vibration zu spüren. Es erscheinen auch keine Benachrichtigungen, wenn du vom oberen Bildschirmrand nach unten wischst.\n\nBenachrichtigungen für grundlegende Smartphone-Aktivitäten und den Smartphone-Status werden weiterhin angezeigt."</string>
<string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Benutzerdefiniert"</string>
@@ -3127,7 +3099,7 @@
<string name="zen_mode_restrict_notifications_disable_custom" msgid="6676997522330453597">"Benutzerdefinierte Einstellung entfernen"</string>
<string name="zen_mode_restrict_notifications_summary_muted" msgid="5450158135853888485">"Kein akustisches Signal bei Benachrichtigungen"</string>
<string name="zen_mode_restrict_notifications_summary_custom" msgid="7416121534987213074">"Teilweise ausgeblendet"</string>
- <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Keine optisches oder akustisches Signal bei Benachrichtigungen"</string>
+ <string name="zen_mode_restrict_notifications_summary_hidden" msgid="3618285192806732504">"Kein optisches oder akustisches Signal bei Benachrichtigungen"</string>
<string name="zen_mode_what_to_block_title" msgid="5480903548365697159">"Benutzerdefinierte Einschränkungen"</string>
<string name="zen_mode_block_effects_screen_on" msgid="4659484530849212827">"Bei aktiviertem Display"</string>
<string name="zen_mode_block_effects_screen_off" msgid="4276414460889400625">"Bei deaktiviertem Display"</string>
@@ -3145,7 +3117,7 @@
<string name="zen_mode_block_effect_summary_sound" msgid="1065107568053759972">"Töne und Vibration"</string>
<string name="zen_mode_block_effect_summary_some" msgid="3635646031575107456">"Töne, Vibration und einige visuelle Elemente von Benachrichtigungen"</string>
<string name="zen_mode_block_effect_summary_all" msgid="1213328945418248026">"Töne, Vibration und visuelle Elemente von Benachrichtigungen"</string>
- <string name="zen_mode_blocked_effects_footer" msgid="5710896246703497760">"Benachrichtigungen für grundlegende Smartphone-Aktivitäten und den Smartphone-Status werden niemals ausgeblendet"</string>
+ <string name="zen_mode_blocked_effects_footer" msgid="5710896246703497760">"Benachrichtigungen für grundlegende Smartphone-Aktivitäten und den Smartphone-Status werden nie ausgeblendet"</string>
<string name="zen_mode_no_exceptions" msgid="7653433997399582247">"Keine"</string>
<string name="zen_mode_other_options" msgid="520015080445012355">"sonstige Optionen"</string>
<string name="zen_mode_add" msgid="90014394953272517">"Hinzufügen"</string>
@@ -3188,7 +3160,7 @@
<string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"Wenn \"Bitte nicht stören\" aktiviert ist, werden alle Nachrichten, Erinnerungen und Termine stummgeschaltet, die du oben nicht ausdrücklich zulässt. Die Nachrichteneinstellungen lassen sich anpassen, damit dich Freunde, Familie oder andere Kontakte erreichen können."</string>
<string name="zen_onboarding_ok" msgid="6131211000824433013">"Fertig"</string>
<string name="zen_onboarding_settings" msgid="9046451821239946868">"Einstellungen"</string>
- <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Keine optisches oder akustisches Signal bei Benachrichtigungen"</string>
+ <string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Kein optisches oder akustisches Signal bei Benachrichtigungen"</string>
<string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Kein Ton bei Benachrichtigungen"</string>
<string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Du siehst oder hörst keine Benachrichtigungen. Anrufe von markierten Kontakten und wiederholten Anrufern sind erlaubt."</string>
<string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Aktuelle Einstellung)"</string>
@@ -3212,7 +3184,7 @@
<string name="recent_notifications_see_all_title" msgid="8572160812124540326">"Alle aus den letzten 7 Tagen ansehen"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"Erweitert"</string>
<string name="profile_section_header" msgid="2320848161066912001">"Geschäftliche Benachrichtigungen"</string>
- <string name="notification_badging_title" msgid="5938709971403474078">"Benachrichtigungspunkte erlauben"</string>
+ <string name="notification_badging_title" msgid="5938709971403474078">"Benachrichtigungspunkte zulassen"</string>
<string name="notification_pulse_title" msgid="1905382958860387030">"Licht blinken lassen"</string>
<string name="lock_screen_notifications_title" msgid="2583595963286467672">"Auf dem Sperrbildschirm"</string>
<string name="locked_work_profile_notification_title" msgid="8327882003361551992">"Wenn das Arbeitsprofil gesperrt ist"</string>
@@ -3231,10 +3203,10 @@
<string name="notification_group_title" msgid="7180506440133859601">"Kategoriegruppe für Benachrichtigungen"</string>
<string name="notification_importance_title" msgid="4368578960344731828">"Verhalten"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"Akustisches Signal erlauben"</string>
- <string name="notification_importance_blocked" msgid="7938180808339386300">"Niemals Benachrichtigungen anzeigen"</string>
+ <string name="notification_importance_blocked" msgid="7938180808339386300">"Nie Benachrichtigungen anzeigen"</string>
<string name="notification_importance_min" msgid="9054819132085066824">"Lautlos anzeigen und minimieren"</string>
<string name="notification_importance_low" msgid="2445139943005315690">"Ohne Ton anzeigen"</string>
- <string name="notification_importance_default" msgid="5958338024601957516">"Akustisches Signal ausgeben"</string>
+ <string name="notification_importance_default" msgid="5958338024601957516">"Akustisches Signal"</string>
<string name="notification_importance_high" msgid="2082429479238228527">"Akustisches Signal und Bildschirmbenachrichtigung"</string>
<string name="notification_importance_high_silent" msgid="2667033773703765252">"Bildschirmbenachrichtigung"</string>
<string name="notification_importance_min_title" msgid="6974673091137544803">"Niedrig"</string>
@@ -3304,9 +3276,9 @@
<string name="notification_toggle_on" msgid="650145396718191048">"Aktiviert"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"Deaktiviert"</string>
<string name="app_notification_block_title" msgid="4069351066849087649">"Alle blockieren"</string>
- <string name="app_notification_block_summary" msgid="4744020456943215352">"Diese Benachrichtigungen niemals anzeigen"</string>
+ <string name="app_notification_block_summary" msgid="4744020456943215352">"Diese Benachrichtigungen nie anzeigen"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"Benachrichtigungen anzeigen"</string>
- <string name="notification_content_block_summary" msgid="7746185794438882389">"Benachrichtigungen niemals in der Leiste oder auf Peripheriegeräten anzeigen"</string>
+ <string name="notification_content_block_summary" msgid="7746185794438882389">"Benachrichtigungen nie in der Leiste oder auf Peripheriegeräten anzeigen"</string>
<string name="notification_badge_title" msgid="6370122441168519809">"App-Benachrichtigungspunkt erlauben"</string>
<string name="notification_channel_badge_title" msgid="2240827899882847087">"App-Benachrichtigungspunkt anzeigen"</string>
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" deaktivieren"</string>
@@ -3403,7 +3375,7 @@
<string name="zen_mode_calls_summary_two" msgid="6592821501321201329">"Von <xliff:g id="CALLER_TYPE">%1$s</xliff:g> und <xliff:g id="CALLERT_TPYE">%2$s</xliff:g>"</string>
<string name="zen_mode_repeat_callers_summary" msgid="239685342222975733">"Wenn dieselbe Person innerhalb von <xliff:g id="MINUTES">%d</xliff:g> Minuten noch einmal anruft"</string>
<string name="zen_mode_behavior_summary_custom" msgid="168127313238020146">"Benutzerdefiniert"</string>
- <string name="zen_mode_when" msgid="2767193283311106373">"Autom. aktivieren"</string>
+ <string name="zen_mode_when" msgid="2767193283311106373">"Automatisch aktivieren"</string>
<string name="zen_mode_when_never" msgid="8809494351918405602">"Nie"</string>
<string name="zen_mode_when_every_night" msgid="3122486110091921009">"Jede Nacht"</string>
<string name="zen_mode_when_weeknights" msgid="8354070633893273783">"Wochentags abends"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Wenn du zum Starten dieses Geräts deine PIN eingibst, stehen Dienste für Bedienungshilfen wie <xliff:g id="SERVICE">%1$s</xliff:g> noch nicht zur Verfügung."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Wenn du zum Starten dieses Geräts dein Muster eingibst, stehen Dienste für Bedienungshilfen wie <xliff:g id="SERVICE">%1$s</xliff:g> noch nicht zur Verfügung."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Wenn du zum Starten dieses Geräts dein Passwort eingibst, stehen Dienste für Bedienungshilfen wie <xliff:g id="SERVICE">%1$s</xliff:g> noch nicht zur Verfügung."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Hinweis: Nach einem Neustart wird diese App erst gestartet, wenn du dein Smartphone entsperrst"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Hinweis: Falls du dein Smartphone neu startest und eine Displaysperre aktiviert ist, wird diese App erst gestartet, wenn du dein Smartphone entsperrst"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI-Informationen"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informationen zur relativen IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Nutzer"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Geschäftlich"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: alle"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: deaktiviert"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Deaktiviert"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorien: sehr hohe Wichtigkeit"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorien: geringe Wichtigkeit"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorien: deaktiviert"</string>
@@ -3561,7 +3533,7 @@
<string name="permit_usage_access" msgid="4012876269445832300">"Zugriff auf Nutzungsdaten gewähren"</string>
<string name="app_usage_preference" msgid="7065701732733134991">"App-Nutzungseinstellungen"</string>
<string name="time_spent_in_app_pref_title" msgid="649419747540933845">"In der App verbrachte Zeit"</string>
- <string name="usage_access_description" msgid="1352111094596416795">"Der Zugriff auf die Nutzungsdaten ermöglicht es einer App, verschiedene Informationen zu erfassen. Unter anderem, welche anderen Apps du wie oft verwendest, welchen Mobilfunkanbieter du nutzt und welche Spracheinstellungen du festgelegt hast."</string>
+ <string name="usage_access_description" msgid="1352111094596416795">"Der Zugriff auf die Nutzungsdaten ermöglicht es einer App, verschiedene Informationen zu erfassen – welche anderen Apps du wie oft verwendest, welchen Mobilfunkanbieter du nutzt, welche Spracheinstellungen du festgelegt hast usw."</string>
<string name="memory_settings_title" msgid="7490541005204254222">"Arbeitsspeicher"</string>
<string name="memory_details_title" msgid="8542565326053693320">"Speicherdetails"</string>
<string name="always_running" msgid="6042448320077429656">"Immer ausgeführt (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Akkuwarnung"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Vollständige Gerätenutzung zeigen"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"App-Nutzung zeigen"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Hoher Verbrauch"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> Apps funktionieren nicht wie gewohnt</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> funktioniert nicht wie gewohnt</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Interner Speicher: <xliff:g id="PERCENTAGE">%1$s</xliff:g> belegt – <xliff:g id="FREE_SPACE">%2$s</xliff:g> frei"</string>
<string name="display_summary" msgid="6737806235882127328">"Ruhemodus wird nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> Inaktivität aktiviert"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Hintergrund, Ruhemodus, Schriftgröße"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Ruhemodus wird nach 10 Minuten Inaktivität aktiviert"</string>
<string name="memory_summary" msgid="8080825904671961872">"Speicher: durchschnittlich <xliff:g id="USED_MEMORY">%1$s</xliff:g> von <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> belegt"</string>
<string name="users_summary" msgid="1674864467098487328">"Angemeldet als <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS nicht zulässig"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kameranutzung nicht zulässig"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshots nicht zulässig"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Deaktivieren der Sicherungen nicht möglich"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"App kann nicht geöffnet werden"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Wende dich bei Fragen an deinen IT-Administrator"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Weitere Details"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Display mit Ausschnitt nachahmen"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Display-Aussparung"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display aussparung, notch"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Keine"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Gerätestandard"</string>
<string name="special_access" msgid="3458780842491881155">"Spezieller App-Zugriff"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> Apps dürfen uneingeschränkt Daten nutzen</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Mit <xliff:g id="ID_1">%1$s</xliff:g> verbunden"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Mit mehreren Geräten verbunden"</string>
<string name="demo_mode" msgid="2798762752209330277">"Demomodus der System-UI"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Nachtmodus"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Nachtmodus einstellen"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Dunkler Modus"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Dunkler Modus"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Kacheln für Schnelleinstellungen für Entwickler"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Einstellungen für Arbeitsprofil"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Suche nach Kontakten"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Suche nach Kontakten durch deine Organisation erlauben, um Anrufer und Kontakte zu identifizieren"</string>
@@ -3979,24 +3950,28 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Zur Kamera wechseln"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Ein-/Aus-Taste zweimal drücken, um Kamera direkt zu starten. Funktioniert bei jedem Display."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kamera schnell öffnen"</string>
- <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamera wechseln"</string>
+ <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamera umschalten"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Schnell Selfies aufnehmen"</string>
<string name="swipe_up_to_switch_apps_title" msgid="2513907834903543667">"Auf Startbildschirmtaste nach oben wischen"</string>
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Wenn du auf der Startbildschirmtaste nach oben wischst, kannst du zwischen Apps wechseln. Wenn du wieder nach oben wischst, siehst du alle Apps. Dies funktioniert auf allen Displays. Es gibt rechts auf deinem Display keine Übersichtsschaltfläche mehr."</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Neue Startbildschirmtaste ausprobieren"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Neue Bewegung zum Wechseln von Apps aktivieren"</string>
- <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Doppeltippen für schnellen Blick auf das Smartphone-Display"</string>
+ <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Für schnellen Blick aufs Display doppeltippen"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Doppeltippen für schnellen Blick auf das Display des Tablets"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Doppeltippen für schnellen Blick auf das Display des Geräts"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Auf den Bildschirm doppeltippen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
- <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Für Benachr. anheben"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Auf den Bildschirm doppeltippen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
+ <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Beim Hochnehmen des Telefons Display anzeigen"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tablet hochnehmen, um das Display anzusehen"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Gerät hochnehmen, um das Display anzusehen"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Smartphone in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Tablet in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Gerät in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
- <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Benachr. mit Fingerabdruck"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Bildschirm aktivieren"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Smartphone in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Tablet in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Gerät in die Hand nehmen, um Uhrzeit, Benachrichtigungen und andere Informationen anzusehen."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Bewegung zum Aktivieren des Sperrbildschirms"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
+ <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Benachrichtigungen durch Wischen über Fingerabdrucksensor öffnen"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Fingerabdrucksensor verwenden"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Auf der Rückseite des Smartphones über den Fingerabdrucksensor nach unten wischen, um Benachrichtigungen zu lesen."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Auf der Rückseite des Tablets über den Fingerabdrucksensor nach unten wischen, um Benachrichtigungen zu lesen."</string>
@@ -4013,7 +3988,7 @@
<string name="web_action_enable_title" msgid="4051513950976670853">"Instant-Apps"</string>
<string name="web_action_enable_summary" msgid="3108127559723396382">"Links in Apps öffnen, selbst wenn diese nicht installiert sind"</string>
<string name="web_action_section_title" msgid="7364647086538399136">"Instant-Apps"</string>
- <string name="instant_apps_settings" msgid="8827777916518348213">"Instant Apps-Einstell."</string>
+ <string name="instant_apps_settings" msgid="8827777916518348213">"Instant-Apps-Einstell."</string>
<string name="domain_url_section_title" msgid="7046835219056428883">"Installierte Apps"</string>
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Dein Speicher wird jetzt vom Speichermanager verwaltet"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"Konten für <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> Versuche</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> Versuch</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Die Daten dieses Geräts werden gesichert"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Dieses Gerät wird von deiner Organisation verwaltet."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Dieses Gerät wird von <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> verwaltet."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4085,7 +4059,7 @@
<item quantity="one">Kamera-App</item>
</plurals>
<string name="default_calendar_app_title" msgid="3545972964391065220">"Kalender-App"</string>
- <string name="default_contacts_app_title" msgid="3497370557378660098">"Kontakte-App"</string>
+ <string name="default_contacts_app_title" msgid="3497370557378660098">"Kontakte App"</string>
<plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
<item quantity="other">E-Mail-Client-Apps</item>
<item quantity="one">E-Mail-Client-App</item>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"AutoFill-Dienst"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatisch, ausfüllen, füllen, autofill"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Findest du diese App vertrauenswürdig?</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> entscheidet anhand der Inhalte auf dem Display, welche Informationen automatisch ausgefüllt werden können."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automatisch ausfüllen"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Protokollierungslevel"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maximale Anzahl von Anfragen pro Sitzung"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maximale Anzahl von sichtbaren Datensätzen"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Auf Standardwerte zurücksetzen"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Die AutoFill-Optionen für Entwickler wurden zurückgesetzt"</string>
<string name="device_theme" msgid="4571803018917608588">"Gerätedesign"</string>
<string name="default_theme" msgid="7085644992078579076">"Standard"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Netzwerkname"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Nutzerverwaltung durch den Anbieter auslösen"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\"Bitte nicht stören\" aktualisieren"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Zur besseren Konzentration Benachrichtigungen pausieren"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Was gibt\'s Neues?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Lass dir zeigen, was dein neues Smartphone alles kann"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Lass dir zeigen, was dein neues Tablet alles kann"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Lass dir zeigen, was dein neues Gerät alles kann"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Diese Funktion ist auf diesem Gerät nicht verfügbar"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Vollständige GNSS-Messung erzwingen"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Alle GNSS-Konstellationen und -Frequenzen ohne GNSS-Zyklus erfassen"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Absturzdialogfeld immer anzeigen"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Dialogfeld bei App-Abstürzen immer anzeigen"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE-App auswählen"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Keine ANGLE-App festgelegt"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE-App: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Verzeichniszugriff"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"verzeichniszugriff"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4168,7 +4147,7 @@
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Akkulaufzeit des Smartphones verbessern"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
<string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Klingeln verhindern"</string>
- <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"\"Ein/Aus\" & \"Lauter\" leicht zusammendrücken"</string>
+ <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"\"Ein/Aus\" & \"Lauter\" gleichzeitig drücken"</string>
<string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Verknüpfung, um Klingeln zu verhindern"</string>
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Vibrieren"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Stummschalten"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Netzwerkdetails"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Dein Gerätename ist für Apps auf deinem Smartphone sichtbar. Wenn du dich mit Bluetooth-Geräten verbindest oder einen WLAN-Hotspot einrichtest, kann er möglicherweise auch von anderen Personen gesehen werden."</string>
<string name="devices_title" msgid="7701726109334110391">"Geräte"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Alle Einstellungen"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Vorschläge"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-Daten"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-Daten"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Netzwerk auswählen"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Nicht verbunden"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Verbunden"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Verbindung wird hergestellt…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Verbindung nicht möglich"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Keine Netzwerke gefunden."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Netzwerke nicht gefunden. Bitte versuch es noch einmal."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(nicht zulässig)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Keine SIM-Karte"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Erweiterte Anruffunktionen"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Bevorzugter Netzwerkmodus: WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Bevorzugter Netzwerkmodus: nur GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Bevorzugter Netzwerkmodus: nur WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Bevorzugter Netzwerkmodus: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Bevorzugter Netzwerkmodus: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Bevorzugter Netzwerkmodus: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Bevorzugter Netzwerkmodus: nur CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Bevorzugter Netzwerkmodus: nur EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Bevorzugter Netzwerkmodus: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Bevorzugter Netzwerkmodus: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Bevorzugter Netzwerkmodus: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Bevorzugter Netzwerkmodus: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Bevorzugter Netzwerkmodus: global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Bevorzugter Netzwerkmodus: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Bevorzugter Netzwerkmodus: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Bevorzugter Netzwerkmodus: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Bevorzugter Netzwerkmodus: TD-SCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Bevorzugter Netzwerkmodus: TD-SCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Bevorzugter Netzwerkmodus: TD-SCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Bevorzugter Netzwerkmodus: LTE/GSM/TD-SCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Bevorzugter Netzwerkmodus: TD-SCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Bevorzugter Netzwerkmodus: TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Bevorzugter Netzwerkmodus: LTE/TD-SCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (empfohlen)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (empfohlen)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Verfügbare Netzwerke"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Wird gesucht…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registrierung in <xliff:g id="NETWORK">%s</xliff:g>..."</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Deine SIM-Karte lässt keine Verbindung mit diesem Netzwerk zu."</string>
+ <string name="connect_later" msgid="978991102125216741">"Momentan kann keine Verbindung mit diesem Netzwerk aufgebaut werden. Bitte versuch es später noch einmal."</string>
+ <string name="registration_done" msgid="4573820010512184521">"In Netzwerk registriert."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Netzwerk automatisch auswählen"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Mobilfunkanbieter-Einstellungen"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Datendienst einrichten"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobile Daten"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Datenzugriff über Mobilfunknetz"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Bevorzugter Netzwerktyp"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Netzwerkmodus ändern"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Bevorzugter Netzwerktyp"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Mobilfunkanbieter"</string>
+ <string name="call_category" msgid="8108654745239563833">"Anruffunktionen"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videoanrufe über Mobilfunkanbieter"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Systemauswahl"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA-Roamingmodus ändern"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Systemauswahl"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Netzwerk"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Netzwerk"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA-Abo"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Zwischen RUIM/SIM und NV wechseln"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"Abo"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatische Registrierung…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Daten-Roaming zulassen?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Wenn du Informationen zu Preisen erhalten möchtest, wende dich bitte an deinen Netzwerkanbieter."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Datennutzung durch Apps"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Ungültiger Netzwerkmodus <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorieren."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Bei Verbindung mit <xliff:g id="CARRIER">%1$s</xliff:g> nicht verfügbar"</string>
+ <string name="see_more" msgid="5953815986207345223">"Mehr anzeigen"</string>
+ <string name="see_less" msgid="1250265310929558370">"Weniger anzeigen"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index b4bbc56..5b176df 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Χρήση ως δικτύου με περιορισμούς"</item>
<item msgid="2266114985518865625">"Χρήση ως δικτύου χωρίς περιορισμούς"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Προεπιλογή (χρήση τυχαίας διεύθυνσης MAC)"</item>
+ <item msgid="5398461510512959597">"Αξιόπιστος"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Όχι"</item>
<item msgid="3863157480502955888">"Ναι"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Πάντα ενεργή"</item>
<item msgid="6385301106124765323">"Πάντα ανενεργή"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Ανενεργή"</item>
+ <item msgid="2182686878828390312">"Εντοπισμός σφαλμάτων"</item>
+ <item msgid="5286514712714822064">"Λεπτομερής"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Μόνο αρχική σελίδα"</item>
+ <item msgid="5034813753274486448">"Αυτόματo"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Προτιμώνται GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Μόνο GSM"</item>
+ <item msgid="488474605709912156">"Μόνο WCDMA"</item>
+ <item msgid="1912421096218750039">"Αυτόματο GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Αυτόματο EvDo/CDMA"</item>
+ <item msgid="370391313511477301">"CDMA χωρίς EvDo"</item>
+ <item msgid="4678789463133969294">"Μόνο EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Παγκόσμιο"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Μόνο TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Παγκόσμιο"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 92642b9..3298cfc 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Δημιουργία"</string>
<string name="allow" msgid="3349662621170855910">"Αποδοχή"</string>
<string name="deny" msgid="6947806159746484865">"Απόρριψη"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Κλείσιμο"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Εναλλαγή"</string>
<string name="device_info_default" msgid="7847265875578739287">"Άγνωστο"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Απομένουν <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> βήματα για να γίνετε προγραμματιστής.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Δεν χρειάζεται, είστε ήδη προγραμματιστής."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Ενεργοποιήστε πρώτα τις επιλογές για προγραμματιστές."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Ασύρματο και δίκτυα"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Συνδέσεις"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Συσκευή"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Προσωπικό"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Πρόσβαση"</string>
<string name="header_category_system" msgid="2816866961183068977">"Σύστημα"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Ενεργοποίηση σύνδεσης δεδομένων"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Απενεργοποίηση σύνδεσης δεδομένων"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Διεύθυνση Bluetooth συσκευής: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Να αποσυνδεθεί η συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>;"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Μετάδοση"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Συσκευή Bluetooth χωρίς όνομα"</string>
<string name="progress_scanning" msgid="192587958424295789">"Αναζήτηση"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Δεν βρέθηκαν συσκευές Bluetooth κοντά."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Μια εφαρμογή θέλει να ενεργοποιήσει το Bluetooth και να κάνει το τηλέφωνό σας ορατό σε άλλες συσκευές. Μπορείτε να αλλάξετε αυτήν την επιλογή αργότερα, από τις ρυθμίσεις Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Ενεργοποίηση του Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Απενεργοποίηση Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Αυτόματη σύνδεση"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Αίτημα σύνδεσης Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Πατήστε για να συνδεθείτε στη συσκευή \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Θέλετε να συνδεθείτε στο \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\";"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Διαθέσιμες συσκευές κλήσης"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Συνδεδεμένες αυτήν τη στιγμή"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Αποθηκευμένες συσκευές"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Προσθήκη συσκευής"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Το Bluetooth θα ενεργοποιηθεί για σύζευξη"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Προτιμήσεις σύνδεσης"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Συσκευές που έχουν συνδεθεί στο παρελθόν"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Συνδέθηκαν στο παρελθόν"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Ενεργοποιημένο Bluetooth"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Προβολή όλων"</string>
<string name="date_and_time" msgid="9062980487860757694">"Ημερομηνία & ώρα"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Επιλέξτε ζώνη ώρας"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Παράλ"</string>
<string name="next_label" msgid="4693520878012668114">"Επόμενο"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Γλώσσες"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Γλωσσικές προτιμήσεις"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Κατάργηση"</string>
<string name="add_a_language" msgid="2330538812283783022">"Προσθήκη γλώσσας"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Ρυθμίσεις"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Συντόμευση ρυθμίσεων"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Λειτουργία πτήσης"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Περισσότερα"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Ασύρματο και δίκτυα"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Διαχείριση Wi-Fi, Bluetooth, λειτουργίας πτήσης, δίκτυα κινητής τηλεφωνίας και VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Δεδομένα κινητής τηλεφωνίας"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Απόρρητο"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Απενεργοποιήθηκε από τον διαχειριστή"</string>
<string name="security_status_title" msgid="5848766673665944640">"Κατάσταση ασφάλειας"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Κλείδωμα οθόνης, Face Unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Κλείδωμα οθόνης, δακτυλικό αποτύπωμα"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Κλείδωμα οθόνης"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Προστέθηκε πρόσωπο"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Ξεκλείδωμα με το πρόσωπό σας"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Χρήση προσώπου για έλεγχο ταυτότητας"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Χρησιμοποιήστε το πρόσωπό σας για να ξεκλειδώνετε το τηλέφωνό σας, να εξουσιοδοτείτε αγορές ή να συνδέεστε σε εφαρμογές."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Χρησιμοποιήστε τον εαυτό σας"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Χρησιμοποιήστε το πρόσωπό σας, για να ξεκλειδώνετε το τηλέφωνό σας ή να εγκρίνετε αγορές.\n\nΣημείωση: Δεν μπορείτε να χρησιμοποιήσετε το πρόσωπό σας για να ξεκλειδώσετε αυτήν τη συσκευή. Για περισσότερες πληροφορίες, επικοινωνήστε με τον διαχειριστή του οργανισμού σας."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Χρησιμοποιήστε το πρόσωπό σας για να ξεκλειδώνετε το τηλέφωνό σας, να εξουσιοδοτείτε αγορές ή να συνδέεστε σε εφαρμογές"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Μπορείτε να προσθέσετε έως <xliff:g id="COUNT">%d</xliff:g> μοναδικά χαρακτηριστικά"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Κεντράρετε το πρόσωπό σας στον κύκλο"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Αργότερα"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Μπορείτε να προσθέσετε έως <xliff:g id="COUNT">%d</xliff:g> πρόσωπα"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Έχετε προσθέσει τον μέγιστο αριθμό προσώπων"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Δεν είναι δυνατή η προσθήκη περισσότερων προσώπων"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Η εγγραφή δεν ολοκληρώθηκε"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ΟΚ"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Λήξη χρονικού ορίου εγγραφής προσώπου. Δοκιμάστε ξανά."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Η εγγραφή προσώπου απέτυχε."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Η εγγραφή ολοκληρώθηκε. Όλα φαίνονται σωστά."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Τέλος"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Χρήση προσώπου για"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Ξεκλείδωμα συσκευής"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Σύνδεση και πληρωμές σε εφαρμ."</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Ανοιχτά μάτια για ξεκλείδωμα"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Για τον έλεγχο ταυτ. προσώπου, τα μάτια σας θα πρέπει να είναι ανοιχτά"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Κατάργ. δεδομ. προσ."</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Βελτίωση δεδομένων προσώπου"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Το πρόσωπό σας μπορεί να χρησιμοποιηθεί για το ξεκλείδωμα της συσκευής σας και για πρόσβαση στις εφαρμογές. "<annotation id="url">"Μάθετε περισσότερα"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Δακτυλικά αποτυπώματα"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Διαχείριση μον.χαρακτ."</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Χρήση μον.χαρακτ.για"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Επιλέξτε τουλάχιστον μία ζώνη συχνοτήτων για το σημείο πρόσβασης Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Ρυθμίσεις IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Απόρρητο"</string>
<string name="wifi_shared" msgid="844142443226926070">"Κοινή χρήση με άλλους χρήστες της συσκευής"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(δεν έγινε αλλαγή)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Επιλέξτε"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Ακύρωση"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Κατάργηση απομνημόνευσης δικτύου;"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Όλοι οι κωδικοί πρόσβασης για αυτό το δίκτυο θα διαγραφούν"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Αποθηκευμένα δίκτυα"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d δίκτυα</item>
<item quantity="one">1 δίκτυο</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Φωτεινότητα"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ρύθμιση της φωτεινότητας της οθόνης"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Προσαρμοστική φωτεινότητα"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Ενεργή"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Ανενεργή"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Η προτιμώμενη φωτεινότητα είναι πολύ χαμηλή"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Η προτιμώμενη φωτεινότητα είναι χαμηλή"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Δεν αλλάζει το PIN.\nΊσως να είναι λάθος."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Το PIN της κάρτας SIM άλλαξε"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Δεν είναι δυνατή η αλλαγή της κατάστασης κλειδώματος της κάρτας SIM.\nΠιθανόν το PIN να είναι λάθος."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Δεν είναι δυνατή η απενεργοποίηση του PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Δεν είναι δυνατή η ενεργοποίηση του PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Ακύρωση"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Βρέθηκαν πολλές SIM"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Αυτό απαιτεί τη μορφοποίηση του μέσου αποθήκευσης <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"Η μορφοποίηση διαγράφει όλα τα δεδομένα που είναι αποθηκευμένα αυτήν τη στιγμή στο μέσο αποθήκευσης <xliff:g id="NAME_1">^1</xliff:g>."</b>" Για να αποφύγετε την απώλεια των δεδομένων σας, εξετάστε το ενδεχόμενο να δημιουργήσετε αντίγραφα ασφαλείας γι΄αυτά."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Διαγραφή δεδομένων και μορφ."</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Μορφοποίηση μέσου αποθήκευσης <xliff:g id="NAME">^1</xliff:g>"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Μην αφαιρείτε το <xliff:g id="NAME">^1</xliff:g> κατά τη μορφοποίηση."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Μην αφαιρέσετε τη συσκευή <xliff:g id="NAME">^1</xliff:g> κατά τη μορφοποίησή της."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Μετακίνηση δεδ.σε νέο χώρο αποθ."</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Μπορείτε να μεταφέρετε τις φωτογραφίες, τα αρχεία και ορισμένες εφαρμογές στη νέα κάρτα <xliff:g id="NAME">^1</xliff:g>. \n\nΗ μεταφορά θα διαρκέσει <xliff:g id="TIME">^2</xliff:g> περίπου και θα απελευθερώσει <xliff:g id="SIZE">^3</xliff:g> από τον εσωτερικό χώρο αποθήκευσης. Ορισμένες εφαρμογές δεν θα λειτουργούν κατά τη διάρκεια της διαδικασίας."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Μετακίνηση τώρα"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Εγκατεστημένη"</string>
<string name="no_applications" msgid="7336588977497084921">"Δεν υπάρχουν εφαρμογές."</string>
<string name="internal_storage" msgid="1584700623164275282">"Εσ. αποθ. χώρος"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"εσωτερικός αποθηκευτικός χώρος"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Αποθ. χώρος USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Κάρ. χώρ. απ. SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Εκ νέου υπολογισμός μεγέθους..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Διαγραφή δεδομένων εφαρμογής;"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Όλα τα δεδομένα της εφαρμογής θα διαγραφούν μόνιμα. Αυτό περιλαμβάνει όλα τα αρχεία, τις ρυθμίσεις, τους λογαριασμούς, τις βάσεις δεδομένων κ.λπ."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Η εφαρμογή δεν βρέθηκε στη λίστα με τις εγκατεστημένες εφαρμογές."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Δεν ήταν δυνατή η διαγραφή αποθηκευτικού χώρου για την εφαρμογή."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Αυτή η εφαρμογή μπορεί να αποκτήσει πρόσβαση στα ακόλουθα στο tablet σας:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Αυτή η εφαρμογή μπορεί να αποκτήσει πρόσβαση στα ακόλουθα στο τηλέφωνό σας:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Αυτή η εφαρμογή έχει τη δυνατότητα πρόσβασης στα παρακάτω στοιχεία στο tablet σας. Προκειμένου να βελτιωθεί η απόδοση και να περιοριστεί η χρήση μνήμης, ορισμένα από αυτά τα δικαιώματα είναι διαθέσιμα στην εφαρμογή <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> καθώς εκτελείται με την ίδια διαδικασία με τις εφαρμογές <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Αυτή η εφαρμογή έχει τη δυνατότητα πρόσβασης στα παρακάτω στοιχεία στο τηλέφωνό σας. Προκειμένου να βελτιωθεί η απόδοση και να περιοριστεί η χρήση μνήμης, ορισμένα από αυτά τα δικαιώματα είναι διαθέσιμα στην εφαρμογή<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> καθώς εκτελείται με την ίδια διαδικασία με τις εφαρμογές <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> και <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ενδέχεται να χρεωθείτε από αυτήν την εφαρμογή:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Να σταλεί SMS ειδικής χρέωσης;"</string>
<string name="computing_size" msgid="1599186977475211186">"Υπολογισμός..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Δεν ήταν δυνατός ο υπολογισμός του μεγέθους του πακέτου."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Δεν έχετε εγκαταστήσει εφαρμογές τρίτων μερών."</string>
<string name="version_text" msgid="9189073826278676425">"έκδοση <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Μετακίνηση"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Μετακίνηση σε tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Μετακίνηση στο τηλέφωνο"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Μετακ. σε αποθ. χώρο USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Μετακίνηση στην κάρτα SD"</string>
- <string name="moving" msgid="6431016143218876491">"Μετακίνηση"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Μια άλλη μετεγκατάσταση είναι ήδη σε εξέλιξη."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Δεν υπάρχει επαρκής αποθηκευτικός χώρος."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Η εφαρμογή δεν υπάρχει."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Δεν είναι δυνατή η εγκατάσταση του διαχειριστή συσκευής σε εξωτερικά μέσα"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Αναγκαστική διακοπή;"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Αν επιβάλετε τη διακοπή μιας εφαρμογής, ενδέχεται να μην λειτουργήσει σωστά."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Δεν ήταν δυνατή η μετακίνηση της εφαρμογής. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Προτιμώμενη θέση εγκατάστασης"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Αλλαγή της προτιμώμενης θέσης εγκατάστασης για νέες εφαρμογές"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Απενεργ. ενσωματωμ. εφαρμογής;"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Απενεργοποίηση εφαρμογής"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Εάν απενεργοποιήσετε αυτήν την εφαρμογή, η λειτουργία του Android και άλλων εφαρμογών ενδέχεται να μην είναι η αναμενόμενη."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Διαγραφή δεδομένων και απενεργοποίηση εφαρμογής;"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Εάν απενεργοποιήσετε αυτήν την εφαρμογή, η λειτουργία του Android και άλλων εφαρμογών ενδέχεται να μην είναι η αναμενόμενη. Επίσης, θα διαγραφούν τα δεδομένα σας."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Απενεργοποίηση ειδοποιήσεων;"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Εάν απενεργοποιήσετε τις ειδοποιήσεις για αυτήν την εφαρμογή, ενδέχεται να χάσετε σημαντικές ειδοποιήσεις και ενημερώσεις."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Κατάστημα"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Λεπτομέρειες εφαρμογής"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Η εφαρμογή εγκαταστάθηκε από το <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Χρήση υπηρεσίας"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Χρήση διόρθωσης χρωμάτων"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Χρήση υποτίτλων"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Συνέχεια"</string>
<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="6371077608778830020">"Προσθήκη ακουστικού βοηθήματος"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Εάν περιορίσετε τη δραστηριότητα στο παρασκήνιο για μια εφαρμογή, μπορεί να μην λειτουργήσει σωστά"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Εφόσον δεν έχει οριστεί βελτιστοποίηση μπαταρίας, δεν είναι δυνατός ο περιορισμός της εφαρμογής.\n\nΓια περιορισμό, ενεργοποιήστε τη βελτιστοποίηση."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Χρήση οθόνης από την πλήρη φόρτιση"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Κατανάλωση οθόνης"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Σάρωση δικτύου κινητής τηλεφωνίας"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Χρήση μπαταρίας από την πλήρη φόρτιση"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Χρόνος ενεργοποίησης της οθόνης από την πλήρη φόρτιση"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Χρήση της συσκευής από την πλήρη φόρτιση"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Λεπτομέρειες χρήσης"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Προσαρμογή χρήσης ισχύος"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Συμπεριλαμβανόμενα πακέτα"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Εφαρμογές που εξαντλούν την μπαταρία"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Διατήρηση της συσκευής ενεργής"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ενεργοποίηση συσκευής στο παρασκήνιο"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Συχνό αίτημα τοποθεσίας"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> εφαρμογές που δεν λειτουργούν σωστά"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Οι εφαρμογές εκτελούνται κανονικά"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Το τηλέφωνο παρουσιάζει τυπική χρήση μπαταρίας στο παρασκήνιο"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Το tablet παρουσιάζει τυπική χρήση μπαταρίας στο παρασκήνιο"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Περιορισμός χρήσης μπαταρίας για %1$d εφαρμογές</item>
<item quantity="one">Περιορισμός χρήσης μπαταρίας για %1$d εφαρμογή</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Περιορίστηκε <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Αυτές οι εφαρμογές χρησιμοποιούν μπαταρία στο παρασκήνιο. Οι εφαρμογές περιορισμένης πρόσβασης πιθανώς να μην λειτουργούν σωστά και οι ειδοποιήσεις ενδέχεται να εμφανίζονται με καθυστέρηση."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Χρήση Διαχείρισης μπαταρίας"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Ανίχνευση εξάντλησης μπαταρίας από εφαρμογές"</string>
@@ -2314,7 +2302,7 @@
<string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Απενεργοποιείτε το Bluetooth όταν δεν το χρησιμοποιείτε"</string>
<string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Δοκιμή σύνδεσης σε διαφορετική συσκευή Bluetooth"</string>
<string name="battery_desc_apps" msgid="8530418792605735226">"Μπαταρία που χρησιμοποιείται από την εφαρμογή"</string>
- <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Τερματισμός ή κατάργηση εγκατάστασης της εφαρμογής"</string>
+ <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Τερματισμός ή απεγκατάσταση της εφαρμογής"</string>
<string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Επιλέξτε κατάσταση εξοικονόμησης μπαταρίας"</string>
<string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Η εφαρμογή ενδέχεται να προσφέρει ρυθμίσεις που θα μειώσουν τη χρήση της μπαταρίας"</string>
<string name="battery_desc_users" msgid="7682989161885027823">"Μπαταρία που χρησιμοποιείται από το χρήστη"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Ακύρωση"</string>
<string name="tts_reset" msgid="2661752909256313270">"Επαναφορά"</string>
<string name="tts_play" msgid="2628469503798633884">"Αναπαραγωγή"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Έλεγχος ισχύος"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ενημέρωση ρύθμισης Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ενημέρωση ρύθμισης Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ενεργή"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"απενεργοποιημένη"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ενεργοποίηση"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"απενεργοποίηση"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Τοποθεσία"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Συγχρονισμός"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Φωτεινότητα <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"αυτόματη"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"πλήρης"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"κατά το ήμισυ"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"απενεργοποιημένη"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Αποθηκ. χώρος διαπιστευτηρίων"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Εγκατάσταση από συσκευή αποθ."</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> από <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Επιλογή όλων"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Χρήση δεδομένων"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Χρήση δεδομένων εφαρμογής"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Δεδ. κιν. τηλ. & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Ο υπολογισμός δεδομένων εταιρείας κινητής τηλεφωνίας μπορεί να διαφέρει από τη συσκευή σας."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Χρήση εφαρμογής"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ΠΛΗΡΟΦΟΡΙΕΣ ΕΦΑΡΜΟΓΗΣ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Εμφάνιση %d κρυφών στοιχείων</item>
<item quantity="one">Εμφάνιση %d κρυφού στοιχείου</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Σύμπτυξη"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Δίκτυο και διαδίκτυο"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"δίκτυο κινητής τηλεφωνίας"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"χρήση δεδομένων"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Εφαρμογές και ειδοποιήσεις"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Άδειες, προεπιλεγμένες εφαρμογές"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Η πρόσβαση ειδοποίησης δεν είναι διαθέσιμη για εφαρμογές στο προφίλ εργασίας."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Λογαριασμοί"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Δεν έχουν προστεθεί λογαριασμοί"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Προεπιλεγμένες εφ."</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Γλώσσες, ώρα, δημιουργία αντιγράφων ασφαλείας, ενημερώσεις"</string>
<string name="search_results_title" msgid="1796252422574886932">"Ρυθμίσεις"</string>
- <string name="search_menu" msgid="6283419262313758339">"Αναζήτηση ρυθμίσεων"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, σύνδεση δικτύου, διαδίκτυο, ασύρματο, δεδομένα, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, ενλλαγή, έλεγχος"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"μήνυμα κειμένου, ανταλλαγή γραπτών μηνυμάτων, μηνύματα, ανταλλαγή μηνυμάτων, προεπιλογή"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"πληρωμή, πάτημα, πληρωμές"</string>
<string name="keywords_backup" msgid="470070289135403022">"αντίγραφο ασφαλείας, δημιουργία αντιγράφου ασφαλείας"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"κίνηση"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"πρόσωπο, ξεκλείδωμα, εξουσιοδότηση, σύνδεση"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"αριθμός imei, meid, min, έκδοση prl, sv αριθμού imei"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"δίκτυο, κατάσταση δικτύου κινητής τηλεφωνίας, κατάσταση υπηρεσίας, ισχύς σήματος, τύπος δικτύου κινητής τηλεφωνίας, περιαγωγή, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"σειριακός αριθμός, έκδοση εξοπλισμού"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"σκούρο θέμα"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"σφάλμα"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Οθόνη περιβάλλοντος, Οθόνη κλειδώματος οθόνης"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"ειδοποίηση οθόνης κλειδώματος"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"πρόσωπο"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"δακτυλικό αποτύπωμα"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"μείωση φωτεινότητας οθόνης, οθόνη αφής, μπαταρία, έξυπνη φωτεινότητα, δυναμική φωτεινότητα"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Κατά την εισαγωγή του PIN σας για την εκκίνηση αυτής της συσκευής, οι υπηρεσίες προσβασιμότητας, όπως το <xliff:g id="SERVICE">%1$s</xliff:g> δεν θα είναι διαθέσιμες ακόμη."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Κατά την εισαγωγή του μοτίβου σας για την εκκίνηση αυτής της συσκευής, οι υπηρεσίες προσβασιμότητας, όπως το <xliff:g id="SERVICE">%1$s</xliff:g> δεν θα είναι διαθέσιμες ακόμη."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Κατά την εισαγωγή του κωδικού πρόσβασής σας για την εκκίνηση αυτής της συσκευής, οι υπηρεσίες προσβασιμότητας, όπως το <xliff:g id="SERVICE">%1$s</xliff:g> δεν θα είναι διαθέσιμες ακόμη."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Σημείωση: Μετά από μια επανεκκίνηση, δεν είναι δυνατή η έναρξη αυτής της συσκευής προτού ξεκλειδώσετε το τηλέφωνό σας"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Σημείωση: Εάν επανεκκινήσετε το τηλέφωνό σας και έχετε ορίσει κάποιο κλείδωμα οθόνης, δεν είναι δυνατή η έναρξη αυτής της εφαρμογής μέχρι να ξεκλειδώσετε το τηλέφωνο"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Πληροφορίες IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Σχετικές πληροφορίες IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Υποδοχή <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Προσωπικό"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Εργασία"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Εφαρμογές: Όλες"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Εφαρμογές: Απενεργοποιημένες"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Απενεργοποιημένες"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Κατηγορίες: Επείγουσες"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Κατηγορίες: Μικρής βαρύτητας"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Κατηγορίες: Απενεργοποιημένες"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Ειδοποιήσεις χρήσης"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Εμφάνιση πλήρους χρήσης συσκευής"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Εμφάνιση χρήσης εφαρμογής"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Υψηλά επίπεδα χρήσης"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other">Μη φυσιολογική συμπεριφορά <xliff:g id="NUMBER">%2$d</xliff:g> εφαρμογών</item>
<item quantity="one">Μη φυσιολογική συμπεριφορά του <xliff:g id="APP">%1$s</xliff:g></item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Εσωτερικός αποθηκευτικός χώρος: <xliff:g id="PERCENTAGE">%1$s</xliff:g> χρησιμοποιείται - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ελεύθερος"</string>
<string name="display_summary" msgid="6737806235882127328">"Αδράνεια μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> απουσίας δραστηριότητας"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Ταπετσαρία, αδράνεια, μέγεθος γραμματοσειράς"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Αδράνεια μετά από 10 λεπτά απουσίας δραστηριότητας"</string>
<string name="memory_summary" msgid="8080825904671961872">"Χρησιμοποιείται κατά μέσο όρο <xliff:g id="USED_MEMORY">%1$s</xliff:g> από <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> μνήμης"</string>
<string name="users_summary" msgid="1674864467098487328">"Συνδέθηκε ως <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Δεν επιτρέπεται η αποστολή SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Δεν επιτρέπεται η χρήση της κάμερας"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Δεν επιτρέπεται η λήψη στιγμιότυπων οθόνης"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Αδύνατη η απενεργοποίηση των αντιγράφων ασφαλείας"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Δεν είναι δυνατό το άνοιγμα αυτής της εφαρμογής"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Εάν έχετε απορίες, επικοινωνήστε με τον διαχειριστή IT"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Περισσότερες λεπτομέρειες"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Προσομοίωση οθόνης με εγκοπή"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Εγκοπή οθόνης"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"διακοπή οθόνης, εγκοπή"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Καμία"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Προεπιλογή συσκευής"</string>
<string name="special_access" msgid="3458780842491881155">"Ειδική πρόσβαση στην εφαρμογή"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> εφαρμογές μπορούν να χρησιμοποιούν απεριόριστα δεδομένα</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Σε σύνδεση στη συσκευή <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Σε σύνδεση σε πολλές συσκευές"</string>
<string name="demo_mode" msgid="2798762752209330277">"Λειτουργία επίδειξης διεπαφής χρήστη συστήματος"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Νυχτερινή λειτουργία"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Ρύθμιση Νυχτερινής λειτουργίας"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Λειτουργία χαμηλού φωτισμού"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Ορισμός λειτουργίας χαμηλού φωτισμού"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Πλακίδια προγραμματιστή για γρήγορες ρυθμίσεις"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Ίχνος Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Ρυθμίσεις προφίλ εργασίας"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Αναζήτηση επαφών"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Επιτρέψτε τις αναζητήσεις επαφών από τον οργανισμό σας, για την αναγνώριση καλούντων και επαφών"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Πατήστε δύο φορές για να ελέγξετε το τηλέφωνο"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Πατήστε δύο φορές για να ελέγξετε το tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Πατήστε δύο φορές για να ελέγξετε τη συσκευή"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Για να ελέγξετε την ώρα, τα εικονίδια ειδοποίησης και άλλες πληροφορίες, κάντε διπλό πάτημα στην οθόνη."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Για να ελέγξετε την ώρα, τις ειδοποιήσεις και άλλες πληροφορίες, πατήστε δύο φορές στην οθόνη."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Σηκώστε το για να δείτε"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Σηκώστε το tablet για να το ελέγξετε"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Σηκώστε τη συσκευή για να την ελέγξετε"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Για να ελέγξετε την ώρα, τα εικονίδια ειδοποίησης και άλλες πληροφορίες, σηκώστε το τηλέφωνό σας."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Για να ελέγξετε την ώρα, τα εικονίδια ειδοποίησης και άλλες πληροφορίες, σηκώστε το tablet σας."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Για να ελέγξετε την ώρα, τα εικονίδια ειδοποίησης και άλλες πληροφορίες, σηκώστε τη συσκευή σας."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Οθόνη ξυπνήματος"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Για να ελέγξετε την ώρα, τις ειδοποιήσεις και άλλες πληροφορίες, σηκώστε το τηλέφωνό σας."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Για να ελέγξετε την ώρα, τις ειδοποιήσεις και άλλες πληροφορίες, σηκώστε το tablet σας."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Για να ελέγξετε την ώρα, τις ειδοποιήσεις και άλλες πληροφορίες, σηκώστε τη συσκευή σας."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Κίνηση για wake lock οθόνης"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Σύρετε στον αισθητήρα δακτυλικών αποτυπωμάτων για ειδοποιήσεις"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Ολίσθηση δακτυλ. αποτυπ."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος του τηλεφώνου."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> προσπάθειες</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> προσπάθεια</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Δημιουργούνται αντίγραφα ασφαλείας για τα δεδομένα αυτής της συσκευής"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Αυτή η συσκευή είναι διαχειριζόμενη από τον οργανισμό σας."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Τη συσκευή διαχειρίζεται ο οργανισμός <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4115,7 +4089,13 @@
<string name="webview_disabled_for_user" msgid="1216426047631256825">"(απενεργοποιήθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
<string name="autofill_app" msgid="7338387238377914374">"Υπηρεσία αυτόμ. συμπλήρωσης"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"αυτόματη, συμπλήρωση, αυτόματη συμπλήρωση"</string>
- <string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Βεβαιωθείτε ότι εμπιστεύεστε αυτήν την εφαρμογή</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> χρησιμοποιεί το περιεχόμενο της οθόνης σας για να διαπιστώσει τι μπορεί να συμπληρωθεί αυτόματα."</string>
+ <string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Βεβαιωθείτε ότι εμπιστεύεστε αυτήν την εφαρμογή</b><br/> <br/> <xliff:g Το id=app_name example=Google Autofill>%1$s</xliff:g> χρησιμοποιεί το περιεχόμενο της οθόνης σας για να διαπιστώσει τι μπορεί να συμπληρωθεί αυτόματα."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Αυτόματη συμπλήρωση"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Επίπεδο καταγραφής"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Μέγιστος αριθμός αιτημάτων ανά περίοδο σύνδεσης"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Μέγιστα ορατά σύνολα δεδομένων"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Επαναφορά στις προεπιλεγμένες τιμές"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Έγινε επαναφορά των επιλογών προγραμματιστή αυτόματης συμπλήρωσης"</string>
<string name="device_theme" msgid="4571803018917608588">"Θέμα συσκευής"</string>
<string name="default_theme" msgid="7085644992078579076">"Προεπιλογή"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Όνομα δικτύου"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ενεργοποίηση παροχής εταιρείας κινητής τηλεφωνίας"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Ενημέρωση λειτουργίας \"Μην ενοχλείτε\""</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Θέστε σε παύση τις ειδοποιήσεις για να παραμένετε συγκεντρωμένοι"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Τι νέο και συναρπαστικό υπάρχει;"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Περιηγηθείτε στο νέο τηλέφωνό σας"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Περιηγηθείτε στο νέο σας tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Περιηγηθείτε στη νέα συσκευή σας"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Αυτή η λειτουργία δεν είναι διαθέσιμη σε αυτήν τη συσκευή"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Αναγκαστικές πλήρεις μετρήσεις GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Παρακολούθηση όλων των πανοραμικών συνθέσεων και των συχνοτήτων GNSS χωρίς κύκλο λειτουργιών"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Να εμφανίζεται πάντα το παράθυρο διαλόγου σφάλματος"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Να εμφανίζεται το παράθυρο διαλόγου κάθε φορά που παρουσιάζεται σφάλμα σε κάποια εφαρμογή"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Επιλογή εφαρμογής με δυνατότητα χρήσης ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Δεν έχει οριστεί κάποια εφαρμογή με δυνατότητα χρήσης ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Εφαρμογή με δυνατότητα χρήσης ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Πρόσβαση στον κατάλογο"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"πρόσβαση στον κατάλογο"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Λεπτομέρειες δικτύου"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Το όνομα της συσκευής σας είναι ορατό σε εφαρμογές στο τηλέφωνό σας. Ενδέχεται επίσης να είναι ορατό και σε άλλα άτομα, όταν συνδέεστε σε συσκευές Bluetooth ή ρυθμίζετε ένα σημείο πρόσβασης Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Συσκευές"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Όλες οι ρυθμίσεις"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Προτάσεις"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Δεδομένα CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Δεδομένα CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Επιλογή δικτύου"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Αποσυνδέθηκε"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Συνδέθηκε"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Σύνδεση…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Αδυναμία σύνδεσης"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Δεν βρέθηκαν δίκτυα."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Δεν ήταν δυνατή η εύρεση δικτύων. Δοκιμάστε ξανά."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(απαγορευμένο)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Δεν υπάρχει κάρτα SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Σύνθετες λειτουργίες κλήσης"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Προτιμώμενη λειτουργία δικτύου: προτιμώμενο WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Προτιμώμενη λειτουργία δικτύου: μόνο GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Προτιμώμενη λειτουργία δικτύου: μόνο WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Προτιμώμενη λειτουργία δικτύου: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Προτιμώμενη λειτουργία δικτύου: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Προτιμώμενη λειτουργία δικτύου: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Προτιμώμενη λειτουργία δικτύου: μόνο CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Προτιμώμενη λειτουργία δικτύου: μόνο EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Προτιμώμενη λειτουργία δικτύου: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Προτιμώμενη λειτουργία δικτύου: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Προτιμώμενη λειτουργία δικτύου: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Προτιμώμενη λειτουργία δικτύου: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Προτιμώμενη λειτουργία δικτύου: Παγκόσμιο"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Προτιμώμενη λειτουργία δικτύου: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Προτιμώμενη λειτουργία δικτύου: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Προτιμώμενη λειτουργία δικτύου: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Προτιμώμενη λειτουργία δικτύου: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Προτιμώμενη λειτουργία δικτύου: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Προτιμώμενη λειτουργία δικτύου: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Προτιμώμενη λειτουργία δικτύου: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Προτιμώμενη λειτουργία δικτύου: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Προτιμώμενη λειτουργία δικτύου: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Προτιμώμενη λειτουργία δικτύου: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Προτιμώμενη λειτουργία δικτύου: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Προτιμώμενη λειτουργία δικτύου: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Προτιμώμενη λειτουργία δικτύου: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (συνιστάται)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (συνιστάται)"</string>
+ <string name="network_global" msgid="959947774831178632">"Παγκόσμιο"</string>
+ <string name="label_available" msgid="1731547832803057893">"Διαθέσιμα δίκτυα"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Αναζήτηση…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Εγγραφή στο δίκτυο <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Η κάρτα SIM δεν επιτρέπει τη σύνδεση σε αυτό το δίκτυο."</string>
+ <string name="connect_later" msgid="978991102125216741">"Δεν είναι δυνατή η σύνδεση στο δίκτυο αυτήν τη στιγμή. Προσπαθήστε ξανά αργότερα."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Εγγράφηκε στο δίκτυο."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Αυτόματη επιλογή δικτύου"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Ρυθμίσεις εταιρείας κινητής τηλεφωνίας"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Ρύθμιση υπηρεσίας δεδομένων"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Δεδομένα κινητής τηλεφωνίας"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Πρόσβαση σε δεδομένα μέσω δικτύου κινητής τηλεφωνίας"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Προτιμώμενος τύπος δικτύου"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Αλλαγή κατάστασης λειτουργίας δικτύου"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Προτιμώμενος τύπος δικτύου"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Εταιρεία κινητής τηλεφωνίας"</string>
+ <string name="call_category" msgid="8108654745239563833">"Κλήση"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Βιντεοκλήση μέσω εταιρείας κινητής τηλεφωνίας"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Επιλογή συστήματος"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Αλλαγή της λειτουργίας περιαγωγής CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Επιλογή συστήματος"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Δίκτυο"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Δίκτυο"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Συνδρομή CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Αλλαγή μεταξύ RUIM/SIM και NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"συνδρομή"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Αυτόματη εγγραφή…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Να επιτρέπεται η περιαγωγή δεδομένων;"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Επικοινωνήστε με τον πάροχο του δικτύου για πληροφορίες σχετικά με τις τιμές."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Χρήση δεδομένων εφαρμογών"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Μη έγκυρη λειτουργία δικτύου <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Παράβλεψη."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Δεν διατίθεται κατά τη σύνδεση σε <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Δείτε περισσότερα"</string>
+ <string name="see_less" msgid="1250265310929558370">"Εμφάνιση λιγότερων"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> συνδεδεμένες συσκευές</item>
+ <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> συνδεδεμένη συσκευή</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Δεν υπάρχουν συνδεδεμένες συσκευές"</string>
</resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index e550a4f..4f1a76a 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Treat as metered"</item>
<item msgid="2266114985518865625">"Treat as unmetered"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Default (use randomised MAC)"</item>
+ <item msgid="5398461510512959597">"Trusted"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"No"</item>
<item msgid="3863157480502955888">"Yes"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Always on"</item>
<item msgid="6385301106124765323">"Always off"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Off"</item>
+ <item msgid="2182686878828390312">"Debug"</item>
+ <item msgid="5286514712714822064">"Verbose"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Home only"</item>
+ <item msgid="5034813753274486448">"Automatic"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferred"</item>
+ <item msgid="807926878589867564">"GSM only"</item>
+ <item msgid="488474605709912156">"WCDMA only"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA auto"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo auto"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo only"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA only"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index ab4b28d..026c58c 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Create"</string>
<string name="allow" msgid="3349662621170855910">"Allow"</string>
<string name="deny" msgid="6947806159746484865">"Deny"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
<string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Please enable developer options first."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless & networks"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Connections"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Access"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Enable data connection"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disable data connection"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Device\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Unnamed Bluetooth device"</string>
<string name="progress_scanning" msgid="192587958424295789">"Searching"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No nearby Bluetooth devices were found."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning on Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth connection request"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tap to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Available call devices"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Currently connected"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Saved devices"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Add device"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth will turn on to pair"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Connection preferences"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Previously connected devices"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Previously connected"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth turned on"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"See all"</string>
<string name="date_and_time" msgid="9062980487860757694">"Date & time"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Skip"</string>
<string name="next_label" msgid="4693520878012668114">"Next"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Languages"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Language preferences"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Remove"</string>
<string name="add_a_language" msgid="2330538812283783022">"Add a language"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Aeroplane mode"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"More"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless & networks"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, & VPNs"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobile data"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disabled by admin"</string>
<string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Screen lock, face unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Screen lock, fingerprint"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Screen lock"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Face added"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Unlock with your face"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Use your face to authenticate"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use your face to unlock your phone, authorise purchases or sign in to apps."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Use you"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use your face to unlock your phone or approve purchases.\n\nNote: You can’t use your face to unlock this device. For more information, contact your organisation’s admin."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use your face to unlock your phone, authorise purchases or sign in to apps"</string>
- <string name="face_add_max" msgid="2342250989212694454">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centre your face in the circle"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Do it later"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"You can add up to <xliff:g id="COUNT">%d</xliff:g> faces"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"You’ve added the maximum number of faces"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Can’t add more faces"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Enrolment was not completed"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Face enrolment time limit reached. Try again."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Face enrolment didn\'t work."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"All set. Looking good."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Done"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Use your face to"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Unlock your device"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"App sign-in & payments"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Eyes open to unlock"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"When using face authentication, your eyes must be open"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Remove face data"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Improve your face data"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Your face can be used to unlock your device and access apps. "<annotation id="url">"Learn more"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Choose at least one band for Wi‑Fi hotspot:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacy"</string>
<string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Please select"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Forget network?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"All passwords for this network will be deleted"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Saved networks"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d networks</item>
<item quantity="one">1 network</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brightness"</string>
<string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"On"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Off"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Preferred brightness is very low"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Preferred brightness is low"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Can\'t change PIN.\nPossibly incorrect PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN changed successfully"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Can\'t change SIM card lock state.\nPossibly incorrect PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Can\'t disable PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Can\'t enable PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Multiple SIMs found"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"This requires the <xliff:g id="NAME_0">^1</xliff:g> to be formatted. \n\n"<b>"Formatting erases all data currently stored on the <xliff:g id="NAME_1">^1</xliff:g>."</b>" To avoid losing the data, consider backing it up."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Erase & format"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatting <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatted."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatted."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Move data to new storage"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"You can move your photos, files and some apps to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won’t work while it’s underway."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Move now"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installed"</string>
<string name="no_applications" msgid="7336588977497084921">"No apps."</string>
<string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD card storage"</string>
<string name="recompute_size" msgid="7722567982831691718">"Recomputing size…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Delete app data?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"All of this app\'s data will be deleted permanently. This includes all files, settings, accounts, databases, etc."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"The app wasn\'t found in the list of installed apps."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Couldn’t clear storage for app."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"This app can access the following on your tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"This app can access the following on your phone:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"This app can access the following on your tablet. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"This app can access the following on your phone. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> and <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"This app may charge you money:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send premium SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Computing…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Couldn\'t compute the package size."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"You don\'t have any third-party apps installed."</string>
<string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Move"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Move to tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Move to phone"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Move to USB storage"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Move to SD card"</string>
- <string name="moving" msgid="6431016143218876491">"Moving"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Another migration is already in progress."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Not enough storage space."</string>
<string name="does_not_exist" msgid="1501243985586067053">"App doesn\'t exist."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Device admin app can\'t be installed on external media"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Force stop?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force-stop an app, it may misbehave."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Couldn\'t move app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Preferred install location"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Change the preferred installation location for new applications."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disable built-in app?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Disable app"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"If you disable this app, Android and other apps may no longer function as intended."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Delete data and disable app?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"If you disable this app, Android and other apps may no longer function as intended. Your data will also be deleted."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Turn off notifications"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"If you turn off notifications for this app, you may miss important alerts and updates."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"App details"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App installed from <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Use service"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Use colour correction"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Use captions"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continue"</string>
<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="6371077608778830020">"Add hearing aid"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"If you limit background activity for an app, it may misbehave"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Battery usage since full charge"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps draining battery"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Keeping device awake"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Apps are running normally"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Phone has typical background battery usage"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet has typical background battery usage"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Limiting battery usage for %1$d apps</item>
<item quantity="one">Limiting battery usage for %1$d app</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restricted <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"These apps have been using battery in the background. Restricted apps may not work properly and notifications may be delayed."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Use Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detect when apps drain battery"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancel"</string>
<string name="tts_reset" msgid="2661752909256313270">"Reset"</string>
<string name="tts_play" msgid="2628469503798633884">"Play"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Updating Wi‑Fi setting"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"on"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"off"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"turning on"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"turning off"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Location"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sync"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"full"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"off"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Credential storage"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Install from storage"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Select all"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobile data & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
<string name="data_usage_app" msgid="4970478397515423303">"App usage"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APP INFO"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Show %d hidden items</item>
<item quantity="one">Show %d hidden item</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Collapse"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Network & Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobile"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data usage"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps & notifications"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Notification access is not available for apps in the work profile."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"No accounts added"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Default apps"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Languages, time, backup, updates"</string>
<string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
- <string name="search_menu" msgid="6283419262313758339">"Search in Settings"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, network connection, internet, wireless, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, toggle, control"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"text message, texting, messages, messaging, default"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesture"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"face, unlock, auth, sign in"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl version, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"network, mobile network state, service state, signal strength, mobile network type, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, hardware version"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"dark theme"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"lock screen notification"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"face"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"dim screen, touchscreen, battery, smart brightness, dynamic brightness"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"When you enter your PIN to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"When you enter your pattern to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"When you enter your password to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Note: After a reboot, this app can\'t start until you unlock your phone"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Turned off"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"High usage"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> behaving abnormally</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Internal storage: <xliff:g id="PERCENTAGE">%1$s</xliff:g> used – <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
<string name="display_summary" msgid="6737806235882127328">"Sleep after <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Wallpaper, sleep, font size"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Sleep after 10 minutes of inactivity"</string>
<string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
<string name="users_summary" msgid="1674864467098487328">"Signed in as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS not allowed"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Camera not allowed"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshot not allowed"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Can’t turn off backups"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Can’t open this app"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"If you have any questions, contact your IT admin"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"More details"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulate a display with a cutout"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"None"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Device default"</string>
<string name="special_access" msgid="3458780842491881155">"Special app access"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
<string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Set Night mode"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Dark mode"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Set Dark mode"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Allow contact searches by your organisation to identify callers and contacts"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Double-tap to check phone"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Double-tap to check tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Double-tap to check device"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"To check time, notification icons and other info, double-tap your screen."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"To check time, notifications and other info, double-tap your screen."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lift to check phone"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Lift to check tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Lift to check device"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"To check time, notification icons and other info, pick up your phone."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"To check time, notification icons and other info, pick up your tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"To check time, notification icons and other info, pick up your device."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Wake up display"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"To check time, notifications and other info, pick up your phone."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"To check time, notifications and other info, pick up your tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"To check time, notifications and other info, pick up your device."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Wake lock screen gesture"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swipe fingerprint for notifications"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Swipe fingerprint"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> attempt</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"This device\'s data is being backed up"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"This device is managed by your organisation."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Make sure that you trust this app</b> <br/> <br/> <xliff:g id=app_name example=Google Auto-fill>%1$s</xliff:g> uses what\'s on your screen to determine what can be auto-filled."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Auto-fill"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Logging level"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Max requests per session"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Max visible datasets"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Reset to default values"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Auto-fill developer options have been reset"</string>
<string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
<string name="default_theme" msgid="7085644992078579076">"Default"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Network name"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Force full GNSS measurements"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Track all GNSS constellations and frequencies with no duty cycling"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Always show crash dialogue"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Show dialogue every time an app crashes"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Select ANGLE enabled app"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"No ANGLE enabled application set"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE enabled application: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Directory access"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"directory access"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Network details"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
<string name="devices_title" msgid="7701726109334110391">"Devices"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"All Settings"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suggestions"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choose network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Disconnected"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connected"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connecting…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Couldn’t connect"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No networks found."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Couldn’t find networks. Try again."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbidden)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"No SIM card"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Advanced Calling"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Preferred network mode: WCDMA preferred"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Preferred network mode: GSM only"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Preferred network mode: WCDMA only"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Preferred network mode: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Preferred network mode: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Preferred network mode: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Preferred network mode: CDMA only"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Preferred network mode: EvDo only"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferred network mode: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferred network mode: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferred network mode: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferred network mode: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferred network mode: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferred network mode: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Preferred network mode: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Preferred network mode: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferred network mode: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preferred network mode: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preferred network mode: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preferred network mode: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preferred network mode: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preferred network mode: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preferred network mode: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preferred network mode: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recommended)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recommended)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Available networks"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Searching…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Your SIM card doesn’t allow a connection to this network."</string>
+ <string name="connect_later" msgid="978991102125216741">"Can’t connect to this network at the moment. Try again later."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registered on network."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automatically select network"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operator settings"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Set up data service"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobile data"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Access data using mobile network"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Preferred network type"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Change the network operating mode"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Preferred network type"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operator"</string>
+ <string name="call_category" msgid="8108654745239563833">"Calling"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operator video calling"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"System select"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Change the CDMA roaming mode"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"System select"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Network"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Network"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA subscription"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Change between RUIM/SIM and NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"subscription"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatic registration…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Allow data roaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Check with your network provider for pricing."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"App data usage"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Invalid network mode <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignore."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"See more"</string>
+ <string name="see_less" msgid="1250265310929558370">"See less"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index e550a4f..4f1a76a 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Treat as metered"</item>
<item msgid="2266114985518865625">"Treat as unmetered"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Default (use randomised MAC)"</item>
+ <item msgid="5398461510512959597">"Trusted"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"No"</item>
<item msgid="3863157480502955888">"Yes"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Always on"</item>
<item msgid="6385301106124765323">"Always off"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Off"</item>
+ <item msgid="2182686878828390312">"Debug"</item>
+ <item msgid="5286514712714822064">"Verbose"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Home only"</item>
+ <item msgid="5034813753274486448">"Automatic"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferred"</item>
+ <item msgid="807926878589867564">"GSM only"</item>
+ <item msgid="488474605709912156">"WCDMA only"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA auto"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo auto"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo only"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA only"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index d2ceec8..93eb896 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Create"</string>
<string name="allow" msgid="3349662621170855910">"Allow"</string>
<string name="deny" msgid="6947806159746484865">"Deny"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
<string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Please enable developer options first."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless & networks"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Connections"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Access"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Enable data connection"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disable data connection"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Device\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Unnamed Bluetooth device"</string>
<string name="progress_scanning" msgid="192587958424295789">"Searching"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No nearby Bluetooth devices were found."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning on Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth connection request"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tap to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Available call devices"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Currently connected"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Saved devices"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Add device"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth will turn on to pair"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Connection preferences"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Previously connected devices"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Previously connected"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth turned on"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"See all"</string>
<string name="date_and_time" msgid="9062980487860757694">"Date & time"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Skip"</string>
<string name="next_label" msgid="4693520878012668114">"Next"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Languages"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Language preferences"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Remove"</string>
<string name="add_a_language" msgid="2330538812283783022">"Add a language"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Airplane mode"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"More"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless & networks"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, airplane mode, mobile networks, & VPNs"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobile data"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disabled by admin"</string>
<string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Screen lock, face unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Screen lock, fingerprint"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Screen lock"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Face added"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Unlock with your face"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Use your face to authenticate"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use your face to unlock your phone, authorise purchases or sign in to apps."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Use you"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use your face to unlock your phone or approve purchases.\n\nNote: You can’t use your face to unlock this device. For more information, contact your organisation’s admin."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use your face to unlock your phone, authorise purchases or sign in to apps"</string>
- <string name="face_add_max" msgid="2342250989212694454">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centre your face in the circle"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Do it later"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"You can add up to <xliff:g id="COUNT">%d</xliff:g> faces"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"You’ve added the maximum number of faces"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Can’t add more faces"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Enrolment was not completed"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Face enrolment time limit reached. Try again."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Face enrolment didn\'t work."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"All set. Looking good."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Done"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Use your face to"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Unlock your device"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"App sign-in & payments"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Eyes open to unlock"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"When using face authentication, your eyes must be open"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Remove face data"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Improve your face data"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Your face can be used to unlock your device and access apps. "<annotation id="url">"Learn more"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Choose at least one band for Wi‑Fi hotspot:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacy"</string>
<string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Please select"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Forget network?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"All passwords for this network will be deleted"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Saved networks"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d networks</item>
<item quantity="one">1 network</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brightness"</string>
<string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"On"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Off"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Preferred brightness is very low"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Preferred brightness is low"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Can\'t change PIN.\nPossibly incorrect PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN changed successfully"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Can\'t change SIM card lock state.\nPossibly incorrect PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Can\'t disable PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Can\'t enable PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Multiple SIMs found"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"This requires the <xliff:g id="NAME_0">^1</xliff:g> to be formatted. \n\n"<b>"Formatting erases all data currently stored on the <xliff:g id="NAME_1">^1</xliff:g>."</b>" To avoid losing the data, consider backing it up."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Erase & format"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatting <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatted."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatted."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Move data to new storage"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"You can move your photos, files and some apps to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won’t work while it’s underway."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Move now"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installed"</string>
<string name="no_applications" msgid="7336588977497084921">"No apps."</string>
<string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD card storage"</string>
<string name="recompute_size" msgid="7722567982831691718">"Recomputing size…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Delete app data?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"All of this app\'s data will be deleted permanently. This includes all files, settings, accounts, databases, etc."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"The app wasn\'t found in the list of installed apps."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Couldn’t clear storage for app."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"This app can access the following on your tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"This app can access the following on your phone:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"This app can access the following on your tablet. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"This app can access the following on your phone. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> and <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"This app may charge you money:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send premium SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Computing…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Couldn\'t compute the package size."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"You don\'t have any third-party apps installed."</string>
<string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Move"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Move to tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Move to phone"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Move to USB storage"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Move to SD card"</string>
- <string name="moving" msgid="6431016143218876491">"Moving"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Another migration is already in progress."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Not enough storage space."</string>
<string name="does_not_exist" msgid="1501243985586067053">"App doesn\'t exist."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Device admin app can\'t be installed on external media"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Force stop?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force-stop an app, it may misbehave."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Couldn\'t move app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Preferred install location"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Change the preferred installation location for new applications."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disable built-in app?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Disable app"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"If you disable this app, Android and other apps may no longer function as intended."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Delete data and disable app?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"If you disable this app, Android and other apps may no longer function as intended. Your data will also be deleted."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Turn off notifications"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"If you turn off notifications for this app, you may miss important alerts and updates."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"App details"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App installed from <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Use service"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Use colour correction"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Use captions"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continue"</string>
<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="6371077608778830020">"Add hearing aid"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"If you limit background activity for an app, it may misbehave"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Battery usage since full charge"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps draining battery"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Keeping device awake"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Apps are running normally"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Phone has typical background battery usage"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet has typical background battery usage"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Limiting battery usage for %1$d apps</item>
<item quantity="one">Limiting battery usage for %1$d app</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restricted <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"These apps have been using battery in the background. Restricted apps may not work properly and notifications may be delayed."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Use Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detect when apps drain battery"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancel"</string>
<string name="tts_reset" msgid="2661752909256313270">"Reset"</string>
<string name="tts_play" msgid="2628469503798633884">"Play"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Updating Wi‑Fi setting"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"on"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"off"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"turning on"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"turning off"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Location"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sync"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"full"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"off"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Credential storage"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Install from storage"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Select all"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobile data & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
<string name="data_usage_app" msgid="4970478397515423303">"App usage"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APP INFO"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Show %d hidden items</item>
<item quantity="one">Show %d hidden item</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Collapse"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Network & Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobile"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data usage"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps & notifications"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Notification access is not available for apps in the work profile."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"No accounts added"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Default apps"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Languages, time, backup, updates"</string>
<string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
- <string name="search_menu" msgid="6283419262313758339">"Search in Settings"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, network connection, internet, wireless, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, toggle, control"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"text message, texting, messages, messaging, default"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesture"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"face, unlock, auth, sign in"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl version, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"network, mobile network state, service state, signal strength, mobile network type, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, hardware version"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"dark theme"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"lock screen notification"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"face"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"dim screen, touchscreen, battery, smart brightness, dynamic brightness"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"When you enter your PIN to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"When you enter your pattern to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"When you enter your password to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Note: After a reboot, this app can\'t start until you unlock your phone"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Turned off"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"High usage"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> behaving abnormally</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Internal storage: <xliff:g id="PERCENTAGE">%1$s</xliff:g> used – <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
<string name="display_summary" msgid="6737806235882127328">"Sleep after <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Wallpaper, sleep, font size"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Sleep after 10 minutes of inactivity"</string>
<string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
<string name="users_summary" msgid="1674864467098487328">"Signed in as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS not allowed"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Camera not allowed"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshot not allowed"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Can’t turn off backups"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Can’t open this app"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"If you have any questions, contact your IT admin"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"More details"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulate a display with a cutout"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"None"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Device default"</string>
<string name="special_access" msgid="3458780842491881155">"Special app access"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
<string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Set Night mode"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Dark mode"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Set Dark mode"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Allow contact searches by your organisation to identify callers and contacts"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Double-tap to check phone"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Double-tap to check tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Double-tap to check device"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"To check time, notification icons and other info, double-tap your screen."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"To check time, notifications and other info, double-tap your screen."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lift to check phone"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Lift to check tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Lift to check device"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"To check time, notification icons and other info, pick up your phone."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"To check time, notification icons and other info, pick up your tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"To check time, notification icons and other info, pick up your device."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Wake up display"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"To check time, notifications and other info, pick up your phone."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"To check time, notifications and other info, pick up your tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"To check time, notifications and other info, pick up your device."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Wake lock screen gesture"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swipe fingerprint for notifications"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Swipe fingerprint"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> attempt</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"This device\'s data is being backed up"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"This device is managed by your organisation."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Make sure that you trust this app</b> <br/> <br/> <xliff:g id=app_name example=Google Auto-fill>%1$s</xliff:g> uses what\'s on your screen to determine what can be auto-filled."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Auto-fill"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Logging level"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Max requests per session"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Max visible datasets"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Reset to default values"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Auto-fill developer options have been reset"</string>
<string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
<string name="default_theme" msgid="7085644992078579076">"Default"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Network name"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Force full GNSS measurements"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Track all GNSS constellations and frequencies with no duty cycling"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Always show crash dialogue"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Show dialogue every time an app crashes"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Select ANGLE enabled app"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"No ANGLE enabled application set"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE enabled application: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Directory access"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"directory access"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Network details"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
<string name="devices_title" msgid="7701726109334110391">"Devices"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"All Settings"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suggestions"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choose network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Disconnected"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connected"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connecting…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Couldn’t connect"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No networks found."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Couldn’t find networks. Try again."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbidden)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"No SIM card"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Advanced Calling"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Preferred network mode: WCDMA preferred"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Preferred network mode: GSM only"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Preferred network mode: WCDMA only"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Preferred network mode: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Preferred network mode: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Preferred network mode: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Preferred network mode: CDMA only"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Preferred network mode: EvDo only"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferred network mode: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferred network mode: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferred network mode: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferred network mode: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferred network mode: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferred network mode: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Preferred network mode: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Preferred network mode: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferred network mode: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preferred network mode: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preferred network mode: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preferred network mode: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preferred network mode: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preferred network mode: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preferred network mode: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preferred network mode: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recommended)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recommended)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Available networks"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Searching…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Your SIM card doesn’t allow a connection to this network."</string>
+ <string name="connect_later" msgid="978991102125216741">"Can’t connect to this network at the moment. Try again later."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registered on network."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automatically select network"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operator settings"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Set up data service"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobile data"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Access data using mobile network"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Preferred network type"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Change the network operating mode"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Preferred network type"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operator"</string>
+ <string name="call_category" msgid="8108654745239563833">"Calling"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operator video calling"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"System select"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Change the CDMA roaming mode"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"System select"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Network"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Network"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA subscription"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Change between RUIM/SIM and NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"subscription"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatic registration…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Allow data roaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Check with your network provider for pricing."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"App data usage"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Invalid network mode <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignore."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"See more"</string>
+ <string name="see_less" msgid="1250265310929558370">"See less"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"No connected devices"</string>
</resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index e550a4f..4f1a76a 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Treat as metered"</item>
<item msgid="2266114985518865625">"Treat as unmetered"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Default (use randomised MAC)"</item>
+ <item msgid="5398461510512959597">"Trusted"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"No"</item>
<item msgid="3863157480502955888">"Yes"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Always on"</item>
<item msgid="6385301106124765323">"Always off"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Off"</item>
+ <item msgid="2182686878828390312">"Debug"</item>
+ <item msgid="5286514712714822064">"Verbose"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Home only"</item>
+ <item msgid="5034813753274486448">"Automatic"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferred"</item>
+ <item msgid="807926878589867564">"GSM only"</item>
+ <item msgid="488474605709912156">"WCDMA only"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA auto"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo auto"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo only"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA only"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ab4b28d..026c58c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Create"</string>
<string name="allow" msgid="3349662621170855910">"Allow"</string>
<string name="deny" msgid="6947806159746484865">"Deny"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
<string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Please enable developer options first."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless & networks"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Connections"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Access"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Enable data connection"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disable data connection"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Device\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Unnamed Bluetooth device"</string>
<string name="progress_scanning" msgid="192587958424295789">"Searching"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No nearby Bluetooth devices were found."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning on Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth connection request"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tap to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Available call devices"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Currently connected"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Saved devices"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Add device"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth will turn on to pair"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Connection preferences"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Previously connected devices"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Previously connected"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth turned on"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"See all"</string>
<string name="date_and_time" msgid="9062980487860757694">"Date & time"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Skip"</string>
<string name="next_label" msgid="4693520878012668114">"Next"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Languages"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Language preferences"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Remove"</string>
<string name="add_a_language" msgid="2330538812283783022">"Add a language"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Aeroplane mode"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"More"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless & networks"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, & VPNs"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobile data"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disabled by admin"</string>
<string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Screen lock, face unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Screen lock, fingerprint"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Screen lock"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Face added"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Unlock with your face"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Use your face to authenticate"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use your face to unlock your phone, authorise purchases or sign in to apps."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Use you"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use your face to unlock your phone or approve purchases.\n\nNote: You can’t use your face to unlock this device. For more information, contact your organisation’s admin."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use your face to unlock your phone, authorise purchases or sign in to apps"</string>
- <string name="face_add_max" msgid="2342250989212694454">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centre your face in the circle"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Do it later"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"You can add up to <xliff:g id="COUNT">%d</xliff:g> faces"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"You’ve added the maximum number of faces"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Can’t add more faces"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Enrolment was not completed"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Face enrolment time limit reached. Try again."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Face enrolment didn\'t work."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"All set. Looking good."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Done"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Use your face to"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Unlock your device"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"App sign-in & payments"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Eyes open to unlock"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"When using face authentication, your eyes must be open"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Remove face data"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Improve your face data"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Your face can be used to unlock your device and access apps. "<annotation id="url">"Learn more"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Choose at least one band for Wi‑Fi hotspot:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacy"</string>
<string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Please select"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Forget network?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"All passwords for this network will be deleted"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Saved networks"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d networks</item>
<item quantity="one">1 network</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brightness"</string>
<string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"On"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Off"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Preferred brightness is very low"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Preferred brightness is low"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Can\'t change PIN.\nPossibly incorrect PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN changed successfully"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Can\'t change SIM card lock state.\nPossibly incorrect PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Can\'t disable PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Can\'t enable PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Multiple SIMs found"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"This requires the <xliff:g id="NAME_0">^1</xliff:g> to be formatted. \n\n"<b>"Formatting erases all data currently stored on the <xliff:g id="NAME_1">^1</xliff:g>."</b>" To avoid losing the data, consider backing it up."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Erase & format"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatting <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatted."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatted."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Move data to new storage"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"You can move your photos, files and some apps to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won’t work while it’s underway."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Move now"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installed"</string>
<string name="no_applications" msgid="7336588977497084921">"No apps."</string>
<string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD card storage"</string>
<string name="recompute_size" msgid="7722567982831691718">"Recomputing size…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Delete app data?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"All of this app\'s data will be deleted permanently. This includes all files, settings, accounts, databases, etc."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"The app wasn\'t found in the list of installed apps."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Couldn’t clear storage for app."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"This app can access the following on your tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"This app can access the following on your phone:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"This app can access the following on your tablet. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"This app can access the following on your phone. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> and <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"This app may charge you money:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send premium SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Computing…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Couldn\'t compute the package size."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"You don\'t have any third-party apps installed."</string>
<string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Move"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Move to tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Move to phone"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Move to USB storage"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Move to SD card"</string>
- <string name="moving" msgid="6431016143218876491">"Moving"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Another migration is already in progress."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Not enough storage space."</string>
<string name="does_not_exist" msgid="1501243985586067053">"App doesn\'t exist."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Device admin app can\'t be installed on external media"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Force stop?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force-stop an app, it may misbehave."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Couldn\'t move app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Preferred install location"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Change the preferred installation location for new applications."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disable built-in app?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Disable app"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"If you disable this app, Android and other apps may no longer function as intended."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Delete data and disable app?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"If you disable this app, Android and other apps may no longer function as intended. Your data will also be deleted."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Turn off notifications"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"If you turn off notifications for this app, you may miss important alerts and updates."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"App details"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App installed from <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Use service"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Use colour correction"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Use captions"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continue"</string>
<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="6371077608778830020">"Add hearing aid"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"If you limit background activity for an app, it may misbehave"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Battery usage since full charge"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps draining battery"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Keeping device awake"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Apps are running normally"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Phone has typical background battery usage"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet has typical background battery usage"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Limiting battery usage for %1$d apps</item>
<item quantity="one">Limiting battery usage for %1$d app</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restricted <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"These apps have been using battery in the background. Restricted apps may not work properly and notifications may be delayed."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Use Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detect when apps drain battery"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancel"</string>
<string name="tts_reset" msgid="2661752909256313270">"Reset"</string>
<string name="tts_play" msgid="2628469503798633884">"Play"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Updating Wi‑Fi setting"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"on"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"off"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"turning on"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"turning off"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Location"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sync"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"full"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"off"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Credential storage"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Install from storage"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Select all"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobile data & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
<string name="data_usage_app" msgid="4970478397515423303">"App usage"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APP INFO"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Show %d hidden items</item>
<item quantity="one">Show %d hidden item</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Collapse"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Network & Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobile"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data usage"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps & notifications"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Notification access is not available for apps in the work profile."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"No accounts added"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Default apps"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Languages, time, backup, updates"</string>
<string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
- <string name="search_menu" msgid="6283419262313758339">"Search in Settings"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, network connection, internet, wireless, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, toggle, control"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"text message, texting, messages, messaging, default"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesture"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"face, unlock, auth, sign in"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl version, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"network, mobile network state, service state, signal strength, mobile network type, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, hardware version"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"dark theme"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"lock screen notification"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"face"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"dim screen, touchscreen, battery, smart brightness, dynamic brightness"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"When you enter your PIN to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"When you enter your pattern to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"When you enter your password to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Note: After a reboot, this app can\'t start until you unlock your phone"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Turned off"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"High usage"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> behaving abnormally</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Internal storage: <xliff:g id="PERCENTAGE">%1$s</xliff:g> used – <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
<string name="display_summary" msgid="6737806235882127328">"Sleep after <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Wallpaper, sleep, font size"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Sleep after 10 minutes of inactivity"</string>
<string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
<string name="users_summary" msgid="1674864467098487328">"Signed in as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS not allowed"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Camera not allowed"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshot not allowed"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Can’t turn off backups"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Can’t open this app"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"If you have any questions, contact your IT admin"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"More details"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulate a display with a cutout"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"None"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Device default"</string>
<string name="special_access" msgid="3458780842491881155">"Special app access"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
<string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Set Night mode"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Dark mode"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Set Dark mode"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Allow contact searches by your organisation to identify callers and contacts"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Double-tap to check phone"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Double-tap to check tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Double-tap to check device"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"To check time, notification icons and other info, double-tap your screen."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"To check time, notifications and other info, double-tap your screen."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lift to check phone"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Lift to check tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Lift to check device"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"To check time, notification icons and other info, pick up your phone."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"To check time, notification icons and other info, pick up your tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"To check time, notification icons and other info, pick up your device."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Wake up display"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"To check time, notifications and other info, pick up your phone."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"To check time, notifications and other info, pick up your tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"To check time, notifications and other info, pick up your device."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Wake lock screen gesture"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swipe fingerprint for notifications"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Swipe fingerprint"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> attempt</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"This device\'s data is being backed up"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"This device is managed by your organisation."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Make sure that you trust this app</b> <br/> <br/> <xliff:g id=app_name example=Google Auto-fill>%1$s</xliff:g> uses what\'s on your screen to determine what can be auto-filled."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Auto-fill"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Logging level"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Max requests per session"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Max visible datasets"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Reset to default values"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Auto-fill developer options have been reset"</string>
<string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
<string name="default_theme" msgid="7085644992078579076">"Default"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Network name"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Force full GNSS measurements"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Track all GNSS constellations and frequencies with no duty cycling"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Always show crash dialogue"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Show dialogue every time an app crashes"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Select ANGLE enabled app"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"No ANGLE enabled application set"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE enabled application: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Directory access"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"directory access"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Network details"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
<string name="devices_title" msgid="7701726109334110391">"Devices"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"All Settings"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suggestions"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choose network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Disconnected"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connected"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connecting…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Couldn’t connect"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No networks found."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Couldn’t find networks. Try again."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbidden)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"No SIM card"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Advanced Calling"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Preferred network mode: WCDMA preferred"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Preferred network mode: GSM only"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Preferred network mode: WCDMA only"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Preferred network mode: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Preferred network mode: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Preferred network mode: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Preferred network mode: CDMA only"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Preferred network mode: EvDo only"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferred network mode: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferred network mode: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferred network mode: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferred network mode: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferred network mode: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferred network mode: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Preferred network mode: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Preferred network mode: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferred network mode: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preferred network mode: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preferred network mode: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preferred network mode: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preferred network mode: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preferred network mode: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preferred network mode: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preferred network mode: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recommended)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recommended)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Available networks"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Searching…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Your SIM card doesn’t allow a connection to this network."</string>
+ <string name="connect_later" msgid="978991102125216741">"Can’t connect to this network at the moment. Try again later."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registered on network."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automatically select network"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operator settings"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Set up data service"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobile data"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Access data using mobile network"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Preferred network type"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Change the network operating mode"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Preferred network type"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operator"</string>
+ <string name="call_category" msgid="8108654745239563833">"Calling"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operator video calling"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"System select"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Change the CDMA roaming mode"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"System select"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Network"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Network"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA subscription"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Change between RUIM/SIM and NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"subscription"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatic registration…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Allow data roaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Check with your network provider for pricing."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"App data usage"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Invalid network mode <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignore."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"See more"</string>
+ <string name="see_less" msgid="1250265310929558370">"See less"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index e550a4f..4f1a76a 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Treat as metered"</item>
<item msgid="2266114985518865625">"Treat as unmetered"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Default (use randomised MAC)"</item>
+ <item msgid="5398461510512959597">"Trusted"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"No"</item>
<item msgid="3863157480502955888">"Yes"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Always on"</item>
<item msgid="6385301106124765323">"Always off"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Off"</item>
+ <item msgid="2182686878828390312">"Debug"</item>
+ <item msgid="5286514712714822064">"Verbose"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Home only"</item>
+ <item msgid="5034813753274486448">"Automatic"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferred"</item>
+ <item msgid="807926878589867564">"GSM only"</item>
+ <item msgid="488474605709912156">"WCDMA only"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA auto"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo auto"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo only"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA only"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index ab4b28d..026c58c 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Create"</string>
<string name="allow" msgid="3349662621170855910">"Allow"</string>
<string name="deny" msgid="6947806159746484865">"Deny"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
<string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Please enable developer options first."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless & networks"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Connections"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Access"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Enable data connection"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disable data connection"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Device\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Unnamed Bluetooth device"</string>
<string name="progress_scanning" msgid="192587958424295789">"Searching"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No nearby Bluetooth devices were found."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning on Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth connection request"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tap to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Available call devices"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Currently connected"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Saved devices"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Add device"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth will turn on to pair"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Connection preferences"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Previously connected devices"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Previously connected"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth turned on"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"See all"</string>
<string name="date_and_time" msgid="9062980487860757694">"Date & time"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Skip"</string>
<string name="next_label" msgid="4693520878012668114">"Next"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Languages"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Language preferences"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Remove"</string>
<string name="add_a_language" msgid="2330538812283783022">"Add a language"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Aeroplane mode"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"More"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless & networks"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, & VPNs"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobile data"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disabled by admin"</string>
<string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Screen lock, face unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Screen lock, fingerprint"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Screen lock"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Face added"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Unlock with your face"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Use your face to authenticate"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use your face to unlock your phone, authorise purchases or sign in to apps."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Use you"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use your face to unlock your phone or approve purchases.\n\nNote: You can’t use your face to unlock this device. For more information, contact your organisation’s admin."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use your face to unlock your phone, authorise purchases or sign in to apps"</string>
- <string name="face_add_max" msgid="2342250989212694454">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centre your face in the circle"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Do it later"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"You can add up to <xliff:g id="COUNT">%d</xliff:g> faces"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"You’ve added the maximum number of faces"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Can’t add more faces"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Enrolment was not completed"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Face enrolment time limit reached. Try again."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Face enrolment didn\'t work."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"All set. Looking good."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Done"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Use your face to"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Unlock your device"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"App sign-in & payments"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Eyes open to unlock"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"When using face authentication, your eyes must be open"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Remove face data"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Improve your face data"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Your face can be used to unlock your device and access apps. "<annotation id="url">"Learn more"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Choose at least one band for Wi‑Fi hotspot:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacy"</string>
<string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Please select"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Forget network?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"All passwords for this network will be deleted"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Saved networks"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d networks</item>
<item quantity="one">1 network</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brightness"</string>
<string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"On"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Off"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Preferred brightness is very low"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Preferred brightness is low"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Can\'t change PIN.\nPossibly incorrect PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN changed successfully"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Can\'t change SIM card lock state.\nPossibly incorrect PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Can\'t disable PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Can\'t enable PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Multiple SIMs found"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"This requires the <xliff:g id="NAME_0">^1</xliff:g> to be formatted. \n\n"<b>"Formatting erases all data currently stored on the <xliff:g id="NAME_1">^1</xliff:g>."</b>" To avoid losing the data, consider backing it up."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Erase & format"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatting <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatted."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatted."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Move data to new storage"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"You can move your photos, files and some apps to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won’t work while it’s underway."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Move now"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installed"</string>
<string name="no_applications" msgid="7336588977497084921">"No apps."</string>
<string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD card storage"</string>
<string name="recompute_size" msgid="7722567982831691718">"Recomputing size…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Delete app data?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"All of this app\'s data will be deleted permanently. This includes all files, settings, accounts, databases, etc."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"The app wasn\'t found in the list of installed apps."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Couldn’t clear storage for app."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"This app can access the following on your tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"This app can access the following on your phone:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"This app can access the following on your tablet. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"This app can access the following on your phone. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> and <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"This app may charge you money:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send premium SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Computing…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Couldn\'t compute the package size."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"You don\'t have any third-party apps installed."</string>
<string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Move"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Move to tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Move to phone"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Move to USB storage"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Move to SD card"</string>
- <string name="moving" msgid="6431016143218876491">"Moving"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Another migration is already in progress."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Not enough storage space."</string>
<string name="does_not_exist" msgid="1501243985586067053">"App doesn\'t exist."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Device admin app can\'t be installed on external media"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Force stop?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force-stop an app, it may misbehave."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Couldn\'t move app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Preferred install location"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Change the preferred installation location for new applications."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disable built-in app?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Disable app"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"If you disable this app, Android and other apps may no longer function as intended."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Delete data and disable app?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"If you disable this app, Android and other apps may no longer function as intended. Your data will also be deleted."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Turn off notifications"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"If you turn off notifications for this app, you may miss important alerts and updates."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"App details"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App installed from <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Use service"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Use colour correction"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Use captions"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continue"</string>
<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="6371077608778830020">"Add hearing aid"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"If you limit background activity for an app, it may misbehave"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Battery usage since full charge"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps draining battery"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Keeping device awake"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Apps are running normally"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Phone has typical background battery usage"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet has typical background battery usage"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Limiting battery usage for %1$d apps</item>
<item quantity="one">Limiting battery usage for %1$d app</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restricted <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"These apps have been using battery in the background. Restricted apps may not work properly and notifications may be delayed."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Use Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detect when apps drain battery"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancel"</string>
<string name="tts_reset" msgid="2661752909256313270">"Reset"</string>
<string name="tts_play" msgid="2628469503798633884">"Play"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Updating Wi‑Fi setting"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"on"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"off"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"turning on"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"turning off"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Location"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sync"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"full"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"off"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Credential storage"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Install from storage"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Select all"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobile data & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operator data accounting may differ from your device."</string>
<string name="data_usage_app" msgid="4970478397515423303">"App usage"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APP INFO"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Show %d hidden items</item>
<item quantity="one">Show %d hidden item</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Collapse"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Network & Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"Mobile"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"Data usage"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps & notifications"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Notification access is not available for apps in the work profile."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"No accounts added"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Default apps"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Languages, time, backup, updates"</string>
<string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
- <string name="search_menu" msgid="6283419262313758339">"Search in Settings"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, network connection, internet, wireless, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, toggle, control"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"text message, texting, messages, messaging, default"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesture"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"face, unlock, auth, sign in"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl version, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"network, mobile network state, service state, signal strength, mobile network type, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, hardware version"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"dark theme"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"lock screen notification"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"face"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"dim screen, touchscreen, battery, smart brightness, dynamic brightness"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"When you enter your PIN to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"When you enter your pattern to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"When you enter your password to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won\'t yet be available."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Note: After a reboot, this app can\'t start until you unlock your phone"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI-related information"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Turned off"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"High usage"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> behaving abnormally</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Internal storage: <xliff:g id="PERCENTAGE">%1$s</xliff:g> used – <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
<string name="display_summary" msgid="6737806235882127328">"Sleep after <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Wallpaper, sleep, font size"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Sleep after 10 minutes of inactivity"</string>
<string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
<string name="users_summary" msgid="1674864467098487328">"Signed in as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS not allowed"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Camera not allowed"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshot not allowed"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Can’t turn off backups"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Can’t open this app"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"If you have any questions, contact your IT admin"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"More details"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulate a display with a cutout"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"None"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Device default"</string>
<string name="special_access" msgid="3458780842491881155">"Special app access"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
<string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Set Night mode"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Dark mode"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Set Dark mode"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Allow contact searches by your organisation to identify callers and contacts"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Double-tap to check phone"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Double-tap to check tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Double-tap to check device"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"To check time, notification icons and other info, double-tap your screen."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"To check time, notifications and other info, double-tap your screen."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lift to check phone"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Lift to check tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Lift to check device"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"To check time, notification icons and other info, pick up your phone."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"To check time, notification icons and other info, pick up your tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"To check time, notification icons and other info, pick up your device."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Wake up display"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"To check time, notifications and other info, pick up your phone."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"To check time, notifications and other info, pick up your tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"To check time, notifications and other info, pick up your device."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Wake lock screen gesture"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swipe fingerprint for notifications"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Swipe fingerprint"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> attempt</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"This device\'s data is being backed up"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"This device is managed by your organisation."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Make sure that you trust this app</b> <br/> <br/> <xliff:g id=app_name example=Google Auto-fill>%1$s</xliff:g> uses what\'s on your screen to determine what can be auto-filled."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Auto-fill"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Logging level"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Max requests per session"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Max visible datasets"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Reset to default values"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Auto-fill developer options have been reset"</string>
<string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
<string name="default_theme" msgid="7085644992078579076">"Default"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Network name"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Operator Provisioning"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Force full GNSS measurements"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Track all GNSS constellations and frequencies with no duty cycling"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Always show crash dialogue"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Show dialogue every time an app crashes"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Select ANGLE enabled app"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"No ANGLE enabled application set"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE enabled application: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Directory access"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"directory access"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Network details"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
<string name="devices_title" msgid="7701726109334110391">"Devices"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"All Settings"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suggestions"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choose network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Disconnected"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connected"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connecting…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Couldn’t connect"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No networks found."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Couldn’t find networks. Try again."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbidden)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"No SIM card"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Advanced Calling"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Preferred network mode: WCDMA preferred"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Preferred network mode: GSM only"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Preferred network mode: WCDMA only"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Preferred network mode: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Preferred network mode: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Preferred network mode: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Preferred network mode: CDMA only"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Preferred network mode: EvDo only"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferred network mode: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferred network mode: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferred network mode: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferred network mode: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferred network mode: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferred network mode: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Preferred network mode: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Preferred network mode: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferred network mode: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preferred network mode: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preferred network mode: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preferred network mode: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preferred network mode: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preferred network mode: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preferred network mode: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preferred network mode: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recommended)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recommended)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Available networks"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Searching…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Your SIM card doesn’t allow a connection to this network."</string>
+ <string name="connect_later" msgid="978991102125216741">"Can’t connect to this network at the moment. Try again later."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registered on network."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automatically select network"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operator settings"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Set up data service"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobile data"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Access data using mobile network"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Preferred network type"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Change the network operating mode"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Preferred network type"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operator"</string>
+ <string name="call_category" msgid="8108654745239563833">"Calling"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operator video calling"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"System select"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Change the CDMA roaming mode"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"System select"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Network"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Network"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA subscription"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Change between RUIM/SIM and NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"subscription"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatic registration…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Allow data roaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Check with your network provider for pricing."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"App data usage"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Invalid network mode <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignore."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"See more"</string>
+ <string name="see_less" msgid="1250265310929558370">"See less"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index be33894..ea0b549 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Treat as metered"</item>
<item msgid="2266114985518865625">"Treat as unmetered"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Default (use randomized MAC)"</item>
+ <item msgid="5398461510512959597">"Trusted"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"No"</item>
<item msgid="3863157480502955888">"Yes"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Always on"</item>
<item msgid="6385301106124765323">"Always off"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Off"</item>
+ <item msgid="2182686878828390312">"Debug"</item>
+ <item msgid="5286514712714822064">"Verbose"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Home only"</item>
+ <item msgid="5034813753274486448">"Automatic"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferred"</item>
+ <item msgid="807926878589867564">"GSM only"</item>
+ <item msgid="488474605709912156">"WCDMA only"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA auto"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo auto"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo only"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA only"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index a3d68d7..bea9276 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Create"</string>
<string name="allow" msgid="3349662621170855910">"Allow"</string>
<string name="deny" msgid="6947806159746484865">"Deny"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Close"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
<string name="device_info_default" msgid="7847265875578739287">"Unknown"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Please enable developer options first."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless & networks"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Connections"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Access"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Enable Data Connection"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disable Data Connection"</string>
@@ -120,7 +114,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Device\'s Bluetooth address: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Unnamed Bluetooth device"</string>
<string name="progress_scanning" msgid="192587958424295789">"Searching"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No nearby Bluetooth devices were found."</string>
@@ -152,7 +145,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"An app wants to turn on Bluetooth and make your phone visible to other devices. You can change this later in Bluetooth settings."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Turning Bluetooth on…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Turning Bluetooth off…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth connection request"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tap to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Do you want to connect to \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -180,12 +172,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Available call devices"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Currently connected"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Saved devices"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Add device"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth will turn on to pair"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Connection preferences"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Previously connected devices"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Previously connected"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth turned on"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"See all"</string>
<string name="date_and_time" msgid="9062980487860757694">"Date & time"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Choose time zone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -268,7 +260,6 @@
<string name="skip_label" msgid="47510779345218297">"Skip"</string>
<string name="next_label" msgid="4693520878012668114">"Next"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Languages"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Language preferences"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Remove"</string>
<string name="add_a_language" msgid="2330538812283783022">"Add a language"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -302,7 +293,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Airplane mode"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"More"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless & networks"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, airplane mode, mobile networks, & VPNs"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobile data"</string>
@@ -387,6 +377,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disabled by admin"</string>
<string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Screen lock, face unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Screen lock, fingerprint"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Screen lock"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Face added"</string>
@@ -396,11 +387,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Unlock with your face"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Use your face to authenticate"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use your face to unlock your phone, authorize purchases, or sign in to apps."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Use you"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use your face to unlock your phone or approve purchases.\n\nNote: You can’t use your face to unlock this device. For more information, contact your organization’s admin."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use your face to unlock your phone, authorize purchases, or sign in to apps"</string>
- <string name="face_add_max" msgid="2342250989212694454">"You can add up to <xliff:g id="COUNT">%d</xliff:g> fingerprints"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Center your face in the circle"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Do it later"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"You can add up to <xliff:g id="COUNT">%d</xliff:g> faces"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"You’ve added the maximum number of faces"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Can’t add more faces"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Enrollment was not completed"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Face enrollment time limit reached. Try again."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Face enrollment didn\'t work."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"All set. Looking good."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Done"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Use your face to"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Unlock your device"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"App sign-in & payments"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Eyes open to unlock"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"When using face authentication, your eyes must be open"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Remove face data"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Improve your face data"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Your face can be used to unlock your device and access apps. "<annotation id="url">"Learn more"</annotation>""</string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -883,6 +890,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Choose at least one band for Wi‑Fi hotspot:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP settings"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacy"</string>
<string name="wifi_shared" msgid="844142443226926070">"Share with other device users"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(unchanged)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Please select"</string>
@@ -922,7 +930,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancel"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Forget network?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"All passwords for this network will be deleted"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Saved networks"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d networks</item>
<item quantity="one">1 network</item>
@@ -1101,8 +1108,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brightness"</string>
<string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"On"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Off"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Preferred brightness is very low"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Preferred brightness is low"</string>
@@ -1198,6 +1204,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Can’t change PIN.\nPossibly incorrect PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN changed successfully"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Can’t change SIM card lock state.\nPossibly incorrect PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Can\'t disable PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Can\'t enable PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancel"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Multiple SIMs found"</string>
@@ -1371,7 +1379,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"This requires the <xliff:g id="NAME_0">^1</xliff:g> to be formatted. \n\n"<b>"Formatting erases all data currently stored on the <xliff:g id="NAME_1">^1</xliff:g>."</b>" To avoid losing the data, consider backing it up."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Erase & format"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatting <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatting."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Don’t remove the <xliff:g id="NAME">^1</xliff:g> while it’s being formatted."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Move data to new storage"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"You can move your photos, files, and some apps to this new <xliff:g id="NAME">^1</xliff:g>. \n\nThe move takes about <xliff:g id="TIME">^2</xliff:g> and will free <xliff:g id="SIZE">^3</xliff:g> on internal storage. Some apps won’t work while it’s underway."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Move now"</string>
@@ -1753,9 +1761,6 @@
<string name="installed" msgid="3070865169422600098">"Installed"</string>
<string name="no_applications" msgid="7336588977497084921">"No apps."</string>
<string name="internal_storage" msgid="1584700623164275282">"Internal storage"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB storage"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD card storage"</string>
<string name="recompute_size" msgid="7722567982831691718">"Recomputing size…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Delete app data?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"All this app’s data will be deleted permanently. This includes all files, settings, accounts, databases, etc."</string>
@@ -1764,24 +1769,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"The app wasn’t found in the list of installed apps."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Couldn’t clear storage for app."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"This app can access the following on your tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"This app can access the following on your phone:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"This app can access the following on your tablet. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"This app can access the following on your phone. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> and <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"This app may charge you money:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send premium SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Computing…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Couldn’t compute package size."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"You don’t have any third-party apps installed."</string>
<string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Move"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Move to tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Move to phone"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Move to USB storage"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Move to SD card"</string>
- <string name="moving" msgid="6431016143218876491">"Moving"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Another migration is already in progress."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Not enough storage space."</string>
<string name="does_not_exist" msgid="1501243985586067053">"App doesn’t exist."</string>
@@ -1791,17 +1788,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Device admin app can\'t be installed on external media"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Force stop?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force stop an app, it may misbehave."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Couldn’t move app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Preferred install location"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Change the preferred installation location for new apps"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disable built-in app?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Disable app"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"If you disable this app, Android and other apps may no longer function as intended."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Delete data and disable app?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"If you disable this app, Android and other apps may no longer function as intended. Your data will also be deleted."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Turn off notifications?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"If you turn off notifications for this app, you may miss important alerts and updates."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"App details"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App installed from <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1994,6 +1987,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Use service"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Use color correction"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Use captions"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continue"</string>
<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="6371077608778830020">"Add hearing aid"</string>
@@ -2137,8 +2131,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"If you limit background activity for an app, it may misbehave"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Since this app is not set to optimize battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimization."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Battery usage since full charge"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
@@ -2165,11 +2157,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Use details"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps draining battery"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Keeping device awake"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Waking up device in background"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Requesting location frequently"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps misbehaving"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Apps are running normally"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Phone has typical background battery usage"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet has typical background battery usage"</string>
@@ -2233,6 +2220,7 @@
<item quantity="other">Limiting battery usage for %1$d apps</item>
<item quantity="one">Limiting battery usage for %1$d app</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restricted <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"These apps have been using battery in the background. Restricted apps may not work properly and notifications may be delayed."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Use Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detect when apps drain battery"</string>
@@ -2410,23 +2398,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancel"</string>
<string name="tts_reset" msgid="2661752909256313270">"Reset"</string>
<string name="tts_play" msgid="2628469503798633884">"Play"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Updating Wi‑Fi setting"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"on"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"off"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"turning on"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"turning off"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Location"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sync"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"full"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"off"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Credential storage"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Install from storage"</string>
@@ -2584,7 +2555,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> out of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Select all"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"App data usage"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobile data & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Carrier data accounting may differ from your device."</string>
<string name="data_usage_app" msgid="4970478397515423303">"App usage"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APP INFO"</string>
@@ -2961,7 +2932,6 @@
<item quantity="other">Show %d hidden items</item>
<item quantity="one">Show %d hidden item</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Collapse"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Network & internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobile"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"data usage"</string>
@@ -2973,12 +2943,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps & notifications"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Notification access is not available for apps in the work profile."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"No accounts added"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Default apps"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Languages, time, backup, updates"</string>
<string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
- <string name="search_menu" msgid="6283419262313758339">"Search settings"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, network connection, internet, wireless, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, toggle, control"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"text message, texting, messages, messaging, default"</string>
@@ -3023,6 +2993,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesture"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"face, unlock, auth, sign in"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl version, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"network, mobile network state, service state, signal strength, mobile network type, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, hardware version"</string>
@@ -3030,6 +3001,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"dark theme"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient display, Lock screen display"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"lock screen notification"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"face"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"dim screen, touchscreen, battery, smart brightness, dynamic brightness"</string>
@@ -3461,7 +3433,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"When you enter your PIN to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won’t yet be available."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"When you enter your pattern to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won’t yet be available."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"When you enter your password to start this device, accessibility services like <xliff:g id="SERVICE">%1$s</xliff:g> won’t yet be available."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Note: After a reboot, this app can\'t start until you unlock your phone"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI information"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI relative information"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3515,7 +3487,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Work"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: All"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Turned off"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Turned off"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categories: Urgent importance"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: Low importance"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: Turned off"</string>
@@ -3576,7 +3548,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Show full device usage"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Show app usage"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"High usage"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> behaving abnormally</item>
@@ -3740,6 +3711,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Internal storage: <xliff:g id="PERCENTAGE">%1$s</xliff:g> used - <xliff:g id="FREE_SPACE">%2$s</xliff:g> free"</string>
<string name="display_summary" msgid="6737806235882127328">"Sleep after <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Wallpaper, sleep, font size"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Sleep after 10 minutes of inactivity"</string>
<string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> of <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memory used"</string>
<string name="users_summary" msgid="1674864467098487328">"Signed in as <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3755,7 +3728,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS not allowed"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Camera not allowed"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshot not allowed"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Can’t turn off backups"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Can’t open this app"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"If you have questions, contact your IT admin"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"More details"</string>
@@ -3919,9 +3891,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulate a display with a cutout"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Display cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display cutout, notch"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"None"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Device default"</string>
<string name="special_access" msgid="3458780842491881155">"Special app access"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
@@ -3943,11 +3915,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connected to <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connected to multiple devices"</string>
<string name="demo_mode" msgid="2798762752209330277">"System UI demo mode"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Set Night mode"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Dark mode"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Set Dark mode"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Work profile settings"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contact search"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Allow contact searches by your organization to identify callers and contacts"</string>
@@ -3988,13 +3959,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Double-tap to check phone"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Double-tap to check tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Double-tap to check device"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"To check time, notification icons, and other info, double-tap your screen."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"To check time, notifications, and other info, double-tap your screen."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lift to check phone"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Lift to check tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Lift to check device"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"To check time, notification icons, and other info, pick up your phone."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"To check time, notification icons, and other info, pick up your tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"To check time, notification icons, and other info, pick up your device."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Wake up display"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"To check time, notifications, and other info, pick up your phone."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"To check time, notifications, and other info, pick up your tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"To check time, notifications, and other info, pick up your device."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Wake lock screen gesture"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swipe fingerprint for notifications"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Swipe fingerprint"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4074,7 +4049,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> attempt</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"This device\'s data is being backed up"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"This device is managed by your organization."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4115,6 +4089,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Autofill service"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, autofill"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Make sure you trust this app</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> uses what\'s on your screen to determine what can be autofilled."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Autofill"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Logging level"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Max requests per session"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Max visible datasets"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Reset to default values"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Autofill developer options have been reset"</string>
<string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
<string name="default_theme" msgid="7085644992078579076">"Default"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Network name"</string>
@@ -4129,15 +4109,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Update Do Not Disturb"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pause notifications to stay focused"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"What\'s new and exciting?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Take a tour of your new tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"This feature is not available on this device"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Force full GNSS measurements"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Track all GNSS constellations and frequencies with no duty cycling"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Always show crash dialog"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Show dialog every time an app crashes"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Select ANGLE enabled app"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"No ANGLE enabled application set"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE enabled application: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Directory access"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"directory access"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4178,4 +4157,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Network details"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
<string name="devices_title" msgid="7701726109334110391">"Devices"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"All Settings"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suggestions"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choose network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Disconnected"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connected"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connecting…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Couldn’t connect"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No networks found."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Couldn’t find networks. Try again."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbidden)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"No SIM card"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Advanced Calling"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Preferred network mode: WCDMA preferred"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Preferred network mode: GSM only"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Preferred network mode: WCDMA only"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Preferred network mode: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Preferred network mode: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Preferred network mode: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Preferred network mode: CDMA only"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Preferred network mode: EvDo only"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferred network mode: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferred network mode: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferred network mode: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferred network mode: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferred network mode: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferred network mode: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Preferred network mode: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Preferred network mode: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferred network mode: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preferred network mode: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preferred network mode: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preferred network mode: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preferred network mode: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preferred network mode: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preferred network mode: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preferred network mode: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recommended)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recommended)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Available networks"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Searching…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Your SIM card doesn’t allow a connection to this network."</string>
+ <string name="connect_later" msgid="978991102125216741">"Can’t connect to this network right now. Try again later."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registered on network."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automatically select network"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Carrier settings"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Set up data service"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobile data"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Access data using mobile network"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Preferred network type"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Change the network operating mode"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Preferred network type"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Carrier"</string>
+ <string name="call_category" msgid="8108654745239563833">"Calling"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Carrier video calling"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"System select"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Change the CDMA roaming mode"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"System select"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Network"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Network"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA subscription"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Change between RUIM/SIM and NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"subscription"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatic registration…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Allow data roaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Check with your network provider for pricing."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"App data usage"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Invalid Network Mode <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignore."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"See more"</string>
+ <string name="see_less" msgid="1250265310929558370">"See less"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"No connected devices"</string>
</resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 9d1de87..b20c31a 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tratar como red de uso medido"</item>
<item msgid="2266114985518865625">"Tratar como red sin tarifa plana"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Predeterminada (usar dirección MAC aleatoria)"</item>
+ <item msgid="5398461510512959597">"De confianza"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"No"</item>
<item msgid="3863157480502955888">"Sí"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Siempre activado"</item>
<item msgid="6385301106124765323">"Siempre desactivado"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Desactivado"</item>
+ <item msgid="2182686878828390312">"Depurado"</item>
+ <item msgid="5286514712714822064">"Detallado"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Página principal solamente"</item>
+ <item msgid="5034813753274486448">"Automático"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferido"</item>
+ <item msgid="807926878589867564">"Solo GSM"</item>
+ <item msgid="488474605709912156">"Solo WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automático"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automático"</item>
+ <item msgid="370391313511477301">"CDMA sin EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo solamente"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Solo TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index e729809..276568e 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Crear"</string>
<string name="allow" msgid="3349662621170855910">"Permitir"</string>
<string name="deny" msgid="6947806159746484865">"Rechazar"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Cerrar"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Cambiar"</string>
<string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Estás a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser programador.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres programador."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Primero habilita las opciones para programador."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Conexiones inalámbricas y redes"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Conexiones"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Acceso"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Habilitar la conexión de datos"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Inhabilitar la conexión de datos"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Dirección Bluetooth del dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"¿Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisión"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sin nombre"</string>
<string name="progress_scanning" msgid="192587958424295789">"Buscando"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No se encontraron dispositivos Bluetooth cercanos."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Una app quiere activar la conexión Bluetooth y que tu teléfono sea visible para otros dispositivos. Puedes cambiar esta opción más tarde en la configuración de Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"¿Desactivar Bluetooth?"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conectar automáticamente"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para establecer conexión de Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Presiona para conectarte a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"¿Deseas conectarte a “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de llamada disponibles"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados actualmente"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivos guardados"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Agregar dispositivo"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Se activará el Bluetooth para sincronizar"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferencias de conexión"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos conectados previamente"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectados anteriormente"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Se activó el Bluetooth"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Ver todo"</string>
<string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Elige la zona horaria"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Omitir"</string>
<string name="next_label" msgid="4693520878012668114">"Siguiente"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Idiomas"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferencias de idioma"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Quitar"</string>
<string name="add_a_language" msgid="2330538812283783022">"Agregar un idioma"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Configuración"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Configuración"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Más"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Conexiones inalámbricas y redes"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Administrar Wi-Fi, Bluetooth, modo avión, redes móviles y VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Datos móviles"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacidad"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"El administrador inhabilitó esta opción"</string>
<string name="security_status_title" msgid="5848766673665944640">"Estado de seguridad"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Bloqueo de pantalla, desbloqueo facial"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueo de pantalla, huella digital"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo de pantalla"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Se agregó el rostro"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Usa tu rostro para desbloquear"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Usa tu rostro para autenticarte"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Usa tu rostro para desbloquear el teléfono, autorizar compras o acceder a las apps."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Usa tu"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Usa tu rostro para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes usarlo para desbloquear este dispositivo. Si quieres obtener más detalles, comunícate con el administrador de la organización."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Usa tu rostro para desbloquear el teléfono, autorizar compras o acceder a las apps"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Puedes agregar hasta <xliff:g id="COUNT">%d</xliff:g> huellas digitales"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centra el rostro en el círculo"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Hacerlo más tarde"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Puedes agregar hasta <xliff:g id="COUNT">%d</xliff:g> rostros"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Agregaste la cantidad máxima permitida de rostros"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"No se pueden agregar más rostros"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"No se completó el registro"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Aceptar"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Se alcanzó el límite de tiempo para el registro de rostros. Vuelve a intentarlo."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"No funcionó el registro de rostros."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Ya terminaste. Está todo listo."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Listo"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Usa el rostro para"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Desbloquea el disp."</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Acceso a apps y pagos"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Ojos abiertos para desbloquear"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Si usas la autenticación facial, debes mantener los ojos abiertos"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Quitar datos rostro"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Mejora los datos faciales"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Usa el reconocimiento facial para desbloquear el dispositivo y acceder a las apps. "<annotation id="url">"Más información"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Huella digital"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Adm. huellas digitales"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar huella dig. para"</string>
@@ -528,7 +535,7 @@
<string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pant. bloqueada"</string>
<string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambiar/inhab. patrón/PIN/contraseña"</string>
<string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Elige un método para bloquear la pantalla."</string>
- <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ninguna"</string>
+ <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ninguno"</string>
<string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
<string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Deslizar"</string>
<string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sin seguridad"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Elige al menos una banda para el hotspot de Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Configuración de IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacidad"</string>
<string name="wifi_shared" msgid="844142443226926070">"Compartir con otros usuarios del dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(sin cambios)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Selecciona"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"¿Quieres olvidar la red?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Se borrarán todas las contraseñas de esta red"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Redes guardadas"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d redes</item>
<item quantity="one">1 red</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brillo"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Activado"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Inhabilitado"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"El nivel de brillo preferido es muy bajo"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"El nivel de brillo preferido es bajo"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"No se puede cambiar el PIN.\nPIN posiblemente incorrecto."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"El PIN de la tarjeta SIM se ha cambiado correctamente"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"No se puede cambiar el estado de bloqueo de la tarjeta SIM.\nPIN posiblemente incorrecto."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"No se puede inhabilitar el PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"No se puede habilitar el PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Aceptar"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Se encontraron varias tarjetas SIM"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Debes formatear el dispositivo <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"Al hacerlo, borrarás todos los datos almacenados en <xliff:g id="NAME_1">^1</xliff:g>."</b>" Para evitar perderlos, puedes crear una copia de seguridad."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Borrar y formatear"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formateando dispositivo (<xliff:g id="NAME">^1</xliff:g>)…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"No extraigas <xliff:g id="NAME">^1</xliff:g> durante el proceso de formateo."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"No extraigas <xliff:g id="NAME">^1</xliff:g> durante el proceso de formateo."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Transferir a almacenam. nuevo"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Puedes transferir las fotos, los archivos y algunas aplicaciones a la nueva unidad <xliff:g id="NAME">^1</xliff:g>. \n\nEl proceso demora aproximadamente <xliff:g id="TIME">^2</xliff:g> y liberará <xliff:g id="SIZE">^3</xliff:g> de almacenamiento interno. Algunas aplicaciones no funcionarán mientras se realiza la transferencia."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Transferir los datos ahora"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Instalada"</string>
<string name="no_applications" msgid="7336588977497084921">"No hay aplicaciones."</string>
<string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"Almacenamiento interno"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almacenamiento USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Almacenamiento en tarjeta SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Recalculando el tamaño…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"¿Borrar los datos de la app?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Todos los datos de esta aplicación serán eliminados de forma permanente. Esto incluye todos los archivos, ajustes, cuentas, bases de datos, etc."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"La aplicación no está en la lista de aplicaciones instaladas."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"No se pudo liberar espacio de almacenamiento de la app."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicación puede acceder a los siguientes elementos de tu tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Esta aplicación puede acceder a los siguientes elementos del dispositivo:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Esta aplicación puede acceder a la siguiente información de tu tablet. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Esta aplicación puede acceder a los siguientes elementos de tu dispositivo. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> y <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Esta aplicación puede costarte dinero:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Enviar SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"Calculando..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"No se pudo calcular el tamaño del paquete."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"No tienes instalada ninguna aplicación de terceros."</string>
<string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Mover"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover al tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover al dispositivo"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover a almacenamiento USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover a la tarjeta SD"</string>
- <string name="moving" msgid="6431016143218876491">"Moviendo"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Hay otra migración en curso."</string>
<string name="insufficient_storage" msgid="481763122991093080">"No hay suficiente espacio de almacenamiento."</string>
<string name="does_not_exist" msgid="1501243985586067053">"La aplicación no existe."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"No se puede instalar la app de administración de dispositivos en medios externos"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"¿Deseas forzar la detención?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Si fuerzas la detención de una aplicación, es posible que funcione incorrectamente."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"No se pudo mover la aplicación. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Ubicación de instalación preferida"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Cambiar la ubicación de instalación preferida para nuevas aplicaciones"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"¿Inhabilitar aplic. incorp.?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Inhabilitar la aplicación"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Si inhabilitas esta app, es posible que Android y otras apps ya no funcionen correctamente."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"¿Deseas borrar los datos y desactivar la aplicación?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Si inhabilitas esta app, es posible que Android y otras apps ya no funcionen correctamente. Además, se borrarán tus datos."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"¿Desactivar notificaciones?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactivas las notificaciones de esta aplicación, es posible que no recibas actualizaciones y alertas importantes."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detalles de la app"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App instalada desde <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Usar el servicio"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Usar la corrección de color"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Usar subtítulos"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continuar"</string>
<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="6371077608778830020">"Agregar audífono"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limitas la actividad en segundo plano de una app, es posible que no funcione correctamente"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Como no se configuró la app para optimizar la batería, no puedes restringirla.\n\nPrimero, activa optimización de batería."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Uso de la pantalla desde carga completa"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Escaneo de redes móviles"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Uso de la batería desde la última carga completa"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tiempo que estuvo encendida la pantalla desde la última carga completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Uso del dispositivo desde la última carga completa"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Ajustar el uso de energía"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps que agotan la batería"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"El dispositivo activo se mantiene activo."</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Activa el dispositivo en segundo plano"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicita la ubicación frecuentemente"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps no funcionan correctamente"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Las apps se ejecutan con normalidad"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"El consumo de batería en segundo plano del teléfono es normal"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"El consumo de batería en segundo plano de la tablet es normal"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Limitando el uso de batería de %1$d apps</item>
<item quantity="one">Limitando el uso de batería de %1$d app</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restringida <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Estas apps consumen batería en segundo plano. Es posible que las apps restringidas no funcionen correctamente y que se retrasen las notificaciones."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Usar el administrador de batería"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detectar cuando las apps agotan la batería"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancelar"</string>
<string name="tts_reset" msgid="2661752909256313270">"Restablecer"</string>
<string name="tts_play" msgid="2628469503798633884">"Reproducir"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Control de energía"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Actualizando configuración de Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"activado"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"desactivado"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Ubicación"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sincronizar"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brillo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completo"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"medio"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"desactivado"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de credenciales"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar desde almacenamiento"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Seleccionar todo"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso datos de aplicación"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Wi-Fi y datos móviles"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"La forma en que el proveedor contabiliza los datos puede variar en tu dispositivo."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Uso de aplicaciones"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFO. DE LA APLICACIÓN"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Mostrar %d elementos ocultos</item>
<item quantity="one">Mostrar %d elemento oculto</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Contraer"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Internet y red"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"red móvil"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps y notificaciones"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, apps predeterminadas"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Las apps del perfil de trabajo no tienen acceso a las notificaciones."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Cuentas"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"No se agregó ninguna cuenta"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Apps predeterminadas"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, hora, copia de seguridad, actualizaciones"</string>
<string name="search_results_title" msgid="1796252422574886932">"Configuración"</string>
- <string name="search_menu" msgid="6283419262313758339">"Buscar en la configuración"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"Wi-Fi, wi-fi, conexión de red, Internet, inalámbrico, datos, wifi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"Wi-Fi, activar o desactivar, control"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"mensaje de texto, mensajes de texto, mensajes, mensajería, predeterminado"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, presionar, pagos"</string>
<string name="keywords_backup" msgid="470070289135403022">"copia de seguridad, copia"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"rostro, desbloqueo, autorización, acceder"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versión de prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"red, estado de la red móvil, estado del servicio, potencia de la señal, tipo de red móvil, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de serie, versión de hardware"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema oscuro"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"error"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Pantalla Ambiente, pantalla bloqueada"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notificación en pantalla bloqueada"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"rostro"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"huella digital"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"atenuar pantalla, pantalla táctil, batería, brillo inteligente, brillo dinámico"</string>
@@ -3460,7 +3432,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Cuando ingreses el PIN para iniciar el dispositivo, los servicios de accesibilidad, como <xliff:g id="SERVICE">%1$s</xliff:g>, aún no estarán disponibles."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Cuando ingreses el patrón para iniciar el dispositivo, los servicios de accesibilidad, como <xliff:g id="SERVICE">%1$s</xliff:g>, aún no estarán disponibles."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Cuando ingreses la contraseña para iniciar el dispositivo, los servicios de accesibilidad, como <xliff:g id="SERVICE">%1$s</xliff:g>, aún no estarán disponibles."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Nota: Luego de reiniciar el dispositivo, esta app no podrá iniciarse hasta que desbloquees tu teléfono"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Nota: Si reinicias el teléfono y tienes configurado un bloqueo de pantalla, no podrá iniciarse la app hasta que lo desbloquees"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Información de IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Ranura <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3514,7 +3486,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: Todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: Desactivadas"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Desactivadas"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categoría: Urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categoría: Poca importancia"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categoría: Desactivadas"</string>
@@ -3559,7 +3531,7 @@
<string name="permit_usage_access" msgid="4012876269445832300">"Apps con acceso de uso"</string>
<string name="app_usage_preference" msgid="7065701732733134991">"Preferencias de uso de la aplicación"</string>
<string name="time_spent_in_app_pref_title" msgid="649419747540933845">"Tiempo que se usó la app"</string>
- <string name="usage_access_description" msgid="1352111094596416795">"El acceso a los datos de uso permite que una aplicación realice un seguimiento de qué otras aplicaciones usas y de la frecuencia con que las usas, además de conocer tu proveedor, configuración de idioma y otros detalles."</string>
+ <string name="usage_access_description" msgid="1352111094596416795">"El acceso a los datos de uso permite que una aplicación controle qué otras aplicaciones utilizas y con qué frecuencia, así como el operador, la configuración de idioma y otros detalles."</string>
<string name="memory_settings_title" msgid="7490541005204254222">"Memoria"</string>
<string name="memory_details_title" msgid="8542565326053693320">"Detalles de la memoria"</string>
<string name="always_running" msgid="6042448320077429656">"Siempre en ejecución (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3575,7 +3547,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo del dispositivo"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps no funcionan correctamente</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> no funciona correctamente</item>
@@ -3664,7 +3635,7 @@
<string name="running_frequency" msgid="6622624669948277693">"Frecuencia"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Uso máximo"</string>
<string name="no_data_usage" msgid="9131454024293628063">"No se utilizaron datos."</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"¿Quieres que la app <xliff:g id="APP">%1$s</xliff:g> tenga acceso en No interrumpir?"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"¿Quieres que la app <xliff:g id="APP">%1$s</xliff:g> tenga acceso a No interrumpir?"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"La aplicación podrá activar y desactivar la función No interrumpir y realizar cambios de configuración relacionados."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Debe seguir activado porque el acceso a las notificaciones está activado"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"¿Quieres revocar el acceso de la app <xliff:g id="APP">%1$s</xliff:g> en No interrumpir?"</string>
@@ -3682,7 +3653,7 @@
<string name="system_alert_window_apps_title" msgid="7005760279028569491">"Aplicaciones"</string>
<string name="system_alert_window_access_title" msgid="6297115362542361241">"Mostrar sobre otras apps"</string>
<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 que estén en uso. Es posible que interfiera con el uso de dichas apps o cambie su apariencia o comportamiento."</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>
@@ -3739,6 +3710,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Almacenamiento interno: <xliff:g id="PERCENTAGE">%1$s</xliff:g> en uso (<xliff:g id="FREE_SPACE">%2$s</xliff:g> libre)"</string>
<string name="display_summary" msgid="6737806235882127328">"Suspender después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Fondo de pantalla, suspender, tamaño de fuente"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Suspender después de 10 minutos de inactividad"</string>
<string name="memory_summary" msgid="8080825904671961872">"Se usó un promedio de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memoria"</string>
<string name="users_summary" msgid="1674864467098487328">"Accediste como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3754,7 +3727,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"No está permitido enviar SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"No está permitido usar la cámara"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"No está permitido tomar capturas de pantalla"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"No se pueden desactivar las copias de seguridad"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"No se puede abrir esta app"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Si tienes alguna pregunta, comunícate con tu administrador de TI"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Más detalles"</string>
@@ -3918,9 +3890,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simular una pantalla con un recorte"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ninguna"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predeterminado del dispositivo"</string>
<string name="special_access" msgid="3458780842491881155">"Acceso especial a apps"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps pueden usar datos sin restricción</item>
@@ -3942,11 +3914,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
<string name="demo_mode" msgid="2798762752209330277">"Modo demostración de la IU del sistema"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Modo nocturno"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Configurar modo nocturno"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Modo oscuro"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Configurar modo oscuro"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de configuración rápida para programadores"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Seguimiento de Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Configuración del perfil de trabajo"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Búsqueda de contactos"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que tu organización busque contactos para identificar a emisores y contactos"</string>
@@ -3987,14 +3958,18 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Presionar dos veces el teléfono para revisarlo"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Presionar dos veces la tablet para revisarla"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Presionar dos veces el dispositivo para revisarlo"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Para consultar la hora, los íconos de notificaciones y otros datos, presiona dos veces la pantalla."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Para consultar la hora, las notificaciones y otra información, presiona dos veces la pantalla."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar el teléfono para revisarlo"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levanta la tablet para revisarla"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levanta el dispositivo para revisarlo"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para consultar la hora, los íconos de notificaciones y otros datos, levanta el teléfono."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para consultar la hora, los íconos de notificaciones y otros datos, levanta la tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para consultar la hora, los íconos de notificaciones y otros datos, levanta el dispositivo."</string>
- <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Desliza tu huella para ver notificaciones"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Activar pantalla"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Para consultar la hora, las notificaciones y otra información, levanta el teléfono."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Para consultar la hora, las notificaciones y otra información, levanta la tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Para consultar la hora, las notificaciones y otra información, levanta el dispositivo."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gesto para activar la pantalla bloqueada"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
+ <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar tu huella para ver notificaciones"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Deslizar huella digital"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior del teléfono."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior de la tablet."</string>
@@ -4073,7 +4048,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> intentos</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> intento</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Es necesario crear una copia de seguridad de los datos de este dispositivo"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Tu organización administra este dispositivo."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> administra este dispositivo."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4114,6 +4088,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Servicio autocompletar"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"auto, completar, autocompletar"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Asegúrate de que esta app sea confiable.</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> usa el contenido de tu pantalla para determinar qué se puede autocompletar."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Autocompletar"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Nivel de registro"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Número máximo de solicitudes por sesión"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Máximo de conjuntos de datos visibles"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Restablecer valores predeterminados"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Se restablecieron las opciones de autocompletar para desarrolladores"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
<string name="default_theme" msgid="7085644992078579076">"Predeterminado"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nombre de la red"</string>
@@ -4128,15 +4108,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar aprovisionamiento del proveedor"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Actualizar el modo No interrumpir"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausa las notificaciones para concentrarte"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"¿Cuáles son las novedades y qué es lo más emocionante?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Descubre tu nuevo teléfono"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nueva tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Descubre tu nuevo dispositivo"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"La función no está disponible en este dispositivo"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forzar dimensiones GNSS completas"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Seguir todas las frecuencias y constelaciones de GNSS sin ciclo de funciones"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Mostrar siempre el cuadro de diálogo de bloqueos"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Mostrar el cuadro de diálogo cada vez que falle una app"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Seleccionar app compatible con ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"No se estableció ninguna app compatible con ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"App compatible con ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Acceso al directorio"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"acceso al directorio"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4177,4 +4156,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalles de la red"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"El nombre de tu dispositivo es visible para las apps del teléfono. Es posible que también lo vean otras personas cuando te conectes a dispositivos Bluetooth o configures un hotspot de Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Toda la configuración"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Sugerencias"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Datos de CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Datos de CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Elegir una red"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desconectado"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Conectado"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Conectando…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"No se pudo establecer conexión"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No se encontraron redes."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"No se encontraron redes. Vuelve a intentarlo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(prohibida)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Sin tarjeta SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Llamadas avanzadas"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Modo de red preferido: WCDMA preferido"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Modo de red preferido: solo GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Modo de red preferido: solo WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Modo de red preferido: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Modo de red preferido: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Modo de red preferido: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Modo de red preferido: solo CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Modo de red preferido: solo EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Modo de red preferido: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Modo de red preferido: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Modo de red preferido: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Modo de red preferido: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Modo de red preferido: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Modo de red preferido: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Modo de red preferido: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Modo de red preferido: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Modo de red preferido: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Modo de red preferido: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Modo de red preferido: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Modo de red preferido: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Modo de red preferido: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Modo de red preferido: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Modo de red preferido: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Modo de red preferido: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Modo de red preferido: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Modo de red preferido: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recomendado)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recomendado)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Redes disponibles"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Buscando…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registrando en <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Tu tarjeta SIM no permite una conexión con esta red."</string>
+ <string name="connect_later" msgid="978991102125216741">"No se puede establecer una conexión con la red en este momento. Vuelve a intentarlo más adelante."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Se registró en la red."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Seleccionar red de forma automática"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Config. del proveedor"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Configurar servicio de datos"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Datos móviles"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Acceder a los datos usando la red móvil"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tipo de red preferido"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Cambiar el modo operativo de la red"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tipo de red preferido"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Proveedor"</string>
+ <string name="call_category" msgid="8108654745239563833">"Llamadas"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videollamada con el proveedor"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Sistema seleccionado"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Cambiar el modo de roaming de CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Sistema seleccionado"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Red"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Red"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Suscripción CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Cambiar entre RUIM/SIM y NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"suscripción"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Registro automático…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"¿Permitir el roaming de datos?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Para saber los precios, consulta con tu proveedor de red."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Uso de datos de la app"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"El modo de red no es válido: <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorar."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"No está disponible cuando estás conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Ver más"</string>
+ <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 944eaa4..b2cd991 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -474,9 +474,13 @@
</string-array>
<string-array name="wifi_metered_entries">
<item msgid="5200910605264415911">"Detectar automáticamente"</item>
- <item msgid="8745603368609022803">"Tratar como red de uso no medido"</item>
+ <item msgid="8745603368609022803">"Tratar como red de uso medido"</item>
<item msgid="2266114985518865625">"Tratar como red de uso medido"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Predeterminado (usar dirección MAC aleatoria)"</item>
+ <item msgid="5398461510512959597">"De confianza"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"No"</item>
<item msgid="3863157480502955888">"Sí"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Siempre activado"</item>
<item msgid="6385301106124765323">"Siempre desactivado"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Desactivado"</item>
+ <item msgid="2182686878828390312">"Depurar"</item>
+ <item msgid="5286514712714822064">"Detallado"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Solo sistema doméstico"</item>
+ <item msgid="5034813753274486448">"Automático"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Preferencia: GSM o WCDMA"</item>
+ <item msgid="807926878589867564">"Solo GSM"</item>
+ <item msgid="488474605709912156">"Solo WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM o WCDMA (automático)"</item>
+ <item msgid="5072198667819683600">"CDMA o EvDo (automático)"</item>
+ <item msgid="370391313511477301">"CDMA sin EvDo"</item>
+ <item msgid="4678789463133969294">"Solo EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA, EvDo, GSM o WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA y LTE o EvDo"</item>
+ <item msgid="8008611169788556519">"GSM, WCDMA o LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE o WCDMA"</item>
+ <item msgid="1879225673847443662">"Solo TD-SCDMA"</item>
+ <item msgid="8373504428469988469">"TD-SCDMA o WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE o TD-SCDMA"</item>
+ <item msgid="2272560096982726294">"TD-SCDMA o GSM"</item>
+ <item msgid="131738018826229696">"LTE, TD-SCDMA o GSM"</item>
+ <item msgid="629422387044789699">"TD-SCDMA, GSM o WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE, TD-SCDMA o WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE, TD-SCDMA, GSM o WCDMA"</item>
+ <item msgid="4107769721462339672">"TD-SCDMA, CDMA, EvDo, GSM o WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE, TD-SCDMA, CDMA, EvDo, GSM o WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE o CDMA"</item>
+ <item msgid="519208953133334357">"LTE, GSM o UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 781fc83..483edb3 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Crear"</string>
<string name="allow" msgid="3349662621170855910">"Permitir"</string>
<string name="deny" msgid="6947806159746484865">"Denegar"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Cerrar"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Cambiar"</string>
<string name="device_info_default" msgid="7847265875578739287">"Desconocido"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Solo te quedan <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser un desarrollador.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Las opciones para desarrolladores ya están activadas."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Habilita primero las opciones para desarrolladores."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Conexiones inalámbricas y redes"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Conexiones"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Acceder"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Habilitar conexión de datos"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Inhabilitar conexión de datos"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Dirección de Bluetooth del dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"¿Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Emisiones"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sin nombre"</string>
<string name="progress_scanning" msgid="192587958424295789">"Buscando"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"No hay dispositivos Bluetooth cercanos."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Una aplicación quiere activar el Bluetooth y hacer visible tu teléfono para otros dispositivos. Puedes cambiar esta opción más tarde en los ajustes de Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexión automática"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para conectar con Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Toca para establecer conexión con \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"¿Quieres conectarte a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de llamada disponibles"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados actualmente"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivos guardados"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Añadir dispositivo"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"El Bluetooth se activará para vincular"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferencias de conexión"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos conectados previamente"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectados previamente"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth activado"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Ver todo"</string>
<string name="date_and_time" msgid="9062980487860757694">"Fecha y hora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Elige una zona horaria"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -199,7 +191,7 @@
<string name="proxy_settings_title" msgid="9049437837600320881">"Proxy"</string>
<string name="proxy_clear_text" msgid="5555400754952012657">"Borrar"</string>
<string name="proxy_port_label" msgid="5655276502233453400">"Puerto del proxy"</string>
- <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Omitir proxy para"</string>
+ <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Saltarproxy para"</string>
<string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar valores predeterminados"</string>
<string name="proxy_action_text" msgid="2957063145357903951">"Ok"</string>
<string name="proxy_hostname_label" msgid="8490171412999373362">"Nombre de host del proxy"</string>
@@ -221,7 +213,7 @@
<string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Servicio de datos:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerancia:"</string>
<string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
- <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"Desvío de llamada:"</string>
+ <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"Desvío de llamadas:"</string>
<string name="radio_info_ppp_resets_label" msgid="3587319503902576102">"Número de PPP restablecido desde el inicio:"</string>
<string name="radio_info_current_network_label" msgid="9151285540639134945">"Red actual:"</string>
<string name="radio_info_ppp_received_label" msgid="363579470428151850">"Datos recibidos:"</string>
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Saltar"</string>
<string name="next_label" msgid="4693520878012668114">"Siguiente"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Idiomas"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferencias de idioma"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Quitar"</string>
<string name="add_a_language" msgid="2330538812283783022">"Añadir un idioma"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Ajustes"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Acceso a Ajustes"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Más"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Conexiones inalámbricas y redes"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Administrar Wi‑Fi, Bluetooth, modo avión, redes móviles y redes VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Datos móviles"</string>
@@ -373,7 +363,7 @@
<string name="profile_info_settings_title" msgid="3518603215935346604">"Información del perfil"</string>
<string name="Accounts_settings_title" msgid="1643879107901699406">"Cuentas"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
- <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Utilizar la ubicación"</string>
+ <string name="location_settings_master_switch_title" msgid="3560242980335542411">"Utilizar ubicación"</string>
<string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
<string name="security_settings_title" msgid="4918904614964215087">"Seguridad y ubicación"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Cifrado y credenciales"</string>
@@ -386,8 +376,9 @@
<string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
<string name="security_passwords_title" msgid="2881269890053568809">"Privacidad"</string>
- <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Inhabilitada por el administrador"</string>
+ <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Inhabilitado por el administrador"</string>
<string name="security_status_title" msgid="5848766673665944640">"Estado de seguridad"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Bloqueo de pantalla, desbloqueo facial"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueo de pantalla y huella digital"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo de pantalla"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Cara añadida"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Desbloquea con tu cara"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Usa tu cara para autenticarte"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Usa tu cara para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Usa tu cara"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utiliza tu cara para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes utilizar tu cara para desbloquear este dispositivo. Si quieres consultar más información, ponte en contacto con el administrador de tu organización."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Usa tu cara para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Puedes añadir hasta <xliff:g id="COUNT">%d</xliff:g> huellas digitales"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centra la cara en el círculo"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"En otro momento"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Puedes añadir hasta <xliff:g id="COUNT">%d</xliff:g> caras"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Has añadido el número máximo de caras"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"No se pueden añadir más caras"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registro no completado"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Aceptar"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Se ha alcanzado el tiempo de registro de la cara. Vuelve a intentarlo."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"El registro de la cara no ha funcionado."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Ya has terminado. Todo perfecto."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Listo"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Usa el reconocimiento facial para"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Desbloquear el dispositivo"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Inicio de sesión y pagos"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Ojos abiertos para desbloquear"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Cuando uses la autenticación facial, abre los ojos"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Eliminar datos faciales"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Mejorar tus datos faciales"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Puedes desbloquear el dispositivo y acceder a tus aplicaciones mediante el reconocimiento facial. "<annotation id="url">"Más información"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Huella digital"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Administrar huellas"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar huella para"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Selecciona al menos una banda para el punto de acceso Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Ajustes de IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacidad"</string>
<string name="wifi_shared" msgid="844142443226926070">"Compartir con otros usuarios del dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(no modificada)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Selecciona una opción"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"¿Olvidar red?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Se eliminarán todas las contraseñas de esta red"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Redes guardadas"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d redes</item>
<item quantity="one">1 red</item>
@@ -998,8 +1005,8 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferencia de itinerancia"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"Preferir Wi-Fi"</item>
- <item msgid="1335127656328817518">"Preferir datos móviles"</item>
+ <item msgid="2124257075906188844">"Dar preferencia a Wi-Fi"</item>
+ <item msgid="1335127656328817518">"Dar prioridad a datos móviles"</item>
<item msgid="3132912693346866895">"Solo conexión Wi-Fi"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
@@ -1013,8 +1020,8 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"Preferir Wi-Fi"</item>
- <item msgid="5074515506087318555">"Preferir datos móviles"</item>
+ <item msgid="5782108782860004851">"Dar preferencia a Wi-Fi"</item>
+ <item msgid="5074515506087318555">"Dar prioridad a datos móviles"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brillo"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Sí"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Desactivado"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"El brillo preferido es muy bajo"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"El brillo preferido es bajo"</string>
@@ -1126,7 +1132,7 @@
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programación"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ninguna"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Activar a una hora personalizada"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Activar de anochecer a amanecer"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Activar del anochecer al amanecer"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"Estado"</string>
@@ -1142,7 +1148,7 @@
<string name="night_display_activation_on_manual" msgid="277343561277625826">"Activar ahora"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"Desactivar ahora"</string>
<string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Activar hasta el amanecer"</string>
- <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Desactivar hasta el atardecer"</string>
+ <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Desactivar hasta el anochecer"</string>
<string name="night_display_activation_on_custom" msgid="5472029024427933598">"Activar hasta las <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"Desactivar hasta las <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Suspender después de"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"No se puede modificar el PIN.\nEs posible que el PIN no sea correcto."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"El PIN de la tarjeta SIM se ha modificado correctamente."</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"No se puede modificar el estado de bloqueo de la tarjeta SIM.\nEs posible que el PIN no sea correcto."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"No se puede inhabilitar el PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"No se puede habilitar el PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Aceptar"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Varias SIM encontradas"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Debes formatear tu <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"Al formatear tu <xliff:g id="NAME_1">^1</xliff:g>, se borrarán todos los datos que tengas almacenados."</b>" Te recomendamos que hagas una copia de seguridad de los datos para no perderlos."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Borrar y formatear"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formateando <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"No extraigas tu <xliff:g id="NAME">^1</xliff:g> mientras se esté formateando."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"No extraigas tu <xliff:g id="NAME">^1</xliff:g> mientras se esté formateando."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mover a nuevo almacenamiento"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Puedes mover tus fotos, tus archivos y algunas aplicaciones al nuevo dispositivo de almacenamiento (<xliff:g id="NAME">^1</xliff:g>). \n\nLa operación puede tardar aproximadamente <xliff:g id="TIME">^2</xliff:g> y permitirá liberar <xliff:g id="SIZE">^3</xliff:g> de espacio de almacenamiento interno. Algunas aplicaciones no funcionarán hasta que finalice el proceso."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mover ahora"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Instalada"</string>
<string name="no_applications" msgid="7336588977497084921">"No hay aplicaciones."</string>
<string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"almacenamiento interno"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almacenamiento USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Tarjeta SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Recalculando tamaño…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"¿Eliminar datos de la aplicación?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Todos los datos de esta aplicación se eliminarán de forma permanente. Esto incluye todos los archivos, ajustes, cuentas, bases de datos, etc."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"No se ha encontrado la aplicación en la lista de aplicaciones instaladas."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"No se ha podido borrar el almacenamiento de la aplicación."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicación puede acceder a los siguientes elementos del tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Esta aplicación puede acceder a los siguientes elementos del teléfono:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Esta aplicación puede acceder a la siguiente información de tu tablet. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Esta aplicación puede acceder a la siguiente información de tu teléfono. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> y <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Puede que se cobre dinero por usar esta aplicación:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Enviar SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"Calculando…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"No se ha podido calcular el tamaño del paquete."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"No tienes instalada ninguna aplicación externa."</string>
<string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Mover"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover al tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover al teléfono"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover a almacen. USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover a la tarjeta SD"</string>
- <string name="moving" msgid="6431016143218876491">"Moviendo"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Hay otra migración en curso."</string>
<string name="insufficient_storage" msgid="481763122991093080">"No hay suficiente espacio de almacenamiento."</string>
<string name="does_not_exist" msgid="1501243985586067053">"La aplicación no existe."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"La aplicación del administrador de dispositivos no se puede instalar en ubicaciones externas"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"¿Forzar detención?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Si fuerzas que se detenga una aplicación, puede que no funcione correctamente."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"No se ha podido mover la aplicación (<xliff:g id="REASON">%1$s</xliff:g>)."</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Ubicación de instalación preferida"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Modificar la ubicación de instalación preferida para nuevas aplicaciones"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"¿Inhabilitar aplicación integrada?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Inhabilitar aplicación"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Si inhabilitas esta aplicación, es posible que Android y otras aplicaciones no funcionen correctamente."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"¿Quieres eliminar los datos e inhabilitar la aplicación?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Si inhabilitas esta aplicación, es posible que Android y otras aplicaciones no funcionen correctamente. Tus datos también se eliminarán."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"¿Desactivar notificaciones?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactivas las notificaciones de esta aplicación, es posible que no recibas actualizaciones y alertas importantes."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Tienda"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detalles de la aplicación"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplicación instalada desde <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1946,7 +1939,7 @@
<string name="usage_time_label" msgid="295954901452833058">"Tiempo de uso"</string>
<string name="accessibility_settings" msgid="3975902491934816215">"Accesibilidad"</string>
<string name="accessibility_settings_title" msgid="2130492524656204459">"Ajustes de accesibilidad"</string>
- <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controles de interacción"</string>
+ <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, interacción"</string>
<string name="vision_settings_title" msgid="4204111425716868288">"Ajustes de visión"</string>
<string name="vision_settings_description" msgid="5679491180156408260">"Personaliza este dispositivo para adaptarlo a tus necesidades. Puedes modificar las funciones de accesibilidad posteriormente en Ajustes."</string>
<string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambiar el tamaño de la fuente"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilizar el servicio"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utilizar la corrección de color"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilizar subtítulos"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continuar"</string>
<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="6371077608778830020">"Añadir audífono"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limitas la actividad en segundo plano de una aplicación, puede que no funcione correctamente"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Esta aplicación no optimiza la batería, por lo que no puedes restringirla.\n\nPara hacerlo, activa antes la optimización."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Uso de la pantalla desde la última carga completa"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Búsqueda de redes móviles"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Uso de la batería desde la última carga completa"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tiempo que la pantalla ha estado encendida desde la carga completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Uso del dispositivo desde la carga completa"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Cómo reducir el uso de la batería"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicaciones que están agotando la batería"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"El dispositivo se mantiene activo"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"El dispositivo se está activando en segundo plano"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"La ubicación se solicita con frecuencia"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Hay <xliff:g id="NUMBER">%1$d</xliff:g> aplicaciones que no funcionan correctamente"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Las aplicaciones funcionan correctamente"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"El teléfono tiene un consumo normal de batería en segundo plano"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"El tablet tiene un consumo normal de batería en segundo plano"</string>
@@ -2220,9 +2207,9 @@
<string name="battery_tip_unrestrict_app_dialog_message" msgid="6537761705584610231">"Esta aplicación puede utilizar la batería en segundo plano y provocar que te quedes sin batería antes de lo que pensabas."</string>
<string name="battery_tip_unrestrict_app_dialog_ok" msgid="6022058431218137646">"Quitar"</string>
<string name="battery_tip_unrestrict_app_dialog_cancel" msgid="3058235875830858902">"Cancelar"</string>
- <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu teléfono te recomendaría que realizaras algunas acciones.\n\nSi tienes poca batería, también puedes activar la función Ahorro de batería."</string>
- <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu tablet te recomendaría que realizaras algunas acciones.\n\nSi tienes poca batería, también puedes activar la función Ahorro de batería."</string>
- <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu dispositivo te recomendaría que realizaras algunas acciones.\n\nSi tienes poca batería, también puedes activar la función Ahorro de batería."</string>
+ <string name="battery_tip_dialog_summary_message" product="default" msgid="4628448253185085796">"Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu dispositivo te recomendaría medidas para evitarlo.\n\nSi te queda poca carga, también puedes activar Ahorro de batería."</string>
+ <string name="battery_tip_dialog_summary_message" product="tablet" msgid="8327950887399420971">"Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu dispositivo te recomendaría medidas para evitarlo.\n\nSi te queda poca carga, también puedes activar Ahorro de batería."</string>
+ <string name="battery_tip_dialog_summary_message" product="device" msgid="6753742263807939789">"Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu dispositivo te recomendaría medidas para evitarlo.\n\nSi te queda poca carga, también puedes activar Ahorro de batería."</string>
<string name="smart_battery_manager_title" msgid="870632749556793417">"Gestor de batería"</string>
<string name="smart_battery_title" msgid="6218785691872466076">"Gestionar aplicaciones automáticamente"</string>
<string name="smart_battery_summary" msgid="1339184602000004058">"Limitar el consumo de batería de las aplicaciones que no utilices con frecuencia"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Se está limitando el consumo de batería de %1$d aplicaciones</item>
<item quantity="one">Se está limitando el consumo de batería de %1$d aplicación</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restringida <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Estas aplicaciones han estado consumiendo batería en segundo plano. Es posible que las aplicaciones restringidas no funcionen correctamente y las notificaciones se retrasen."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Utilizar el gestor de batería"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detectar el consumo de batería de las aplicaciones"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancelar"</string>
<string name="tts_reset" msgid="2661752909256313270">"Restablecer"</string>
<string name="tts_play" msgid="2628469503798633884">"Reproducir"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Control de energía"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Actualizando configuración de la conexión Wi-Fi..."</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de la conexión Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"activado"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"desactivado"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Ubicación"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sincronizar"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brillo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completo"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"medio"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"desactivado"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de credenciales"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar desde almacenamiento"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Seleccionar todo"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso de datos de aplicac."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Datos móviles y Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"El uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Uso de las aplicaciones"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIÓN DE LA APLICACIÓN"</string>
@@ -2667,8 +2638,8 @@
<string name="data_usage_metered_title" msgid="7383175371006596441">"Restricciones de red"</string>
<string name="data_usage_metered_body" msgid="7655851702771342507">"Las redes sin uso medido se tratan como redes móviles cuando se restringe el uso de datos en segundo plano. Las aplicaciones pueden mostrar una advertencia antes de usar estas redes para descargar archivos grandes."</string>
<string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
- <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi-Fi sin uso medido"</string>
- <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes sin uso medido, activa el Wi‑Fi."</string>
+ <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi-Fi de uso medido"</string>
+ <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Para seleccionar redes de uso medido, activa el Wi-Fi."</string>
<string name="data_usage_metered_auto" msgid="1262028400911918865">"Automática"</string>
<string name="data_usage_metered_yes" msgid="9217539611385225894">"De uso medido"</string>
<string name="data_usage_metered_no" msgid="4025232961929071789">"Con uso medido"</string>
@@ -2852,7 +2823,7 @@
<string name="nfc_payment_settings_title" msgid="1807298287380821613">"Toca y paga"</string>
<string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Cómo funciona"</string>
<string name="nfc_payment_no_apps" msgid="5477904979148086424">"Paga en las tiendas con tu teléfono"</string>
- <string name="nfc_payment_default" msgid="8648420259219150395">"Aplicación de pago predeterminada"</string>
+ <string name="nfc_payment_default" msgid="8648420259219150395">"Aplicación de pagos predeterminada"</string>
<string name="nfc_payment_default_not_set" msgid="7485060884228447765">"No definida"</string>
<string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
<string name="nfc_payment_use_default" msgid="3234730182120288495">"Usar aplicación predeterminada"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Mostrar %d elementos ocultos</item>
<item quantity="one">Mostrar %d elemento oculto</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Ocultar"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Redes e Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"móvil"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicaciones y notificaciones"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicaciones predeterminadas"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Las aplicaciones del perfil de trabajo no tienen acceso a las notificaciones."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Cuentas"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"No se ha añadido ninguna cuenta"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicaciones predeter."</string>
- <string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, hora, copias de seguridad y actualizaciones"</string>
+ <string name="system_dashboard_summary" msgid="5797743225249766685">"Idioma, hora, copias de seg. y actualizaciones"</string>
<string name="search_results_title" msgid="1796252422574886932">"Ajustes"</string>
- <string name="search_menu" msgid="6283419262313758339">"Buscar ajustes"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi‑fi, conexión de red, internet, inalámbrica, datos, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi‑fi, alternar, controlar"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"mensaje de texto, enviar mensajes, mensajes, sms, predeterminado"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagos"</string>
<string name="keywords_backup" msgid="470070289135403022">"copia de seguridad, copia seguridad"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"cara, desbloquear, autorización, iniciar sesión"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versión de prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"red, estado de la red móvil, estado del servicio, intensidad de la señal, tipo de red móvil, itinerancia, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de serie, versión de hardware"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema oscuro"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"error"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Pantalla ambiente, pantalla de bloqueo"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notificación en pantalla de bloqueo"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"cara"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"huella digital"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"atenuar pantalla, pantalla táctil, batería, brillo inteligente, brillo dinámico"</string>
@@ -3428,7 +3400,7 @@
<string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"Permitir que las notificaciones silenciadas por el modo No molestar activen la pantalla"</string>
<string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
<string name="suggestion_button_text" msgid="3275010948381252006">"Aceptar"</string>
- <string name="device_feedback" msgid="3238056036766293294">"Enviar sugerencias sobre el dispositivo"</string>
+ <string name="device_feedback" msgid="3238056036766293294">"Enviar comentarios sobre el dispositivo"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introducir el PIN del administrador"</string>
<string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
<string name="switch_off_text" msgid="1139356348100829659">"Desactivado"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Cuando introduzcas tu PIN para iniciar este dispositivo, los servicios de accesibilidad como <xliff:g id="SERVICE">%1$s</xliff:g> aún no estarán disponibles."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Cuando introduzcas tu patrón para iniciar este dispositivo, los servicios de accesibilidad como <xliff:g id="SERVICE">%1$s</xliff:g> aún no estarán disponibles."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Cuando introduzcas tu contraseña para iniciar este dispositivo, los servicios de accesibilidad como <xliff:g id="SERVICE">%1$s</xliff:g> aún no estarán disponibles."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Nota: Después de reiniciar, tienes que desbloquear el teléfono para que esta aplicación se pueda iniciar"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Nota: Si reinicias el teléfono y has definido un bloqueo de pantalla, esta aplicación no se podrá iniciar hasta que desbloquees el teléfono"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Información del IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con el IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(N.º <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Trabajo"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplicaciones: todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplicaciones: desactivadas"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Desactivadas"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorías: urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorías: poca importancia"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorías: desactivadas"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo del dispositivo"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de aplicaciones"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicaciones no funcionan con normalidad</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> no funciona con normalidad</item>
@@ -3737,10 +3708,12 @@
<string name="notification_summary_none" msgid="4586376436702610">"Activadas para todas las aplicaciones"</string>
<string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplicaciones instaladas"</string>
<string name="apps_summary_example" msgid="2118896966712746139">"24 aplicaciones instaladas"</string>
- <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> usado - <xliff:g id="FREE_SPACE">%2$s</xliff:g> disponible"</string>
+ <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> usado - <xliff:g id="FREE_SPACE">%2$s</xliff:g> disponibles"</string>
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Almacenamiento interno: <xliff:g id="PERCENTAGE">%1$s</xliff:g> usado (<xliff:g id="FREE_SPACE">%2$s</xliff:g> disponible)"</string>
<string name="display_summary" msgid="6737806235882127328">"Suspender tras <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Fondo de pantalla, suspensión, tamaño de la fuente"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Suspender tras 10 minutos de inactividad"</string>
<string name="memory_summary" msgid="8080825904671961872">"Se está usando una media de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de memoria"</string>
<string name="users_summary" msgid="1674864467098487328">"Has iniciado sesión como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"No se permite enviar SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"No se permite usar la cámara"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"No se permiten capturar pantallas"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"No se pueden desactivar las copias de seguridad"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"No se puede abrir esta aplicación"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Si tienes alguna pregunta, ponte en contacto con tu administrador de TI"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Más información"</string>
@@ -3883,7 +3855,7 @@
<string name="battery_saver_on_summary" msgid="7722791295871319534">"Activado"</string>
<string name="battery_saver_off_scheduled_summary" msgid="3953785517002197881">"Se activará cuando esté al <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
<string name="battery_saver_off_summary" msgid="784360321235698247">"Desactivado"</string>
- <string name="battery_saver_button_turn_on" msgid="3699954061337848832">"Activar"</string>
+ <string name="battery_saver_button_turn_on" msgid="3699954061337848832">"Activar ahora"</string>
<string name="battery_saver_button_turn_off" msgid="5916996792004611890">"Desactivar"</string>
<string name="not_battery_optimizing" msgid="5362861851864837617">"No se está utilizando la optimización de la batería"</string>
<string name="lockscreen_remote_input" msgid="969871538778211843">"Si el dispositivo está bloqueado, evitar que se escriban respuestas u otros textos en las notificaciones"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simular una pantalla con un recorte"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ninguna"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Opción predeterminada del dispositivo"</string>
<string name="special_access" msgid="3458780842491881155">"Acceso especial de aplicaciones"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicaciones pueden utilizar datos sin restricción</item>
@@ -3943,12 +3915,11 @@
<string name="bluetooth_disabled" msgid="6244000672828617410">"Desactivado"</string>
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
- <string name="demo_mode" msgid="2798762752209330277">"Modo de demostración de IU del sistema"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Modo nocturno"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Definir modo nocturno"</string>
+ <string name="demo_mode" msgid="2798762752209330277">"Modo de demostración de UI del sistema"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Modo oscuro"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Establecer modo oscuro"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ajustes rápidos de mosaicos de desarrolladores"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Rastro de Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Ajustes de perfil de trabajo"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Búsqueda de contactos"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que tu organización busque contactos para identificar llamadas y contactos"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar el teléfono dos veces para consultarlo"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar el tablet dos veces para comprobar notificaciones"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar el dispositivo dos veces para comprobar notificaciones"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Toca la pantalla dos veces para ver la hora, los iconos de notificación y otra información."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Toca la pantalla dos veces para consultar la hora, las notificaciones y otra información."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar el teléfono para consultarlo"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar el tablet para comprobar las notificaciones"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar el dispositivo para comprobar las notificaciones"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Coge el teléfono para ver la hora, los iconos de notificación y otros datos."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Coge el tablet para ver la hora, los iconos de notificación y otra información."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Coge el dispositivo para consultar la hora, iconos de notificación y otra información."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Activar pantalla"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Coge el teléfono para consultar la hora, las notificaciones y otra información."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Coge el tablet para consultar la hora, las notificaciones y otra información."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Coge el dispositivo para consultar la hora, las notificaciones y otra información."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gesto para mostrar pantalla de bloqueo"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar por el sensor de huellas para abrir notificaciones"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Deslizar huella digital"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales situado en la parte trasera del teléfono."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> intentos</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> intento</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Se está creando una copia de seguridad de los datos del dispositivo"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Este dispositivo está administrado por tu organización."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> administra este dispositivo."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Servicio Autocompletar"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automático, completar, autocompletar"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Asegúrate de que confías en esta aplicación</b> <br/> <br/> <xliff:g id=app_name example=Autocompletar de Google>%1$s</xliff:g> utiliza el contenido que se muestra en la pantalla para determinar el texto que se puede autocompletar."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Autocompletar"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Nivel almacen. registros"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Máximo de solicitudes por sesión"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Número máximo de conjuntos de datos visibles"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Restablecer valores predeterminados"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Se ha restablecido la opción de autocompletar las opciones del desarrollador"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
<string name="default_theme" msgid="7085644992078579076">"Predeterminado"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nombre de la red"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Activar servicios del operador"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Actualizar el modo No molestar"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausa las notificaciones para concentrarte"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"¿Cuáles son las fascinantes novedades?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Descubre tu nuevo teléfono"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Descubre tu nuevo tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Descubre tu nuevo dispositivo"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta función no está disponible en este dispositivo"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forzar mediciones de GNSS completas"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Registrar todas las frecuencias y constelaciones de GNSS sin ciclo de servicio"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Mostrar siempre el cuadro de diálogo de bloqueos"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Mostrar el cuadro de diálogo cuando una aplicación falle"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Seleccionar una aplicación para usar ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"No se ha seleccionado ninguna aplicación para usar ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplicación para usar ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Acceso al directorio"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"acceso al directorio"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalles de la red"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Las aplicaciones de tu teléfono pueden ver el nombre de tu dispositivo. También es posible que lo vean otros usuarios si lo conectas con dispositivos Bluetooth o configuras un punto de acceso Wi‑Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Todos los ajustes"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Sugerencias"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Datos de CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Datos de CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Elegir red"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desconectada"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Conectada"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Conectando…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"No se ha podido conectar"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"No se ha encontrado ninguna red."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"No se ha encontrado ninguna red. Vuelve a intentarlo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(prohibida)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"No hay ninguna tarjeta SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Llamadas avanzadas"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Preferencia de modo de red: WCDMA preferido"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Preferencia de modo de red: solo GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Preferencia de modo de red: solo WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Preferencia de modo de red: GSM o WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Preferencia de modo de red: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Preferencia de modo de red: CDMA o EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Preferencia de modo de red: solo CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Preferencia de modo de red: solo EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferencia de modo de red: CDMA, EvDo, GSM o WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferencia de modo de red: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferencia de modo de red: GSM, WCDMA o LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferencia de modo de red: CDMA y LTE o EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferencia de modo de red: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferencia de modo de red: LTE o WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Preferencia de modo de red: LTE, GSM o UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Preferencia de modo de red: LTE o CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferencia de modo de red: TD-SCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preferencia de modo de red: TD-SCDMA o WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preferencia de modo de red: LTE o TD-SCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preferencia de modo de red: TD-SCDMA o GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preferencia de modo de red: LTE, GSM o TD-SCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preferencia de modo de red: TD-SCDMA, GSM o WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preferencia de modo de red: LTE, TD-SCDMA o WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preferencia de modo de red: LTE, TD-SCDMA, GSM o WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preferencia de modo de red: TD-SCDMA, CDMA, EvDo, GSM o WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preferencia de modo de red: LTE, TD-SCDMA, CDMA, EvDo, GSM o WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recomendado)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recomendado)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Redes disponibles"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Buscando…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registrándose en <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"La tarjeta SIM no permite establecer conexión con esta red."</string>
+ <string name="connect_later" msgid="978991102125216741">"No se puede conectar a la red en este momento. Inténtalo de nuevo más tarde."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registrado en la red."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Seleccionar una red automáticamente"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Ajustes del operador"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Configurar servicio de datos"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Datos móviles"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Acceder a los datos con la red móvil"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Preferencia de tipo de red"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Cambiar el modo operativo de la red"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Preferencia de tipo de red"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operador"</string>
+ <string name="call_category" msgid="8108654745239563833">"Llamadas"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videollamadas a través del operador"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Selección del sistema"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Cambiar modo de itinerancia CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Selección del sistema"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Red"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Red"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Suscripción CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Cambiar entre RUIM/SIM y NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"suscripción"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Registro automático…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"¿Permitir la itinerancia de datos?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Ponte en contacto con tu proveedor de red para consultar el precio."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Uso de datos de la aplicación"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"El modo de red <xliff:g id="NETWORKMODEID">%1$d</xliff:g> no es válido. Ignorar."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"No está disponible cuando se está conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Ver más"</string>
+ <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"No hay dispositivos conectados"</string>
</resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index d55fd30..8a332e3 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Käsitle mahupõhisena"</item>
<item msgid="2266114985518865625">"Käsitle mittemahupõhisena"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Vaikimisi (kasuta juhuslikku MAC-aadressi)"</item>
+ <item msgid="5398461510512959597">"Usaldusväärne"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ei"</item>
<item msgid="3863157480502955888">"Jah"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Alati sees"</item>
<item msgid="6385301106124765323">"Alati väljas"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Väljas"</item>
+ <item msgid="2182686878828390312">"Silumine"</item>
+ <item msgid="5286514712714822064">"Üksikasjalik"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Ainult kodus"</item>
+ <item msgid="5034813753274486448">"Automaatne"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Eelistatud: GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Ainult GSM"</item>
+ <item msgid="488474605709912156">"Ainult WCDMA"</item>
+ <item msgid="1912421096218750039">"Automaatne GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Automaatne CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA ilma EvDo-ta"</item>
+ <item msgid="4678789463133969294">"Ainult EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Üldine"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Ainult TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Üldine"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 9a706e5..a1abee3 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Loo"</string>
<string name="allow" msgid="3349662621170855910">"Luba"</string>
<string name="deny" msgid="6947806159746484865">"Keela"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Sule"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Lüliti"</string>
<string name="device_info_default" msgid="7847265875578739287">"Tundmatu"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Olete nüüd <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> sammu kaugusel arendajastaatusest.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Ei ole vaja, olete juba arendaja."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Lubage esmalt arendaja valikud."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Traadita ühendus ja võrgud"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Ühendused"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Seade"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Isiklik"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Sisene"</string>
<string name="header_category_system" msgid="2816866961183068977">"Süsteem"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Luba andmesideühendus"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Keela andmesideühendus"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Seadme Bluetoothi aadress: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Kas katkestada ühendus seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Edastamine"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Nimetu Bluetooth-seade"</string>
<string name="progress_scanning" msgid="192587958424295789">"Otsimine"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Läheduses ei leitud Bluetooth-seadmeid."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Rakendus soovib Bluetoothi sisse lülitada ja teie telefoni teistele seadmetele nähtavaks muuta. Seda saate hiljem Bluetoothi seadetes muuta."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetoothi sisselülitamine ..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetoothi väljalülitamine ..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automaatne ühendamine"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-ühenduse taotlus"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Puudutage seadmega „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” ühenduse loomiseks."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Kas soovite ühendada seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Saadaolevad helistamisseadmed"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Praegu ühendatud"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Salvestatud seadmed"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Seadme lisamine"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth lülitatakse sidumiseks sisse"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Ühenduse eelistused"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Varem ühendatud seadmed"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Eelnevalt ühendatud"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth on sisse lülitatud"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Kuva kõik"</string>
<string name="date_and_time" msgid="9062980487860757694">"Kuupäev ja kellaaeg"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Ajavööndi valimine"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Jäta vahele"</string>
<string name="next_label" msgid="4693520878012668114">"Järgmine"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Keeled"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Keele-eelistused"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Eemalda"</string>
<string name="add_a_language" msgid="2330538812283783022">"Lisa keel"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Seaded"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Seadete otsetee"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Lennurežiim"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Rohkem"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Traadita ühendus ja võrgud"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"WiFi, Bluetoothi, lennurežiimi ja mobiilsidevõrkude ning VPN-ide haldamine"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobiilne andmeside"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privaatsus"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Administraatori keelatud"</string>
<string name="security_status_title" msgid="5848766673665944640">"Turvalisuse olek"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Ekraanilukk, Face Unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Ekraanilukk, sõrmejälg"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekraanilukk"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Nägu on lisatud"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Avage oma näoga"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Kasutage autentimiseks oma nägu"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Kasutage oma nägu telefoni avamiseks, ostude volitamiseks või rakendustesse sisselogimiseks."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Kasutage enda nägu"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Kasutage telefoni avamiseks või ostude kinnitamiseks oma nägu.\n\nMärkus: te ei saa kasutada oma nägu selle seadme avamiseks. Lisateabe saamiseks võtke ühendust oma organisatsiooni administraatoriga."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Kasutage oma nägu telefoni avamiseks, ostude volitamiseks või rakendustesse sisselogimiseks"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Lisada saab kuni <xliff:g id="COUNT">%d</xliff:g> sõrmejälge"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Hoidke oma nägu ringi keskel"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Teen seda hiljem"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Lisada saab kuni <xliff:g id="COUNT">%d</xliff:g> nägu"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Olete lisanud maksimaalse arvu nägusid"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Rohkem nägusid ei saa lisada"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registreerimist ei lõpetatud"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Näo registreerimisaeg lõppes. Proovige uuesti."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Näo registreerimine ei toiminud."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Kõik on valmis. Kõik on korras."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Valmis"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Kasutage oma nägu"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Seadme avamine"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Rakendusse sisselog. ja maksed"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Avamiseks silmad avatud"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Näotuvastuse kasutamiseks peavad teie silmad olema avatud"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Eemalda näoandmed"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Näoandmete täiustamine"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Võite oma nägu kasutada seadme avamiseks ja rakendustele juurdepääsemiseks. "<annotation id="url">"Lisateave"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sõrmejälg"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Sõrmejälgede haldamine"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sõrmej. kasutatakse:"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Valige WiFi-leviala lubamiseks vähemalt üks sagedusriba:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP-seaded"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privaatsus"</string>
<string name="wifi_shared" msgid="844142443226926070">"Jaga seadme teiste kasutajatega"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(muutmata)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Valige"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Tühista"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Kas unustada võrk?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Kõik selle võrgu paroolid kustutatakse"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Salvestatud võrgud"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d võrku</item>
<item quantity="one">1 võrk</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Heledus"</string>
<string name="brightness_summary" msgid="838917350127550703">"Reguleeri ekraani heledust"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Kohanduv heledus"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Sees"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Väljas"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Eelistatav heledus on väga tume"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Eelistatav heledus on tume"</string>
@@ -1122,7 +1128,7 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"Heledust optimeeritakse valgustingimuste järgi. Kui funktsioon on sisse lülitatud, saate heledust siiski ajutiselt reguleerida."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"Teie ekraanikuva eredust kohandatakse automaatselt teie keskkonna ja tegevuste järgi. Võite liugurit käsitsi liigutada, et aidata kohanduval eredusel teie eelistusi õppida."</string>
<string name="night_display_title" msgid="2626451512200357686">"Öövalgus"</string>
- <string name="night_display_text" msgid="1837277457033025056">"Funktsioon Öövalgus toonib ekraani kollaseks. Nii on hämaras ekraani mugavam vaadata ja sellelt teksti lugeda. See võib aidata teil ka hõlpsamini magama jääda."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"Funktsioon Öövalgus toonib ekraani oranžkollaseks. Nii on hämaras ekraani mugavam vaadata ja sellelt teksti lugeda. See võib aidata teil ka hõlpsamini magama jääda."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ajastamine"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Mitte kunagi"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Lülitub sisse kohandatud ajal"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN-koodi ei saa muuta.\nPIN-kood võib vale olla."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-i PIN-koodi muutmine õnnestus"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM-kaardi lukustusolekut ei saa muuta.\nVõimalik, et PIN-kood on vale."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN-koodi ei saa keelata."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN-koodi ei saa lubada."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Tühista"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Leiti mitu SIM-kaarti"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Seade <xliff:g id="NAME_0">^1</xliff:g> tuleb vormindada. \n\n"<b>"Vormindamisel kustutatakse kõik praegu seadmesse <xliff:g id="NAME_1">^1</xliff:g> salvestatud andmed."</b>" Andmete kaotsimineku vältimiseks kaaluge nende varundamist."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Kustuta ja vorminda"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Üksuse <xliff:g id="NAME">^1</xliff:g> vormindamine …"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Ärge eemaldage seadet <xliff:g id="NAME">^1</xliff:g> vormindamise ajal."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Ärge eemaldage üksust <xliff:g id="NAME">^1</xliff:g> vormindamise ajal."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Teis. andmed uude salvestusruumi"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Saate fotod, failid ja mõned rakendused teisaldada uude üksusesse <xliff:g id="NAME">^1</xliff:g>. \n\nTeisaldamine võtab umbes <xliff:g id="TIME">^2</xliff:g> ja vabastab sisemises salvestusruumis <xliff:g id="SIZE">^3</xliff:g>. Selle toimingu ajal mõned rakendused ei tööta."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Teisalda kohe"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installitud"</string>
<string name="no_applications" msgid="7336588977497084921">"Rakendusi pole."</string>
<string name="internal_storage" msgid="1584700623164275282">"Sisemälu"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"sisemine salvestusruum"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-mäluseade"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kaardi mäluruum"</string>
<string name="recompute_size" msgid="7722567982831691718">"Suuruse ümberarvutamine ..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Kas kustutada rakenduse andmed?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Rakenduse kõik andmed kustutatakse lõplikult. See hõlmab kõiki faile, seadeid, kontosid, andmebaase jne."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Rakendust ei leitud installitud rakenduste loendist."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Rakenduse salvestusruumi ei õnnestunud tühjendada."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"See rakendus pääseb teie tahvelarvutis juurde järgmisele:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Sel rakendusel on teie telefonis järgmised juurdepääsuõigused:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Sellel rakendusel on teie tahvelarvutis juurdepääs järgmisele. Toimivuse parandamiseks ja mälukasutuse vähendamiseks on mõned neist lubadest saadaval rakenduse <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jaoks, kuna see töötab samas protsessis kui <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Sellel rakendusel on teie telefonis juurdepääs järgmisele. Toimivuse parandamiseks ja mälukasutuse vähendamiseks on mõned neist lubadest saadaval rakenduse <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jaoks, kuna see töötab samas protsessis kui <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ja <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"See rakendus võib põhjustada tasusid:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Tasulise SMS-i saatmine"</string>
<string name="computing_size" msgid="1599186977475211186">"Arvutamine ..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Paketi suurust ei saanud arvutada."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Teil pole ühtegi kolmanda osapoole rakendust installitud."</string>
<string name="version_text" msgid="9189073826278676425">"versioon <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Teisalda"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Teisalda tahvelarvutisse"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Teisalda telefoni"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Teisalda USB-mällu"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Teisalda SD-kaardile"</string>
- <string name="moving" msgid="6431016143218876491">"Teisaldamine"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Teine üleviimine on juba pooleli."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Ei ole piisavalt ruumi."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Rakendust ei ole olemas."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Seadme administraatori rakendust ei saa installida välisele andmekandjale"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Kas peatada sunniviisiliselt?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Kui sunnite rakenduse peatuma, võib see valesti käituda."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Ei saa rakendust teisaldada. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Eelistatud installiasukoht"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Muutke uute rakenduste eelistatud installiasukohta"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Kas keelata sisseeh. rakendus?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Keela rakendus"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Rakenduse keelamisel ei pruugi Android ja muud rakendused enam ootuspäraselt töötada."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Kas kustutada andmed ja keelata rakendus?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Rakenduse keelamisel ei pruugi Android ja muud rakendused enam ootuspäraselt töötada. Ka teie andmed kustutatakse."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Kas lülitada teatised välja?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Kui lülitate selle rakenduse teatised välja, võivad olulised märguanded ja värskendused märkamata jääda."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Pood"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Rakenduse üksikasjad"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Rakendus installiti poest <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Kasuta teenust"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Kasuta värvikorrigeerimist"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Kasuta tiitreid"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Jätka"</string>
<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="6371077608778830020">"Kuuldeaparaadi lisamine"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Kui piirate rakenduse tegevust taustal, võib rakendus valesti käituda."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Kuna rak. pole aku optimeerimine seadistatud, ei saa te seda piirata.\n\nRak. piiramiseks lülit. esmalt sisse aku optimeerimine."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Ekraani kasutus alates täislaadimisest"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Ekraani energiatarve"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobiilivõrgustiku skannimine"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Akukasutus alates täislaadimisest"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Ekraani töötamise aeg alates viimasest täislaadimisest"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Seadme kasutus alates viimasest täislaadimisest"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Kasuta detaile"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Reguleerige energiakasutust"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Kaasnevad paketid"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Akut kulutavad rakendused"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Seadme ärkvel hoidmine"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Seadme äratamine taustal"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Asukohateabe sage taotlemine"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> valesti käituvat rakendust"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Rakendused töötavad tavapäraselt"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon kasutab akut taustal tavapärases ulatuses"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tahvelarvuti kasutab akut taustal tavapärases ulatuses"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Akukasutust piiratakse %1$d rakenduse jaoks</item>
<item quantity="one">Akukasutust piiratakse %1$d rakenduse jaoks</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Piiratud <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Need rakendused kasutavad taustal akut. Piiratud rakendused ei pruugi korralikult töötada ja märguanded võivad viibida."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Akuhalduri kasutamine"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Tuvasta, kui rakendused kurnavad akut"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Tühista"</string>
<string name="tts_reset" msgid="2661752909256313270">"Lähtesta"</string>
<string name="tts_play" msgid="2628469503798633884">"Esita"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Toite juhtimine"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"WiFi-seade värskendamine"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetoothi seade värskendamine"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"sees"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"väljas"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"sisselülitamine"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"väljalülitamine"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"WiFi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Asukoht"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sünkroonimine"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Heledus <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automaatne"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"täielik"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"poolik"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"väljas"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Mandaatide salvestusruum"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Salvestusseadmelt installimine"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Vali kõik"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Andmekasutus"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Rakenduste andmekasutus"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobiilne andmeside, WiFi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operaatori andmemahuarvestus võib erineda seadme omast"</string>
<string name="data_usage_app" msgid="4970478397515423303">"Rakenduse kasutamine"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"RAKENDUSTE TEAVE"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Kuva %d peidetud üksust</item>
<item quantity="one">Kuva %d peidetud üksus</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Ahenda"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Võrk ja Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiil"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"andmekasutus"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Rakendused ja märguanded"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Load, vaikerakendused"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Tööprofiilil pole märguannete juurdepääs rakenduste puhul saadaval."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Kontod"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Kontosid pole lisatud"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Vaikerakendused"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Keeled, aeg, varundamine, värskendused"</string>
<string name="search_results_title" msgid="1796252422574886932">"Seaded"</string>
- <string name="search_menu" msgid="6283419262313758339">"Otsige seadetest"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, võrguühendus, internet, juhtmeta, andmed, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, WiFi, lüliti, juhtimine"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"tekstsõnum, tekstsõnumi saatmine, sõnumid, sõnumside, vaikeseade"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"maksa, puuduta, maksed"</string>
<string name="keywords_backup" msgid="470070289135403022">"varukoopia, varundamine"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"liigutus"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"nägu, avamine, autentimine, sisselogimine"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl-i versioon, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"võrk, mobiilsidevõrgu olek, teenuse olek, signaali tugevus, mobiilsidevõrgu tüüp, rändlus, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"seerianumber, riistvaraversioon"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tume teema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"viga"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Säästlik ekraan, lukustuskuva ekraan"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"lukustuskuva märguanne"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"nägu"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"sõrmejälg"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ekraani hämardamine, puuteekraan, aku, nutikas heledus, dünaamiline heledus"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Kui sisestate PIN-koodi seadme käivitamiseks, siis pole juurdepääsetavusteenused (nagu <xliff:g id="SERVICE">%1$s</xliff:g>) saadaval."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Kui sisestate mustri seadme käivitamiseks, siis pole juurdepääsetavusteenused (nagu <xliff:g id="SERVICE">%1$s</xliff:g>) saadaval."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Kui sisestate parooli seadme käivitamiseks, siis pole juurdepääsetavusteenused (nagu <xliff:g id="SERVICE">%1$s</xliff:g>) saadaval."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Märkus. Pärast taaskäivitamist ei saa see rakendus käivituda enne, kui olete telefoni avanud"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Märkus. Kui telefoni taaskäivitate ja määratud on ekraanilukk, ei saa see rakendus käivituda enne, kui olete telefoni avanud"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI teave"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI suhteline teave"</string>
<string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. pesa)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Isiklik"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Töö"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Rakendused: kõik"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Rakendused: välja lülitatud"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Välja lülitatud"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategooriad: kiireloomuline"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategooriad: vähetähtis"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategooriad: välja lülitatud"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Teated kasutuse kohta"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Kuva seadme kogu kasutusteave"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Kuva rakenduse kasutusteave"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Suur kasutus"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> rakendust käitub ebatavaliselt</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> käitub ebatavaliselt</item>
@@ -3666,7 +3637,7 @@
<string name="running_frequency" msgid="6622624669948277693">"Sagedus"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Maksimaalne kasutus"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Andmeid pole kasutatud"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Kas lubada rakenduse <xliff:g id="APP">%1$s</xliff:g> juurdepääs funktsioonile Mitte segada?"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Rakenduse <xliff:g id="APP">%1$s</xliff:g> juurdepääs funktsioonile Mitte segada"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Rakendus saab funktsiooni Mitte segada sisse/välja lülitada ja muuta sellega seotud seadeid."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Peab jääma sisselülitatud asendisse, kuna juurdepääs märguannetele on sisse lülitatud"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Kas tühistada rakenduse <xliff:g id="APP">%1$s</xliff:g> juurdepääs režiimile Mitte segada?"</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Sisemine salvestusruum: <xliff:g id="PERCENTAGE">%1$s</xliff:g> kasutatud, <xliff:g id="FREE_SPACE">%2$s</xliff:g> vaba"</string>
<string name="display_summary" msgid="6737806235882127328">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetut olekut lülitatakse unerežiimi"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Taustapilt, unerežiim, fondi suurus"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Lülita unerežiimi pärast 10-minutilist tegevuseta olekut"</string>
<string name="memory_summary" msgid="8080825904671961872">"Keskmiselt on kasutusel <xliff:g id="USED_MEMORY">%1$s</xliff:g> mälu <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>-st"</string>
<string name="users_summary" msgid="1674864467098487328">"Sisse logitud kasutajana <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-id ei ole lubatud"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kaamera ei ole lubatud"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Ekraanipildi tegemine ei ole lubatud"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Varundamist ei saa välja lülitada"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Seda rakendust ei saa avada"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Küsimuste korral võtke ühendust IT-administraatoriga"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Rohkem üksikasju"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Modelleeri ekraani väljalõikega"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Puudub"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Seadme vaikeseade"</string>
<string name="special_access" msgid="3458780842491881155">"Rakenduste erijuurdepääs"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> rakendusel on piiranguteta juurdepääs andmesidele</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ühendatud seadmega <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ühendatud mitme seadmega"</string>
<string name="demo_mode" msgid="2798762752209330277">"Süsteemi kasutajaliidese demorežiim"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Öörežiim"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Öörežiimi määramine"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Tume režiim"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Tumeda režiimi määramine"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Arendaja kiirseadete paanid"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Tööprofiili seaded"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktiotsing"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Lubage organisatsioonile helistajate ja kontaktide tuvastamiseks kontaktiotsingud"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefoni kontrollimiseks topeltpuudutamine"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Topeltpuudutage tahvelarvuti kontrollimiseks"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Topeltpuudutage seadme kontrollimiseks"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Kellaaja, märguandeikoonide ja muu teabe vaatamiseks topeltpuudutage ekraani."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Kellaaja, märguannete ja muu teabe vaatamiseks topeltpuudutage oma ekraani."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefoni kontrollimiseks tõstmine"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tahvelarvuti kontrollimiseks tõstke seda"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Seadme kontrollimiseks tõstke seda"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Kellaaja, märguandeikoonide ja muu teabe vaatamiseks võtke telefon kätte."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Kellaaja, märguandeikoonide ja muu teabe vaatamiseks võtke tahvelarvuti kätte."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Kellaaja, märguandeikoonide ja muu teabe vaatamiseks võtke seade kätte."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Ekraani äratamine"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Kellaaja, märguannete ja muu teabe vaatamiseks võtke telefon kätte."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Kellaaja, märguannete ja muu teabe vaatamiseks võtke tahvelarvuti kätte."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Kellaaja, märguannete ja muu teabe vaatamiseks võtke seade kätte."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Äratuslukuekraani liigutus"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Sõrmejälje pühkimine märguannete vaatamiseks"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Sõrmejälje pühkimine"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Märguannete kontrollimiseks pühkige telefoni tagaküljel oleval sõrmejäljeanduril alla."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> katset</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> katse</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Selle seadme andmeid varundatakse"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Seda seadet haldab teie organisatsioon."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Seda seadet haldab <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Automaattäite teenus"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automaatne, täide, automaattäide"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Veenduge, et rakendus oleks usaldusväärne</b> <br/> <br/> <xliff:g id=app_name example=Google\'i automaatne täitmine>%1$s</xliff:g> kasutab automaatse täitmise sisestuse määramiseks ekraanil kuvatut."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automaattäide"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Logimistase"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Max taotluste arv seansi kohta"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Max nähtavate andmekomplektide arv"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Vaikeväärtustele lähtestamine"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Arendaja automaattäite valikud on lähtestatud"</string>
<string name="device_theme" msgid="4571803018917608588">"Seadme teema"</string>
<string name="default_theme" msgid="7085644992078579076">"Vaikeseade"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Võrgu nimi"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operaatori ettevalmistamise päästik"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Värskendage režiimi Mitte segada"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Keskendumiseks peatage märguanded"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Mis on uut ja põnevat?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tutvuge oma uue telefoniga"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutvuge oma uue tahvelarvutiga"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tutvuge oma uue seadmega"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Sellel seadmel pole see funktsioon saadaval"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Jõusta GNSS-i täielikud mõõtmistulemused"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Jälgi kõiki GNSS-i radu ja sagedusi ilma töötsüklita"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Kuva alati kokkujooksmise dialoog"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Dialoog kuvatakse alati, kui rakendus kokku jookseb"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Valige rakendus, milles ANGLE on lubatud"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Seadistatud pole ühtegi rakendust, milles ANGLE on lubatud"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Rakendus, milles ANGLE on lubatud: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Juurdepääs kaustale"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"juurdepääs kataloogile"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Võrgu üksikasjad"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Teie seadme nimi on telefonis rakendustele nähtav. Bluetoothi seadmetega ühendamisel või WiFi-pääsupunkti loomisel võivad seda näha ka teised inimesed."</string>
<string name="devices_title" msgid="7701726109334110391">"Seadmed"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Kõik seaded"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Soovitused"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-i andmed"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-i andmed"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Vali võrk"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Ühendus on katkestatud"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Ühendatud"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Ühendamine …"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Ühendust ei saanud luua"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Võrke ei leitud."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Võrke ei õnnestunud leida. Proovige uuesti."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(keelatud)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM-kaarti pole"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Täpsem helistamine"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Eelistatud võrgurežiim: eelistatud WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Eelistatud võrgurežiim: ainult GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Eelistatud võrgurežiim: ainult WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Eelistatud võrgurežiim: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Eelistatud võrgurežiim: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Eelistatud võrgurežiim: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Eelistatud võrgurežiim: ainult CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Eelistatud võrgurežiim: ainult EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Eelistatud võrgurežiim: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Eelistatud võrgurežiim: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Eelistatud võrgurežiim: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Eelistatud võrgurežiim: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Eelistatud võrgurežiim: üldine"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Eelistatud võrgurežiim: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Eelistatud võrgurežiim: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Eelistatud võrgurežiim: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Eelistatud võrgurežiim: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Eelistatud võrgurežiim: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Eelistatud võrgurežiim: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Eelistatud võrgurežiim: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Eelistatud võrgurežiim: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Eelistatud võrgurežiim: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Eelistatud võrgurežiim: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Eelistatud võrgurežiim: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Eelistatud võrgurežiim: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Eelistatud võrgurežiim: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (soovitatav)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (soovitatav)"</string>
+ <string name="network_global" msgid="959947774831178632">"Üldine"</string>
+ <string name="label_available" msgid="1731547832803057893">"Saadaolevad võrgud"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Otsimine …"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registreerimine võrgus <xliff:g id="NETWORK">%s</xliff:g> …"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Teie SIM-kaart ei võimalda ühendust selle võrguga."</string>
+ <string name="connect_later" msgid="978991102125216741">"Võrguga ei saa praegu ühendust. Proovige hiljem uuesti."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Võrgus registreeritud."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Vali võrk automaatselt"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operaatori seaded"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Andmesideteenuse seadistamine"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobiilne andmeside"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Andmesideühendus mobiilsidevõrgu abil"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Eelistatud võrgutüüp"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Võrgu töörežiimi muutmine"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Eelistatud võrgutüüp"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operaator"</string>
+ <string name="call_category" msgid="8108654745239563833">"Helistamine"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operaatori videokõne"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Süsteemi valimine"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA-rändlusrežiimi muutmine"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Süsteemi valimine"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Võrk"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Võrk"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA-tellimus"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM-i ja NV vahetamine"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"tellimus"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automaatne registreerimine …"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Kas lubada andmeside rändlus?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Hinnakirja küsige oma võrguteenuse pakkujalt."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Rakenduse andmekasutus"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Võrgu režiim <xliff:g id="NETWORKMODEID">%1$d</xliff:g> on sobimatu. Eirake seda."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Pole saadaval, kui on ühendus on loodud operaatoriga <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Kuva rohkem"</string>
+ <string name="see_less" msgid="1250265310929558370">"Kuva vähem"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Ühendatud seadmeid pole"</string>
</resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index b25cf64..e33d1a1 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tratatu sare mugatu gisa"</item>
<item msgid="2266114985518865625">"Tratatu mugatu gabeko sare gisa"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Lehenetsia (erabili ausaz aukeratutako MAC helbidea)"</item>
+ <item msgid="5398461510512959597">"Fidagarria"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ez"</item>
<item msgid="3863157480502955888">"Bai"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Beti aktibatuta"</item>
<item msgid="6385301106124765323">"Beti desaktibatuta"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Desaktibatuta"</item>
+ <item msgid="2182686878828390312">"Arazketa"</item>
+ <item msgid="5286514712714822064">"Xehatua"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Etxekoak soilik"</item>
+ <item msgid="5034813753274486448">"Automatikoa"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA hobetsita"</item>
+ <item msgid="807926878589867564">"GSM soilik"</item>
+ <item msgid="488474605709912156">"WCDMA soilik"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automatikoa"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automatikoa"</item>
+ <item msgid="370391313511477301">"EvDo gabeko CDMA"</item>
+ <item msgid="4678789463133969294">"EvDo soilik"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Orokorrak"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA soilik"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Orokorrak"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 9c6317e..18491e0 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Sortu"</string>
<string name="allow" msgid="3349662621170855910">"Baimendu"</string>
<string name="deny" msgid="6947806159746484865">"Ukatu"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Itxi"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Aldatu"</string>
<string name="device_info_default" msgid="7847265875578739287">"Ezezaguna"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> urrats falta zaizkizu garatzaile izateko.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Ez dago zertan, dagoeneko garatzailea zara."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Lehendabizi, gaitu garatzaileen aukerak."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Hari gabekoak eta sareak"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Konexioak"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Gailua"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Pertsonalak"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Sarbidea"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Gaitu datu-konexioa"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desgaitu datu-konexioa"</string>
@@ -88,7 +82,7 @@
<string name="font_size_preview_text_headline" msgid="7955317408475392247">"Testu-lagina"</string>
<string name="font_size_preview_text_title" msgid="1310536233106975546">"Ozeko azti miragarria"</string>
<string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"11. kapitulua: Esmeraldazko Oz hiri harrigarria"</string>
- <string name="font_size_preview_text_body" msgid="2846183528684496723">"Begiak betaurreko berdeekin babestuta bazituzten ere, Dorothy eta bere lagunak txundituta geratu ziren Hiri zoragarri haren distira lehenbizikoz ikustean. Kaleak etxe ederrez josita zeuden; marmol berdezkoak ziren, eta esmeralda distiratsuz zeuden apainduta. Marmol berde hartaz egindako espaloian ibili ziren, eta lauzen junturak esmeraldazko errenkadak zirela nabaritu zuten, bata bestearen ondoan estu-estu jarriak, eguzkitan dir-dir egiten. Leihoen kristalak berdeak ziren. Hiria estaltzen zuen zeruak kutsu berdea zuen, eta berdeak ziren eguzki-izpiak ere. \n\nJende asko zebilen hara eta hona: gizonak, emakumeak eta haurrak, guztiak berdez jantziak eta azal berdexkakoak. Zalantzaz begiratzen zieten Dorothyri eta bere lagun talde xelebreari, eta haurrak amaren atzean ezkutatzen ziren lehoia ikusi bezain laster. Hala ere, inork ez zien txintik ere esan. Denda asko zeuden kalean, eta salgai guztiak berdeak zirela antzeman zuen Dorothyk. Gozoki berdeak eta krispeta berdeak eros zitezkeen, baita zapata berdeak, kapela berdeak eta askotariko jantzi berdeak ere. Gizon bat limonada berdea saltzen ari zen, eta haur batzuek erosi ziotenean, txanpon berdeekin ordaindu zutela ikusi zuen Dorothyk. \n\nEz zegoen zaldirik edo inolako animaliarik; gizonek orgatxo berdeak bultzatuta eramaten zituzten gauzak batetik bestera. Denak zeuden pozik, alai eta zoriontsu."</string>
+ <string name="font_size_preview_text_body" msgid="2846183528684496723">"Begiak betaurreko berdeekin babestuta bazituzten ere, Dorothy eta haren lagunak txundituta geratu ziren Hiri zoragarri haren distira lehenbizikoz ikustean. Kaleak etxe ederrez josita zeuden; marmol berdezkoak ziren, eta esmeralda distiratsuz zeuden apainduta. Marmol berde hartaz egindako espaloian ibili ziren, eta lauzen junturak esmeraldazko errenkadak zirela nabaritu zuten, bata bestearen ondoan estu-estu jarriak, eguzkitan dir-dir egiten. Leihoen kristalak berdeak ziren. Hiria estaltzen zuen zeruak kutsu berdea zuen, eta berdeak ziren eguzki-izpiak ere. \n\nJende asko zebilen hara eta hona: gizonak, emakumeak eta haurrak, guztiak berdez jantziak eta azal berdexkakoak. Zalantzaz begiratzen zieten Dorothyri eta haren lagun talde xelebreari, eta haurrak amaren atzean ezkutatzen ziren lehoia ikusi bezain laster. Hala ere, inork ez zien txintik ere esan. Denda asko zeuden kalean, eta salgai guztiak berdeak zirela antzeman zuen Dorothyk. Gozoki berdeak eta krispeta berdeak eros zitezkeen, baita zapata berdeak, kapela berdeak eta askotariko jantzi berdeak ere. Gizon bat limonada berdea saltzen ari zen, eta haur batzuek erosi ziotenean, txanpon berdeekin ordaindu zutela ikusi zuen Dorothyk. \n\nEz zegoen zaldirik edo inolako animaliarik; gizonek orgatxo berdeak bultzatuta eramaten zituzten gauzak batetik bestera. Denak zeuden pozik, alai eta zoriontsu."</string>
<string name="font_size_save" msgid="3450855718056759095">"Ados"</string>
<string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB memoria"</string>
<string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD txartela"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Gailuaren Bluetooth helbidea: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatu nahi duzu?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Igorpena"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Izenik gabeko Bluetooth gailua"</string>
<string name="progress_scanning" msgid="192587958424295789">"Bilatzen"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Ez da Bluetooth gailurik aurkitu inguruan."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Aplikazio batek Bluetooth konexioa aktibatu eta telefonoa beste gailu batzuen aurrean ikusgai ezarri nahi du. Bluetooth ezarpenetan alda dezakezu hori geroago."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetootha aktibatzen…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetootha desaktibatzen…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Konexio automatikoa"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth bidez konektatzeko eskaera"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" gailura konektatzeko, sakatu hau."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" gailura konektatu nahi duzu?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Deitzeko balio duten gailu erabilgarriak"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Konektatuta daudenak"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Gordetako gailuak"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Gehitu gailu bat"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth konexioa aktibatuko da parekatu ahal izateko"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Konexio-hobespenak"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Aurrez konektatutako gailuak"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Aurretik konektatutakoak"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Aktibatu da Bluetooth konexioa"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Ikusi guztiak"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data eta ordua"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Aukeratu ordu-zona"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Saltatu"</string>
<string name="next_label" msgid="4693520878012668114">"Hurrengoa"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Hizkuntzak"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Hizkuntza-hobespenak"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Kendu"</string>
<string name="add_a_language" msgid="2330538812283783022">"Gehitu hizkuntza bat"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Ezarpenak"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Ezarpenen lasterbidea"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Hegaldi modua"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Gehiago"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Hari gabeko konexioak eta sareak"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Kudeatu Wi-Fia, Bluetootha, hegaldi modua, sare mugikorrak eta VPNak"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Datu-konexioa"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Pribatutasuna"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Administratzaileak desgaitu du"</string>
<string name="security_status_title" msgid="5848766673665944640">"Segurtasunaren egoera"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Pantailaren blokeoa, aurpegiaren bidez desblokeatzea"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Pantailaren blokeoa, hatz-marka"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Pantailaren blokeoa"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Gehitu da aurpegia"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Desblokeatu aurpegiarekin"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Erabili aurpegia autentifikatzeko"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Erabili aurpegia telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Erabili aurpegia"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Erabili aurpegia telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: ezin duzu aurpegia erabili gailu hau desblokeatzeko. Informazio gehiago lortzeko, jarri zure erakundearen administratzailearekin harremanetan."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Erabili aurpegia telefonoa desblokeatzeko, erosketak baimentzeko edo aplikazioetan saioa hasteko"</string>
- <string name="face_add_max" msgid="2342250989212694454">"<xliff:g id="COUNT">%d</xliff:g> hartz-marka gehi ditzakezu gehienez"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Zentratu aurpegia zirkuluan"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Egin geroago"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"<xliff:g id="COUNT">%d</xliff:g> aurpegi gehi ditzakezu"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Iritsi zara onartzen den gehieneko aurpegi kopurura"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Ezin duzu gehitu beste aurpegirik"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Ezin izan da erregistratu"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Ados"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Aurpegiak erregistratzeko denbora-muga gainditu da. Saiatu berriro."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Ezin izan da erregistratu aurpegia."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Dena prest. Itxura ona du."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Eginda"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Erabili aurpegia hauetarako:"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Desblokeatu gailua"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Aplikazioetan saioa hastea eta ordainketak"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Desblokeatzeko, ireki begiak"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Aurpegiaren bidez autentifikatzeko, ireki begiak"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Kendu aurpegiaren datuak"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Hobetu aurpegiaren datuak"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Gailua desblokeatzeko eta aplikazioetan sartzeko erabil dezakezu aurpegia. "<annotation id="url">"Lortu informazio gehiago"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Hatz-marka digitala"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Kudeatu hatz-markak"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Hatz-marken erabilera"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Aukeratu gutxienez banda bat Wi-Fi sare publikorako:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ezarpenak"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Pribatutasuna"</string>
<string name="wifi_shared" msgid="844142443226926070">"Partekatu gailuaren gainerako erabiltzaileekin"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(aldatu gabea)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Hautatu"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Utzi"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Sarea ahaztu nahi al duzu?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Sare honen pasahitz guztiak ezabatuko dira"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Gordetako sareak"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d sare</item>
<item quantity="one">1 sare</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Distira"</string>
<string name="brightness_summary" msgid="838917350127550703">"Doitu pantailaren distira"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Distira doigarria"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Aktibatuta"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Desaktibatuta"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Oso txikia da distira-maila hobetsia"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Txikia da distira-maila hobetsia"</string>
@@ -1123,7 +1129,7 @@
<string name="auto_brightness_description" msgid="7310335517128283729">"Pantailaren distira automatikoki doituko da inguruneko argiaren eta egiten ari zarenaren arabera. Eskuz aldatu nahi baduzu distira, mugitu graduatzailea distira doigarriak zure hobespenak ikas ditzan."</string>
<string name="night_display_title" msgid="2626451512200357686">"Gaueko argia"</string>
<string name="night_display_text" msgid="1837277457033025056">"Gaueko argiak tindu horikaraz janzten du pantaila. Horrela, ez zaizu horren nekagarria egingo argi gutxirekin pantailari begira egotea eta errazago hartuko duzu lo, gainera."</string>
- <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programazioa"</string>
+ <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ordutegia"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Bat ere ez"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Ordu jakinetan aktibatzen da"</string>
<string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Iluntzetik egunsentira aktibatzen da"</string>
@@ -1143,8 +1149,8 @@
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"Desaktibatu"</string>
<string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Aktibatu egunsentira arte"</string>
<string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Desaktibatu ilunabarrera arte"</string>
- <string name="night_display_activation_on_custom" msgid="5472029024427933598">"Aktibatu <xliff:g id="ID_1">%1$s</xliff:g> arte"</string>
- <string name="night_display_activation_off_custom" msgid="6169984658293744715">"Desaktibatu <xliff:g id="ID_1">%1$s</xliff:g> arte"</string>
+ <string name="night_display_activation_on_custom" msgid="5472029024427933598">"Aktibatu <xliff:g id="ID_1">%1$s</xliff:g>(a)k arte"</string>
+ <string name="night_display_activation_off_custom" msgid="6169984658293744715">"Desaktibatu <xliff:g id="ID_1">%1$s</xliff:g>(a)k arte"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Ezarri egonean moduan"</string>
<string name="screen_timeout_title" msgid="5130038655092628247">"Pantaila itzaltzen da"</string>
<string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Ezin da PINa aldatu.\nAgian PINa okerra da."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIMaren PINa behar bezala aldatu da"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Ezin da SIM txartelaren blokeo-egoera aldatu.\nAgian PINa okerra da."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Ezin da desgaitu PIN kodea."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Ezin da gaitu PIN kodea."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Ados"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Utzi"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Hainbat SIM txartel aurkitu dira"</string>
@@ -1372,13 +1380,13 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Hori egiteko, <xliff:g id="NAME_0">^1</xliff:g> formateatu egin behar da. \n\n"<b>"Formateatuz gero, <xliff:g id="NAME_1">^1</xliff:g> gailuko datu guztiak ezabatuko dira."</b>" Datuak ez galtzeko, babeskopiak egitea gomendatzen dugu."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ezabatu eta formateatu"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> formateatzen…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Formateatzen ari den bitartean, ez kendu <xliff:g id="NAME">^1</xliff:g>."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Formateatzen ari den bitartean, ez atera <xliff:g id="NAME">^1</xliff:g>."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Eraman datuak memoria berrira"</string>
- <string name="storage_wizard_migrate_body" msgid="890751699549542345">"Argazkiak, fitxategiak eta zenbait aplikazio ekar ditzakezu <xliff:g id="NAME">^1</xliff:g> memoria-unitate berrira. \n\nTransferentzia-prozesuak <xliff:g id="TIME">^2</xliff:g> irauten du gutxi gorabehera, eta <xliff:g id="SIZE">^3</xliff:g> askatuko ditu barneko memoriatik. Aplikazio batzuek ez dute funtzionatuko transferentzia egiten ari den bitartean."</string>
+ <string name="storage_wizard_migrate_body" msgid="890751699549542345">"Argazkiak, fitxategiak eta zenbait aplikazio ekar ditzakezu <xliff:g id="NAME">^1</xliff:g> memoria-unitate berrira. \n\nTransferentzia-prozesuak <xliff:g id="TIME">^2</xliff:g> irauten du gutxi gorabehera, eta barneko memorian <xliff:g id="SIZE">^3</xliff:g> utziko dira libre. Aplikazio batzuek ez dute funtzionatuko transferentzia egiten ari den bitartean."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mugitu orain"</string>
<string name="storage_wizard_migrate_later" msgid="3173482328116026253">"Mugitu geroago"</string>
<string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"Mugitu datuak"</string>
- <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"<xliff:g id="TIME">^1</xliff:g> inguru beharko dira datuak migratzeko. <xliff:g id="SIZE">^2</xliff:g> askatuko ditu <xliff:g id="NAME">^3</xliff:g> gailutik."</b></string>
+ <string name="storage_wizard_migrate_confirm_body" msgid="4212060581792135962"><b>"<xliff:g id="TIME">^1</xliff:g> inguru beharko dira datuak migratzeko. <xliff:g id="NAME">^3</xliff:g> gailuan <xliff:g id="SIZE">^2</xliff:g> utziko dira libre."</b></string>
<string name="storage_wizard_migrate_confirm_next" msgid="5509475628423823202">"Mugitu"</string>
<string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"Datuak mugitzen…"</string>
<string name="storage_wizard_migrate_details" msgid="3709728824651136227">"Transferentzia egiten den bitartean: \n• Ez kendu <xliff:g id="NAME">^1</xliff:g> memoria. \n• Aplikazio batzuek ez dute ongi funtzionatuko. \n• Gailuak kargatuta egon behar du."</string>
@@ -1618,7 +1626,7 @@
<string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Pasahitza ezarri da."</string>
<string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PINa ezarri da"</string>
<string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Eredua ezarri da."</string>
- <string name="lockpassword_choose_your_password_header_for_face" msgid="7876621019688907534">"Ezarri aurpegi bidezko autentifikazioaren pasahitza"</string>
+ <string name="lockpassword_choose_your_password_header_for_face" msgid="7876621019688907534">"Ezarri aurpegi bidezko autent. pasahitza"</string>
<string name="lockpassword_choose_your_pattern_header_for_face" msgid="8070525076987585344">"Ezarri aurpegi bidezko autentifikazioaren eredua"</string>
<string name="lockpassword_choose_your_pin_header_for_face" msgid="7304398683609714816">"Ezarri aurpegi bidezko autentifikazioaren PIN kodea"</string>
<string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"Aurrera egiteko, marraztu gailuaren eredua"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Instalatuta"</string>
<string name="no_applications" msgid="7336588977497084921">"Ez dago aplikaziorik."</string>
<string name="internal_storage" msgid="1584700623164275282">"Barneko memoria"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"barneko memoria"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB memoria"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD txartelaren memoria"</string>
<string name="recompute_size" msgid="7722567982831691718">"Tamaina berriro kalkulatzen…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Aplikazioen datuak ezabatu?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Aplikazioaren datu guztiak betiko ezabatuko dira; besteak beste, fitxategi, ezarpen, kontu, datu-base eta abar guztiak."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Ez da aplikazioa aurkitu instalatutako aplikazioen zerrendan."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Ezin izan da garbitu aplikazioaren biltegia."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Aplikazioak tabletaren elementu hauek atzi ditzake:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Aplikazioak telefonoaren elementu hauek atzi ditzake:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Aplikazioak zure tabletaren elementu hauek atzi ditzake. Errendimendua hobetzeko eta memoria-erabilera murrizteko, baimen horietako batzuk <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> aplikaziorako ere erabilgarri daude, <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> aplikazioen prozesu bera exekutatzen duelako:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Aplikazioak zure telefonoaren elementu hauek atzi ditzake. Errendimendua hobetzeko eta memoria-erabilera murrizteko, baimen horietako batzuk <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> aplikaziorako ere erabilgarri daude, <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> aplikazioen prozesu bera exekutatzen duelako:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> eta <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Baliteke aplikazioak dirua kobratzea:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Bidali premium SMSa"</string>
<string name="computing_size" msgid="1599186977475211186">"Kalkulatzen…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Ezin izan da paketearen tamaina kalkulatu."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Ez duzu hirugarrenen aplikaziorik instalatuta."</string>
<string name="version_text" msgid="9189073826278676425">"<xliff:g id="VERSION_NUM">%1$s</xliff:g> bertsioa"</string>
<string name="move_app" msgid="5042838441401731346">"Eraman"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Eraman tabletara"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Eraman telefonora"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Eraman USB memoriara"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Eraman SD txartelera"</string>
- <string name="moving" msgid="6431016143218876491">"Eramaten"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Beste migrazio bat abian da dagoeneko."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Ez dago behar adina memoria."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplikazioa ez dago."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Gailua administratzeko aplikazioa ezin da instalatu kanpoko euskarri batean"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Gelditzera behartu?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Aplikazioak gelditzera behartzen badituzu, baliteke behar bezala ez funtzionatzea."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Ezin izan da aplikazioa eraman. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Instalazioaren kokapen hobetsia"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Aldatu aplikazio berrien instalazio-kokapen hobetsia"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Aplikazio integratua desgaitu?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Desgaitu aplikazioa"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Aplikazioa desgaitzen baduzu, baliteke Android-ek eta beste aplikazio batzuek behar bezala ez funtzionatzea."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Datuak ezabatu eta aplikazioa desgaitu?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Aplikazioa desgaitzen baduzu, baliteke Android-ek beste aplikazio batzuek behar bezala ez funtzionatzea. Datuak ezabatu egingo dira."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Jakinarazpenak desaktibatu nahi dituzu?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Aplikazioaren jakinarazpenak desaktibatzen badituzu, alerta eta eguneratze garrantzitsuak gal ditzakezu."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Denda"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Aplikazioaren xehetasunak"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> dendatik instalatu da aplikazioa"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Erabili zerbitzua"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Erabili koloreen zuzenketa"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Erabili azpitituluak"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Egin aurrera"</string>
<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="6371077608778830020">"Gehitu audiofonoa"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Aplikazio baten atzeko planoko jarduerak mugatzen badituzu, baliteke aplikazioak behar bezala ez funtzionatzea"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplikazio hau bateria optimizatzeko konfiguratuta ez dagoenez, ezin duzu mugatu.\n\nMugatzeko, aktibatu bateriaren optimizazioa."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Pantailaren erabilera gailua guztiz kargatu zenetik"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Pantailaren kontsumoa"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Sare mugikorra bilatzen"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Bateriaren erabilera gailua guztiz kargatu zenetik"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Gailua guztiz kargatu zenetik pantaila piztuta egon den denbora"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Gailuaren erabilera hura guztiz kargatu zenetik"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Erabilera-xehetasunak"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Doitu energia-erabilera"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Sartutako paketeak"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Bateria asko kontsumitzen ari diren aplikazioak"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Zerbaitek aktibo mantendu du gailua"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Zerbait gailua esnarazten aritu da atzeko planoan"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Gailua sarriegi ari da eskatzen kokapena"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikazio ez dira ari behar bezala funtzionatzen"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikazioak ohiko moduan dabiltza"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefonoak ohiko bateria kantitatea erabiltzen du atzeko planoan"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tabletak ohiko bateria kantitatea erabiltzen du atzeko planoan"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d aplikazioren bateria-erabilera mugatzen</item>
<item quantity="one">%1$d aplikazioren bateria-erabilera mugatzen</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Mugatze-data: <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Aplikazio hauek bateria erabiltzen aritu dira atzeko planoan. Baliteke aplikazio mugatuek behar bezala ez funtzionatzea eta jakinarazpenak atzeratzea."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Erabili bateria-kudeatzailea"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Hauteman aplikazioak bateria agortzen ari direla"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Utzi"</string>
<string name="tts_reset" msgid="2661752909256313270">"Berrezarri"</string>
<string name="tts_play" msgid="2628469503798633884">"Erreproduzitu"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Energiaren kontrola"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi ezarpena eguneratzen"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ezarpena eguneratzea"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"aktibatuta"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"desaktibatuta"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"aktibatzen"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"desaktibatzen"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Kokapena"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinkronizazioa"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Distira <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatikoa"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"beteta"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"erdia"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"desaktibatuta"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Kredentzialen biltegia"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalatu biltegitik"</string>
@@ -2492,7 +2463,7 @@
<string name="adding_profile_owner_warning" msgid="1354474524852805802">"Aurrera eginez gero, administratzaileak kudeatuko dizu erabiltzaile-kontua, eta erlazionatutako datuak gorde ahal izango ditu zure datu pertsonalez gain.\n\nEra berean, erabiltzaile-kontu honekin erlazionatutako ezarpenak, sarbidea, aplikazioak eta datuak gainbegiratu eta kudeatu ahal izango ditu (esaterako, sareko jarduerak), baita gailuaren kokapen-informazioa ere."</string>
<string name="admin_disabled_other_options" msgid="7712694507069054530">"Gainerako aukerak desgaitu egin ditu administratzaileak"</string>
<string name="admin_more_details" msgid="7901420667346456102">"Xehetasun gehiago"</string>
- <string name="sound_category_sound_title" msgid="1488759370067953996">"Orokorra"</string>
+ <string name="sound_category_sound_title" msgid="1488759370067953996">"Orokorrak"</string>
<string name="notification_log_title" msgid="3766148588239398464">"Jakinarazpenen erregistroa"</string>
<string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Tonua eta dardara"</string>
<string name="sound_category_system_title" msgid="1480844520622721141">"Sistema"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Hautatu guztiak"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Datuen erabilera"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Aplik. datuen erabilera"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Datu-konexioa eta Wi‑Fi konexioa"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Beharbada operadoreak zenbatzen duen datu kopurua eta gailuak zenbatzen duena ez datoz bat."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Aplikazioen erabilera"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APLIKAZIOEN INFORMAZIOA"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Erakutsi %d elementu ezkutu</item>
<item quantity="one">Erakutsi %d elementu ezkutu</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Tolestu"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Sareak eta Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mugikorra"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datuen erabilera"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikazioak eta jakinarazpenak"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Baimenak, aplikazio lehenetsiak"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Laneko profilaren aplikazioek ezin dituzte atzitu jakinarazpenak."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Kontuak"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Ez da gehitu konturik"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplikazio lehenetsiak"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Hizkuntzak, ordua, babeskopiak, eguneratzeak"</string>
<string name="search_results_title" msgid="1796252422574886932">"Ezarpenak"</string>
- <string name="search_menu" msgid="6283419262313758339">"Bilatu ezarpenetan"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, sareko konexioa, internet, haririk gabekoa, datuak, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, aldatu, kontrola"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"testu-mezua, testu-mezuak bidali, mezuak, mezularitza, lehenetsia"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ordaindu, ukitu, ordainketak"</string>
<string name="keywords_backup" msgid="470070289135403022">"babeskopia, segurtasun kopia"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"keinua"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"aurpegia, desblokeatzea, autentifikazioa, hasi saioa"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl bertsioa, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"sarea, sare mugikorraren egoera, zerbitzuaren egoera, seinalearen indarra, sare mugikor mota, ibiltaritza, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serie-zenbakia, hardwarearen bertsioa"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"gai iluna"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"akatsa"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Pantaila ilundua, pantaila blokeatuaren bistaratzea"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"pantaila blokeatuko jakinarazpena"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"aurpegia"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"hatz-marka"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ilundu pantaila, ukipen-pantaila, bateria, distira adimenduna, distira dinamikoa"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Gailua abiarazteko PIN kodea idazten duzunean, <xliff:g id="SERVICE">%1$s</xliff:g> bezalako erabilerraztasun-zerbitzuak ez dira erabilgarri egongo oraindik."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Gailua abiarazteko eredua marrazten duzunean, <xliff:g id="SERVICE">%1$s</xliff:g> bezalako erabilerraztasun-zerbitzuak ez dira erabilgarri egongo oraindik."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Gailua abiarazteko pasahitza idazten duzunean, <xliff:g id="SERVICE">%1$s</xliff:g> bezalako erabilerraztasun-zerbitzuak ez dira erabilgarri egongo oraindik."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Oharra: berrabiarazi ondoren, ezin izango da abiarazi aplikazio hau telefonoa desblokeatzen duzun arte"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Oharra: telefonoa berrabiarazten baduzu eta pantailaren blokeoa ezarrita badaukazu, ezin izango da abiarazi aplikazio hau telefonoa desblokeatzen duzun arte"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEIari buruzko informazioa"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEIari buruzko informazioa"</string>
<string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. zirrikitua)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Pertsonalak"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Lanekoak"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikazioak: guztiak"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikazioak: desaktibatutakoak"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Desaktibatuta"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategoriak: premiazkoak"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategoriak: garrantzi txikikoak"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategoriak: desaktibatutakoak"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Erabilera-alertak"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Erakutsi gailuaren erabilera guztia"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Erakutsi aplikazioaren erabilera"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Kontsumo handia"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikazio ez dira ari behar bezala funtzionatzen</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ez da ari behar bezala funtzionatzen</item>
@@ -3666,8 +3637,8 @@
<string name="running_frequency" msgid="6622624669948277693">"Maiztasuna"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Gehieneko erabilera"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Ez da erabili daturik"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> aplikazioari \"Ez molestatu\" egoerarako sarbidea baimendu nahi diozu?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikazioak \"Ez molestatu\" egoera aktibatu eta desaktibatu ahal izango du, eta horrekin erlazionatutako ezarpenetan aldaketak egin ahal izango ditu."</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> aplikazioari \"Ez molestatu\" modurako sarbidea eman?"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikazioak \"Ez molestatu\" egoera aktibatu eta desaktibatu ahal izango du, eta erlazionatutako ezarpenetan aldaketak egin ahal izango ditu."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Aktibatuta egon behar du, jakinarazpenetarako sarbidea aktibatuta dagoelako"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Ez molestatzeko arauetarako sarbidea kendu nahi diozu <xliff:g id="APP">%1$s</xliff:g> aplikazioari?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Kendu egingo dira aplikazioak sortu dituen ez molestatzeko arau guztiak."</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Barneko memoria: <xliff:g id="PERCENTAGE">%1$s</xliff:g> erabilita - <xliff:g id="FREE_SPACE">%2$s</xliff:g> libre"</string>
<string name="display_summary" msgid="6737806235882127328">"Lokartu <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Horma-papera, inaktibo ezartzea, letra-tipoaren tamaina"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Ezarri inaktibo hamar minutuan jarduerarik gabe egon ondoren"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="USED_MEMORY">%1$s</xliff:g> / <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> erabili dira batez beste"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> gisa hasi duzu saioa"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Ez da onartzen SMS mezuak bidaltzea"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Ez da onartzen kamera erabiltzea"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Ez da onartzen pantaila-argazkiak ateratzea"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Ezin dira desaktibatu babeskopiak"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Ezin da ireki aplikazioa"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Galderarik baduzu, jarri IKT administratzailearekin harremanetan"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Xehetasun gehiago"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulatu mozketa bat duen pantaila bat"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Pantailaren mozketa"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"pantailaren mozketa, koska"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Bat ere ez"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Gailuaren balio lehenetsia"</string>
<string name="special_access" msgid="3458780842491881155">"Aplikazio-baimen bereziak"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikaziok dute datuak mugarik gabe erabiltzeko aukera</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> gailura konektatuta"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Gailu batera baino gehiagotara konektatuta"</string>
<string name="demo_mode" msgid="2798762752209330277">"Sistemaren erabiltzaile-interfazearen demo modua"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Gau modua"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Ezarri gau modua"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Modu iluna"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Ezarri Modu iluna"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ezarpen bizkorretako garatzaileentzako lauzak"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope arrastoa"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Laneko profilaren ezarpenak"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktu-bilaketak"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Onartu erakundeko kontaktu-bilaketek deitzaileak eta kontaktuak identifikatzea"</string>
@@ -3986,16 +3957,20 @@
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Aplikazioz aldatzeko, pasatu hatza gora Hasiera botoian, eta pasa ezazu berriro aplikazio guztiak ikusteko. Edozein pantailatan funtzionatzen du. Jada ez dago ikuspegi orokorraren botoia pantailaren behealdean eskuinetara."</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Probatu Hasiera botoi berria"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Aktibatu aplikazioz aldatzeko keinu berria"</string>
- <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Sakatu birritan telefonoa bertan dagoela ikusteko"</string>
+ <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Sakatu birritan telefonoa bertan dagoena ikusteko"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Sakatu birritan tableta bertan dagoela ikusteko"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Sakatu birritan gailua bertan dagoela ikusteko"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, sakatu pantaila birritan."</string>
- <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Jaso telefonoa bertan dagoela ikusteko"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, sakatu pantaila birritan."</string>
+ <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Jaso telefonoa bertan dagoena ikusteko"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Jaso tableta bertan dagoela ikusteko"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Jaso gailua bertan dagoela ikusteko"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, hartu telefonoa."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, hartu tableta."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ordua, jakinarazpenen ikonoak eta bestelako informazioa begiratzeko, hartu gailua."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Esnarazi pantaila"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, hartu telefonoa."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, hartu tableta."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, hartu gailua."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Pantaila esnarazteko keinua"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Pasatu hatza sentsoretik jakinarazpenak ikusteko"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Pasatu hatza sentsoretik"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Jakinarazpenei begiratu bat emateko, pasatu hatza behera telefonoaren atzealdeko hatz-marken sentsorean."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> saiakera</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> saiakera</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Gailu honetako datuen babeskopia egiten da"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Zure erakundeak kudeatzen du gailua."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> erakundeak kudeatzen du gailu hau."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Betetze automatikoaren zerbitzua"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"bete, automatikoki, betetze automatiko"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Ziurtatu aplikazioa fidagarria dela</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> eginbideak pantailan dagoena erabiltzen du automatikoki bete daitekeena zehazteko."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Betetze automatikoa"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Erregistratze-maila"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Saio bakoitzeko gehieneko eskaera kopurua"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Ikusgai dauden gehieneko datu multzoak"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Berrezarri balio lehenetsiak"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Garatzaileak ez ditu berrezarri betetze automatikoko aukerak"</string>
<string name="device_theme" msgid="4571803018917608588">"Gailuaren gaia"</string>
<string name="default_theme" msgid="7085644992078579076">"Lehenetsia"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Sarearen izena"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Abiarazi operadorearen hornikuntza"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Eguneratu \"Ez molestatu\" modua"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausatu jakinarazpenak arreta ez galtzeko"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Zer berri dago?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Eman txango bat telefono berrian barrena"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Eman txango bat tableta berrian barrena"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Eman txango bat gailu berrian barrena"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Eginbidea ez dago erabilgarri gailu honetan"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Behartu GNSS neurketa osoak gauzatzera"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Egin GNSS konstelazio eta maiztasun guztien jarraipena, eginbeharren ziklorik gabe"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Erakutsi beti hutsegiteen leihoak"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Erakutsi leiho bat aplikazioren batek huts egiten duen bakoitzean"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Hautatu ANGLE-rekin bateragarria den aplikazio bat"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Ez da gaitu ANGLE-rekiko bateragarritasuna"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE-rekin bateragarria den aplikazioa: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Direktoriorako sarbidea"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"direktoriorako sarbidea"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Sarearen xehetasunak"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Mugikorreko aplikazioek gailuaren izena ikus dezakete. Halaber, jendeak ere ikus dezake Bluetooth gailuetara konektatzean edo Wi-Fi sare publiko bat konfiguratzean."</string>
<string name="devices_title" msgid="7701726109334110391">"Gailuak"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Ezarpen guztiak"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Iradokizunak"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS datuak"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS datuak"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Aukeratu sarea"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Deskonektatuta"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Konektatuta"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Konektatzen…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Ezin izan da konektatu"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Ez da aurkitu sarerik."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Ezin izan da aurkitu sarerik. Saiatu berriro."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(debekatuta)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Ez dago SIM txartelik"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Deitzeko aukera aurreratuak"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Sare modu hobetsia: WCDMA hobetsita"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Sare modu hobetsia: GSM soilik"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Sare modu hobetsia: WCDMA soilik"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Sare modu hobetsia: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Sare modu hobetsia: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Sare modu hobetsia: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Sare modu hobetsia: CDMA soilik"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Sare modu hobetsia: EvDo soilik"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Sare modu hobetsia: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Sare modu hobetsia: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Sare modu hobetsia: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Sare modu hobetsia: CDMA + LTE / EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Sare modu hobetsia: orokorra"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Sare modu hobetsia: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Sare modu hobetsia: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Sare modu hobetsia: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Sare modu hobetsia: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Sare modu hobetsia: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Sare modu hobetsia: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Sare modu hobetsia: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Sare modu hobetsia: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Sare modu hobetsia: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Sare modu hobetsia: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Sare modu hobetsia: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Sare modu hobetsia: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Sare modu hobetsia: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (gomendatua)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (gomendatua)"</string>
+ <string name="network_global" msgid="959947774831178632">"Orokorrak"</string>
+ <string name="label_available" msgid="1731547832803057893">"Sare erabilgarriak"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Bilatzen…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> sarean erregistratzen…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM txartelak ez dizu sare honetara konektatzea baimentzen."</string>
+ <string name="connect_later" msgid="978991102125216741">"Une honetan, ezin da konektatu sare horretara. Saiatu berriro geroago."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Erregistratu zara sarean."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Hautatu sarea automatikoki"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operadorearen ezarpenak"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Konfiguratu datu-zerbitzua"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Datu-konexioa"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Atzitu datuak datu-konexioaren bidez"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Sare mota lehenetsia"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Aldatu sare modua"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Sare mota lehenetsia"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operadorea"</string>
+ <string name="call_category" msgid="8108654745239563833">"Deiak"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operadorearen bideo-deiak"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Sistemaren hautapena"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Aldatu CDMA ibiltaritzaren modua"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Sistemaren hautapena"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Sarea"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Sarea"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA harpidetza"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Aldatu RUIM/SIM eta NV artean"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"harpidetza"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Erregistratze automatikoa…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Datu-ibiltaritza baimendu nahi duzu?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Eskatu prezioari buruzko informazioa sare-hornitzaileari."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Aplikazioen datuen erabilera"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"<xliff:g id="NETWORKMODEID">%1$d</xliff:g> sare moduak ez du balio. Egin ez ikusi."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Ez dago erabilgarri <xliff:g id="CARRIER">%1$s</xliff:g> operadorera konektatuta egoteagatik"</string>
+ <string name="see_more" msgid="5953815986207345223">"Ikusi gehiago"</string>
+ <string name="see_less" msgid="1250265310929558370">"Ikusi gutxiago"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Ez dago gailurik konektatuta"</string>
</resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index f38a0fb..7f1de04 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -279,7 +279,7 @@
<item msgid="2111767435887685265">"نمایش تست"</item>
<item msgid="1091168669714823370">"فرستادن رسانه"</item>
<item msgid="485564189219029300">"فعال کردن VPN"</item>
- <item msgid="7155384795265164395">"نوشتن کاغذدیواری"</item>
+ <item msgid="7155384795265164395">"نوشتن تصویرزمینه"</item>
<item msgid="1835836196806147034">"ساختار دستیار"</item>
<item msgid="5989890403088155055">"عکس صفحهنمایش دستیار"</item>
<item msgid="8582699692765917557">"خواندن وضعیت تلفن"</item>
@@ -346,7 +346,7 @@
<item msgid="427580389823724225">"نمایش تست"</item>
<item msgid="4992007785575926253">"فرستادن رسانه"</item>
<item msgid="2482631530338029480">"فعال کردن VPN"</item>
- <item msgid="1662979573471871926">"نوشتن کاغذدیواری"</item>
+ <item msgid="1662979573471871926">"نوشتن تصویرزمینه"</item>
<item msgid="5964768335278263478">"ساختار دستیار"</item>
<item msgid="2657138701132782702">"عکس صفحهنمایش دستیار"</item>
<item msgid="8571369610363539266">"خواندن وضعیت تلفن"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"بهعنوان محدود در نظر شود"</item>
<item msgid="2266114985518865625">"بهعنوان نامحدود در نظر شود"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"پیشفرض (استفاده از MAC تصادفی)"</item>
+ <item msgid="5398461510512959597">"مورد اعتماد"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"نه"</item>
<item msgid="3863157480502955888">"بله"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"همیشه روشن"</item>
<item msgid="6385301106124765323">"همیشه خاموش"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"خاموش"</item>
+ <item msgid="2182686878828390312">"اشکالزدایی"</item>
+ <item msgid="5286514712714822064">"درازنویسی"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"فقط خانه"</item>
+ <item msgid="5034813753274486448">"خودکار"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA برگزیده"</item>
+ <item msgid="807926878589867564">"فقط GSM"</item>
+ <item msgid="488474605709912156">"فقط WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA خودکار"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo خودکار"</item>
+ <item msgid="370391313511477301">"CDMA بدون EvDo"</item>
+ <item msgid="4678789463133969294">"فقط EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"جهانی"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"فقط TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"جهانی"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b70ff07..4935060 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"ایجاد"</string>
<string name="allow" msgid="3349662621170855910">"مجاز است"</string>
<string name="deny" msgid="6947806159746484865">"اجازه ندارد"</string>
- <string name="dlg_close" msgid="7471087791340790015">"بستن"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"تغییر حالت"</string>
<string name="device_info_default" msgid="7847265875578739287">"ناشناس"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">اکنون <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم با برنامهنویس شدن فاصله دارید.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"نیازی نیست، شما در حال حاضر یک برنامهنویس هستید."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"لطفاً ابتدا گزینههای تولیدکننده را فعال کنید."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"بیسیم و شبکهها"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"اتصالها"</string>
- <string name="header_category_device" msgid="4544026001618307754">"دستگاه"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"شخصی"</string>
- <string name="header_category_access" msgid="7580499097416970962">"دسترسی"</string>
<string name="header_category_system" msgid="2816866961183068977">"سیستم"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"فعال کردن اتصال داده"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"غیرفعال کردن اتصال داده"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"نشانی بلوتوث دستگاه: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ارتباط <xliff:g id="DEVICE_NAME">%1$s</xliff:g> قطع شود؟"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"پخش"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"دستگاه بلوتوث بدون نام"</string>
<string name="progress_scanning" msgid="192587958424295789">"در حال جستجو"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"هیچ دستگاه بلوتوثی در این اطراف پیدا نشد."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"برنامهای میخواهد بلوتوث را روشن کند و تلفن شما را برای سایر دستگاهها قابلمشاهده کند. میتوانید بعداً این مورد را در تنظیمات بلوتوث تغییر دهید."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"درحال روشن کردن بلوتوث…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"خاموش کردن بلوتوث؟؟؟"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"اتصال خودکار"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"درخواست اتصال بلوتوث"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"برای اتصال به «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>» ضربه بزنید."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"آیا میخواهید به \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" وصل شوید؟"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"دستگاههای برقراری تماس موجود"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"درحالحاضر متصل"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"دستگاههای ذخیرهشده"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"افزودن دستگاه"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"بلوتوث برای مرتبط شدن روشن خواهد شد"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"اولویتهای اتصال"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"دستگاههایی که قبلاً متصل شدهاند"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"قبلاً متصلشده"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"بلوتوث روشن شد"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"دیدن همه"</string>
<string name="date_and_time" msgid="9062980487860757694">"تاریخ و زمان"</string>
<string name="choose_timezone" msgid="1362834506479536274">"انتخاب منطقهٔ زمانی"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"رد شدن"</string>
<string name="next_label" msgid="4693520878012668114">"بعدی"</string>
<string name="language_picker_title" msgid="3596315202551687690">"زبانها"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"اولویتهای زبان"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"برداشتن"</string>
<string name="add_a_language" msgid="2330538812283783022">"افزودن زبان"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"تنظیمات"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"میانبر تنظیمات"</string>
<string name="airplane_mode" msgid="8837269988154128601">"حالت هواپیما"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"بیشتر"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"بیسیم و شبکهها"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"مدیریت Wi-Fi، بلوتوث، حالت هواپیما، شبکههای تلفن همراه، و VPNها"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"داده شبکه تلفن همراه"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"حریم خصوصی"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"غیرفعالشده توسط سرپرست"</string>
<string name="security_status_title" msgid="5848766673665944640">"وضعیت امنیتی"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"قفل صفحه، باز کردن قفل با چهره"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"قفل صفحه، اثرانگشت"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"قفل صفحه"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"چهره افزوده شد"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"با چهرهتان قفل را باز کنید"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"از چهرهتان برای احراز هویت استفاده کنید"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"برای باز کردن قفل تلفنتان، مجاز کردن خریدها یا ورود به سیستم برنامهها، از چهرهتان استفاده کنید."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"استفاده از چهرهتان"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"از چهرهتان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: نمیتوانید از چهرهتان برای باز کردن قفل این دستگاه استفاده کنید. برای اطلاعات بیشتر، با سرپرست سیستم سازمانتان تماس بگیرید."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"برای باز کردن قفل تلفنتان، مجاز کردن خریدها یا ورود به سیستم برنامهها، از چهرهتان استفاده کنید"</string>
- <string name="face_add_max" msgid="2342250989212694454">"میتوانید حداکثر <xliff:g id="COUNT">%d</xliff:g> اثرانگشت اضافه کنید"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"صورتتان را در مرکز دایره قرار دهید"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"بعداً انجام شود"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"میتوانید حداکثر <xliff:g id="COUNT">%d</xliff:g> چهره اضافه کنید"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"حداکثر تعداد چهره را اضافه کردهاید"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"چهره بیشتری نمیتوان اضافه کرد"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"ثبت انجام نشد"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"تأیید"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"مهلت زمانی ثبت چهره به پایان رسید. دوباره امتحان کنید."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ثبت چهره کار نکرد."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"همه چیز تنظیم شد. خوب به نظر میرسد."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"تمام"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"استفاده از چهره برای"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"باز کردن قفل دستگاه"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ورودبهسیستم برنامه و پرداختها"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"برای باز کردن قفل، چشمهایتان را باز کنید"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"هنگام استفاده از احراز هویت چهره، چشمهایتان باید باز باشد"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"حذف دادههای چهره"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"بهبود دادههای چهره"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"میتوانید از چهرهتان برای باز کردن قفل دستگاه و دسترسی به برنامهها استفاده کنید. "<annotation id="url">"بیشتر بدانید"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"اثر انگشت"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"مدیریت اثر انگشت"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"استفاده از اثر انگشت برای"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"۵٫۰ گیگاهرتز"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"حداقل یک باند برای نقطه اتصال Wi‑Fi انتخاب کنید:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"تنظیمات IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"حریم خصوصی"</string>
<string name="wifi_shared" msgid="844142443226926070">"اشتراکگذاری با دیگر استفادهکنندگان از دستگاه"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(بدون تغییر)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"لطفاً انتخاب کنید"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"لغو"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"شبکه فراموش شود؟"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"همه گذرواژههای این شبکه حذف خواهند شد"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"شبکههای ذخیره شده"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d شبکه</item>
<item quantity="other">%d شبکه</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"روشنایی"</string>
<string name="brightness_summary" msgid="838917350127550703">"تنظیم روشنایی صفحه"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"روشنایی تطبیقی"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"روشن"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"خاموش"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"میزان روشنایی ترجیحی بسیار کم است"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"میزان روشنایی ترجیحی کم است"</string>
@@ -1148,12 +1154,12 @@
<string name="screen_timeout" msgid="4351334843529712571">"حالت خواب"</string>
<string name="screen_timeout_title" msgid="5130038655092628247">"صفحه نمایش خاموش میشود"</string>
<string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> پس از غیرفعال بودن"</string>
- <string name="wallpaper_settings_title" msgid="5449180116365824625">"کاغذدیواری"</string>
+ <string name="wallpaper_settings_title" msgid="5449180116365824625">"تصویرزمینه"</string>
<string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"پیشفرض"</string>
<string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"سفارشی"</string>
- <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"تغییر کاغذدیواری"</string>
+ <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"تغییر تصویرزمینه"</string>
<string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"شخصیسازی صفحهنمایش"</string>
- <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"انتخاب کاغذدیواری از"</string>
+ <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"انتخاب تصویرزمینه از"</string>
<string name="screensaver_settings_title" msgid="1770575686476851778">"محافظ صفحه"</string>
<string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"هنگام شارژ یا اتصال به پایه"</string>
<string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"هر دو"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"نمیتوانید پین را تغییر دهید.\nممکن است پین اشتباه باشد."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"پین سیم کارت با موفقیت تغییر کرد"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"نمیتوان وضعیت قفل سیم کارت را تغییر داد.\nاحتمالاً پین نادرست است."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"پین غیرفعال نشد."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"پین فعال نشد."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"تأیید"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"لغو"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"چندین سیمکارت یافت شد"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"برای این کار قالببندی <xliff:g id="NAME_0">^1</xliff:g> لازم است.\n\n"<b>"قالببندی همه دادههایی را که درحالحاضر در <xliff:g id="NAME_1">^1</xliff:g> ذخیره شده است، پاک میکند."</b>" برای از دست ندادن دادهها، از آنها پشتیبان بگیرید."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"پاک کردن و قالببندی"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"در حال قالببندی <xliff:g id="NAME">^1</xliff:g>..."</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"درحین قالببندی، <xliff:g id="NAME">^1</xliff:g> را جدا نکنید."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"درحین قالببندی، <xliff:g id="NAME">^1</xliff:g> را جدا نکنید."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"انتقال اطلاعات به حافظه جدید"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"میتوانید عکسها، فایلها و برخی از برنامههایتان را به این <xliff:g id="NAME">^1</xliff:g> جدید منتقل کنید. \n\nانتقال حدود <xliff:g id="TIME">^2</xliff:g> طول میکشد و <xliff:g id="SIZE">^3</xliff:g> از حافظه داخلی را آزاد میکند. در طول انتقال بعضی از برنامهها کار نمیکنند."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"اکنون منتقل شود"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"نصبشده"</string>
<string name="no_applications" msgid="7336588977497084921">"برنامهای موجود نیست."</string>
<string name="internal_storage" msgid="1584700623164275282">"حافظهٔ داخلی"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"حافظه داخلی"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"حافظهٔ USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"حافظه کارت SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"محاسبه مجدد اندازه…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"دادههای برنامه حذف شود؟"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"همه دادههای این برنامه به صورت دائمی حذف میشود. این شامل تمام فایلها، تنظیمات، حسابها، پایگاههای داده و دیگر موارد میشود."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"برنامه در فهرست برنامههای نصب شده یافت نشد."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"فضای ذخیرهسازی برای برنامه پاک نشد."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"این برنامه میتواند به موارد زیر در رایانهٔ لوحی شما دسترسی داشته باشد:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"این برنامه میتواند به موارد زیر در گوشی شما دسترسی داشته باشد:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"این برنامه میتواند به موارد زیر در رایانهٔ لوحی شما دسترسی داشته باشد. به منظور بهبود عملکرد و کاهش استفاده از حافظه، برخی از این مجوزها در<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> در دسترس هستند چون پردازش آن مانند <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> است:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"این برنامه میتواند به موارد زیر در تلفن شما دسترسی داشته باشد. به منظور بهبود عملکرد و کاهش استفاده از حافظه، برخی از این مجوزها در<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> در دسترس هستند چون پردازش آن مانند <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> است:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> و <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>، <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"این برنامه ممکن است برای شما هزینه داشته باشد:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ارسال پیامک ممتاز"</string>
<string name="computing_size" msgid="1599186977475211186">"در حال محاسبه..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"اندازه بسته قابل محاسبه نیست."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"شما هیچ برنامه شخص ثالثی را نصب نکردهاید."</string>
<string name="version_text" msgid="9189073826278676425">"نسخه <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"انتقال"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"انتقال به رایانهٔ لوحی"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"انتقال به تلفن"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"انتقال به حافظهٔ USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"انتقال به کارت SD"</string>
- <string name="moving" msgid="6431016143218876491">"انتقال دادن"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"انتقال دیگری اکنون درحال انجام است."</string>
<string name="insufficient_storage" msgid="481763122991093080">"حافظه کافی موجود نیست."</string>
<string name="does_not_exist" msgid="1501243985586067053">"برنامه وجود ندارد."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"سرپرست دستگاه بر روی رسانههای خارجی نصب نمیشود"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"توقف اجباری؟"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"توقف اجباری یک برنامه ممکن است باعث عملکرد نادرست آن شود."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"نمیتوان برنامه را انتقال داد. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"مکان نصب برگزیده"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"تغییر مکان نصب دلخواه برای برنامههای جدید"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"برنامه داخلی غیرفعال شود؟"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"غیرفعال کردن برنامه"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"اگر این برنامه را غیرفعال کنید، ممکن است Android و سایر برنامهها دیگر عملکرد موردانتظار را نداشته باشند."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"حذف دادهها و غیرفعال کردن برنامه؟"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"اگر این برنامه را غیرفعال کنید، ممکن است Android و سایر برنامهها دیگر عملکرد موردانتظار را نداشته باشند. دادههایتان نیز حذف میشود."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"خاموش کردن اعلانها؟"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"اگر اعلانی را برای این برنامه خاموش کنید، ممکن است هشدارها و بهروزرسانیهای مهم را از دست بدهید."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"فروشگاه"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"جزئیات برنامه"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"برنامه از <xliff:g id="APP_STORE">%1$s</xliff:g> نصب شد"</string>
@@ -1969,7 +1962,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="1996584694050087161">"زمانیکه درشتنمایی روشن است، برای درشتنمایی سریع از دکمه «دسترسپذیری» در پایین صفحه استفاده کنید.\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="1996584694050087161">"زمانیکه درشتنمایی روشن است، برای درشتنمایی سریع از دکمه «دسترسپذیری» در پایین صفحه استفاده کنید.\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_configuration_warning" msgid="70533120652758190">"دکمه دسترسپذیری روی <xliff:g id="SERVICE">%1$s</xliff:g> تنظیم شده است. برای استفاده از درشتنمایی، دکمه دسترسپذیری را لمس کنید و نگهدارید، سپس درشتنمایی را انتخاب کنید."</string>
<string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"میانبر کلید بلندی صدا"</string>
<string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"سرویس میانبر"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"استفاده از سرویس"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"استفاده از تصحیح رنگ"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"استفاده از زیرنویس"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"ادامه"</string>
<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="6371077608778830020">"افزودن سمعک"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"محدود کردن فعالیت پسزمینه برای برنامه ممکن است باعث عملکرد نادرست آن شود."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"از آنجا که این برنامه برای بهینه کردن باتری تنظیم نشده است، نمیتوانید آن را محدود کنید.\n\nبرای محدود کردن برنامه، ابتدا بهینهسازی باتری را روشن کنید."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"مصرف صفحهنمایش از زمان شارژ کامل"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"مصرف صفحهنمایش"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"اسکن شبکه تلفن همراه"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"مصرف باتری از زمان شارژ کامل"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"مدتزمان مصرف صفحهنمایش از زمان شارژ کامل"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"مصرف دستگاه از زمان شارژ کامل"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"جزئیات استفاده"</string>
<string name="controls_subtitle" msgid="390468421138288702">"تنظیم استفاده از نیرو"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"شامل بسته ها"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"برنامهها باتری را خالی میکنند"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"دستگاه را بیدار نگه میدارد"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"دستگاه را در پسزمینه بیدار میکند"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"بهطور مکرر مکان را درخواست میکند"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> برنامه عملکرد نادرست دارند"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"برنامهها بهطور معمول اجرا میشوند"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"میزان مصرف باتری تلفن در پسزمینه معمولی است"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"میزان مصرف باتری رایانه لوحی در پسزمینه معمولی است"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">محدود کردن مصرف باتری برای %1$d برنامه</item>
<item quantity="other">محدود کردن مصرف باتری برای %1$d برنامه</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"محدودشده در: <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"این برنامهها در پسزمینه از باتری استفاده میکند. ممکن است برنامههای محدودشده درست کار نکند و اعلانهایشان با تأخیر همراه باشد."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"استفاده از مدیر باتری"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"تخلیه شدن شارژ باتری توسط برنامهها شناسایی شود"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"لغو"</string>
<string name="tts_reset" msgid="2661752909256313270">"بازنشانی"</string>
<string name="tts_play" msgid="2628469503798633884">"پخش"</string>
- <string name="gadget_title" msgid="5519037532720577836">"کنترل نیرو"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"بهروزرسانی تنظیم Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"بهروزرسانی تنظیمات بلوتوث"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"فعال"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"غیرفعال"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"روشن کردن"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"در حال خاموش کردن"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"بلوتوث"</string>
- <string name="gadget_location" msgid="2974757497945178165">"مکان"</string>
- <string name="gadget_sync" msgid="858895763714222152">"همگامسازی"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"روشنایی <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"خودکار"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"کامل"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"نیمه"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"غیرفعال"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"حافظه اطلاعات کاربری"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"نصب از حافظه"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> از مجموع <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"انتخاب همه"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"مصرف داده"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"میزان مصرف داده در برنامه"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"داده تلفن همراه و Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"ممکن است شرکت مخابراتی دادهها را به گونهای متفاوت با دستگاه شما محاسبه کند."</string>
<string name="data_usage_app" msgid="4970478397515423303">"میزان مصرف برنامه"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"اطلاعات برنامه"</string>
@@ -2770,14 +2741,14 @@
<item quantity="other">اعتماد یا حذف گواهیها</item>
</plurals>
<plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
- <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> مرجعهای صدور گواهی در دستگاهتان نصب کرده است که ممکن است به او اجازه دهند فعالیتهای کاری دستگاه، از جمله رایانامهها، برنامهها و وبسایتهای ایمن را کنترل کند.\n\nبرای کسب اطلاعات بیشتر درباره این گواهیها، با سرپرستتان تماس بگیرید.</item>
- <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> مرجعهای صدور گواهی در دستگاهتان نصب کرده است که ممکن است به او اجازه دهند فعالیتهای کاری دستگاه، از جمله رایانامهها، برنامهها و وبسایتهای ایمن را کنترل کند.\n\nبرای کسب اطلاعات بیشتر درباره این گواهیها، با سرپرستتان تماس بگیرید.</item>
+ <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> مرجعهای صدور گواهی در دستگاهتان نصب کرده است که ممکن است به او اجازه دهند فعالیتهای کاری دستگاه، از جمله ایمیلها، برنامهها و وبسایتهای ایمن را کنترل کند.\n\nبرای کسب اطلاعات بیشتر درباره این گواهیها، با سرپرستتان تماس بگیرید.</item>
+ <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> مرجعهای صدور گواهی در دستگاهتان نصب کرده است که ممکن است به او اجازه دهند فعالیتهای کاری دستگاه، از جمله ایمیلها، برنامهها و وبسایتهای ایمن را کنترل کند.\n\nبرای کسب اطلاعات بیشتر درباره این گواهیها، با سرپرستتان تماس بگیرید.</item>
</plurals>
<plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
- <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> مرجع صدور گواهیای برای نمایه کاری شما نصب کرده است که ممکن است به او اجازه دهد فعالیتهای کاری شبکه، از جمله رایانامهها، برنامهها و وبسایتهای ایمن را کنترل کند.\n\nبرای کسب اطلاعات بیشتر درباره این گواهیها، با سرپرستتان تماس بگیرید.</item>
- <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> مرجع صدور گواهیای برای نمایه کاری شما نصب کرده است که ممکن است به او اجازه دهد فعالیتهای کاری شبکه، از جمله رایانامهها، برنامهها و وبسایتهای ایمن را کنترل کند.\n\nبرای کسب اطلاعات بیشتر درباره این گواهیها، با سرپرستتان تماس بگیرید.</item>
+ <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> مرجع صدور گواهیای برای نمایه کاری شما نصب کرده است که ممکن است به او اجازه دهد فعالیتهای کاری شبکه، از جمله ایمیلها، برنامهها و وبسایتهای ایمن را کنترل کند.\n\nبرای کسب اطلاعات بیشتر درباره این گواهیها، با سرپرستتان تماس بگیرید.</item>
+ <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> مرجع صدور گواهیای برای نمایه کاری شما نصب کرده است که ممکن است به او اجازه دهد فعالیتهای کاری شبکه، از جمله ایمیلها، برنامهها و وبسایتهای ایمن را کنترل کند.\n\nبرای کسب اطلاعات بیشتر درباره این گواهیها، با سرپرستتان تماس بگیرید.</item>
</plurals>
- <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"شخص ثالتی میتواند روی فعالیتهای شبکه شما ازجمله رایانامهها، برنامهها و وبسایتهای ایمن نظارت داشته باشد.\n\nاعتبارنامه مطمئن نصبشده در دستگاهتان این کار را شدنی میکند."</string>
+ <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"شخص ثالتی میتواند روی فعالیتهای شبکه شما ازجمله ایمیلها، برنامهها و وبسایتهای ایمن نظارت داشته باشد.\n\nاعتبارنامه مطمئن نصبشده در دستگاهتان این کار را شدنی میکند."</string>
<plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
<item quantity="one">بررسی گواهی</item>
<item quantity="other">بررسی گواهیها</item>
@@ -2805,7 +2776,7 @@
<string name="user_add_user_item_title" msgid="8212199632466198969">"کاربر"</string>
<string name="user_add_profile_item_title" msgid="8353515490730363621">"نمایه محدود شده"</string>
<string name="user_add_user_title" msgid="2108112641783146007">"کاربر جدیدی اضافه میکنید؟"</string>
- <string name="user_add_user_message_long" msgid="6768718238082929201">"میتوانید با ایجاد کاربران اضافی، این دستگاه را با سایر افراد به اشتراک بگذارید. هر کاربر فضای مخصوص به خود دارد و میتواند این فضا را با برنامهها، کاغذدیواری و موارد دیگر سفارشی کند. کاربران همچنین میتوانند تنظیماتی را در دستگاه ایجاد کنند که بر همه کاربرها تأثیر میگذارد، مانند Wi-Fi.\n\nوقتی کاربری جدید اضافه میکنید، آن شخص باید فضای خودش را تنظیم کند.\n\nهر کاربر میتواند برنامهها را برای سایر کاربران بهروزرسانی کند. دسترسپذیری، تنظیمات و سرویسها قابل انتقال به کاربر جدید نیستند."</string>
+ <string name="user_add_user_message_long" msgid="6768718238082929201">"میتوانید با ایجاد کاربران اضافی، این دستگاه را با سایر افراد به اشتراک بگذارید. هر کاربر فضای مخصوص به خود دارد و میتواند این فضا را با برنامهها، تصویرزمینه و موارد دیگر سفارشی کند. کاربران همچنین میتوانند تنظیماتی را در دستگاه ایجاد کنند که بر همه کاربرها تأثیر میگذارد، مانند Wi-Fi.\n\nوقتی کاربری جدید اضافه میکنید، آن شخص باید فضای خودش را تنظیم کند.\n\nهر کاربر میتواند برنامهها را برای سایر کاربران بهروزرسانی کند. دسترسپذیری، تنظیمات و سرویسها قابل انتقال به کاربر جدید نیستند."</string>
<string name="user_add_user_message_short" msgid="1511354412249044381">"وقتی کاربر جدیدی اضافه میکنید آن فرد باید فضای خودش را تنظیم کند.\n\nهر کاربری میتواند برنامهها را برای همه کاربران دیگر بهروزرسانی کند."</string>
<string name="user_setup_dialog_title" msgid="1765794166801864563">"هم اکنون کاربر تنظیم شود؟"</string>
<string name="user_setup_dialog_message" msgid="1004068621380867148">"مطمئن شوید شخص در دسترس است تا دستگاه را بگیرد و فضایش را تنظیم کند"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">نمایش %d مورد پنهان</item>
<item quantity="other">نمایش %d مورد پنهان</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"کوچک کردن"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"شبکه و اینترنت"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"دستگاه همراه"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"مصرف داده"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"بلوتوث"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"برنامهها و اعلانها"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"مجوزها، برنامههای پیشفرض"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"برنامهها نمیتوانند در نمایه کاری به اعلانها دسترسی داشته باشند."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"حسابها"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"حسابی اضافه نشد"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"برنامههای پیشفرض"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"زبان، زمان، پشتیبانگیری و بهروزرسانی"</string>
<string name="search_results_title" msgid="1796252422574886932">"تنظیمات"</string>
- <string name="search_menu" msgid="6283419262313758339">"جستجوی تنظیمات"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi، Wi-Fi، اتصال شبکه، اینترنت، بیسیم، داده، wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi، wi-fi، روشن/خاموش کردن، کنترل کردن"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"پیامک، ارسال پیامک، پیامها، پیامرسانی، پیشفرض"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"پرداخت کردن، ضربه زدن، پرداختها"</string>
<string name="keywords_backup" msgid="470070289135403022">"پشتیبانگیری، پشتیبان"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"اشاره"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"چهره، باز کردن قفل، احراز هویت، ورود به سیستم"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei، meid، min، نسخه prl، imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"شبکه، وضعیت شبکه همراه، وضعیت سرویس، شدت سیگنال، نوع شبکه همراه، رومینگ، iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"شماره سریال، نسخه سختافزار"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"طرح زمینه تیره"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"اشکال"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"نمایشگر محیطی. نمایشگر صفحه در حالت قفل"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"اعلان صفحه قفل"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"چهره"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"اثر انگشت"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"تار کردن صفحهنمایش، صفحه لمسی، باتری، روشنایی هوشمند، روشنایی پویا"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"هنگامی که برای راهاندازی این دستگاه، پین خودتان را وارد میکنید، سرویسهای دسترسپذیری مانند <xliff:g id="SERVICE">%1$s</xliff:g> هنوز در دسترس نیستند."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"هنگامی که برای راهاندازی این دستگاه، الگویتان را وارد میکنید، سرویسهای دسترسپذیری مانند <xliff:g id="SERVICE">%1$s</xliff:g> هنوز در دسترس نیستند."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"هنگامی که برای راهاندازی این دستگاه، گذرواژهتان را وارد میکنید، سرویسهای دسترسپذیری مانند <xliff:g id="SERVICE">%1$s</xliff:g> هنوز در دسترس نیستند."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"توجه: بعد از راهاندازی تا زمانیکه قفل تلفنتان را باز نکنید، این برنامه نمیتواند شروع شود"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"توجه: اگر تلفن را بازراهاندازی کنید و قفل صفحه تنظیم کرده باشید، تا قفل تلفن را باز نکنید، این برنامه نمیتواند شروع به کار کند"</string>
<string name="imei_information_title" msgid="8499085421609752290">"اطلاعات IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"اطلاعات مربوط به IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(شکاف<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"شخصی"</string>
<string name="filter_work_apps" msgid="24519936790795574">"کاری"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"برنامهها: همه موارد"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"برنامهها: موارد خاموش"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"خاموش"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"دستهها: موارد با اهمیت فوری"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"دستهها: موارد کماهمیت"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"دستهها: موارد خاموش"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"هشدارهای استفاده"</string>
<string name="show_all_apps" msgid="1512506948197818534">"نمایش اطلاعات کامل درباره مصرف دستگاه"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"نمایش مصرف برنامه"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"مصرف بالا"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> برنامه رفتار غیرعادی دارند</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> برنامه رفتار غیرعادی دارند</item>
@@ -3740,7 +3711,9 @@
<string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> استفادهشده - <xliff:g id="FREE_SPACE">%2$s</xliff:g> آزاد"</string>
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"فضای ذخیرهسازی داخلی: <xliff:g id="PERCENTAGE">%1$s</xliff:g> استفادهشده - <xliff:g id="FREE_SPACE">%2$s</xliff:g> آزاد"</string>
<string name="display_summary" msgid="6737806235882127328">"خواب پس از <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> عدم فعالیت"</string>
- <string name="display_dashboard_summary" msgid="4145888780290131488">"کاغذدیواری، حالت خواب، اندازه قلم"</string>
+ <string name="display_dashboard_summary" msgid="4145888780290131488">"تصویرزمینه، حالت خواب، اندازه قلم"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"خواب پس از ۱۰ دقیقه عدم فعالیت"</string>
<string name="memory_summary" msgid="8080825904671961872">"بهطور متوسط <xliff:g id="USED_MEMORY">%1$s</xliff:g> از <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> حافظه استفاده شده است"</string>
<string name="users_summary" msgid="1674864467098487328">"واردشده به سیستم با <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"استفاده از پیامک مجاز نیست"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"استفاده از دوربین مجاز نیست"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"گرفتن عکس از صفحهنمایش مجاز نیست"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"نمیتوان پشتیبان را خاموش کرد"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"نمیتوان این برنامه را باز کرد"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"اگر سؤالی دارید، با سرپرست فناوری اطلاعاتتان تماس بگیرید"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"جزئیات بیشتر"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"شبیهسازی نمایشگری که برش تصویر دارد"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"برش نمایشگر"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"بریدگی حاشیه نمایشگر، حاشیه بالای نمایشگر"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"هیچکدام"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"پیشفرض دستگاه"</string>
<string name="special_access" msgid="3458780842491881155">"دسترسی ویژه به برنامه"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> برنامه میتواند بدونمحدودیت از داده استفاده کند</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"متصل به <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"متصل به چند دستگاه"</string>
<string name="demo_mode" msgid="2798762752209330277">"حالت نمایشی رابط کاربری سیستم"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"حالت شب"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"تنظیم حالت شب"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"حالت تاریک"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"تنظیم حالت تاریک"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"کاشیهای برنامهنویسی تنظیمات سریع"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"رد Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"تنظیمات نمایه کاری"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"جستجوی مخاطب"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"جستجوهای مخاطب توسط سازمانتان برای شناسایی تماسگیرندگان و مخاطبین مجاز است"</string>
@@ -3979,23 +3950,27 @@
<string name="double_tap_power_for_camera_title" msgid="64716226816032800">"رفتن به دوربین"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"برای باز کردن سریع دوربین، دکمه روشن/خاموش را دو بار فشار دهید. در همه صفحهها کار میکند."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"باز کردن سریع دوربین"</string>
- <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"چرخش دوربین"</string>
+ <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"چرخاندن دوربین"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"سریعتر گرفتن خودگرفت"</string>
<string name="swipe_up_to_switch_apps_title" msgid="2513907834903543667">"تند بالا کشیدن انگشتان روی دکمه اصلی"</string>
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"برای تغییر برنامهها انگشتتان را روی دکمه اصلی به بالا تند بکشید. برای دیدن همه برنامهها، انگشتتان را دوباره تند به بالا بکشید. دیگردر سمت چپ پایین صفحهنمایشتان، دکمه نمای کلی ندارید."</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"دکمه صفحه اصلی جدید را امتحان کنید"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"برای تغییر برنامهها، اشاره جدید را روشن کنید"</string>
- <string name="ambient_display_title" product="default" msgid="5144814600610448504">"برای بررسی تلفن، دو ضربه سریع بزنید"</string>
+ <string name="ambient_display_title" product="default" msgid="5144814600610448504">"دو ضربه سریع برای بررسی تلفن"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"برای بررسی رایانه لوحی، دو ضربه سریع بزنید"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"برای بررسی دستگاه، دو ضربه سریع بزنید"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"برای بررسی زمان، نمادهای اعلان و سایر اطلاعات، روی صفحهنمایش دو ضربه سریع بزنید."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"برای بررسی زمان، اعلانها و اطلاعات دیگر، روی صفحهنمایش دو ضربه سریع بزنید."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"برای بررسی تلفن، آن را بردارید"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"برای بررسی رایانه لوحی، آن را بردارید"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"برای بررسی دستگاه، آن را بردارید"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"برای بررسی زمان، نمادهای اعلان و سایر اطلاعات، تلفنتان را بردارید."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"برای بررسی زمان، نمادهای اعلان و سایر اطلاعات، رایانه لوحیتان را بردارید."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"برای بررسی زمان، نمادهای اعلان و سایر اطلاعات، دستگاهتان را بردارید."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"روشن کردن نمایشگر"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"برای بررسی زمان، اعلانها و اطلاعات دیگر، تلفنتان را انتخاب کنید"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"برای بررسی زمان، اعلانها و اطلاعات دیگر، رایانه لوحیتان را انتخاب کنید"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"برای بررسی زمان، اعلانها و اطلاعات دیگر، دستگاهتان را انتخاب کنید"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"اشاره بیدار کردن صفحه قفل"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"تند کشیدن اثرانگشت برای اعلانها"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"تند کشیدن اثرانگشت"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"برای بررسی اعلانها، انگشتتان را روی حسگر اثرانگشت (در پشت تلفن) تند به پایین بکشید."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> بار</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> بار</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"دادههای این دستگاه درحال پشتیبانگیری هستند"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"این دستگاه را سازمانتان مدیریت میکند."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"این دستگاه توسط <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> مدیریت میشود."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4087,8 +4061,8 @@
<string name="default_calendar_app_title" msgid="3545972964391065220">"برنامه تقویم"</string>
<string name="default_contacts_app_title" msgid="3497370557378660098">"برنامه مخاطبین"</string>
<plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
- <item quantity="one">برنامههای کارخواه رایانامه</item>
- <item quantity="other">برنامههای کارخواه رایانامه</item>
+ <item quantity="one">برنامههای کارخواه ایمیل </item>
+ <item quantity="other">برنامههای کارخواه ایمیل </item>
</plurals>
<string name="default_map_app_title" msgid="7560143381633608567">"برنامه نقشه"</string>
<plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"سرویس تکمیل خودکار"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"خودکار، پر کردن، تکمیل خودکار"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>مطمئن شوید به این برنامه اطمینان دارید</b> <br/> <br/> <xliff:g id=app_name example=تکمیل خودکار Google>%1$s</xliff:g> برای تعیین مواردی که میتوانند بهطور خودکار تکمیل شوند، از آنچه روی صفحهنمایش شما است استفاده میکند."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"تکمیل خودکار"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"سطح گزارشدهی"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"حداکثر درخواست در هر جلسه"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"حداکثر تعداد پایگاههای داده قابل مشاهده"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"بازنشانی به مقادیر پیشفرض"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"گزینههای برنامهنویس تکمیل خودکار بازنشانی شد"</string>
<string name="device_theme" msgid="4571803018917608588">"طرح زمینه دستگاه"</string>
<string name="default_theme" msgid="7085644992078579076">"پیشفرض"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"نام شبکه"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"شروع ارائه شرکت مخابراتی"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"بهروزرسانی «مزاحم نشوید»"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"توقف موقت اعلانها برای متمرکز ماندن"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"چه مواردی جدید و هیجانانگیز هستند؟"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"در تلفن جدیدتان گشتی بزنید"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"در رایانه لوحی جدیدتان گشتی بزنید"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"در دستگاه جدیدتان گشتی بزنید"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"این ویدیو در این دستگاه دردسترس نیست."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"اجرای کامل اندازهگیری GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"بدون دوره کاری همه زنجیره عکسهای پانوراما و فرکانسها را ردیابی کنید."</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"همیشه کادر گفتگوی خرابی نمایش داده شود"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"نمایش کادر گفتگو هنگامی که برنامهای خراب میشود"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"برنامه دارای ANGLE فعال انتخاب کنید"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"هیچ برنامه دارای ANGLE فعال تنظیم نشده است"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"برنامه دارای ANGLE فعال: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"دسترسی به فهرست راهنما"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"دسترسی به فهرست راهنما"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"جزئیات شبکه"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"نام دستگاه شما برای برنامههای موجود در تلفنتان قابلمشاهده است. ممکن است وقتی به دستگاههای بلوتوث متصل میشوید یا نقطه اتصال Wi-Fi راهاندازی میکنید، برای سایر افراد نیز قابلمشاهده باشد."</string>
<string name="devices_title" msgid="7701726109334110391">"دستگاهها"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"همه تنظیمات"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"پیشنهادها"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"دادههای CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"دادههای CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"انتخاب شبکه"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"اتصال قطع شد"</string>
+ <string name="network_connected" msgid="4943925032253989621">"متصل"</string>
+ <string name="network_connecting" msgid="76404590784733557">"درحال اتصال…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"متصل نشد"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"شبکهای پیدا نشد."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"شبکهها پیدا نشدند. دوباره امتحان کنید."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ممنوع است)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"سیمکارت موجود نیست"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"تماس پیشرفته"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"حالت شبکه برگزیده: WCDMA برگزیده"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"حالت شبکه برگزیده: فقط GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"حالت شبکه برگزیده: فقط WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"حالت شبکه برگزیده: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"حالت شبکه برگزیده: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"حالت شبکه برگزیده: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"حالت شبکه برگزیده: فقط CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"حالت شبکه برگزیده: فقط EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"حالت شبکه برگزیده: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"حالت شبکه برگزیده: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"حالت شبکه برگزیده: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"حالت شبکه برگزیده: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"حالت شبکه برگزیده: سراسری"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"حالت شبکه برگزیده: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"حالت شبکه برگزیده: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"حالت شبکه برگزیده: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"حالت شبکه برگزیده: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"حالت شبکه برگزیده: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"حالت شبکه برگزیده: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"حالت شبکه برگزیده: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"حالت شبکه برگزیده: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"حالت شبکه برگزیده: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"حالت شبکه برگزیده: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"حالت شبکه برگزیده: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"حالت شبکه برگزیده: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"حالت شبکه برگزیده: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (توصیه میشود)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (توصیه شده)"</string>
+ <string name="network_global" msgid="959947774831178632">"جهانی"</string>
+ <string name="label_available" msgid="1731547832803057893">"شبکههای موجود"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"درحال جستجو…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"درحال ثبت در <xliff:g id="NETWORK">%s</xliff:g>..."</string>
+ <string name="not_allowed" msgid="1667079919821581706">"سیمکارت اجازه اتصال به این شبکه را نمیدهد."</string>
+ <string name="connect_later" msgid="978991102125216741">"اتصال به این شبکه درحالحاضر امکانپذیر نیست. بعداً دوباره امتحان کنید."</string>
+ <string name="registration_done" msgid="4573820010512184521">"در شبکه ثبت شد."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"انتخاب خودکار شبکه"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"تنظیمات شرکت مخابراتی"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"تنظیم سرویسهای داده"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"داده تلفن همراه"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"دسترسی به دادهها با استفاده از شبکه تلفن همراه"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"نوع شبکه برگزیده"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"تغییر حالت عملکرد شبکه"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"نوع شبکه برگزیده"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"شرکت مخابراتی"</string>
+ <string name="call_category" msgid="8108654745239563833">"درحال تماس"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"تماس ویدیویی با شرکت مخابراتی"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"انتخاب سیستم"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"تغییر حالت رومینگ CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"انتخاب سیستم"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"شبکه"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"شبکه"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"اشتراک CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"تغییر بین RUIM/SIM و NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"اشتراک"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ثبت خودکار..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"رومینگ داده مجاز است؟"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"برای قیمت با ارائهدهنده شبکهتان بررسی کنید."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"مصرف داده برنامه"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"حالت شبکه نامعتبر <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. نادیده گرفته شود."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"هنگام اتصال به <xliff:g id="CARRIER">%1$s</xliff:g>، دردسترس نیست"</string>
+ <string name="see_more" msgid="5953815986207345223">"موارد بیشتر"</string>
+ <string name="see_less" msgid="1250265310929558370">"مشاهده موارد کمتر"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> دستگاه متصل</item>
+ <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> دستگاه متصل</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"دستگاه متصلی وجود ندارد"</string>
</resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 2f2f49d..c952112 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Merkitse maksulliseksi"</item>
<item msgid="2266114985518865625">"Merkitse maksuttomaksi"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Oletus (käytä satunnaistettua MAC-osoitetta)"</item>
+ <item msgid="5398461510512959597">"Luotettu"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ei"</item>
<item msgid="3863157480502955888">"Kyllä"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Aina käytössä"</item>
<item msgid="6385301106124765323">"Aina pois"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Ei käytössä"</item>
+ <item msgid="2182686878828390312">"Virheenkorjaus"</item>
+ <item msgid="5286514712714822064">"Monisanainen"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Vain kotipuhelin"</item>
+ <item msgid="5034813753274486448">"Automaattinen"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Ensisijaisesti GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Vain GSM"</item>
+ <item msgid="488474605709912156">"Vain WCDMA"</item>
+ <item msgid="1912421096218750039">"Automaattinen GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Automaattinen CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA ilman EvDoa"</item>
+ <item msgid="4678789463133969294">"Vain EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Maailmanlaajuinen"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Vain TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Maailmanlaajuinen"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f0bac5a..ba2ae7b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Luo"</string>
<string name="allow" msgid="3349662621170855910">"Salli"</string>
<string name="deny" msgid="6947806159746484865">"Hylkää"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Sulje"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Vaihda"</string>
<string name="device_info_default" msgid="7847265875578739287">"Tuntematon"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Enää <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> vaihetta, niin sinusta tulee kehittäjä.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Ei tarvitse klikata, olet jo kehittäjä."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Ota kehittäjäasetukset ensin käyttöön."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Langaton verkko ja verkot"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Yhteydet"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Laite"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Henkilökohtainen"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Käyttöoikeudet"</string>
<string name="header_category_system" msgid="2816866961183068977">"Järjestelmä"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Ota tiedonsiirto käyttöön"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Poista tiedonsiirto käytöstä"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Laitteen Bluetooth-osoite: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Katkaistaanko yhteys laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Lähetys"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Nimetön Bluetooth-laite"</string>
<string name="progress_scanning" msgid="192587958424295789">"Haetaan"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Bluetooth-laitteita ei löydy lähistöltä."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Sovellus haluaa ottaa Bluetoothin käyttöön ja määrittää, että puhelimesi on muiden laitteiden löydettävissä. Voit muokata tätä asetusta myöhemmin Bluetooth-asetuksissa."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth otetaan käyttöön…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth poistetaan käytöstä..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Yhdistä automaattisesti"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-yhteyspyyntö"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Yhdistä laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koskettamalla."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Haluatko yhdistää laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Käytettävissä olevat soittolaitteet"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Yhdistetty tällä hetkellä"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Tallennetut laitteet"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Lisää laite"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth käynnistetään parinmuodostusta varten."</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Yhteysasetukset"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Aiemmin liitetyt laitteet"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Aiemmin liitetyt"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth käytössä"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Näytä kaikki"</string>
<string name="date_and_time" msgid="9062980487860757694">"Päivämäärä ja aika"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Valitse aikavyöhyke"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Ohita"</string>
<string name="next_label" msgid="4693520878012668114">"Seuraava"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Kielet"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Kieliasetukset"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Poista"</string>
<string name="add_a_language" msgid="2330538812283783022">"Lisää kieli"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Asetukset"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Asetukset-pikakuvake"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Lentokonetila"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Lisää"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Langaton verkko ja verkot"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Hallinnoi Wi-Fi- ja Bluetooth-yhteyksiä, lentokonetilaa ja mobiili- ja VPN-verkkoja"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobiilidata"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Tietosuoja"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Järjestelmänvalvojan estämä"</string>
<string name="security_status_title" msgid="5848766673665944640">"Suojaustila"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Näytön lukitus, Face Unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Näytön lukitus, sormenjälki"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Näytön lukitus"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Kasvot lisätty"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Lukituksen avaaminen kasvoilla"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Todennus kasvojen avulla"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Voit avata puhelimen, hyväksyä ostoksia tai kirjautua sisään sovelluksiin kasvojen avulla."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Käytä"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Avaa puhelin tai hyväksy ostoksia sormenjäljellä.\n\nHuom. Tämän laitteen lukitusta ei voi avata kasvojentunnistuksella. Saat lisätietoja organisaatiosi järjestelmänvalvojalta."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Voit avata puhelimen, hyväksyä ostoksia tai kirjautua sisään sovelluksiin kasvojen avulla."</string>
- <string name="face_add_max" msgid="2342250989212694454">"Voit lisätä korkeintaan <xliff:g id="COUNT">%d</xliff:g> sormenjälkeä"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Keskitä kasvosi ympyrän sisälle"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Tee myöhemmin"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Voit lisätä korkeintaan <xliff:g id="COUNT">%d</xliff:g> kasvoa"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Et voi lisätä useampia kasvoja"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Enimmäismäärä kasvoja lisätty"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Rekisteröitymistä ei suoritettu loppuun."</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Kasvojen rekisteröinnin aikaraja on saavutettu. Yritä uudelleen."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Kasvojen rekisteröinti epäonnistui."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Kaikki valmiina. Hyvältä näyttää."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Valmis"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Kasvotoiminnot"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Laitteen avaaminen"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Sovelluskirjautuminen, maksut"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Tunnistus silmät auki"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Silmien on oltava auki kasvojentunnistusta varten"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Poista kasvodata"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Paranna kasvodataa"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Voit avata laitteesi ja käyttää sovelluksia kasvojesi avulla. "<annotation id="url">"Lisätietoja"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sormenjälki"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Sormenjälkien hallinta"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sormenj. käyttökohde"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Valitse vähintään yksi kaista Wi‑Fi-hotspotille:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP-asetukset"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Tietosuoja"</string>
<string name="wifi_shared" msgid="844142443226926070">"Jaa muiden laitteen käyttäjien kanssa"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ei muutettu)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Valitse"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Peruuta"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Unohdetaanko verkko?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Kaikki tämän verkon salasanat poistetaan."</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Tallennetut verkot"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d verkkoa</item>
<item quantity="one">1 verkko</item>
@@ -990,7 +997,7 @@
<string name="wifi_tether_disabled_by_airplane" msgid="414480185654767932">"Ei käytettävissä, koska lentokonetila on päällä"</string>
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi-puhelut"</string>
<string name="wifi_calling_suggestion_title" msgid="5702964371483390024">"Laajenna puhelumahdollisuuksia Wi‑Fillä"</string>
- <string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"Paranna kattavuutta ottamalla Wi-Fi-puhelut käyttöön"</string>
+ <string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"Paranna tavoittavuutta ottamalla Wi-Fi-puhelut käyttöön"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Puheluasetus"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi-puhelutila"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Roaming-asetus"</string>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Kirkkaus"</string>
<string name="brightness_summary" msgid="838917350127550703">"Säädä näytön kirkkautta"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Kirkkauden säätö"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Käytössä"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Pois käytöstä"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Ensisijainen kirkkaustaso on Hyvin matala."</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Ensisijainen kirkkaustaso on Matala."</string>
@@ -1141,10 +1147,10 @@
<string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Sammuu automaattisesti, kun aurinko nousee"</string>
<string name="night_display_activation_on_manual" msgid="277343561277625826">"Ota käyttöön nyt"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"Poista käytöstä nyt"</string>
- <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Käytössä auringonnousuun saakka"</string>
+ <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Käytössä auringonnousuun asti"</string>
<string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Pois käytöstä auringonlaskuun asti"</string>
- <string name="night_display_activation_on_custom" msgid="5472029024427933598">"Poista käytöstä <xliff:g id="ID_1">%1$s</xliff:g> asti"</string>
- <string name="night_display_activation_off_custom" msgid="6169984658293744715">"Poista käytöstä <xliff:g id="ID_1">%1$s</xliff:g> asti"</string>
+ <string name="night_display_activation_on_custom" msgid="5472029024427933598">"Käytössä <xliff:g id="ID_1">%1$s</xliff:g> asti"</string>
+ <string name="night_display_activation_off_custom" msgid="6169984658293744715">"Pois käytöstä <xliff:g id="ID_1">%1$s</xliff:g> asti"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Siirtyminen virransäästöön"</string>
<string name="screen_timeout_title" msgid="5130038655092628247">"Näyttö sammuu"</string>
<string name="screen_timeout_summary" msgid="327761329263064327">"Laitteen oltua käyttämättä: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN-koodin vaihtaminen epäonnistui.\nSaatoit antaa väärän PIN-koodin."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-kortin PIN-koodin vaihtaminen onnistui"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM-kortin lukitustilan muuttaminen epäonnistui.\nPIN-koodi on mahdollisesti virheellinen."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN-koodin käytöstä poistaminen epäonnistui."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN-koodin käyttöönotto epäonnistui."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Peruuta"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"SIM-kortteja löytyi useita"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> on alustettava. \n\n"<b>"Alustaminen tarkoittaa, että <xliff:g id="NAME_1">^1</xliff:g> tyhjennetään kaikista tiedoista. "</b>" Suosittelemme varmuuskopiointia, jotta et menetä tärkeitä tietoja."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Poista tiedot ja alusta"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Alustetaan kohdetta <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Pidä <xliff:g id="NAME">^1</xliff:g> laitteessa alustuksen ajan."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Pidä <xliff:g id="NAME">^1</xliff:g> laitteessa alustuksen ajan."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Siirrä tiedot uuteen paikkaan"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Uusi <xliff:g id="NAME">^1</xliff:g> on nyt käytettävissä, ja voit siirtää kuvasi, tiedostosi ja jotkin sovellukset siihen. \n\nSiirto vie noin <xliff:g id="TIME">^2</xliff:g> ja vapauttaa <xliff:g id="SIZE">^3</xliff:g> sisäistä tallennustilaa. Jotkin sovellukset eivät toimi siirron aikana."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Siirrä nyt"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Asennettu"</string>
<string name="no_applications" msgid="7336588977497084921">"Ei sovelluksia."</string>
<string name="internal_storage" msgid="1584700623164275282">"Sisäinen tallennustila"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"sisäinen tallennustila"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-tila"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortti"</string>
<string name="recompute_size" msgid="7722567982831691718">"Lasketaan kokoa uudelleen..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Poistetaanko sovelluksen tiedot?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Kaikki tämän sovelluksen tiedot poistetaan pysyvästi. Tähän sisältyvät kaikki tiedostot, asetukset, tilit, tietokannat jne."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Sovellusta ei löydy asennettujen sovelluksien luettelosta."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Sovelluksen tietojen tyhjentäminen tallennustilasta epäonnistui."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Tämä sovellus voi käyttää seuraavia tablet-laitteesi ominaisuuksia:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Tämä sovellus saa käyttää seuraavia puhelimesi toimintoja:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Tämä sovellus voi käyttää seuraavia tablet-laitteen ominaisuuksia. Tehokkuuden parantamiseksi ja muistin käytön vähentämiseksi <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> saa käyttää joitakin näistä luvista, koska se käyttää samaa prosessia kuin <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Tämä sovellus voi käyttää seuraavia puhelimen ominaisuuksia. Tehokkuuden parantamiseksi ja muistin käytön vähentämiseksi <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> saa käyttää joitakin näistä luvista, koska se käyttää samaa prosessia kuin <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ja <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Tämä sovellus voi veloittaa rahaa:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Lähetä maksullinen tekstiviesti"</string>
<string name="computing_size" msgid="1599186977475211186">"Lasketaan..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Paketin koon laskeminen epäonnistui."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Et ole asentanut yhtään kolmannen osapuolen sovellusta."</string>
<string name="version_text" msgid="9189073826278676425">"versio <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Siirrä"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Siirrä tablet-laitteelle"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Siirrä puhelimeen"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Siirrä USB-tilaan"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Siirrä SD-kortille"</string>
- <string name="moving" msgid="6431016143218876491">"Siirretään"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Toinen siirto on jo käynnissä."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Ei tarpeeksi säilytystilaa."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Sovellusta ei ole olemassa."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Laitteenhallintasovellusta ei voi asentaa ulkoiseen tallennustilaan."</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Pakotetaanko lopetus?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Jos pakotat sovelluksen pysähtymään, se saattaa alkaa toimia virheellisesti."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Sovelluksen siirto epäonnistui.<xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Ensisijainen asennussijainti"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Vaihda uusien sovelluksien ensisijaista asennussijaintia."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Poista sis. sovellus käytöstä?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Poista sovellus käytöstä"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Jos poistat sovelluksen käytöstä, Android ja muut sovellukset eivät välttämättä enää toimi oikein."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Poistetaanko tiedot ja poistetaanko sovellus käytöstä?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Jos poistat sovelluksen käytöstä, Android ja muut sovellukset eivät välttämättä enää toimi oikein. Lisäksi tietosi poistetaan."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Poista ilmoitukset käytöstä?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jos poistat tämän sovelluksen ilmoitukset käytöstä, et välttämättä näe tärkeitä ilmoituksia ja päivityksiä."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Kauppa"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Sovelluksen tiedot"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Sovelluksen asennuslähde: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Käytä palvelua"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Käytä värinkorjausta"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Käytä tekstityksiä"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Jatka"</string>
<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="6371077608778830020">"Lisää kuulolaite"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jos rajoitat sovelluksen toimintaa taustalla, se voi alkaa toimia virheellisesti."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Sovellusta ei voi rajoittaa, koska akun optimointi ei ole käytössä.\n\nOta optimointi käyttöön rajoittamista varten."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Näytön käyttö täyden latauksen jälkeen"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Näytön virrankulutus"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobiiliverkkojen haku"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Akun käyttö täyden latauksen jälkeen"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Näytön käyttöaika edellisen täyden latauksen jälkeen"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Laitteen käyttö edellisen täyden latauksen jälkeen"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Käyttötiedot"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Säädä virrankäyttöä"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Sisältyvät paketit"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Akkua kuluttavat sovellukset"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Pitää näytön päällä"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Käynnistää näytön taustalla"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Pyytää sijaintitietoja usein"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> sovellusta ei toimi oikein"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Sovellukset toimivat normaalisti"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Puhelimen virran taustakulutus on tyypillistä."</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tabletin virran taustakulutus on tyypillistä."</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d sovelluksen akunkäyttöä rajoitetaan</item>
<item quantity="one">%1$d sovelluksen akunkäyttöä rajoitetaan</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Rajoitettu <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Nämä sovellukset kuluttavat virtaa taustalla. Rajoitetut sovellukset eivät ehkä toimi oikein ja ilmoituksia voidaan näyttää viiveellä."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Käytä virranhallintaa"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Tunnista akkua kuluttavat sovellukset"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Peruuta"</string>
<string name="tts_reset" msgid="2661752909256313270">"Nollaa"</string>
<string name="tts_play" msgid="2628469503798633884">"Toista"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Virranhallinta"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Päivitetään Wi-Fi-asetuksia"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Päivitetään Bluetooth-asetuksia"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"käytössä"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"pois käytöstä"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"otetaan käyttöön"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"poistetaan käytöstä"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Sijainti"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synkronointi"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Kirkkaus <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"kirkkain"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"puolittainen"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"himmein"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Käyttöoikeustietojen tallennus"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Asenna tallennustilasta"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Valitse kaikki"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Datan käyttö"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Sovelluksen tiedonsiirto"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobiilidata ja Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operaattorin mittaustulos saattaa erota laitteesi mittaamasta."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Sovellusten käyttötiedot"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"SOVELLUSTIEDOT"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Näytä %d piilotettua kohdetta</item>
<item quantity="one">Näytä %d piilotettu kohde</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Tiivistä"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Verkko ja internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiili"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datan käyttö"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Sovellukset ja ilmoitukset"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Käyttöoikeudet, oletussovellukset"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Työprofiilin sovelluksilla ei voi olla ilmoitusten käyttöoikeuksia."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Tilit"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Tilejä ei lisätty"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Oletussovellukset"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Kielet, aika, varmuuskopiointi, päivitykset"</string>
<string name="search_results_title" msgid="1796252422574886932">"Asetukset"</string>
- <string name="search_menu" msgid="6283419262313758339">"Hae asetuksista"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, verkkoyhteys, internet, langaton, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, päälle/pois, hallinta"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"tekstiviesti, tekstailu, viestit, viestittely, oletus"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"maksa, napauta, maksut"</string>
<string name="keywords_backup" msgid="470070289135403022">"varmuuskopiointi, varmuuskopio"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ele"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"kasvot, avaaminen, todennus, kirjautuminen"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl-versio, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"verkko, mobiiliverkon tila, yhteyden tila, signaalinvoimakkuus, mobiiliverkon tyyppi, verkkovierailu, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"sarjanumero, laitteistoversio"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tumma teema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"virhe"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Lepotilanäyttö, lukitusnäyttö"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"lukitusnäyttöilmoitus"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"kasvot"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"sormenjälki"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"himmeä näyttö, kosketusnäyttö, akku, älykäs kirkkaus, dynaaminen kirkkaus"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Kun annat PIN-koodisi käynnistääksesi tämän laitteen, käytettävyyspalvelut, kuten <xliff:g id="SERVICE">%1$s</xliff:g>, eivät ole vielä käytettävissä."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Kun annat mallin käynnistääksesi tämän laitteen, käytettävyyspalvelut, kuten <xliff:g id="SERVICE">%1$s</xliff:g>, eivät ole vielä käytettävissä."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Kun annat salasanasi käynnistääksesi tämän laitteen, käytettävyyspalvelut, kuten <xliff:g id="SERVICE">%1$s</xliff:g>, eivät ole vielä käytettävissä."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Huom. Jotta voit käynnistää tämän sovelluksen uudelleenkäynnistyksen jälkeen, sinun täytyy avata puhelimen lukitus."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Huom. Jos käynnistät puhelimen uudelleen ja näytön lukitus on käytössä, sovellus voi käynnistyä vasta avattuasi lukituksen."</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI-koodin tiedot"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI-koodiin liittyvät tiedot"</string>
<string name="slot_number" msgid="3762676044904653577">"(Paikka <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Henkilökohtaiset"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Työ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Sovellukset: kaikki"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Sovellukset: ei käytössä"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Poistettu käytöstä"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Luokat: kiireellinen"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Luokat: ei kovin tärkeä"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Luokat: ei käytössä"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Käyttöilmoitukset"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Näytä kaikki laitteen käyttö"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Näytä sovelluksen käyttö"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Suuri virrankulutus"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> sovellusta toimii epätavallisesti.</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> toimii epätavallisesti.</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Sisäinen tallennustila: <xliff:g id="PERCENTAGE">%1$s</xliff:g> käytössä, <xliff:g id="FREE_SPACE">%2$s</xliff:g> vapaana"</string>
<string name="display_summary" msgid="6737806235882127328">"Jos laitetta ei käytetä, se siirtyy virransäästötilaan, kun <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> on kulunut."</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Taustakuva, virransäästö, fonttikoko"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Jos laitetta ei käytetä, se siirtyy virransäästötilaan, kun 10 minuuttia on kulunut."</string>
<string name="memory_summary" msgid="8080825904671961872">"Muistia käytetty keskimäärin <xliff:g id="USED_MEMORY">%1$s</xliff:g>/<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Kirjautunut sisään käyttäjänä <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Tekstiviestejä ei sallita"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kameraa ei sallita"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Kuvakaappauksia ei sallita"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Varmuuskopioimista ei voi poistaa käytöstä"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Sovellusta ei voi avata"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Jos sinulla on kysyttävää, ota yhteyttä järjestelmänvalvojaan."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Lisätietoja"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Jäljittele näyttöä, jossa on aukko"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"–"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Laitteen oletusasetus"</string>
<string name="special_access" msgid="3458780842491881155">"Sovellusten erikoiskäyttö"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> sovelluksen datankäyttöä ei rajoiteta.</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Yhdistetty laitteeseen <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Yhdistetty useisiin laitteisiin"</string>
<string name="demo_mode" msgid="2798762752209330277">"Käyttöliittymän esittelytila"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Yötila"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Aseta yötila"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Tumma tila"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Aseta tumma tila"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pika-asetusosiot kehittäjille"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-jäljitys"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Työprofiilin asetukset"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Yhteystietohaku"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Salli organisaatiosi yhteystietohakujen tunnistaa soittajia ja yhteystietoja."</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tarkista ilmoitukset kaksoisnapauttamalla puhelimen näyttöä"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tarkista ilmoitukset kaksoisnapauttamalla tabletin näyttöä"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tarkista ilmoitukset kaksoisnapauttamalla laitteen näyttöä"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Kaksoisnapauta näyttöä, niin näet ajan, ilmoituskuvakkeet ja muita tietoja."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Kaksoisnapauta näyttöä, niin näet ajan, ilmoitukset ja muita tietoja."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tarkista ilmoitukset nostamalla puhelimesi"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tarkista ilmoitukset nostamalla tablettisi"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Tarkista ilmoitukset nostamalla laitteesi"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ota puhelin käteesi, niin näet ajan, ilmoituskuvakkeet ja muita tietoja."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ota tabletti käteesi, niin näet ajan, ilmoituskuvakkeet ja muita tietoja."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ota laite käteesi, niin näet ajan, ilmoituskuvakkeet ja muita tietoja."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Näytön aktivointi"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Ota puhelin käteesi, niin näet ajan, ilmoitukset ja muita tietoja."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Ota tabletti käteesi, niin näet ajan, ilmoitukset ja muita tietoja."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Ota laite käteesi, niin näet ajan, ilmoitukset ja muita tietoja."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Lukitusnäytön aktivointiele"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Pyyhkäise ilmoitukset esiin"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Sormenjäljen pyyhkäisy"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Voit katsoa ilmoitukset pyyhkäisemällä puhelimen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> yritystä</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> yritys</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Laitteen dataa varmuuskopioidaan"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Organisaatiosi hallinnoi tätä laitetta."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Tätä laitetta hallitsee <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Automaattinen täyttö ‑palvelu"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automaattinen, täyttää, automaattinen täyttö"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Varmista, että luotat tähän sovellukseen</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> päättelee näytöllä olevien kohteiden perusteella, mitä voidaan täyttää automaattisesti."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automaattinen täyttö"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Lokikirjaustaso"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Pyyntöjen enimmäismäärä käyttökertaa kohti"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Näkyvien data-aineistojen enimmäismäärä"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Palauta oletusarvot"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Automaattisen täytön kehittäjäasetukset palautettu"</string>
<string name="device_theme" msgid="4571803018917608588">"Laitteen teema"</string>
<string name="default_theme" msgid="7085644992078579076">"Oletus"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Verkon nimi"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Ota operaattorin hallinta käyttöön"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Päivitä Älä häiritse ‑tila"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Keskeytä ilmoitukset, jotta voit keskittyä"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Uutta"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tutustu uuteen puhelimeesi"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tutustu uuteen tablettiisi"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tutustu uuteen laitteeseesi"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ominaisuus ei ole käytettävissä tällä laitteella."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Pakota täydet GNSS-mitat"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Seuraa kaikkia GNSS-kuvioita ja ‑taajuuksia, joissa ei ole pulssisuhdetta."</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Näytä aina kaatumisikkuna"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Näytä valintaikkuna aina, kun sovellus kaatuu."</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Valitse ANGLE-yhteensopiva sovellus"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Ei määritettyä ANGLE-yhteensopivaa sovellusta"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE-yhteensopiva sovellus: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Hakemiston käyttöoikeus"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"hakemiston käyttöoikeus"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Verkon tiedot"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Puhelimen sovellukset näkevät laitteesi nimen. Muut voivat myös nähdä nimen, kun muodostat Bluetooth-yhteyden laitteisiin tai aktivoit Wi-Fi-hotspotin."</string>
<string name="devices_title" msgid="7701726109334110391">"Laitteet"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Kaikki asetukset"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Ehdotukset"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Valitse verkko"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Yhteys katkaistu"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Yhdistetty"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Yhdistetään…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Yhdistäminen epäonnistui"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Ei verkkoja"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Verkkoja ei löytynyt. Yritä uudelleen."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(kielletty)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Ei SIM-korttia"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Puhelujen lisävaihtoehdot"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Ensisijainen verkkotila: ensisijaisesti WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Ensisijainen verkkotila: vain GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Ensisijainen verkkotila: vain WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Ensisijainen verkkotila: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Ensisijainen verkkotila: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Ensisijainen verkkotila: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Ensisijainen verkkotila: vain CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Ensisijainen verkkotila: vain EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Ensisijainen verkkotila: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Ensisijainen verkkotila: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Ensisijainen verkkotila: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Ensisijainen verkkotila: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Ensisijainen verkkotila: Maailmanlaajuinen"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Ensisijainen verkkotila: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Ensisijainen verkkotila: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Ensisijainen verkkotila: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Ensisijainen verkkotila: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Ensisijainen verkkotila: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Ensisijainen verkkotila: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Ensisijainen verkkotila: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Ensisijainen verkkotila: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Ensisijainen verkkotila: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Ensisijainen verkkotila: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Ensisijainen verkkotila: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Ensisijainen verkkotila: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Ensisijainen verkkotila: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (suositus)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (suositus)"</string>
+ <string name="network_global" msgid="959947774831178632">"Maailmanlaajuinen"</string>
+ <string name="label_available" msgid="1731547832803057893">"Käytettävissä olevat verkot"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Haetaan…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> rekisteröidään…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM-kortti ei anna muodostaa yhteyttä tähän verkkoon."</string>
+ <string name="connect_later" msgid="978991102125216741">"Tähän verkkoon ei saada juuri nyt yhteyttä. Yritä myöhemmin uudelleen."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Rekisteröity verkkoon"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Valitse verkko automaattisesti"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operaattoriasetukset"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Määritä datapalvelu"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobiilidata"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Käytä mobiiliverkon dataa"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Ensisijainen verkko"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Vaihda verkon käyttötilaa"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Ensisijainen verkko"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operaattori"</string>
+ <string name="call_category" msgid="8108654745239563833">"Puhelut"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videopuheluiden operaattori"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Valitse järjestelmä"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Vaihda CDMA-roaming-tila"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Valitse järjestelmä"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Verkko"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Verkko"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA-tilaus"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Vaihda RUIM/SIM:n- ja NV:n välillä"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"tilaus"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automaattinen rekisteröinti…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Sallitaanko roaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Kysy hinnasta operaattorilta."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Sovelluksen datan käyttö"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Virheellinen verkkotila <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ohita."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Ei käytettävissä <xliff:g id="CARRIER">%1$s</xliff:g> ‑käytön aikana"</string>
+ <string name="see_more" msgid="5953815986207345223">"Lisää"</string>
+ <string name="see_less" msgid="1250265310929558370">"Näytä vähemmän"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Ei yhdistettyjä laitteita"</string>
</resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 8a1d323..a88362f 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Traiter comme mesuré"</item>
<item msgid="2266114985518865625">"Traiter comme non mesuré"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Par défaut (utiliser une adresse MAC au hasard)"</item>
+ <item msgid="5398461510512959597">"Fiable"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Non"</item>
<item msgid="3863157480502955888">"Oui"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Toujours activé"</item>
<item msgid="6385301106124765323">"Toujours désactivé"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Désactivé"</item>
+ <item msgid="2182686878828390312">"Déboguer"</item>
+ <item msgid="5286514712714822064">"Détaillé"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Réseaux domestiques uniquement"</item>
+ <item msgid="5034813753274486448">"Automatique"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA de préférence"</item>
+ <item msgid="807926878589867564">"GSM uniquement"</item>
+ <item msgid="488474605709912156">"WCDMA uniquement"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automatique"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automatique"</item>
+ <item msgid="370391313511477301">"CDMA sans EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo seulement"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA uniquement"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 3ba5e0a..d756cc6 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -21,21 +21,15 @@
<string name="create" msgid="3578857613172647409">"Créer"</string>
<string name="allow" msgid="3349662621170855910">"Autoriser"</string>
<string name="deny" msgid="6947806159746484865">"Refuser"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Fermer"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Changer"</string>
<string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Plus qu’<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir un développeur.</item>
<item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir un développeur.</item>
</plurals>
<string name="show_dev_on" msgid="1110711554982716293">"Vous êtes désormais un développeur!"</string>
- <string name="show_dev_already" msgid="2151632240145446227">"Inuti, vous êtes déjà un développeur."</string>
+ <string name="show_dev_already" msgid="2151632240145446227">"Inutile, vous êtes déjà un concepteur."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Veuillez d\'abord activer les options pour les concepteurs"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Sans fil et réseaux"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Connexions"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Appareil"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personnel"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Accès"</string>
<string name="header_category_system" msgid="2816866961183068977">"Système"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Activer la connexion de données"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Désactiver la connexion de données"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresse Bluetooth de l\'appareil : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Déconnecter <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Appareil Bluetooth sans nom"</string>
<string name="progress_scanning" msgid="192587958424295789">"Recherche en cours…"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Aucun appareil Bluetooth détecté."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Une application souhaite activer le Bluetooth et rendre votre téléphone visible à d\'autres appareils. Vous pouvez modifier ce réglage plus tard dans les paramètres Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Activation du Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Désactivation du Bluetooth..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexion automatique"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Demande de connexion Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Touchez ici pour vous connecter à « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> »."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Voulez-vous vous connecter à « <xliff:g id="DEVICE_NAME">%1$s</xliff:g> »?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Appareils d\'appels accessibles"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Actuellement connecté"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Appareils enregistrés"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Ajouter un appareil"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Le Bluetooth s\'activera pour l\'association"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Préférences de connexion"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Appareils précédemment connectés"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Connecté précedemment"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth activé"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Tout afficher"</string>
<string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Passer"</string>
<string name="next_label" msgid="4693520878012668114">"SUIVANT"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Langues"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Préférences linguistiques"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Supprimer"</string>
<string name="add_a_language" msgid="2330538812283783022">"Ajouter une langue"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Paramètres"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Raccourci vers les paramètres"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Mode avion"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Plus"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sans fil et réseaux"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Gérer le Wi-Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les RPV"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Données cellulaires"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Confidentialité"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Désactivé par l\'administrateur"</string>
<string name="security_status_title" msgid="5848766673665944640">"État de la sécurité"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Verrouillage de l\'écran, déverrouillage par reconnaissance du visage"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Verrouillage de l\'écran, empreintes digitales"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Verrouillage de l\'écran"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Visage ajouté"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Déverrouiller avec votre visage"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Utiliser son visage pour s\'authentifier"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser vos achats et vous connecter à des applications."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Utiliser votre"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utilisez votre visage pour déverrouiller votre téléphone ou autoriser des achats.\n\nRemarque : Vous ne pouvez pas utiliser votre visage pour déverrouiller cet appareil. Pour obtenir plus d\'information, communiquez avec l\'administrateur de votre organisation."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser vos achats et vous connecter à des applications"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrez votre visage dans le cercle"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Plus tard"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> visages"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Vous avez ajouté le nombre maximal de visages"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Impossible d\'ajouter d\'autres visages"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"L\'inscription n\'est pas terminée"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Le temps attribué pour l\'inscription des visages est écoulé. Veuillez essayer de nouveau."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"L\'inscription du visage n\'a pas fonctionné."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Tout est prêt et semble être en ordre."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Terminé"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Util. votre visage pour"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Déverrouiller votre appareil"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Connex. et paiements dans applis"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Yeux ouverts pour déverrouillage"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Lorsque vous utilisez l\'authent. visage, vos yeux doivent être ouverts"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Suppr. données visage"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Améliorer données des visages"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Votre visage peut être utilisé pour déverrouiller votre appareil et accéder aux applications. "<annotation id="url">"En savoir plus"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Lecteur d\'empreintes digitales"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gérer les empreintes digitales"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Util. empr. dig. pour"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Choisissez au moins une bande pour le point d\'accès Wi-Fi :"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Paramètres IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Confidentialité"</string>
<string name="wifi_shared" msgid="844142443226926070">"Partager avec d\'autres utilisateurs d\'appareils"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(aucune modification)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Veuillez choisir"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Annuler"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Oublier le réseau?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Tous les mots de passe de ce réseau seront supprimés"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Réseaux enregistrés"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d réseau</item>
<item quantity="other">%d réseaux</item>
@@ -998,7 +1005,7 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Préférences d\'itinérance"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"Réseau Wi-Fi de préférence"</item>
+ <item msgid="2124257075906188844">"Connexion Wi-Fi de préférence"</item>
<item msgid="1335127656328817518">"Connexion cellulaire de préférence"</item>
<item msgid="3132912693346866895">"Wi-Fi seulement"</item>
</string-array>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Luminosité"</string>
<string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Luminosité adaptative"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Activé"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Désactivée"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"La luminosité préférée est très faible"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"La luminosité préférée est faible"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Impossible de modifier le NIP.\nLe NIP est peut-être incorrect."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Le NIP de la carte SIM a été modifié."</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Impossible de changer l\'état de verrouillage de la carte SIM.\nLe NIP est peut-être incorrect."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Impossible de désactiver le NIP."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Impossible d\'activer le NIP."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Annuler"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Plusieurs cartes SIM détectées"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Cette option nécessite de formater la mémoire de stockage « <xliff:g id="NAME_0">^1</xliff:g> ». \n\n"<b>"Le formatage entraîne la suppression de toutes les données enregistrées sur la mémoire « <xliff:g id="NAME_1">^1</xliff:g> »."</b>" Pour ne pas risquer de perdre vos données, nous vous conseillons de les sauvegarder."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Effacer et formater"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatage de « <xliff:g id="NAME">^1</xliff:g> » en cours..."</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Ne retirez pas <xliff:g id="NAME">^1</xliff:g> durant le formatage."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Ne retirez pas <xliff:g id="NAME">^1</xliff:g> durant le formatage."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Déplacer vers une autre mémoire"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Vous pouvez déplacer vos photos, vos fichiers et certaines applications vers la nouvelle mémoire de stockage « <xliff:g id="NAME">^1</xliff:g> ». \n\nCette opération prend environ <xliff:g id="TIME">^2</xliff:g> et permet de libérer <xliff:g id="SIZE">^3</xliff:g> sur la mémoire de stockage interne. Certaines applications ne fonctionneront pas pendant l\'opération."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Déplacer maintenant"</string>
@@ -1470,7 +1478,7 @@
<string name="menu_restore" msgid="8260067415075573273">"Rétablir les valeurs par défaut"</string>
<string name="restore_default_apn_completed" msgid="2824775307377604897">"La réinitialisation des paramètres APN par défaut est terminée."</string>
<string name="reset_dashboard_title" msgid="6254873816990678620">"Options de réinitialisation"</string>
- <string name="reset_dashboard_summary" msgid="4851012632493522755">"Impossible de réinitialiser le réseau, les applications ou l\'appareil"</string>
+ <string name="reset_dashboard_summary" msgid="4851012632493522755">"Vous pouvez réinitialiser le réseau, les applications ou l\'appareil"</string>
<string name="reset_network_title" msgid="6166025966016873843">"Réinitialiser les paramètres Wi-Fi, cellulaires et Bluetooth"</string>
<string name="reset_network_desc" msgid="5547979398298881406">"Cette opération entraîne la réinitialisation de tous les paramètres réseau, y compris :\n\n"<li>"Le Wi‑Fi"</li>\n<li>"Les données cellulaires"</li>\n<li>"Le Bluetooth"</li></string>
<string name="reset_esim_title" msgid="2419812515540592802">"Réinitialiser aussi la carte eSIM"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installée"</string>
<string name="no_applications" msgid="7336588977497084921">"Aucune application"</string>
<string name="internal_storage" msgid="1584700623164275282">"Mémoire de stockage interne"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"stockage interne"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Mémoire de stockage USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Stockage sur la carte SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Calcul de la taille..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Supprimer les données de l\'application?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Toutes les données de cette application vont être définitivement supprimées, y compris tous les fichiers, les paramètres, les comptes, les bases de données, etc."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"L\'application ne figure pas dans la liste des applications installées."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Impossible de supprimer l\'espace de stockage pour l\'application."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Cette application peut accéder aux éléments suivants de votre tablette :"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Cette application peut accéder aux éléments suivants de votre téléphone :"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Cette application peut accéder aux éléments de votre tablette répertoriés ci-dessous. Afin d\'améliorer les performances et de réduire l\'utilisation de la mémoire, certaines autorisations sont accordées à <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, car elle s\'exécute au sein du même processus que les applications <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Cette application peut accéder aux éléments de votre téléphone répertoriés ci-dessous. Afin d\'améliorer les performances et de réduire l\'utilisation de la mémoire, certaines autorisations sont accordées à <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, car elle s\'exécute au sein du même processus que les applications <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> et <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Cette application peut engendrer des frais :"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Envoyer un SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"Traitement..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Impossible de calculer la taille du package."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Aucune application tierce n\'est installée."</string>
<string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Déplacer"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Déplacer vers la tablette"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Déplacer vers le téléphone"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Déplacer vers la mémoire de stockage USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Déplacer vers la carte SD"</string>
- <string name="moving" msgid="6431016143218876491">"Déplacement en cours"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Un autre transfert est déjà en cours."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Espace de stockage insuffisant."</string>
<string name="does_not_exist" msgid="1501243985586067053">"L\'application n\'existe pas."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Les applications d\'administration d\'appareils ne peuvent pas être installées sur un support externe"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Forcer l\'arrêt?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Si vous forcez l\'arrêt d\'une application, son fonctionnement peut en être affecté."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Impossible de déplacer l\'application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Emplacement d\'installation souhaité"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Modifier l\'emplacement d\'installation par défaut pour les nouvelles applications"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Désactiver appli intégrée?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Désactiver l\'application"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Si vous désactivez cette application, Android et d\'autres applications risquent de ne plus fonctionner correctement."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Supprimer les données et désactiver l\'application?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Si vous désactivez cette application, Android et d\'autres applications risquent de ne plus fonctionner correctement. Vos données seront également supprimées."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Désactiver les notifications?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si vous désactivez les notifications de cette application, vous risquez de manquer des alertes et des mises à jour importantes."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Boutique d\'applications"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Détails de l\'application"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Source de l\'application : <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utiliser le service"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utiliser la correction des couleurs"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utiliser les légendes"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continuer"</string>
<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="6371077608778830020">"Ajouter une prothèse auditive"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer un fonctionnement instable"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Comme cette appli n\'est pas config. pour optim. la pile, vous ne pouvez pas la restr.\n\nPour la restr., activez l\'optim. de pile."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Utilisation de l\'écran depuis la charge complète"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux cellulaires"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Utilisation de la pile depuis la charge complète"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Durée que l\'écran a été actif depuis la dernière charge complète"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Utilisation de l\'appareil depuis la charge complète"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Ajuster la consommation"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Modules inclus"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Applications qui drainent la pile"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Gardent l\'appareil actif"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Réveillent l\'appareil en arrière-plan"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Demandent la position fréquemment"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> applications se comportent de manière anormale"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Les applications fonctionnent normalement"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Le téléphone utilise une quantité typique d\'énergie en arrière-plan"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"La tablette utilise une quantité typique d\'énergie en arrière-plan"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">Limitation de l\'utilisation de la pile pour %1$d application</item>
<item quantity="other">Limitation de l\'utilisation de la pile pour %1$d applications</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Application restreinte : <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Ces applications ont utilisé la pile en arrière-plan. Il se peut que les applications restreintes ne fonctionnent pas correctement et que les notifications soient retardées."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Utiliser le gestionnaire de pile"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Détecter quand les applications drainent la pile"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Annuler"</string>
<string name="tts_reset" msgid="2661752909256313270">"Réinitialiser"</string>
<string name="tts_play" msgid="2628469503798633884">"Lire"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Contrôle de l\'alimentation"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Mise à jour des paramètres Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mise à jour des paramètres Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"Activé"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"désactivé"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"activation"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"désactivation"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Position"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synchroniser"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Luminosité <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatique"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"maximale"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"moyenne"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"désactivée"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"RPV"</string>
<string name="credentials_title" msgid="4446234003860769883">"Stockage des identifiants"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer à partir de la mémoire"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Tout sélectionner"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Utilisation des données"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilisation des données"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Données cell. et Wi-Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"La manière dont le fournisseur de services effectue les calcul des données peut être différente."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Utilisation de l\'appli"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"DÉTAILS DE L\'APPLICATION"</string>
@@ -2626,7 +2597,7 @@
<string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
<string name="data_usage_list_mobile" msgid="5588685410495019866">"Cellulaire"</string>
<string name="data_usage_list_none" msgid="3933892774251050735">"Aucun"</string>
- <string name="data_usage_enable_mobile" msgid="986782622560157977">"Données mobiles"</string>
+ <string name="data_usage_enable_mobile" msgid="986782622560157977">"Données cellulaires"</string>
<string name="data_usage_enable_3g" msgid="6304006671869578254">"Données 2G-3G"</string>
<string name="data_usage_enable_4g" msgid="3635854097335036738">"Données 4G"</string>
<string name="data_roaming_enable_mobile" msgid="1523331545457578362">"Itinérance"</string>
@@ -2635,7 +2606,7 @@
<string name="data_usage_app_settings" msgid="2279171379771253165">"Paramètres de l\'application"</string>
<string name="data_usage_app_restrict_background" msgid="7359227831562303223">"Données en arrière-plan"</string>
<string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"Activer l\'utilisation de données cellulaires en arrière-plan"</string>
- <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Pour restreindre les données en arrière-plan, définissez un quota de données mobiles."</string>
+ <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Pour restreindre les données en arrière-plan, définissez un quota de données cellulaires."</string>
<string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Limiter les données en arrière-plan?"</string>
<string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Cette fonctionnalité peut empêcher certaines applications de s\'exécuter lorsque celles-ci sont dépendantes des données en arrière-plan et que seuls des réseaux mobiles sont disponibles.\n\nVous trouverez des options plus adaptées en matière de contrôle de la consommation des données dans les paramètres de l\'application."</string>
<string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"La limitation des données en arrière-plan n\'est possible que si vous avez défini un plafond d\'utilisation pour les données cellulaires."</string>
@@ -2649,7 +2620,7 @@
<string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Définir"</string>
<string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Définir l\'avertissement d\'utilisation des données"</string>
<string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Définir la limite de consommation des données"</string>
- <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitation de la consommation de données mobiles"</string>
+ <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitation de la consommation de données cellulaires"</string>
<string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Votre tablette désactivera les données cellulaires lorsqu\'elle atteindra la limite que vous définissez.\n\nComme c\'est votre tablette qui mesure la consommation des données, et que votre fournisseur de services peut utiliser un système de mesure différent, nous vous conseillons d\'utiliser une limite plus basse."</string>
<string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Votre téléphone désactivera les données cellulaires lorsqu\'il atteindra la limite que vous définissez.\n\nComme c\'est votre téléphone qui mesure la consommation des données, et que votre fournisseur de services peut utiliser un système de mesure différent, nous vous conseillons de définir une limite plus basse."</string>
<string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Limiter les données en arrière-plan?"</string>
@@ -2900,8 +2871,8 @@
<string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Contrôlées par <xliff:g id="APP">%1$s</xliff:g>"</string>
<string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Cette application peut accéder à vos comptes."</string>
<string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"Cette application peut accéder à vos comptes. Contrôlée par <xliff:g id="APP">%1$s</xliff:g>."</string>
- <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi et données mobiles"</string>
- <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Autoriser les modifications des paramètres du Wi‑Fi et des données mobiles"</string>
+ <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi et données cellulaires"</string>
+ <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Autoriser les modifications des paramètres du Wi‑Fi et des données cellulaires"</string>
<string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
<string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Autoriser les modifications des associations et des paramètres Bluetooth"</string>
<string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">Afficher %d élément masqué</item>
<item quantity="other">Afficher %d éléments masqués</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Réduire"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Réseau et Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"cellulaire"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilisation de données"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applis et notifications"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorisations, applications par défaut"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Les applications du profil professionnel n\'ont pas accès aux notifications."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Comptes"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Aucun compte ajouté"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Applications par défaut"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Langues, sauvegardes, mises à jour"</string>
<string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
- <string name="search_menu" msgid="6283419262313758339">"Rechercher dans les paramètres"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, connexion réseau, internet, sans fil, données, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, activer, désactiver, gestion"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"message texte, SMS, messages, messagerie, par défaut"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"payer, toucher, paiements"</string>
<string name="keywords_backup" msgid="470070289135403022">"sauvegarde, sauvegarder"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"geste"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"visage, déverrouiller, authentification, se connecter"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"iiem, idem, min, version de la liste d\'itinérance préférée, iiem sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"réseau, état du réseau cellulaire, état du service, puissance du signal, type de réseau cellulaire, itinérance, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"numéro de série, version matérielle"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"thème sombre"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bogue"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Affichage en mode Veille, écran de verrouillage"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notification sur l\'écran de verrouillage"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"visage"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"empreintes digitales"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"réduire la luminosité de l\'écran, écran tactile, pile, réglage intelligent de la luminosité, luminosité dynamique"</string>
@@ -3451,7 +3423,7 @@
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger un mot de passe pour démarrer l\'appareil?"</string>
<string name="encryption_interstitial_message_pin_for_face" msgid="2017438765366716760">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre NIP avant que l\'appareil ne démarre, en plus de la reconnaissance du visage. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le NIP pour démarrer l\'appareil?"</string>
<string name="encryption_interstitial_message_pattern_for_face" msgid="3551827507967661552">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre schéma avant que l\'appareil ne démarre, en plus de la reconnaissance du visage. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le schéma pour démarrer l\'appareil?"</string>
- <string name="encryption_interstitial_message_password_for_face" msgid="3452793542112093614">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de la reconnaissance du visage. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le mot de passe pour démarrer l\'appareil?"</string>
+ <string name="encryption_interstitial_message_password_for_face" msgid="3452793542112093614">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de la reconnaissance du visage. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le mot de passe pour démarrer l\'appareil?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"Oui"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"Non"</string>
<string name="restricted_true_label" msgid="4761453839409220473">"Restreinte"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Lorsque vous entrez votre NIP pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne seront pas accessibles immédiatement."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Lorsque vous entrez votre schéma pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne seront pas accessibles immédiatement."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Lorsque vous entrez votre mot de passe pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne seront pas accessibles immédiatement."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Remarque : Après un redémarrage, vous ne pouvez pas lancer cette application tant que vous n\'avez pas déverrouillé votre téléphone."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Remarque : Si vous redémarrez votre téléphone et que vous avez défini un verrouillage de l\'écran, cette application ne peut pas démarrer tant que vous n\'avez pas déverrouillé votre téléphone"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Information concernant le code IIEM"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Information concernant le code IIEM"</string>
<string name="slot_number" msgid="3762676044904653577">"(Fente <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personnel"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Travail"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Applications : toutes"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Applis : notifications bloquées"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Désactivées"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Catégories : importance urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Catégories : importance faible"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Catégories : notif. bloquées"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Afficher l\'utilisation totale de l\'appareil"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Afficher utilisation des applis"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Utilisation élevée"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> application se comporte de manière anormale</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> applications se comportent de manière anormale</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Stockage interne : <xliff:g id="PERCENTAGE">%1$s</xliff:g> utilisé - <xliff:g id="FREE_SPACE">%2$s</xliff:g> disponible"</string>
<string name="display_summary" msgid="6737806235882127328">"Passer en veille après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Fond d\'écran, mode sommeil, taille de la police"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Veille après 10 minutes d\'inactivité"</string>
<string name="memory_summary" msgid="8080825904671961872">"Mémoire utilisée en moyenne : <xliff:g id="USED_MEMORY">%1$s</xliff:g> sur <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Connecté en tant que <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"La messagerie texte est désactivée"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"L\'appareil photo est désactivé"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Les captures d\'écran sont désactivées"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Impossible de désactiver les sauvegardes"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Impossible d\'ouvrir cette application"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Si vous avez des questions, veuillez communiquer avec votre administrateur informatique"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Détails supplémentaires"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simuler un écran avec une découpe"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Aucun"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Par défaut de l\'appareil"</string>
<string name="special_access" msgid="3458780842491881155">"Accès spéciaux applis"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut utiliser les données sans restriction</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connecté à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connecté à plusieurs appareils"</string>
<string name="demo_mode" msgid="2798762752209330277">"Mode de démonstration de l\'interface système"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Mode Nuit"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Activer le mode Nuit"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Mode Sombre"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Définir le mode Sombre"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Paramètres rapides, tuiles de concepteur"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Traçage Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Paramètres du profil professionnel"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Recherche de contacts"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Autoriser les recherches de contacts dans votre organisation à identifier les appelants et les contacts"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Toucher deux fois le téléphone pour le consulter"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Touchez l\'écran deux fois pour consulter votre tablette"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Touchez l\'écran deux fois pour consulter votre appareil"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, toucher deux fois l\'écran."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, touchez deux fois l\'écran."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisir pour consulter le téléphone"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Saisissez la tablette pour consulter les notifications"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Saisissez l\'appareil pour consulter les notifications"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, saisir votre téléphone."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, saisir votre tablette."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Pour vérifier l\'heure, les icônes de notification et d\'autres renseignements, saisir votre appareil."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Réactiver l\'écran"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, saisissez votre téléphone."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, saisissez votre tablette."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, saisissez votre appareil."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Geste de verrou de réveil de l\'écran"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Balayer lecteur d\'empreintes pour voir notif."</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Balayer empreinte"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pour consulter vos notifications, passer votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière du téléphone."</string>
@@ -4013,7 +3988,7 @@
<string name="web_action_enable_title" msgid="4051513950976670853">"Applications instantanées"</string>
<string name="web_action_enable_summary" msgid="3108127559723396382">"Ouvrir les liens dans les applications, même si elles ne sont pas installées"</string>
<string name="web_action_section_title" msgid="7364647086538399136">"Applications instantanées"</string>
- <string name="instant_apps_settings" msgid="8827777916518348213">"Préférences des applications instantanées"</string>
+ <string name="instant_apps_settings" msgid="8827777916518348213">"Préf. applis instantanées"</string>
<string name="domain_url_section_title" msgid="7046835219056428883">"Applications installées"</string>
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Votre espace de stockage est maintenant géré par le gestionnaire de stockage"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"Comptes pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> tentative</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentatives</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Les données de cet appareil sont en cours de sauvegarde"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Cet appareil est géré par votre organisation."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Cet appareil est géré par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Service de remplissage auto"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatique, remplir, remplissage automatique"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Assurez-vous de faire confiance à cette application</b> <br/> <br/> <xliff:g id=app_name example=Google Remplissage automatique>%1$s</xliff:g> utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de l\'entrée automatique."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Remplissage automatique"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Niveau de journalisation"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Nombre maximal de demandes par session"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Nombre maximal d\'ensembles de données"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Réinitialiser aux valeurs par défaut"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Les options de remplissage automatique du concepteur ont été réinitialisées"</string>
<string name="device_theme" msgid="4571803018917608588">"Thème de l\'appareil"</string>
<string name="default_theme" msgid="7085644992078579076">"Par défaut"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nom du réseau"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher l\'approvisionnement du fournisseur de services"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Mettre à jour les paramètres du mode Ne pas déranger"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Suspendre les notifications pour rester concentré"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Quelles sont les nouveautés toutes chaudes?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Découvrez votre nouveau téléphone"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Découvrez votre nouvel appareil"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas accessible sur cet appareil."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forcer les mesures GNSS complètes"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Faire le suivi de toutes les constellations et les fréquences GNSS sans cycle de tâches"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Toujours afficher la fenêtre de plantage"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Afficher la fenêtre chaque fois qu\'une application plante"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Sélectionnez l\'application compatible avec ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Aucune application compatible avec ANGLE n\'a été définie"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Application compatible avec ANGLE : <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Accès au répertoire"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"accès au répertoire"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Détails du réseau"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Le nom de votre appareil est visible pour les applications de votre téléphone. Il est aussi possible que d\'autres personnes le voient lorsque vous vous connectez à des appareils Bluetooth ou lorsque vous configurez un point d\'accès Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Appareils"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Tous les paramètres"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suggestions"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Données CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Données CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Choisir un réseau"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Déconnecté"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connecté"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connexion en cours…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Impossible de se connecter"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Aucun réseau trouvé."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Impossible de trouver des réseaux. Réessayez."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(interdit)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Aucune carte SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Appels avancés"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Mode réseau préféré : WCDMA de préférence"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Mode réseau préféré : GSM uniquement"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Mode réseau préféré : WCDMA uniquement"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Mode réseau préféré : GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Mode réseau préféré : CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Mode réseau préféré : CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Mode réseau préféré : CDMA uniquement"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Mode réseau préféré : EvDo uniquement"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Mode réseau préféré : CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Mode réseau préféré : LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Mode réseau préféré : GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Mode réseau préféré : CDMA+LTE/EvDo"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Mode réseau préféré : global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Mode réseau préféré : LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Mode réseau préféré : LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Mode réseau préféré : LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Mode réseau préféré : TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Mode réseau préféré : TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Mode réseau préféré : LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Mode réseau préféré : TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Mode réseau préféré : LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Mode réseau préféré : TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Mode réseau préféré : LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Mode réseau préféré : LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Mode réseau préféré : TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Mode réseau préféré : LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recommandé)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recommandé)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Réseaux disponibles"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Recherche en cours…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Enregistrement sur <xliff:g id="NETWORK">%s</xliff:g> en cours…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Votre carte SIM ne vous permet pas de vous connecter à ce réseau."</string>
+ <string name="connect_later" msgid="978991102125216741">"Impossible de se connecter à ce réseau pour le moment. Veuillez réessayer plus tard."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Enregistré sur le réseau."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Sélectionner automatiquement le réseau"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Param. du fourn. de serv."</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Configurer service de données"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Données cellulaires"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Accéder aux données sur réseau cellulaire"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Type de réseau préféré"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Changer le mode de fonctionnement du réseau"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Type de réseau préféré"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Fournisseur de services"</string>
+ <string name="call_category" msgid="8108654745239563833">"Appels"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Appels vidéo par l\'entremise du fournisseur de services"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Sélection système"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Modifier le mode d\'itinérance CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Sélection système"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Réseau"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Réseau"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Abonnement CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Basculer entre les cartes RUIM/SIM et NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"abonnement"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Enregistrement automatique en cours…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Autoriser les données en itinérance?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Communiquez avec votre fournisseur réseau pour connaître les tarifs."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Utilisation des données par l\'application"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Mode réseau non valide : <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorer."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Indisponible lorsque vous êtes connectés au réseau de <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"En voir plus"</string>
+ <string name="see_less" msgid="1250265310929558370">"En voir moins"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Aucun appareil connecté"</string>
</resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 7af86ea..a80d768 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Considérer comme facturé à l\'usage"</item>
<item msgid="2266114985518865625">"Considérer comme non facturé à l\'usage"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Par défaut (utiliser une adresse MAC aléatoire)"</item>
+ <item msgid="5398461510512959597">"Fiable"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Non"</item>
<item msgid="3863157480502955888">"Oui"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Toujours activé"</item>
<item msgid="6385301106124765323">"Toujours désactivé"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Désactivé"</item>
+ <item msgid="2182686878828390312">"Débogage"</item>
+ <item msgid="5286514712714822064">"Détaillé"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Réseaux domestiques uniquement"</item>
+ <item msgid="5034813753274486448">"Automatique"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA de préférence"</item>
+ <item msgid="807926878589867564">"GSM uniquement"</item>
+ <item msgid="488474605709912156">"WCDMA uniquement"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automatique"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automatique"</item>
+ <item msgid="370391313511477301">"CDMA sans EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo uniquement"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Général"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA uniquement"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Général"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1997599..f09cdf3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Créer"</string>
<string name="allow" msgid="3349662621170855910">"Autoriser"</string>
<string name="deny" msgid="6947806159746484865">"Refuser"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Fermer"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Changer"</string>
<string name="device_info_default" msgid="7847265875578739287">"Inconnu"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir développeur</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Inutile, vous êtes déjà un développeur."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Veuillez tout d\'abord activer les options pour les développeurs."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Sans fil et réseaux"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Connexions"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Appareil"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personnel"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Accès"</string>
<string name="header_category_system" msgid="2816866961183068977">"Système"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Activer la connexion des données"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Désactiver la connexion des données"</string>
@@ -114,14 +108,13 @@
<string name="bluetooth_disconnect_all_profiles" product="device" msgid="3995834526315103965">"Votre appareil va se déconnecter de \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_disconnect_dialog_ok" msgid="3308586619539119106">"Déconnecter"</string>
<string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
- <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Associer nouvel app."</string>
+ <string name="bluetooth_pairing_pref_title" msgid="7429413067477968637">"Associer un appareil"</string>
<string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Lorsque le Bluetooth est activé, votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible par les appareils à proximité."</string>
<string name="bluetooth_footer_mac_message" product="default" msgid="1109366350000220283">"Adresse Bluetooth du téléphone : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_footer_mac_message" product="tablet" msgid="6807634484499166486">"Adresse Bluetooth de la tablette : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresse Bluetooth de l\'appareil : <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Déconnecter l\'appareil \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Appareil Bluetooth sans nom"</string>
<string name="progress_scanning" msgid="192587958424295789">"Recherche en cours"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Aucun appareil Bluetooth détecté."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Une application requiert l\'activation du Bluetooth et nécessite que d\'autres appareils puissent détecter votre téléphone. Vous pourrez ensuite annuler cette opération dans les paramètres Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Activation du Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Désactivation du Bluetooth..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connexion automatique"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Demande de connexion Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Appuyez pour vous connecter à l\'appareil \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Voulez-vous vous connecter à \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ?"</string>
@@ -168,7 +160,7 @@
<string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visible avec le nom \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" pour les autres appareils"</string>
<string name="bluetooth_off_footer" msgid="8406865700572772936">"Activez le Bluetooth pour vous connecter à d\'autres appareils."</string>
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Vos appareils"</string>
- <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer nouvel app."</string>
+ <string name="bluetooth_pairing_page_title" msgid="7712127387361962608">"Associer nouvel appareil"</string>
<string name="bluetooth_pref_summary" product="tablet" msgid="3520035819421024105">"Autoriser la tablette à communiquer avec les appareils Bluetooth à proximité"</string>
<string name="bluetooth_pref_summary" product="device" msgid="2205100629387332862">"Autoriser l\'appareil à communiquer avec les appareils Bluetooth à proximité"</string>
<string name="bluetooth_pref_summary" product="default" msgid="782032074675157079">"Autoriser le téléphone à communiquer avec les appareils Bluetooth à proximité"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Périphériques d\'appel disponibles"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Actuellement connecté"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Appareils enregistrés"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Ajouter un appareil"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Le Bluetooth sera activé pour permettre l\'association"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Préférences de connexion"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Appareils connectés précédemment"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Connecté précedemment"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth activé"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Tout afficher"</string>
<string name="date_and_time" msgid="9062980487860757694">"Date et heure"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Sélectionner le fuseau horaire"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Ignorer"</string>
<string name="next_label" msgid="4693520878012668114">"Suivant"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Langues"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Préférences de langue"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Supprimer"</string>
<string name="add_a_language" msgid="2330538812283783022">"Ajouter une langue"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Paramètres"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Raccourci vers les paramètres"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Mode Avion"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Plus"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sans fil et réseaux"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Gérer le Wi-Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Données mobiles"</string>
@@ -363,7 +353,7 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Message sur écran verrouillé"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Activer les widgets"</string>
<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_title" msgid="7393790212603280213">"Afficher l\'option de blocage"</string>
<string name="lockdown_settings_summary" msgid="429230431748285997">"Afficher l\'option du bouton Marche/Arrêt, qui désactive la fonctionnalité Smart Lock, le déverrouillage à l\'aide d\'une empreinte numérique et les notifications sur l\'écran de verrouillage"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Aucun"</string>
<string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Confidentialité"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Désactivé par l\'administrateur"</string>
<string name="security_status_title" msgid="5848766673665944640">"État de la sécurité"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Verrouillage de l\'écran, Face Unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Verrouillage de l\'écran, empreinte digitale"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Verrouillage de l\'écran"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Visage ajouté"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Déverrouiller avec le visage"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Vous authentifier avec votre visage"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Utilisez votre visage"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utilisez votre visage pour déverrouiller votre téléphone ou approuver des achats.\n\nRemarque : Vous ne pouvez pas utiliser votre visage pour déverrouiller cet appareil. Pour en savoir plus, contactez l\'administrateur de votre organisation."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Utilisez votre visage pour déverrouiller votre téléphone, autoriser des achats ou vous connecter à des applications"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> empreintes digitales"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrer votre visage dans le cercle"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Plus tard"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Vous pouvez ajouter jusqu\'à <xliff:g id="COUNT">%d</xliff:g> visages"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Vous avez ajouté le nombre maximal autorisé de visages"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Impossible d\'ajouter d\'autres visages"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"L\'enregistrement n\'est pas terminé"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Délai d\'enregistrement du visage expiré. Veuillez réessayer."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"L\'enregistrement du visage n\'a pas fonctionné."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Configuration réussie. Aucun problème."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"OK"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Utiliser visage pour"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Déverrouiller appareil"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Connexion applis et paiements"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Yeux ouverts pour déverrouil."</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Si vous utilisez l\'authentification faciale, vous devez avoir les yeux ouverts"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Suppr. données visage"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Améliorer les données du visage"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Vous pouvez utiliser votre visage pour déverrouiller votre appareil et accéder à des applications. "<annotation id="url">"En savoir plus"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Empreinte digitale"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gérer empreintes num."</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Utiliser empr. num. pour"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Sélectionnez au moins une bande pour le point d\'accès Wi-Fi :"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Paramètres IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Confidentialité"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Veuillez sélectionner un élément"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Annuler"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Supprimer le réseau ?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Tous les mots de passe pour ce réseau seront supprimés"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Réseaux enregistrés"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d réseau</item>
<item quantity="other">%d réseaux</item>
@@ -998,8 +1005,8 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Préférences en matière d\'itinérance"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"Wi-Fi préféré"</item>
- <item msgid="1335127656328817518">"Priorité au mobile"</item>
+ <item msgid="2124257075906188844">"Wi-Fi de préférence"</item>
+ <item msgid="1335127656328817518">"Données mobiles de préférence"</item>
<item msgid="3132912693346866895">"Wi-Fi uniquement"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
@@ -1014,7 +1021,7 @@
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
<item msgid="5782108782860004851">"Wi-Fi de préférence"</item>
- <item msgid="5074515506087318555">"Priorité au mobile"</item>
+ <item msgid="5074515506087318555">"Données mobiles de préférence"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
@@ -1091,7 +1098,7 @@
<string name="color_mode_option_natural" msgid="5013837483986772758">"Naturel"</string>
<string name="color_mode_option_boosted" msgid="8588223970257287524">"Contrasté"</string>
<string name="color_mode_option_saturated" msgid="4569683960058798843">"Saturé"</string>
- <string name="color_mode_option_automatic" msgid="7996505473528529568">"Adaptative"</string>
+ <string name="color_mode_option_automatic" msgid="7996505473528529568">"Adaptatif"</string>
<string name="color_mode_summary_natural" msgid="6624188642920403099">"N\'utiliser que des couleurs proches de la réalité"</string>
<string name="color_mode_summary_automatic" msgid="4669516973360709431">"Ajuster entre les couleurs vives et proches de la réalité"</string>
<string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Luminosité"</string>
<string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Adaptation de la luminosité"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Activée"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Désactivée"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Niveau de luminosité préféré très faible"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Niveau de luminosité préféré faible"</string>
@@ -1125,7 +1131,7 @@
<string name="night_display_text" msgid="1837277457033025056">"L\'éclairage nocturne colore votre écran en rouge ambré. Cela vous permet de le regarder ou de lire plus facilement lorsque l\'éclairage est faible, et peut vous aider à vous endormir."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programme"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Aucun"</string>
- <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"S\'active à partir d\'une certaine heure"</string>
+ <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Actif à une heure définie"</string>
<string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Actif toute la nuit"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"Heure de début"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"Heure de fin"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Impossible de modifier le code PIN.\nLe code PIN est peut-être incorrect."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Le code PIN de la carte SIM a été modifié."</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Impossible de changer l\'état de verrouillage de la carte SIM.\nLe code PIN est peut-être incorrect."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Impossible de désactiver le code."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Impossible d\'activer le code."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Annuler"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Plusieurs cartes SIM détectées"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Cette option nécessite de formater la mémoire de stockage \"<xliff:g id="NAME_0">^1</xliff:g>\". \n\n"<b>"Le formatage entraîne la suppression de toutes les données enregistrées sur la mémoire \"<xliff:g id="NAME_1">^1</xliff:g>\"."</b>" Pour ne pas risquer de perdre vos données, nous vous conseillons de les sauvegarder."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Effacer et formater"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatage de mémoire \"<xliff:g id="NAME">^1</xliff:g>\" en cours"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Ne retirez pas le périphérique <xliff:g id="NAME">^1</xliff:g> pendant le formatage."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Ne retirez pas le périphérique <xliff:g id="NAME">^1</xliff:g> pendant le formatage."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Déplacer vers une autre mémoire"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Vous pouvez déplacer vos photos, vos fichiers et certaines applications vers la nouvelle mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\". \n\nCette opération prend environ <xliff:g id="TIME">^2</xliff:g> et permet de libérer <xliff:g id="SIZE">^3</xliff:g> sur la mémoire de stockage interne. Certaines applications ne fonctionneront pas pendant l\'opération."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Déplacer les données maintenant"</string>
@@ -1392,20 +1400,20 @@
<string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ne retirez pas la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\" pendant le déplacement. \n\nL\'application \"<xliff:g id="APP">^2</xliff:g>\" ne sera pas disponible jusqu\'à la fin de l\'opération."</string>
<string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Annuler le déplacement"</string>
<string name="storage_wizard_slow_body" msgid="8010127667184768025">"Ce <xliff:g id="NAME_0">^1</xliff:g> ne semble pas rapide. \n\nVous pouvez continuer, mais les applis déplacées vers cet emplacement risquent de se bloquer et les transferts de données pourront prendre du temps. \n\nVeuillez utiliser un <xliff:g id="NAME_1">^1</xliff:g> plus rapide pour de meilleures performances."</string>
- <string name="storage_wizard_init_v2_title" msgid="8858395869710288372">"Comment utiliserez-vous <xliff:g id="NAME">^1</xliff:g> ?"</string>
+ <string name="storage_wizard_init_v2_title" msgid="8858395869710288372">"Comment utiliserez-vous ce support (<xliff:g id="NAME">^1</xliff:g>) ?"</string>
<string name="storage_wizard_init_v2_internal_title" product="tablet" msgid="4315585580670552654">"Utiliser en stockage tabl. supp."</string>
- <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="570443086512059390">"Pour applis/fichiers/contenus multimédias sur cette tabl. uniq."</string>
+ <string name="storage_wizard_init_v2_internal_summary" product="tablet" msgid="570443086512059390">"Pour les applis, fichiers, contenus multimédias sur cette tablette uniquement"</string>
<string name="storage_wizard_init_v2_internal_action" product="tablet" msgid="7760758592993284143">"Stockage sur la tablette"</string>
- <string name="storage_wizard_init_v2_internal_title" product="default" msgid="8373070138732653456">"Utiliser en stockage tél. supp."</string>
- <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="685194340141573218">"Pour applis/fichiers/contenus multimédias sur ce tél. uniquement"</string>
+ <string name="storage_wizard_init_v2_internal_title" product="default" msgid="8373070138732653456">"Stockage supplémentaire sur le téléphone"</string>
+ <string name="storage_wizard_init_v2_internal_summary" product="default" msgid="685194340141573218">"Pour les applis, fichiers, contenus multimédias sur ce téléphone uniquement"</string>
<string name="storage_wizard_init_v2_internal_action" product="default" msgid="904425171564310150">"Stockage sur le téléphone"</string>
<string name="storage_wizard_init_v2_or" msgid="1958295749349454436">"Ou"</string>
- <string name="storage_wizard_init_v2_external_title" msgid="3565348221712759463">"Utiliser comme mémoire externe"</string>
- <string name="storage_wizard_init_v2_external_summary" msgid="801198071793584445">"Pour transférer fichiers/contenus multimédias entre appareils"</string>
- <string name="storage_wizard_init_v2_external_action" msgid="8662451480642784031">"Périphérique de stockage externe"</string>
+ <string name="storage_wizard_init_v2_external_title" msgid="3565348221712759463">"Stockage externe"</string>
+ <string name="storage_wizard_init_v2_external_summary" msgid="801198071793584445">"Pour transférer des fichiers et contenus multimédias entre des appareils"</string>
+ <string name="storage_wizard_init_v2_external_action" msgid="8662451480642784031">"Stockage externe"</string>
<string name="storage_wizard_init_v2_later" msgid="1080613420170749130">"Configurer plus tard"</string>
- <string name="storage_wizard_format_confirm_v2_title" msgid="5744790239994621663">"Formater le périphérique <xliff:g id="NAME">^1</xliff:g> ?"</string>
- <string name="storage_wizard_format_confirm_v2_body" msgid="4614199613500900975">"Le périphérique <xliff:g id="NAME_0">^1</xliff:g> doit être formaté pour stocker des applications, des fichiers et des contenus multimédias. \n\nNotez que le formatage effacera le contenu actuel de \"<xliff:g id="NAME_1">^2</xliff:g>\". Pour éviter toute perte de contenu, sauvegardez-le sur un autre périphérique <xliff:g id="NAME_2">^3</xliff:g> ou sur un autre appareil."</string>
+ <string name="storage_wizard_format_confirm_v2_title" msgid="5744790239994621663">"Formater le support (<xliff:g id="NAME">^1</xliff:g>) ?"</string>
+ <string name="storage_wizard_format_confirm_v2_body" msgid="4614199613500900975">"Le support (<xliff:g id="NAME_0">^1</xliff:g>) doit être formaté pour stocker des applications, des fichiers et des contenus multimédias. \n\nNotez que le formatage effacera le contenu actuel du support (<xliff:g id="NAME_1">^2</xliff:g>). Pour éviter toute perte de contenu, sauvegardez-le sur un autre support (<xliff:g id="NAME_2">^3</xliff:g>) ou sur un autre appareil."</string>
<string name="storage_wizard_format_confirm_v2_action" msgid="8258363472135537500">"Formater <xliff:g id="NAME">^1</xliff:g>"</string>
<string name="storage_wizard_migrate_v2_title" msgid="31406330052996898">"Déplacer le contenu vers <xliff:g id="NAME">^1</xliff:g> ?"</string>
<string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4476553430145054781">"Vous pouvez déplacer des fichiers, des contenus multimédias et certains applications vers le périphérique <xliff:g id="NAME">^1</xliff:g>. \n\nCette opération permet de libérer jusqu\'à <xliff:g id="SIZE">^2</xliff:g> sur votre tablette et dure environ <xliff:g id="DURATION">^3</xliff:g>."</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installée"</string>
<string name="no_applications" msgid="7336588977497084921">"Aucune application"</string>
<string name="internal_storage" msgid="1584700623164275282">"Stockage interne"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"mémoire de stockage interne"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Mémoire USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Carte SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Calcul de la taille..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Supprimer les données de l\'application ?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Les données de cette application (fichiers, paramètres, comptes, bases de données, etc.) vont être définitivement supprimées."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"L\'application ne figure pas dans la liste des applications installées."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Impossible d\'effacer le stockage pour l\'application."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Cette application peut accéder aux éléments suivants de votre tablette :"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Cette application peut effectuer les actions suivantes sur votre téléphone :"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Cette application peut accéder aux éléments de votre tablette répertoriés ci-dessous. Afin d\'améliorer les performances et de réduire l\'utilisation de la mémoire, certaines autorisations sont accordées à <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, car elle s\'exécute au sein du même processus que les applications <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Cette application peut accéder aux éléments de votre téléphone répertoriés ci-dessous. Afin d\'améliorer les performances et de réduire l\'utilisation de la mémoire, certaines autorisations sont accordées à <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, car elle s\'exécute au sein du même processus que les applications <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> et <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Cette application peut engendrer des frais :"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Envoyer un SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"Traitement..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Impossible de calculer la taille du package."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Aucune application tierce n\'est installée."</string>
<string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Déplacer"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Déplacer vers la tablette"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Déplacer vers le téléphone"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Déplacer vers USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Déplacer vers la carte SD"</string>
- <string name="moving" msgid="6431016143218876491">"Déplacement en cours"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Une autre migration est déjà en cours."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Espace de stockage insuffisant."</string>
<string name="does_not_exist" msgid="1501243985586067053">"L\'application n\'existe pas."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Impossible d\'installer l\'application d\'administration de l\'appareil sur des supports externes"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Forcer l\'arrêt ?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"L\'arrêt forcé d\'une application peut provoquer un fonctionnement instable."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Impossible de déplacer l\'application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Emplacement d\'installation souhaité"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Modifier l\'emplacement d\'installation par défaut pour les nouvelles applications"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Désactiver l\'appli intégrée ?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Désactiver l\'application"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Si vous désactivez cette application, il est possible qu\'Android et d\'autres applications ne fonctionnent plus comme prévu."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Supprimer les données et désactiver l\'application ?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Si vous désactivez cette application, il est possible qu\'Android et d\'autres applications ne fonctionnent plus comme prévu. Vos données seront également supprimées."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Désactiver les notifications ?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si vous désactivez les notifications de cette application, vous risquez de manquer des alertes et des mises à jour importantes."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Boutique"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Infos sur l\'application"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Application installée depuis la boutique <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,7 +1988,8 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utiliser le service"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Corriger les couleurs"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utiliser les sous-titres"</string>
- <string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Appareil auditif"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continuer"</string>
+ <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="6371077608778830020">"Ajouter un appareil auditif"</string>
<string name="accessibility_hearingaid_pair_instructions_first_message" msgid="3912093691643131154">"Pour associer votre appareil auditif, recherchez-le et appuyez dessus sur l\'écran suivant."</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer son dysfonctionnement"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Cette appli n\'étant pas configurée pour optimiser batterie, vous ne pouvez pas la limiter.\n\nActivez optimisation batterie."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Utilisation de l\'écran depuis la dernière charge complète"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux mobiles"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Utilisation de la batterie depuis la dernière charge complète"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Durée d\'activation de l\'écran depuis la charge complète"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Utilisation de l\'appareil depuis la charge complète"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Ajuster la consommation"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Modules inclus"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Applications qui déchargent la batterie"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Appareil maintenu activé"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Activation de l\'appareil en arrière-plan"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Position demandée fréquemment"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> applications ne fonctionnent pas correctement"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Les applications s\'exécutent normalement"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"L\'utilisation en arrière-plan de la batterie par le téléphone est normale"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"L\'utilisation en arrière-plan de la batterie par la tablette est normale"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">Limitation de l\'utilisation de la batterie pour %1$d application</item>
<item quantity="other">Limitation de l\'utilisation de la batterie pour %1$d applications</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Limitée <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Ces applications utilisent la batterie en arrière-plan. Les applications dont l\'accès est limité peuvent ne pas fonctionner correctement et leurs notifications risquent d\'être retardées."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Utiliser le gestionnaire de batterie"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Détecter les applications qui déchargent la batterie"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Annuler"</string>
<string name="tts_reset" msgid="2661752909256313270">"Réinitialiser"</string>
<string name="tts_play" msgid="2628469503798633884">"Lecture"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Contrôle de l\'alimentation"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Mise à jour des paramètres Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mise à jour des paramètres Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"activé"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"désactivé"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"activation"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"désactivation"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Localisation"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synchronisation"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Luminosité <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatique"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"maximale"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"moyenne"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"désactivée"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Stockage des identifiants"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer depuis la mémoire"</string>
@@ -2452,7 +2423,7 @@
<string name="credentials_not_erased" msgid="7685932772284216097">"Impossible eff. stockage identifiants."</string>
<string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Avant de pouvoir utiliser le stockage des identifiants, vous devez définir un écran de verrouillage sécurisé sur votre appareil"</string>
<string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"DÉFINIR VERROUILLAGE"</string>
- <string name="usage_access_title" msgid="332333405495457839">"Applis avec accès données util."</string>
+ <string name="usage_access_title" msgid="332333405495457839">"Applis avec accès données conso"</string>
<string name="emergency_tone_title" msgid="254495218194925271">"Signal de numérotation d\'urgence"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
<string name="privacy_settings_title" msgid="2978878794187459190">"Sauvegarde"</string>
@@ -2584,8 +2555,8 @@
<string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="NUMBER">%1$d</xliff:g> fichiers sélectionnés sur <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Tout sélectionner"</string>
- <string name="data_usage_summary_title" msgid="3804110657238092929">"Conso. des données"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Conso données"</string>
+ <string name="data_usage_summary_title" msgid="3804110657238092929">"Conso des données"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Données mobiles et Wi-Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Le suivi de la consommation effectué par votre opérateur peut différer de celui de votre appareil."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Consommation par application"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"Infos appli"</string>
@@ -2962,10 +2933,9 @@
<item quantity="one">Afficher %d élément masqué</item>
<item quantity="other">Afficher %d éléments masqués</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Réduire"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Réseau et Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobile"</string>
- <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"conso. des données"</string>
+ <string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"conso des données"</string>
<string name="network_dashboard_summary_hotspot" msgid="8494210248613254574">"point d\'accès"</string>
<string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
<string name="connected_devices_dashboard_summary" msgid="2665221896894251402">"Bluetooth, mode Voiture, NFC"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applis et notifications"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorisations, applications par défaut"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Les applications du profil professionnel n\'ont pas accès aux notifications."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Comptes"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Aucun compte ajouté"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Applications par défaut"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Langues, date et heure, sauvegarde, mises à jour"</string>
<string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
- <string name="search_menu" msgid="6283419262313758339">"Rechercher dans les paramètres"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, connexion réseau, internet, sans fil, données, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, activer/désactiver, contrôle"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, envoyer un SMS, messages, envoyer un message, par défaut"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"payer, appuyer, paiements"</string>
<string name="keywords_backup" msgid="470070289135403022">"sauvegarde, sauvegarder"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"geste"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"visage, déverrouiller, authentifier, se connecter"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, version prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"réseau, état du réseau mobile, état du service, force du signal, type de réseau mobile, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"numéro de série, version logicielle"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"thème foncé"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"affichage en mode veille, affichage de l\'écran de verrouillage"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notification sur l\'écran de verrouillage"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"visage"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"empreinte digitale"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"réduire la luminosité de l\'écran, écran tactile, batterie, réglage intelligent de la luminosité, luminosité dynamique"</string>
@@ -3076,7 +3048,7 @@
<string name="other_sound_settings" msgid="3151004537006844718">"Autres sons"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonalités du numéroteur"</string>
<string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons du verrouillage d\'écran"</string>
- <string name="charging_sounds_title" msgid="1132272552057504251">"Sons de rechargement"</string>
+ <string name="charging_sounds_title" msgid="1132272552057504251">"Sons de recharge"</string>
<string name="docking_sounds_title" msgid="155236288949940607">"Sons de la station d\'accueil"</string>
<string name="touch_sounds_title" msgid="5326587106892390176">"Sons des touches"</string>
<string name="vibrate_on_touch_title" msgid="1510405818894719079">"Vibreur pour le toucher"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Lorsque vous saisissez votre code PIN pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne sont pas disponibles."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Lorsque vous dessinez votre schéma pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne sont pas disponibles."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Lorsque vous saisissez votre mot de passe pour démarrer cet appareil, les services d\'accessibilité comme <xliff:g id="SERVICE">%1$s</xliff:g> ne sont pas disponibles."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Remarque : Après un redémarrage, vous ne pouvez pas lancer cette application tant que vous n\'avez pas déverrouillé votre téléphone."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Remarque : Si vous redémarrez votre téléphone et que le verrouillage de l\'écran est activé, vous ne pouvez pas lancer cette application tant que vous n\'avez pas déverrouillé votre téléphone"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informations sur le code IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informations relatives au code IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Emplacement <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personnelles"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Professionnelles"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Applications : toutes"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Applications désactivées"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Désactivées"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Catégories : urgent"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Catégories : importance faible"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Catégories : désactivées"</string>
@@ -3557,7 +3529,7 @@
<string name="system_app" msgid="9068313769550747372">"(Système)"</string>
<string name="system_default_app" msgid="3091113402349739037">"(Paramètres par défaut)"</string>
<string name="apps_storage" msgid="4353308027210435513">"Volume occupé par appli"</string>
- <string name="usage_access" msgid="5479504953931038165">"Accès aux données d\'utilisation"</string>
+ <string name="usage_access" msgid="5479504953931038165">"Accès à la conso des données"</string>
<string name="permit_usage_access" msgid="4012876269445832300">"Autoriser l\'accès aux données d\'utilisation"</string>
<string name="app_usage_preference" msgid="7065701732733134991">"Préférences d\'utilisation de l\'application"</string>
<string name="time_spent_in_app_pref_title" msgid="649419747540933845">"Temps passé sur l\'application"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'utilisation"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Afficher l\'utilisation de l\'appareil chargé"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Afficher utilisation appli"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Utilisation élevée"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> application a un comportement anormal</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> applications ont un comportement anormal</item>
@@ -3626,8 +3597,8 @@
<string name="usb_control_device" msgid="5821511964163469463">"Cet appareil"</string>
<string name="usb_switching" msgid="8995313698715545619">"Changement…"</string>
<string name="usb_switching_failed" msgid="4156073015692409651">"Échec du changement"</string>
- <string name="usb_summary_charging_only" msgid="7544327009143659751">"Rechargement de l\'appareil"</string>
- <string name="usb_summary_power_only" msgid="1996391096369798526">"Rechargement de l\'appareil connecté"</string>
+ <string name="usb_summary_charging_only" msgid="7544327009143659751">"Recharge de l\'appareil"</string>
+ <string name="usb_summary_power_only" msgid="1996391096369798526">"Recharge de l\'appareil connecté"</string>
<string name="usb_summary_file_transfers" msgid="6925168380589489645">"Transfert de fichiers"</string>
<string name="usb_summary_tether" msgid="951190049557074535">"Partage de connexion via USB"</string>
<string name="usb_summary_photo_transfers" msgid="665584667685030007">"PTP"</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Mémoire de stockage interne : <xliff:g id="PERCENTAGE">%1$s</xliff:g> utilisés – <xliff:g id="FREE_SPACE">%2$s</xliff:g> disponibles"</string>
<string name="display_summary" msgid="6737806235882127328">"Mode veille activé après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Fond d\'écran, mise en veille, taille de police"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Mode veille après 10 minutes d\'inactivité"</string>
<string name="memory_summary" msgid="8080825904671961872">"Utilisation moyenne de <xliff:g id="USED_MEMORY">%1$s</xliff:g> sur <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de mémoire"</string>
<string name="users_summary" msgid="1674864467098487328">"Connecté en tant que \"<xliff:g id="USER_NAME">%1$s</xliff:g>\""</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS non autorisés"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Appareil photo non autorisé"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Capture d\'écran non autorisée"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Impossible de désactiver les sauvegardes"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Impossible d\'ouvrir cette application"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Pour toute question, contactez votre administrateur informatique"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Plus d\'informations"</string>
@@ -3812,7 +3784,7 @@
<string name="ota_disable_automatic_update" msgid="2319639631655915050">"Mises à jour automatiques du système"</string>
<string name="ota_disable_automatic_update_summary" msgid="940729694354373087">"Appliquer les mises à jour au démarrage de l\'appareil"</string>
<string name="usage" msgid="2977875522080448986">"Consommation"</string>
- <string name="cellular_data_usage" msgid="2155683719898158203">"Conso. données mobiles"</string>
+ <string name="cellular_data_usage" msgid="2155683719898158203">"Conso des données mobiles"</string>
<string name="app_cellular_data_usage" msgid="5468472735806533448">"Consommation de données des applications"</string>
<string name="wifi_data_usage" msgid="771603760674507659">"Consommation des données Wi-Fi"</string>
<string name="ethernet_data_usage" msgid="5108764537574354616">"Consommation de données Ethernet"</string>
@@ -3870,7 +3842,7 @@
<string name="data_saver_on" msgid="6774217590237934709">"Activé"</string>
<string name="data_saver_off" msgid="6892309031162738794">"Désactivé"</string>
<string name="data_saver_switch_title" msgid="836312690356005669">"Utiliser l\'économiseur de données"</string>
- <string name="unrestricted_app_title" msgid="4465437191723332066">"Conso. données non restreinte"</string>
+ <string name="unrestricted_app_title" msgid="4465437191723332066">"Conso données non restreinte"</string>
<string name="unrestricted_app_summary" msgid="6458008993501723912">"Autoriser l\'accès non restreint aux données lorsque l\'économiseur de données est activé"</string>
<string name="home_app" msgid="4066188520886810030">"Application sur la page d\'accueil"</string>
<string name="no_default_home" msgid="7184117487704520238">"Aucune page d\'accueil par défaut"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simuler un écran avec une encoche"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Encoche"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"encoche pour écran, entaille"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Aucune"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Appareil par défaut"</string>
<string name="special_access" msgid="3458780842491881155">"Applis : accès spécial"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut utiliser les données sans restrictions</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connecté à <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connecté à plusieurs appareils"</string>
<string name="demo_mode" msgid="2798762752209330277">"Mode de démonstration de l\'interface du système"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Mode Nuit"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Activer le mode Nuit"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Mode Foncé"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Définir le mode Foncé"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Tuiles de configuration rapide pour les développeurs"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Trace Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Paramètres du profil professionnel"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Recherche de contacts"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Autoriser les recherches de contacts dans votre organisation à identifier les appelants et les contacts"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Appuyer deux fois sur tél. pour le consulter"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Appuyez deux fois sur la tablette pour la consulter"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Appuyez deux fois sur l\'appareil pour le consulter"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, appuyez deux fois sur l\'écran."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Pour afficher l\'heure, les notifications et d\'autres informations, appuyez deux fois sur l\'écran."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisir le téléphone pour le consulter"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Saisir la tablette pour la consulter"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Saisir l\'appareil pour le consulter"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, saisissez votre téléphone."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, soulevez votre tablette."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Pour afficher l\'heure, les icônes de notification et d\'autres informations, soulevez votre appareil."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Activer l\'écran"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Pour afficher l\'heure, les notifications et d\'autres informations, saisissez votre téléphone."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Pour afficher l\'heure, les notifications et d\'autres informations, saisissez votre tablette."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Pour afficher l\'heure, les notifications et d\'autres informations, saisissez votre appareil."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Geste pour afficher l\'écran wakelock"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Utiliser le lecteur d\'empreinte pour afficher les notifications"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Balayer lecteur empreinte"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière du téléphone."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> tentative</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentatives</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Les données de cet appareil sont en cours de sauvegarde"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Cet appareil est géré par votre organisation."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Cet appareil est géré par <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Service de saisie automatique"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatique, saisie, saisie automatique"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Assurez-vous de faire confiance à cette application</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de la saisie automatique."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Saisie automatique"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Niveau de journalisation"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Nombre maximal de demandes par session"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Nombre maximal d\'ensembles de données visibles"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Rétablir les valeurs par défaut"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Les options de saisie automatique du développeur ont été réinitialisées"</string>
<string name="device_theme" msgid="4571803018917608588">"Thème de l\'appareil"</string>
<string name="default_theme" msgid="7085644992078579076">"Par défaut"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nom du réseau"</string>
@@ -4125,20 +4105,19 @@
<string name="storage_manager_indicator_on" msgid="8625551710194584733">"Activé"</string>
<string name="install_type_instant" msgid="3174425974536078647">"Appli instantanée"</string>
<string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"Désactiver le gestionnaire d\'espace de stockage ?"</string>
- <string name="storage_movies_tv" msgid="5498394447562086890">"Applications defilms et TV"</string>
+ <string name="storage_movies_tv" msgid="5498394447562086890">"Applications de films et TV"</string>
<string name="carrier_provisioning" msgid="4398683675591893169">"Informations de gestion des comptes opérateur"</string>
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Déclencher la gestion des comptes opérateur"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Mettre à jour le mode Ne pas déranger"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Suspendre les notifications pour rester concentré"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Nouveautés à découvrir"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Découvrez votre nouveau téléphone"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Découvrez votre nouvelle tablette"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Découvrez votre nouvel appareil"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Cette fonctionnalité n\'est pas disponible sur cet appareil"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forcer les mesures GNSS complètes"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Effectuer le suivi de toutes les fréquences et constellations GNSS sans rapport cyclique"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Toujours afficher une boîte de dialogue en cas de plantage"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Afficher une boîte de dialogue chaque fois qu\'une application plante"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Sélectionner une application compatible avec ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Aucune application compatible avec ANGLE n\'est définie"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Application compatible avec ANGLE : <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Accès à l\'annuaire"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"accès à l\'annuaire"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Détails du réseau"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Le nom de votre appareil est visible par les applications installées sur votre téléphone. Il peut l\'être également par d\'autres personnes en cas de connexion à des appareils Bluetooth ou de configuration d\'un point d\'accès Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Appareils"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Tous les paramètres"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suggestions"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Données CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Données CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Sélectionner un réseau"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Déconnecté"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connecté"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connexion…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Impossible de se connecter"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Aucun réseau trouvé."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Réseaux introuvables. Veuillez réessayer."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(interdit)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Pas de carte SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Appel avancé"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Mode réseau préféré : WCDMA de préférence"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Mode réseau préféré : GSM uniquement"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Mode réseau préféré : WCDMA uniquement"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Mode réseau préféré : GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Mode réseau préféré : CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Mode réseau préféré : CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Mode réseau préféré : CDMA uniquement"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Mode réseau préféré : EvDo uniquement"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Mode réseau préféré : CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Mode réseau préféré : LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Mode réseau préféré : GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Mode réseau préféré : CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Mode réseau préféré : général"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Mode réseau préféré : LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Mode réseau préféré : LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Mode réseau préféré : LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Mode réseau préféré : TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Mode réseau préféré : TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Mode réseau préféré : LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Mode réseau préféré : TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Mode réseau préféré : LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Mode réseau préféré : TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Mode réseau préféré : LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Mode réseau préféré : LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Mode réseau préféré: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Mode réseau préféré : LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recommandé)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recommandé)"</string>
+ <string name="network_global" msgid="959947774831178632">"Général"</string>
+ <string name="label_available" msgid="1731547832803057893">"Réseaux disponibles"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Recherche…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Enregistrement sur <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Votre carte SIM ne permet pas de vous connecter à ce réseau."</string>
+ <string name="connect_later" msgid="978991102125216741">"Impossible de se connecter à ce réseau pour le moment. Réessayez plus tard."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Enregistré sur le réseau."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Sélectionner automatiquement le réseau"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Paramètres de l\'opérateur"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Configurer service données"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Données mobiles"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Accéder aux données via le réseau mobile"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Type de réseau préféré"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Changer le mode de fonctionnement du réseau"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Type de réseau préféré"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Opérateur"</string>
+ <string name="call_category" msgid="8108654745239563833">"Appels"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Appels vidéo via l\'opérateur"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Sélection système"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Modifier le mode d\'itinérance CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Sélection système"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Réseau"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Réseau"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Abonnement CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Basculer entre les cartes RUIM/SIM et NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"abonnement"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Enregistrement automatique…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Autoriser l\'itinérance des données ?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Vérifiez le tarif auprès de votre opérateur."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Consommation de données des applications"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Mode réseau non valide <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Action ignorée."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Indisponible lorsque connecté à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Voir plus"</string>
+ <string name="see_less" msgid="1250265310929558370">"Moins de détails"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index e256490..34aa0a2 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -275,7 +275,7 @@
<item msgid="26109888160231211">"supervisar a localización"</item>
<item msgid="5753382310468855812">"supervisar localización de alta potencia"</item>
<item msgid="3356591542543137332">"obter estatísticas de uso"</item>
- <item msgid="3073734345226842233">"desactivar/activar o micrófono"</item>
+ <item msgid="3073734345226842233">"desactivar/activar o son do micrófono"</item>
<item msgid="2111767435887685265">"mostrar notificación emerxente"</item>
<item msgid="1091168669714823370">"multimedia do proxecto"</item>
<item msgid="485564189219029300">"activar VPN"</item>
@@ -342,7 +342,7 @@
<item msgid="8584357129746649222">"Localización"</item>
<item msgid="7669257279311110599">"Localización"</item>
<item msgid="3459320345690097795">"Obter estatísticas de uso"</item>
- <item msgid="1312534577834048535">"Desactivar/activar o micrófono"</item>
+ <item msgid="1312534577834048535">"Desactivar/activar o son do micrófono"</item>
<item msgid="427580389823724225">"Mostrar notificación emerxente"</item>
<item msgid="4992007785575926253">"Multimedia do proxecto"</item>
<item msgid="2482631530338029480">"Activar VPN"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tratar como rede de pago por consumo"</item>
<item msgid="2266114985518865625">"Tratar como rede sen límite de datos"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Predeterminado (utilizar enderezo MAC aleatorio)"</item>
+ <item msgid="5398461510512959597">"De confianza"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Non"</item>
<item msgid="3863157480502955888">"Si"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Sempre activado"</item>
<item msgid="6385301106124765323">"Sempre desactivado"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Desactivar"</item>
+ <item msgid="2182686878828390312">"Depurar"</item>
+ <item msgid="5286514712714822064">"Detallar"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Só redes domésticas"</item>
+ <item msgid="5034813753274486448">"Automático"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Preferencia: GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Só GSM"</item>
+ <item msgid="488474605709912156">"Só WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automático"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automático"</item>
+ <item msgid="370391313511477301">"CDMA sen EvDo"</item>
+ <item msgid="4678789463133969294">"Só EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA e LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Só TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index f3a4a96..4737b59 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Crear"</string>
<string name="allow" msgid="3349662621170855910">"Permitir"</string>
<string name="deny" msgid="6947806159746484865">"Rexeitar"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Pechar"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Cambiar"</string>
<string name="device_info_default" msgid="7847265875578739287">"Descoñecido"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Agora estás a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pasos de ser programador.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Non é necesario, xa es un programador."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Activa primeiro as opcións de programador."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Sen fíos e redes"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Conexións"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Persoal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Acceso"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Activar conexión de datos"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desactivar conexión de datos"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Enderezo Bluetooth do dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Queres desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusión"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sen nome"</string>
<string name="progress_scanning" msgid="192587958424295789">"Buscando"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Non hai ningún dispositivo próximo."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Unha aplicación quere activar o Bluetooth e que o teu teléfono estea visible para outros dispositivos. Podes cambiar esta opción máis adiante na configuración do Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando o Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexión automática"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitude de conexión Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Toca aquí para conectarte a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Queres conectarte a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de chamada dispoñibles"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Conectado actualmente"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivos gardados"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Engadir dispositivo"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Activarase o Bluetooth para permitir a sincronización"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferencias de conexión"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos previamente conectados"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Dispositivos conectados previamente"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"O Bluetooth está activado"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Ver todos os dispositivos"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Seleccionar zona horaria"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Omitir"</string>
<string name="next_label" msgid="4693520878012668114">"Seguinte"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Idiomas"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferencias de idioma"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Eliminar"</string>
<string name="add_a_language" msgid="2330538812283783022">"Engadir un idioma"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Configuración"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Atallo de configuración"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Máis"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sen fíos e redes"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Xestiona a wifi, o Bluetooth, o modo avión, redes de telefonía móbil e VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Datos móbiles"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desactivado polo administrador"</string>
<string name="security_status_title" msgid="5848766673665944640">"Estado de seguranza"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Bloqueo de pantalla e Desbloqueo facial"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueo de pantalla, impresión dixital"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo de pantalla"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Engadiuse a cara"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Desbloquear coa túa cara"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Utilizar a autenticación facial"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Utiliza a túa cara para desbloquear o teléfono, autorizar compras e iniciar sesión en aplicacións."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Usa a túa cara para autenticarte"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utiliza a cara para desbloquear o teléfono ou autorizar as compras.\n\nNota: Non podes utilizar a cara para desbloquear este dispositivo. Para obter máis información, ponte en contacto co administrador da túa organización."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Utiliza a túa cara para desbloquear o teléfono, autorizar compras e iniciar sesión en aplicacións"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Podes engadir ata <xliff:g id="COUNT">%d</xliff:g> impresións dixitais"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centra a cara no círculo"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Facelo máis tarde"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Podes engadir ata <xliff:g id="COUNT">%d</xliff:g> caras"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Engadiches o número máximo de caras"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Non se poden engadir máis caras"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Non se completou o rexistro"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Aceptar"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Esgotouse o tempo de espera do rexistro da cara. Téntao de novo."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Produciuse un erro ao rexistrar a cara."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Todo listo. Saíches moi ben."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Feito"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Usar a cara para"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Desbloquear dispos."</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Pagos/inicio de sesión en apps"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Ollos abertos para desbloquear"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Ao usar a autenticación facial, debes ter os ollos abertos"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Quitar datos da cara"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Mellorar datos da túa cara"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Podes usar a cara para desbloquear o teu dispositivo e acceder ás aplicacións. "<annotation id="url">"Máis información"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impresión dixital"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Xest. identificación"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar identificac. para"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Selecciona polo menos unha banda para a zona wifi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Configuración IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacidade"</string>
<string name="wifi_shared" msgid="844142443226926070">"Compartir rede con outros usuarios do dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(non cambiado)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Selecciona"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Queres que se esqueza a rede?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Eliminaranse todos os contrasinais desta rede"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Redes gardadas"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d redes</item>
<item quantity="one">1 rede</item>
@@ -992,7 +999,7 @@
<string name="wifi_calling_suggestion_title" msgid="5702964371483390024">"Amplía as chamadas coa wifi"</string>
<string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"Activa as chamadas por wifi para ampliar a cobertura"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"Preferencia de chamada"</string>
- <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de chamadas wifi"</string>
+ <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Modo de chamadas por wifi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Preferencia de itinerancia"</string>
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
@@ -1024,7 +1031,7 @@
<item msgid="2339246858001475047">"2"</item>
<item msgid="6200207341126893791">"1"</item>
</string-array>
- <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Cando están activadas as chamadas wifi, o teu teléfono pode enviar as túas chamadas a través de redes wifi ou da rede do teu operador, dependendo das túas preferencias e de cal teña o sinal máis forte. Antes de activar esta función, consulta co teu operador as tarifas e outra información."</string>
+ <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Cando están activadas as chamadas por wifi, o teu teléfono pode enviar as túas chamadas a través de redes wifi ou da rede do teu operador, dependendo das túas preferencias e de cal teña o sinal máis forte. Antes de activar esta función, consulta co teu operador as tarifas e outra información."</string>
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<string name="emergency_address_title" msgid="932729250447887545">"Enderezo de urxencia"</string>
<string name="emergency_address_summary" msgid="7751971156196115129">"Utilízase como a túa localización cando fas unha chamada de urxencia por wifi"</string>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brillo"</string>
<string name="brightness_summary" msgid="838917350127550703">"Axusta o brillo da pantalla"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Activado"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Desactivado"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"O brillo preferido é moi baixo"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"O brillo preferido é baixo"</string>
@@ -1125,8 +1131,8 @@
<string name="night_display_text" msgid="1837277457033025056">"A función Luz nocturna dálle un ton ámbar á pantalla pola noite para que che resulte máis fácil mirala con pouca luz e che axude a coller o sono."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Programar"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nunca"</string>
- <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Activar en horario personalizado"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Activar do anoitecer ao amencer"</string>
+ <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Actívase en horario personalizado"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Activar do solpor ao amencer"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"Estado"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Non se pode cambiar o PIN.\nÉ posible que o PIN non sexa correcto."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN da SIM cambiado correctamente"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Non se pode cambiar o estado de bloqueo da tarxeta SIM.\nÉ posible que o PIN non sexa correcto."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Non se puido desactivar o PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Non se puido activar o PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Aceptar"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Encontráronse varias tarxetas SIM"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Esta acción esixe que se formate a <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"O formatado borra todos os datos actualmente almacenados en <xliff:g id="NAME_1">^1</xliff:g>."</b>" Para evitar perder os datos, pensa na posibilidade de facer unha copia de seguranza."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Borrar e formatar"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatando a <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Non quites a <xliff:g id="NAME">^1</xliff:g> mentres se estea formatando."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Non quites o dispositivo (<xliff:g id="NAME">^1</xliff:g>) mentres se estea formatando."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Migrar datos a almacenamento novo"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Podes mover as túas fotos, ficheiros e algunhas aplicacións a <xliff:g id="NAME">^1</xliff:g>. \n\nEsta acción tarda arredor de <xliff:g id="TIME">^2</xliff:g> e liberará <xliff:g id="SIZE">^3</xliff:g> de almacenamento interno. Algunhas aplicacións non funcionarán mentres estea en progreso."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Migrar agora"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Aplicación instalada"</string>
<string name="no_applications" msgid="7336588977497084921">"Ningunha aplicación"</string>
<string name="internal_storage" msgid="1584700623164275282">"Almacenamento interno"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"almacenamento interno"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almac. USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Tarxeta SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Recalculando o tamaño…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Eliminar os datos da aplicación?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Eliminaranse todos os datos desta aplicación permanentemente. Entre estes inclúense todos os ficheiros, configuracións, contas, bases de datos, etc."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Non se atopou a aplicación na lista de aplicacións instaladas."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Non se puido borrar o almacenamento da aplicación"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicación pode acceder aos seguintes elementos na túa tableta:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Esta aplicación pode acceder aos seguintes elementos do teléfono:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Esta aplicación pode acceder aos seguintes elementos na túa tableta. Para mellorar o rendemento e reducir o uso de memoria, algúns destes permisos están dispoñibles para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se executa no mesmo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Esta aplicación pode acceder ao seguinte no teu teléfono. Para mellorar o rendemento e reducir o uso de memoria, algúns destes permisos están dispoñibles para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se executa no mesmo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> e <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"É posible que se cobre diñeiro por utilizar esta aplicación:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Enviar SMS Premium"</string>
<string name="computing_size" msgid="1599186977475211186">"Calculando…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Non se puido calcular o tamaño do paquete."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Non tes ningunha aplicación de terceiros instalada."</string>
<string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Mover"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover á tableta"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover ao teléfono"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover a almacenamento USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover á tarxeta SD"</string>
- <string name="moving" msgid="6431016143218876491">"Movendo"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Xa está en curso outra migración."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Non hai espazo de almacenamento suficiente."</string>
<string name="does_not_exist" msgid="1501243985586067053">"A aplicación non existe."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Non se pode instalar a aplicación do administrador do dispositivo en soportes externos"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Queres forzar a parada?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Se forzas a parada dunha aplicación, é posible que non funcione correctamente."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Non se puido mover a aplicación. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Localización de instalación preferida"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Cambia a localización de instalación preferida para as aplicacións novas"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desactivar app integrada?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Desactivar aplicación"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Se desactivas esta aplicación, é posible que Android e outras aplicacións deixen de funcionar segundo o previsto."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Queres borrar datos e desactivar a aplicación?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Se desactivas esta aplicación, é posible que Android e outras aplicacións deixen de funcionar segundo o previsto. Tamén se eliminarán os teus datos."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Desactivar as notificacións?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se desactivas as notificacións desta aplicación, é posible que perdas alertas e actualizacións importantes."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Tenda"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detalles da aplicación"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"A aplicación instalouse desde <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1946,7 +1939,7 @@
<string name="usage_time_label" msgid="295954901452833058">"Tempo de uso"</string>
<string name="accessibility_settings" msgid="3975902491934816215">"Accesibilidade"</string>
<string name="accessibility_settings_title" msgid="2130492524656204459">"Configuración de accesibilidade"</string>
- <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, pantalla, controis de interacción"</string>
+ <string name="accessibility_settings_summary" msgid="981260486011624939">"Lectores de pantalla, interacción, pantalla"</string>
<string name="vision_settings_title" msgid="4204111425716868288">"Configuración de visualización"</string>
<string name="vision_settings_description" msgid="5679491180156408260">"Podes personalizar este dispositivo segundo as túas necesidades. Podes cambiar estas funcións de accesibilidade máis tarde en Configuración."</string>
<string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambiar tamaño do tipo de letra"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Usar servizo"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Usar corrección da cor"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Usar subtítulos"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continuar"</string>
<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="6371077608778830020">"Engadir audiófono"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Si limitas a actividade en segundo plano para unha aplicación, é posible que non funcione correctamente"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Non podes limitar a aplicación porque non se configurou para optimizar a batería.\n\nPrimeiro activa a optimización da batería."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Uso da pantalla desde a carga completa"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da pantalla"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Exploración de redes móbiles"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Uso da batería desde a carga completa"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tempo durante o que a pantalla estivo activada desde a carga completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Axustar uso de enerxía"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluídos"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicacións que están esgotando a batería"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantendo o dispositivo activo"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Activando o dispositivo en segundo plano"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando a localización con frecuencia"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicacións funcionan incorrectamente"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"As aplicacións execútanse con normalidade"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"O teléfono utiliza habitualmente batería en segundo plano"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"A tableta utiliza habitualmente batería en segundo plano"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Limitando o uso de batería para %1$d aplicacións</item>
<item quantity="one">Limitando o uso de batería para %1$d aplicación</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restrinxiuse <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Estas aplicacións consumiron batería en segundo plano. É posible que as aplicacións restrinxidas non funcionen de forma adecuada e que as notificacións se atrasen."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Utilizar o xestor de batería"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detecta se as aplicacións consomen batería"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancelar"</string>
<string name="tts_reset" msgid="2661752909256313270">"Restablecer"</string>
<string name="tts_play" msgid="2628469503798633884">"Reproducir"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Control de enerxía"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Actualizando configuración da wi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización da configuración Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"activado"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"desactivado"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"activación"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivación"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wifi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Localización"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sincronizar"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brillo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completo"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"metade"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"desactivado"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Almacenamento de credenciais"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar do almacenamento"</string>
@@ -2586,7 +2557,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Seleccionar todo"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso de datos das apps"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Datos móbiles e wifi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"A contabilidade dos datos do operador pode ser diferente á do teu dispositivo."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Uso da aplicación"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIÓN DA APLICACIÓN"</string>
@@ -2963,7 +2934,6 @@
<item quantity="other">Mostrar %d elementos ocultos</item>
<item quantity="one">Mostrar %d elemento oculto</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Contraer"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Rede e Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rede de telefonía móbil"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de datos"</string>
@@ -2975,12 +2945,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicacións e notificacións"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicacións predeterminadas"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Non se permite que as aplicacións do perfil de traballo accedan ás notificacións."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Contas"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Non se engadiron contas"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicacións predeterminadas"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, hora, copia de seguranza, actualizacións"</string>
<string name="search_results_title" msgid="1796252422574886932">"Configuración"</string>
- <string name="search_menu" msgid="6283419262313758339">"Buscar na configuración"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, conexión de rede, Internet, sen fíos, datos"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, activar, desactivar, control"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"mensaxe de texto, envío de mensaxes de texto, mensaxes, mensaxería, predeterminado"</string>
@@ -3025,6 +2995,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagos"</string>
<string name="keywords_backup" msgid="470070289135403022">"copia de seguranza, facer copia de seguranza"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"xesto"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"cara, desbloqueo, autenticar, iniciar sesión"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versión de prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"rede, estado da rede de telefonía móbil, estado do servizo, intensidade do sinal, tipo de rede de telefonía móbil, itinerancia, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de serie, versión do hardware"</string>
@@ -3032,6 +3003,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema escuro"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"erro"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Visualización da pantalla de bloqueo, pantalla ambiente"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notificación da pantalla de bloqueo"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"cara"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"impresión dixital"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"atenuar pantalla, pantalla táctil, batería, brillo intelixente, brillo dinámico"</string>
@@ -3270,7 +3242,7 @@
<string name="no_vr_listeners" msgid="2689382881717507390">"Ningunha aplicación instalada solicitou executarse como servizos do asistente de RV."</string>
<string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Queres permitir o acceso do servizo de RV para <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
<string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> poderá executarse cando utilices aplicacións no modo de realidade virtual."</string>
- <string name="display_vr_pref_title" msgid="8104485269504335481">"Cando o dispositivo está no modo de RV"</string>
+ <string name="display_vr_pref_title" msgid="8104485269504335481">"Cando o dispositivo está no modo RV"</string>
<string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reducir desenfoque (recomendado)"</string>
<string name="display_vr_pref_off" msgid="2190091757123260989">"Reducir escintilación"</string>
<string name="picture_in_picture_title" msgid="5824849294270017113">"Pantalla superposta"</string>
@@ -3279,7 +3251,7 @@
<string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Pantalla superposta"</string>
<string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Permitir pantalla superposta"</string>
<string name="picture_in_picture_app_detail_summary" msgid="1264019085827708920">"Permite que esta aplicación cree unha ventá de pantalla superposta mentres estea aberta ou despois de saír dela (por exemplo, para continuar visualizando un vídeo). A ventá móstrase sobre as demais aplicacións que esteas utilizando."</string>
- <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso en modo Non molestar"</string>
+ <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso a Non molestar"</string>
<string name="zen_access_empty_text" msgid="8772967285742259540">"Ningunha aplicación instalada solicitou acceso en modo Non molestar"</string>
<string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicacións..."</string>
<string name="app_notifications_off_desc" msgid="8289223211387083447">"Segundo solicitaches, Android bloquea a visualización de notificacións desta aplicación neste dispositivo"</string>
@@ -3338,9 +3310,9 @@
<string name="zen_mode_unknown_app_set_behavior" msgid="2558968232814237874">"Agora non se poden cambiar estas opcións de configuración. Unha aplicación activou automaticamente o modo Non molestar co comportamento personalizado."</string>
<string name="zen_mode_qs_set_behavior" msgid="6200424436456086312">"Agora non se poden cambiar estas opcións de configuración. Activouse manualmente o modo Non molestar co comportamento personalizado."</string>
<string name="zen_schedule_rule_type_name" msgid="6163149826036287324">"Hora"</string>
- <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Estableceuse a norma automática para activar Non molestar durante as horas especificadas"</string>
+ <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Estableceuse a norma automática para activar o modo Non molestar durante as horas especificadas"</string>
<string name="zen_event_rule_type_name" msgid="6503468472212606158">"Evento"</string>
- <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Norma automática establecida para activar Non molestar durante os eventos especificados"</string>
+ <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Norma automática establecida para activar o modo Non molestar durante os eventos especificados"</string>
<string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Durante os eventos de"</string>
<string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Durante os eventos de <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
<string name="zen_mode_event_rule_summary_any_calendar" msgid="4936646399126636358">"calquera calendario"</string>
@@ -3463,7 +3435,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Cando introduzas o teu PIN para iniciar este dispositivo, os servizos de accesibilidade como <xliff:g id="SERVICE">%1$s</xliff:g> aínda non estarán dispoñibles."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Cando introduzas o teu padrón para iniciar este dispositivo, os servizos de accesibilidade como <xliff:g id="SERVICE">%1$s</xliff:g> aínda non estarán dispoñibles."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Cando introduzas o teu contrasinal para iniciar este dispositivo, os servizos de accesibilidade como <xliff:g id="SERVICE">%1$s</xliff:g> aínda non estarán dispoñibles."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Nota: Tras un reinicio, non se pode iniciar esta aplicación ata que desbloquees o teléfono"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Nota: Se reinicias o teléfono e definiches un bloqueo de pantalla, esta aplicación non se poderá iniciar ata que desbloquees o teléfono"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Información do IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Información relativa ao IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Rañura<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3517,7 +3489,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Persoais"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Do traballo"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplicacións: todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplicacións: desactivadas"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Notificacións desactivadas"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorías: relevancia urxente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorías: relevancia baixa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorías: desactivadas"</string>
@@ -3578,7 +3550,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso completo do dispositivo"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso da aplicación"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicacións presentan un comportamento anormal</item>
<item quantity="one">A aplicación <xliff:g id="APP">%1$s</xliff:g> presenta un comportamento anormal</item>
@@ -3667,11 +3638,11 @@
<string name="running_frequency" msgid="6622624669948277693">"Frecuencia"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Uso máximo"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Non se utilizaron datos"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Queres que <xliff:g id="APP">%1$s</xliff:g> teña acceso ao modo Non molestar?"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Queres permitir o acceso da aplicación <xliff:g id="APP">%1$s</xliff:g> ao modo Non molestar?"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"A aplicación poderá activar ou desactivar o modo Non molestar e facer cambios na configuración relacionada."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Debe permanecer activado porque o acceso ás notificacións está activado"</string>
- <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Queres revogarlle o acceso a <xliff:g id="APP">%1$s</xliff:g> ás normas Non molestar?"</string>
- <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Eliminaranse todas as normas Non molestar creadas por esta aplicación."</string>
+ <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Queres revogar o acceso da aplicación <xliff:g id="APP">%1$s</xliff:g> ao modo Non molestar?"</string>
+ <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Eliminaranse todas as normas do modo Non molestar creadas por esta aplicación."</string>
<string name="ignore_optimizations_on" msgid="6915689518016285116">"Non optimizar"</string>
<string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizar"</string>
<string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"A batería pódese esgotar máis rápido. Deixarase de restrinxir o uso da batería en segundo plano por parte da aplicación."</string>
@@ -3742,6 +3713,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Almacenamento interno: <xliff:g id="PERCENTAGE">%1$s</xliff:g> utilizado, <xliff:g id="FREE_SPACE">%2$s</xliff:g> libre"</string>
<string name="display_summary" msgid="6737806235882127328">"Despois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividade"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Fondo de pantalla, suspensión, tamaño do tipo de letra"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Suspensión tras 10 minutos de inactividade"</string>
<string name="memory_summary" msgid="8080825904671961872">"Uso medio da memoria: <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Iniciaches sesión como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3757,7 +3730,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"As SMS non están permitidas"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"O uso da cámara non está permitido"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"As capturas de pantalla non están permitidas"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Non se poden desactivar as copias de seguranza"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Non se pode abrir esta aplicación"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Se tes algunha pregunta, contacta co teu administrador de TI"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Máis detalles"</string>
@@ -3921,9 +3893,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simular unha pantalla cun recorte"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ningunha simulación"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Configuración predeterminada do dispositivo"</string>
<string name="special_access" msgid="3458780842491881155">"Acceso especial ás aplicacións"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacións poden usar datos sen restricións</item>
@@ -3936,7 +3908,7 @@
<string name="notification_suggestion_title" msgid="387052719462473500">"Información de control sobre a pantalla de bloqueo"</string>
<string name="notification_suggestion_summary" msgid="8521159741445416875">"Mostrar ou ocultar o contido das notificacións"</string>
<string name="page_tab_title_summary" msgid="4070309266374993258">"Todo"</string>
- <string name="page_tab_title_support" msgid="4407600495101788249">"Consellos e asistencia"</string>
+ <string name="page_tab_title_support" msgid="4407600495101788249">"Asistencia e consellos"</string>
<string name="developer_smallest_width" msgid="7516950434587313360">"Menor largura"</string>
<string name="premium_sms_none" msgid="8268105565738040566">"Ningunha aplicación instalada solicitou acceso ás mensaxes premium"</string>
<string name="premium_sms_warning" msgid="9086859595338944882">"É posible que teñas que pagar polas mensaxes premium, cuxos custos se engadirán ás facturas do teu operador. Se activas o permiso para unha aplicación, poderás enviar mensaxes premium a través desa aplicación."</string>
@@ -3945,11 +3917,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a varios dispositivos"</string>
<string name="demo_mode" msgid="2798762752209330277">"Modo de demostración da IU do sistema"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Modo nocturno"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Establecer modo nocturno"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Modo escuro"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Establecer modo escuro"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos para programadores de configuración rápida"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Rastro de Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Configuración do perfil de traballo"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Busca de contactos"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permite buscas de contactos por parte da túa organización para identificar os emisores das chamadas e os contactos"</string>
@@ -3987,16 +3958,20 @@
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Para cambiar de aplicacións, pasa o dedo cara arriba no botón de inicio. Pásao de novo para ver todas as aplicacións. Este xesto funciona en calquera pantalla, así que na parte inferior dereita, xa non terás o botón Visión xeral."</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Proba o novo botón de inicio"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Activa o novo xesto para cambiar de aplicacións"</string>
- <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar dúas veces para consultar o teléfono"</string>
+ <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dobre toque para consultar o teléfono"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar dúas veces para consultar a tableta"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar dúas veces para consultar o dispositivo"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Para consultar a hora, as iconas de notificación e outra información, toca a pantalla dúas veces."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Para consultar a hora, as notificacións e outra información, toca a pantalla dúas veces."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar teléfono para consultalo"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar a tableta para consultala"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar o dispositivo para consultalo"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para consultar a hora, as iconas de notificación e outros datos, colle o teléfono."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para consultar a hora, as iconas de notificación e outros datos, colle a tableta."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para consultar a hora, as iconas de notificación e outros datos, colle o dispositivo."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Activar a pantalla de bloqueo"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Para consultar a hora, as notificacións e outros datos, colle o teléfono."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Para consultar a hora, as notificacións e outros datos, colle a tableta."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Para consultar a hora, as notificacións e outros datos, colle o dispositivo."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Xesto para activar a pantalla de bloqueo"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Dedo no sensor para ver notificacións"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Pasar dedo impr. dixital"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do teléfono."</string>
@@ -4076,7 +4051,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> intentos</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> intento</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Estase facendo unha copia de seguranza dos datos deste dispositivo"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Este dispositivo está xestionado pola túa organización."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo está xestionado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4117,6 +4091,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Servizo de autocompletar"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automático, completar, autocompletar"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Asegúrate de que confías nesta aplicación</b> <br/> <br/> <xliff:g id=app_name example=Autocompletar de Google>%1$s</xliff:g> utiliza o contido da pantalla para determinar o que se pode completar."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Autocompletar"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Nivel de rexistro"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Máximo de solicitudes por sesión"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Número máximo de conxuntos de datos visibles"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Restablecer os valores predeterminados"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Restablecéronse as opcións de programador da función de autocompletar"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
<string name="default_theme" msgid="7085644992078579076">"Predeterminado"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nome da rede"</string>
@@ -4131,15 +4111,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aprovisionamento do operador do activador"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Actualizar a modo Non molestar"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pon en pausa as notificacións para concentrarte"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Cales son as novidades fascinantes?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Realiza unha visita guiada polo teu novo teléfono"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Realiza unha visita guiada pola túa nova tableta"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Realiza unha visita guiada polo teu novo dispositivo"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta función non está dispoñible neste dispositivo"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forzar medicións completas de GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Realiza un seguimento de todas as frecuencias e constelacións de satélites de GNSS sen ciclos"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Mostrar sempre o cadro de diálogo de fallos"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Mostra o cadro de diálogo cada vez que falla unha aplicación"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Seleccionar aplicación compatible con ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Non se definiu ningunha aplicación compatible con ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplicación compatible con ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Acceso ao directorio"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"acceso ao directorio"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4168,9 +4147,9 @@
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"Mellora a vida útil da batería do dispositivo"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Mellora a vida útil da batería do teléfono"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
- <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Silenciar o son"</string>
+ <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Evitar que soe"</string>
<string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Manter premidos os botóns de acendido e subir volume ao mesmo tempo"</string>
- <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Atallo para evitar facer soar o dispositivo"</string>
+ <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Atallo para evitar que soe o dispositivo"</string>
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Vibrar"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Silenciar"</string>
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"Non facer nada"</string>
@@ -4180,4 +4159,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalles da rede"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"As aplicacións do teu teléfono poden consultar o nome do teu dispositivo. Tamén poden velo outros usuarios cando te conectes a dispositivos Bluetooth ou configures zonas wifi."</string>
<string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Toda a configuración"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suxestións"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Datos de CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Datos de CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Escoller rede"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Rede desconectada"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Rede conectada"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Conectando…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Non se puido establecer conexión"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Non se atopou ningunha rede."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Non se puido encontrar ningunha rede. Téntao de novo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(rede non-permitida)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Non hai ningunha tarxeta SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Chamadas avanzadas"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Modo de rede preferido: WCDMA preferido"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Modo de rede preferido: só GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Modo de rede preferido: só WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Modo de rede preferido: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Modo de rede preferido: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Modo de rede preferido: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Modo de rede preferido: só CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Modo de rede preferido: só EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Modo de rede preferido: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Modo de rede preferido: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Modo de rede preferido: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Modo de rede preferido: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Modo de rede preferido: global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Modo de rede preferido: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Modo de rede preferido: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Modo de rede preferido: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Modo de rede preferido: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Modo de rede preferido: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Modo de rede preferido: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Modo de rede preferido: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Modo de rede preferido: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Modo de rede preferido: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Modo de rede preferido: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Modo de rede preferido: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Modo de rede preferido: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Modo de rede preferido: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recomendado)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recomendado)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Redes dispoñibles"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Buscando…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Rexistrando en <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"A tarxeta SIM non permite conectar o dispositivo a esta rede."</string>
+ <string name="connect_later" msgid="978991102125216741">"Non se pode conectar con esta rede nestes momentos. Téntao de novo máis tarde."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Realizouse o rexistro na rede."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Seleccionar rede automaticamente"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Configuración do operador"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Configurar servizo de datos"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Datos móbiles"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Acceder aos datos cunha rede de telefonía móbil"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tipo de rede preferido"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Cambia o modo de funcionamento da rede"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tipo de rede preferido"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operador"</string>
+ <string name="call_category" msgid="8108654745239563833">"Chamando"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videochamadas do operador"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Selección do sistema"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Cambia o modo de itinerancia CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Selección do sistema"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Rede"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Rede"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Subscrición a CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Cambia entre RUIM/SIM e NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"subscrición"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Rexistro automático…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Queres permitir a itinerancia de datos?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Consulta os prezos co teu provedor de rede."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Uso de datos da aplicación"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Modo de rede non-válido: <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorar."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Non dispoñible cando o dispositivo está conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Ver máis"</string>
+ <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 8215e74..bd7d915 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"મીટર કરેલ તરીકે ગણો"</item>
<item msgid="2266114985518865625">"મીટર ન કરેલ તરીકે ગણો"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ડિફૉલ્ટ (રેન્ડમ કરેલ MACનો ઉપયોગ કરો)"</item>
+ <item msgid="5398461510512959597">"વિશ્વસનીય"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"ના"</item>
<item msgid="3863157480502955888">"હા"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"હંમેશા ચાલુ"</item>
<item msgid="6385301106124765323">"હંમેશા બંધ"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"બંધ છે"</item>
+ <item msgid="2182686878828390312">"ડિબગ કરો"</item>
+ <item msgid="5286514712714822064">"શબ્દબહુલ"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"માત્ર હોમ"</item>
+ <item msgid="5034813753274486448">"ઑટોમૅટિક"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA પસંદ કર્યો છે"</item>
+ <item msgid="807926878589867564">"માત્ર GSM"</item>
+ <item msgid="488474605709912156">"માત્ર WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA ઑટો"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo ઑટો"</item>
+ <item msgid="370391313511477301">"EvDo વિના CDMA"</item>
+ <item msgid="4678789463133969294">"માત્ર EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"વૈશ્વિક"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"માત્ર TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"વૈશ્વિક"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 5541b8d..6304ccd 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"બનાવો"</string>
<string name="allow" msgid="3349662621170855910">"મંજૂરી આપો"</string>
<string name="deny" msgid="6947806159746484865">"નકારો"</string>
- <string name="dlg_close" msgid="7471087791340790015">"બંધ કરો"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"સ્વિચ કરો"</string>
<string name="device_info_default" msgid="7847265875578739287">"અજાણ્યું"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">તમે હવે એક વિકાસકર્તા બનવાથી <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> પગલાં દૂર છો.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"કોઈ જરૂર નથી, તમે પહેલાંથી જ એક વિકાસકર્તા છો."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"કૃપા કરીને પહેલાં વિકાસકર્તાના વિકલ્પો સક્ષમ કરો."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"વાયરલેસ અને નેટવર્ક્સ"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"કનેક્શંસ"</string>
- <string name="header_category_device" msgid="4544026001618307754">"ઉપકરણ"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"વ્યક્તિગત"</string>
- <string name="header_category_access" msgid="7580499097416970962">"ઍક્સેસ"</string>
<string name="header_category_system" msgid="2816866961183068977">"સિસ્ટમ"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ડેટા કનેક્શન સક્ષમ કરો"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ડેટા કનેક્શન અક્ષમ કરો"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ઉપકરણનું બ્લૂટૂથ ઍડ્રેસ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ને ડિસ્કનેક્ટ કરીએ?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"બ્રૉડકાસ્ટ કરી રહ્યાં છે"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"અનામાંકિત બ્લૂટૂથ ઉપકરણ"</string>
<string name="progress_scanning" msgid="192587958424295789">"શોધી રહ્યું છે"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"કોઈ નજીકનાં બ્લૂટૂથ ઉપકરણો મળ્યાં નહોતા."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"કોઈ ઍપ્લિકેશન બ્લૂટૂથ ચાલુ કરવા અને તમારા ફોનને અન્ય ઉપકરણો પર દૃશ્યક્ષમ બનાવવા માગે છે. તમે આને પછીથી બ્લૂટૂથ સેટિંગ્સમાં બદલી શકો છો."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"બ્લૂટૂથ ચાલુ કરી રહ્યું છે…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"બ્લૂટૂથ બંધ થઈ રહ્યું છે…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"સ્વતઃ કનેક્ટ કરો"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"બ્લૂટૂથ કનેક્શન વિનંતી"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" સાથે કનેક્ટ કરવા માટે ટૅપ કરો."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"શું તમે \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" સાથે કનેક્ટ કરવા માંગો છો?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"ઉપલબ્ધ કૉલ ઉપકરણો"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"હાલમાં કનેક્ટ કરેલ છે"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"સાચવેલ ઉપકરણો"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"ઉપકરણ ઉમેરો"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"બ્લૂટૂથ જોડી બનાવવાનું ચાલુ કરશે"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"કનેક્શનની પસંદગીઓ"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"પહેલાં કનેક્ટ થયેલા ઉપકરણો"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"પહેલાં કનેક્ટ કરેલા"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"બ્લૂટૂથ ચાલુ કર્યું"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"બધા ડિવાઇસ જુઓ"</string>
<string name="date_and_time" msgid="9062980487860757694">"તારીખ અને સમય"</string>
<string name="choose_timezone" msgid="1362834506479536274">"સમય ઝોન પસંદ કરો"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"છોડો"</string>
<string name="next_label" msgid="4693520878012668114">"આગલું"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ભાષાઓ"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ભાષા પસંદગીઓ"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"દૂર કરો"</string>
<string name="add_a_language" msgid="2330538812283783022">"ભાષા ઉમેરો"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"સેટિંગ્સ"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"સેટિંગ્સ શૉર્ટકટ"</string>
<string name="airplane_mode" msgid="8837269988154128601">"એરપ્લેન મોડ"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"વધુ"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"વાયરલેસ અને નેટવર્ક્સ"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"વાઇ-ફાઇ, બ્લૂટૂથ, એરપ્લેન મોડ, મોબાઇલ નેટવર્ક્સ અને VPN સંચાલિત કરો"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"મોબાઇલ ડેટા"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"ગોપનીયતા"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"વ્યવસ્થાપકે અક્ષમ કરેલ"</string>
<string name="security_status_title" msgid="5848766673665944640">"સુરક્ષાની સ્થિતિ"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"સ્ક્રીન લૉક, ફેસ અનલૉક"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"સ્ક્રીન લૉક, ફિંગરપ્રિન્ટ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"સ્ક્રીન લૉક"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ચહેરો ઉમેર્યો"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"તમારા ચહેરા વડે અનલૉક કરો"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"પ્રમાણિત કરવા તમારા ચહેરાનો ઉપયોગ કરો"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપમાં સાઇન ઇન કરવા માટે તમારા ચહેરાનો ઉપયોગ કરો."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"તમારા ચહેરાનો ઉપયોગ"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદીઓને મંજૂર કરવા માટે તમારા ચહેરાનો ઉપયોગ કરો.\n\nનોંધ: આ ઉપકરણને અનલૉક કરવા માટે તમે તમારા ચહેરાનો ઉપયોગ નહીં કરી શકો. વધુ માહિતી માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"તમારા ફોનને અનલૉક કરવા, ખરીદીઓ અધિકૃત કરવા અથવા ઍપમાં સાઇન ઇન કરવા માટે તમારા ચહેરાનો ઉપયોગ કરો"</string>
- <string name="face_add_max" msgid="2342250989212694454">"તમે <xliff:g id="COUNT">%d</xliff:g> ફિંગરપ્રિન્ટ સુધી ઉમેરી શકો છો"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"તમારા ચહેરાને વર્તુળના કેન્દ્રમાં રાખો"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"થોડા સમય પછી નોંધણી કરો"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"તમે <xliff:g id="COUNT">%d</xliff:g> ચહેરા સુધી ઉમેરી શકો છો"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"તમે મહત્તમ ચહેરા ઉમેર્યાં છે"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"વધુ ચહેરા ઉમેરી શકાતા નથી"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"નોંધણી પૂર્ણ થઈ ન હતી"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ઓકે"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"ચહેરાની નોંધણીની સમય મર્યાદા સુધી પહોંચી ગયાં. ફરી પ્રયાસ કરો."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ચહેરાની નોંધણી કરી શકાઈ નથી."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"બધું સેટ થઈ ગયું. સરસ દેખાય છે."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"થઈ ગયું"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"ચહેરાનો ઉપયોગ આમ કરો"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"ઉપકરણ અનલૉક કરો"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ઍપ્લિકેશન સાઇન ઇન અને ચુકવણીઓ"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"અનલૉક કરવા માટે આંખો ખુલ્લી"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"ચહેરા પ્રમાણીકરણનો ઉપયોગ કરતી વખતે, તમારી આંખો ખુલ્લી હોવી જરૂરી છે"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"ચહેરાના ડેટાને કાઢો"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"ચહેરાના ડેટામાં સુધારણા કરો"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"તમારું ઉપકરણ અનલૉક કરવા અને ઍપ ઍક્સેસ કરી શકવા માટે તમારા ચહેરાનો ઉપયોગ થઈ શકે છે. "<annotation id="url">"વધુ જાણો"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ફિંગરપ્રિન્ટ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ફિંગરપ્રિન્ટનું સંચાલન"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"આ માટે ફિંગરપ્રિન્ટ ઉપયોગ"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"વાઇ-ફાઇ હૉટસ્પૉટ માટે ઓછામાં ઓછું એક બેન્ડ પસંદ કરો:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP સેટિંગ્સ"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"પ્રાઇવસી"</string>
<string name="wifi_shared" msgid="844142443226926070">"અન્ય ઉપકરણ વપરાશકર્તાઓ સાથે શેર કરો"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(અપરિવર્તિત)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"કૃપા કરીને પસંદ કરો"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"રદ કરો"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"નેટવર્કને ભૂલી જઈએ?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"આ નેટવર્ક માટેના બધા પાસવર્ડ ડિલીટ કરવામાં આવશે"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"સાચવેલા નેટવર્ક્સ"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d નેટવર્ક</item>
<item quantity="other">%d નેટવર્ક</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"તેજ"</string>
<string name="brightness_summary" msgid="838917350127550703">"સ્ક્રીનનાં તેજને સમાયોજિત કરો"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"એડૅપ્ટિવ બ્રાઇટનેસ"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ચાલુ કરો"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"બંધ"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"પસંદગીનું તેજ ખૂબ નિમ્ન છે"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"પસંદગીનું તેજ નિમ્ન છે"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"પિન બદલી શકાતો નથી.\nસંભવિત રૂપે ખોટો પિન છે."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"સિમ પિનને સફળતાપૂર્વક બદલ્યો"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"સિમ કાર્ડ લૉક સ્થિતિ બદલી શકાતી નથી.\nસંભવિતરૂપે ખોટો પિન છે."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"પિન બંધ કરી શકાતો નથી."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"પિન ચાલુ કરી શકાતો નથી."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ઓકે"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"રદ કરો"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"બહુવિધ સિમ મળી"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"આના માટે <xliff:g id="NAME_0">^1</xliff:g> ને ફોર્મેટ કરવું આવશ્યક છે. \n\n"<b>"ફોર્મેટ કરવું <xliff:g id="NAME_1">^1</xliff:g> હાલમાં સંગ્રહિત તમામ ડેટાને કાઢી નાખે છે."</b>" ડેટાને ગુમાવવાનું ટાળવા માટે, તેનું બેક અપ લેવાનું વિચારો."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"કાઢી નાખો અને ફોર્મેટ કરો"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ને ફોર્મેટ કરી રહ્યાં છે…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g>ને તે ફૉર્મેટ થઈ રહ્યું હોય તે વખતે દૂર કરશો નહીં."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g>ને તે ફોર્મેટ થઈ રહ્યું હોય તે વખતે દૂર કરશો નહીં."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ડેટાને નવા સ્ટોરેજ પર ખસેડો"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"તમે આ નવા <xliff:g id="NAME">^1</xliff:g>.પર તમારા ફોટો, ફાઇલો અને કેટલીક ઍપ્લિકેશનો ખસેડી શકો છો. \n\nખસેડવામાં <xliff:g id="TIME">^2</xliff:g> જેટલો સમય લાગશે. તે <xliff:g id="SIZE">^3</xliff:g> આંતરિક સ્ટોરેજ ખાલી કરશે. થોડી ઍપ્લિકેશનો પ્રક્રિયામાં હોવા પર કાર્ય કરશે નહીં."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"હમણાં ખસેડો"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ઇન્સ્ટોલ કરેલી છે"</string>
<string name="no_applications" msgid="7336588977497084921">"કોઈ ઍપ્લિકેશનો નથી."</string>
<string name="internal_storage" msgid="1584700623164275282">"આંતરિક સ્ટોરેજ"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"આંતરિક સ્ટોરેજ"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB સ્ટોરેજ"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD કાર્ડ સંગ્રહ"</string>
<string name="recompute_size" msgid="7722567982831691718">"કદની ફરીથી ગણના કરી રહ્યું છે…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"ઍપ્લિકેશન ડેટા કાઢી નાખીએ?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"આ તમામ એપ્લિકેશનનો ડેટા કાયમી રીતે કાઢી નાંખવામાં આવશે. આમાં તમામ ફાઇલો, સેટિંગ્સ, એકાઉન્ટ્સ, ડેટાબેસેસ વગેરે શામેલ છે."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ઇન્સ્ટોલ કરેલ ઍપ્લિકેશન્સની સૂચિમાં ઍપ્લિકેશન મળી નહોતી."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"ઍપ માટે સ્ટોરેજ સાફ ન કરી શક્યાં."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"આ ઍપ્લિકેશન તમારા ટેબ્લેટ પર નીચે મુજબ ઍક્સેસ કરી શકે છે:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"આ ઍપ્લિકેશન તમારા ફોન પર નીચે મુજબ ઍક્સેસ કરી શકે છે:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"આ ઍપ્લિકેશન તમારા ટેબ્લેટ પર નીચે મુજબ ઍક્સેસ કરી શકે છે. કામગીરીને સુધારવા અને મેમરી વપરાશ ઘટાડવા માટે, આમાંની કેટલીક પરવાનગીઓ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> પર ઉપલબ્ધ છે કારણ કે તે <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ના જેવી સમાન પ્રક્રિયામાં ચાલે છે:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"આ ઍપ્લિકેશન તમારા ફોન પર નીચે મુજબ ઍક્સેસ કરી શકે છે. કામગીરીને સુધારવા અને મેમરી વપરાશ ઘટાડવા માટે, આમાંની કેટલીક પરવાનગીઓ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> પર ઉપલબ્ધ છે કારણ કે તે <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ના જેવી સમાન પ્રક્રિયામાં ચાલે છે:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> અને <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"આ ઍપ્લિકેશન તમને નાણા ચાર્જ કરી શકે છે:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"પ્રીમિયમ SMS મોકલો"</string>
<string name="computing_size" msgid="1599186977475211186">"ગણતરી કરી રહ્યું છે…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"પેકેજ કદની ગણતરી કરી શક્યાં નથી."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"તમારી પાસે કોઈપણ તૃતીય-પક્ષ ઍપ્લિકેશનો ઇન્સ્ટોલ કરેલી નથી."</string>
<string name="version_text" msgid="9189073826278676425">"સંસ્કરણ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"ખસેડો"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ટેબ્લેટ પર ખસેડો"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ફોન પર ખસેડો"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB સંગ્રહમાં ખસેડો"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD કાર્ડ પર ખસેડો"</string>
- <string name="moving" msgid="6431016143218876491">"ખસેડી રહ્યું છે"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"અન્ય સ્થાનાંતરણ પહેલેથી જ પ્રગતિ પર છે."</string>
<string name="insufficient_storage" msgid="481763122991093080">"પર્યાપ્ત સંગ્રહ સ્થાન નથી."</string>
<string name="does_not_exist" msgid="1501243985586067053">"ઍપ્લિકેશન અસ્તિત્વમાં નથી."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"ઉપકરણ વ્યવસ્થાપક ઍપ્લિકેશનને બાહ્ય મીડિયા પર ઇન્સ્ટૉલ કરી શકાતી નથી"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"ફરજિયાત બંધ કરીએ?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"જો તમે કોઇ એપ્લિકેશનને ફરજિયાત બંધ કરો છો, તો તે અયુક્ત વર્તન કરી શકે છે."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"એપ્લિકેશનને ખસેડી શકાય નથી. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"પસંદ કરેલ ઇન્સ્ટોલ સ્થાન"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"નવી એપ્લિકેશન્શ માટે પસંદગીનું ઇન્સ્ટોલેશન સ્થાન બદલો"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"બિલ્ટ-ઇન ઍપ્લિકેશન અક્ષમ કરીએ?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"ઍપ્લિકેશન અક્ષમ કરો"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"જો તમે આ ઍપ્લિકેશન અક્ષમ કરો છો, તો Android અને અન્ય ઍપ્લિકેશનો અપેક્ષા પ્રમાણે કાર્ય કરી શકશે નહીં."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ડેટાને કાઢી નાખી અને એપ્લિકેશનને અક્ષમ કરીએ?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"જો તમે આ ઍપ્લિકેશન અક્ષમ કરો છો, તો Android અને અન્ય ઍપ્લિકેશનો અપેક્ષા પ્રમાણે કાર્ય કરી શકશે નહીં. તમારો ડેટા પણ કાઢી નાખવામાં આવશે."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"સૂચનાઓ બંધ કરીએ?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"જો તમે આ ઍપ્લિકેશન માટે સૂચનાઓ બંધ કરો, તો મહત્વપૂર્ણ ચેતવણીઓ અને અપડેટ્સ ચૂકી શકો છો."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"દુકાન"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"ઍપ્લિકેશનની વિગતો"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> માંથી ઇન્સ્ટૉલ કરેલ ઍપ્લિકેશન"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"સેવાનો ઉપયોગ કરો"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"રંગ સુધારણાનો ઉપયોગ કરો"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"કૅપ્શનનો ઉપયોગ કરો"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"આગળ ચાલુ રાખો"</string>
<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="6371077608778830020">"શ્રવણ યંત્ર ઉમેરો"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"જો તમે બૅકગ્રાઉન્ડ પ્રવૃત્તિને એક ઍપ માટે મર્યાદિત કરો છો, તો તે અયોગ્ય વર્તન કરી શકે છે"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"આ ઍપ બૅટરી ઑપ્ટિમાઇઝ કરવા સેટ નથી તેથી તમે તેને પ્રતિબંધિત કરી શકશો નહીં.\n\nએને પ્રતિબંધિત કરવા, પહેલાં બૅટરી ઑપ્ટિમાઇઝ કરવાનું ચાલુ કરો."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"સંપૂર્ણ ચાર્જ કર્યાં પછી સ્ક્રીન વપરાશ"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"સ્ક્રીન દ્વારા વપરાશ"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"મોબાઇલ નેટવર્ક સ્કૅન કરવામાં"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"પૂર્ણ ચાર્જ પછીનો બૅટરી વપરાશ"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"સંપૂર્ણ ચાર્જ પછી સ્ક્રીન ચાલુ રહેવાનો સમયગાળો"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"સંપૂર્ણ ચાર્જ પછી ઉપકરણ વપરાશ"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"વિગતોનો ઉપયોગ કરો"</string>
<string name="controls_subtitle" msgid="390468421138288702">"પાવર વપરાશ સમાયોજિત કરો"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"સમાવિષ્ટ પૅકેજીસ"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ઍપ્લિકેશનો અતિશય બૅટરી વાપરે છે"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ઉપકરણને સક્રિય રાખે છે"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ઉપકરણને પૃષ્ઠભૂમિમાં સક્રિય કરે છે"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"વારંવાર સ્થાનની વિનંતી કરે છે"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ઍપ્લિકેશનો વિચિત્ર રીતે કાર્ય કરે છે"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"ઍપ સામાન્ય રીતે ચાલી રહી છે"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ફોન બૅકગ્રાઉન્ડમાં બૅટરીનો વપરાશ સામાન્ય રૂપે જ કરે છે"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ટૅબ્લેટ બૅકગ્રાઉન્ડમાં બૅટરીનો વપરાશ સામાન્ય રૂપે જ કરે છે"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">%1$d ઍપ માટે બૅટરી વપરાશ મર્યાદિત કરીએ છીએ</item>
<item quantity="other">%1$d ઍપ માટે બૅટરી વપરાશ મર્યાદિત કરીએ છીએ</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> પ્રતિબંધિત કરવામાં આવેલ"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"આ ઍપ બૅકગ્રાઉન્ડમાં બૅટરી વાપરી રહી છે. પ્રતિબંધિત ઍપ યોગ્ય રીતે કાર્ય કરશે નહીં અને નોટિફિકેશનમાં વિલંબ થઈ શકે છે."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"બૅટરી મેનેજરનો ઉપયોગ કરો"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"જ્યારે ઍપ બૅટરીનો અતિશય ઉપયોગ કરે, ત્યારે જાણકારી મેળવો"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"રદ કરો"</string>
<string name="tts_reset" msgid="2661752909256313270">"ફરીથી સેટ કરો"</string>
<string name="tts_play" msgid="2628469503798633884">"ચલાવો"</string>
- <string name="gadget_title" msgid="5519037532720577836">"પાવર નિયંત્રણ"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"વાઇ-ફાઇ સેટિંગ અપડેટ કરી રહ્યાં છે"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"બ્લૂટૂથ સેટિંગ અપડેટ કરી રહ્યું છે"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ચાલુ"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"બંધ"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ચાલુ કરી રહ્યું છે"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"બંધ કરી રહ્યું છે"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"વાઇ-ફાઇ"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"બ્લૂટૂથ"</string>
- <string name="gadget_location" msgid="2974757497945178165">"સ્થાન"</string>
- <string name="gadget_sync" msgid="858895763714222152">"સમન્વયન"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"તેજ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"સ્વતઃ"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"પૂર્ણ"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"અડધી"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"બંધ"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ઓળખપત્ર સ્ટોરેજ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"સંગ્રહમાંથી ઇન્સ્ટોલ કરો"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> માંથી <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"બધા પસંદ કરો"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ડેટા વપરાશ"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ઍપ્લિકેશન ડેટા વપરાશ"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"મોબાઇલ ડેટા અને Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"કેરિઅર ડેટા એકાઉન્ટિંગ તમારા ઉપકરણથી અલગ હોઈ શકે છે."</string>
<string name="data_usage_app" msgid="4970478397515423303">"ઍપ્લિકેશન વપરાશ"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ઍપ્લિકેશન માહિતી"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">%d છુપાયેલ આઇટમ બતાવો</item>
<item quantity="other">%d છુપાયેલ આઇટમ બતાવો</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"સંકુચિત કરો"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"નેટવર્ક અને ઇન્ટરનેટ"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"મોબાઇલ"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ડેટા વપરાશ"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"બ્લૂટૂથ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ઍપ્લિકેશનો અને સૂચનાઓ"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"પરવાનગીઓ, ડિફૉલ્ટ ઍપ્લિકેશનો"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"કાર્યાલયની પ્રોફાઇલમાં ઍપ માટે નોટિફિકેશન ઍક્સેસ ઉપલબ્ધ નથી."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"એકાઉન્ટ"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"કોઈ એકાઉન્ટ ઉમેરવામાં આવ્યાં નથી"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ડિફૉલ્ટ ઍપ્લિકેશનો"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ભાષાઓ, સમય, બૅકઅપ, અપડેટ"</string>
<string name="search_results_title" msgid="1796252422574886932">"સેટિંગ્સ"</string>
- <string name="search_menu" msgid="6283419262313758339">"સેટિંગ્સ શોધો"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"વાઇફાઇ, વાઇ-ફાઇ, નેટવર્ક કનેક્શન, ઇન્ટરનેટ, વાયરલેસ, ડેટા, વાઇ-ફાઇ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"વાઇફાઇ, વાઇ-ફાઇ, ટૉગલ કરો, નિયંત્રિત કરો"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"ટેક્સ્ટ સંદેશ, ટેક્સ્ટિંગ, સંદેશા, મેસેજિંગ, ડિફૉલ્ટ"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ચુકવણી કરો, ટૅપ કરો, ચુકવણીઓ"</string>
<string name="keywords_backup" msgid="470070289135403022">"બૅકઅપ, બૅક અપ"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"સંકેત"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ફેસ, અનલૉક, પ્રમાણીકરણ, સાઇન ઇન"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl વર્ઝન, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"નેટવર્ક, મોબાઇલ નેટવર્કની સ્થિતિ, સેવાની સ્થિતિ, સિગ્નલ પ્રબળતા, મોબાઇલ નેટવર્કનો પ્રકાર, રોમિંગ, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"અનુક્રમ નંબર, હાર્ડવેર વર્ઝન"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ઘેરી થીમ"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ખામી"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"વ્યાપક ડિસ્પ્લે, લૉક સ્ક્રીન ડિસ્પ્લે"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"લૉક સ્ક્રીન નોટિફિકેશન"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ચહેરો"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ફિંગરપ્રિન્ટની સેટિંગ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ઝાંખી સ્ક્રીન, ટચસ્ક્રીન, બૅટરી, સ્માર્ટ બ્રાઇટનેસ, ડાયનામિક બ્રાઇટનેસ"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"જ્યારે તમે આ ઉપકરણને પ્રારંભ કરવા માટે તમારો પિન દાખલ કરો છો, ત્યારે અૅક્સેસિબિલિટી સેવાઓ જેમ કે <xliff:g id="SERVICE">%1$s</xliff:g>, હજી પણ ઉપલબ્ધ રહેશે નહીં."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"જ્યારે તમે આ ઉપકરણને પ્રારંભ કરવા માટે તમારી પૅટર્ન દાખલ કરો છો, ત્યારે અૅક્સેસિબિલિટી સેવાઓ જેમ કે <xliff:g id="SERVICE">%1$s</xliff:g>, હજી પણ ઉપલબ્ધ રહેશે નહીં."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"જ્યારે તમે આ ઉપકરણને પ્રારંભ કરવા માટે તમારો પાસવર્ડ દાખલ કરો છો, ત્યારે અૅક્સેસિબિલિટી સેવાઓ જેમ કે <xliff:g id="SERVICE">%1$s</xliff:g>, હજી પણ ઉપલબ્ધ રહેશે નહીં."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"નોંધ: રીબૂટ કર્યાં પછી, જ્યાં સુધી તમે તમારો ફોન અનલૉક કરશો નહીં ત્યાં સુધી આ ઍપ્લિકેશન શરૂ થઈ શકશે નહીં"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"નોંધ: જો તમે તમારો ફોન ફરી ચાલુ કરો અને સ્ક્રીન લૉક સેટ કરેલ રાખો, તો જ્યાં સુધી તમે તમારો ફોન અનલૉક કરશો નહીં ત્યાં સુધી આ ઍપ શરૂ થઈ શકશે નહીં"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI માહિતી"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI સંબંધિત માહિતી"</string>
<string name="slot_number" msgid="3762676044904653577">"(સ્લોટ<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"વ્યક્તિગત"</string>
<string name="filter_work_apps" msgid="24519936790795574">"કાર્યાલય"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ઍપ્લિકેશનો: તમામ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ઍપ્લિકેશનો: બંધ કરી"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"બંધ કરેલી છે"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"કૅટેગરી: તાત્કાલિક મહત્વની"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"કૅટેગરી: ઓછી મહત્વની"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"કૅટેગરી: બંધ કરી"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"વપરાશ સંબંધી ચેતવણીઓ"</string>
<string name="show_all_apps" msgid="1512506948197818534">"ઉપકરણનો સંપૂર્ણ વપરાશ બતાવો"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"ઍપ્લિકેશનનો વપરાશ બતાવો"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ઉચ્ચ વપરાશ"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> ઍપ્લિકેશન અસાધારણ રીતે વર્તન કરી રહી છે</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ઍપ્લિકેશન અસાધારણ રીતે વર્તન કરી રહી છે</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"આંતરિક સ્ટૉરેજ: <xliff:g id="PERCENTAGE">%1$s</xliff:g> વપરાયો - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ખાલી"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> સુધી કોઈ પ્રવૃત્તિ ન થવા પર નિષ્ક્રિય કરો"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"વૉલપેપર, નિષ્ક્રિય થાઓ, ફૉન્ટનું કદ"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 મિનિટ સુધી કોઈ પ્રવૃત્તિ ન થવા પર નિષ્ક્રિય કરો"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> માંથી સરેરાશ <xliff:g id="USED_MEMORY">%1$s</xliff:g> મેમરીનો ઉપયોગ કર્યો"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> તરીકે સાઇન ઇન કર્યું"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMSની મંજૂરી નથી"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"કૅમેરાની મંજૂરી નથી"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"સ્ક્રીનશૉટની મંજૂરી નથી"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"બૅકઅપ બંધ કરી શકતા નથી"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"આ ઍપ ખોલી શકાતી નથી"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"જો તમને કોઈ પ્રશ્ન હોય, તો તમારા IT વ્યવસ્થાપકનો સંપર્ક કરો"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"વધુ વિગતો"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"કટઆઉટ વડે એક ડિસ્પ્લેનું અનુકરણ કરો"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ડિસ્પ્લે કટઆઉટ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"નૉચ, કટઆઉટ બતાવો"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"કોઈ નહીં"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ડિવાઇસ ડિફૉલ્ટ"</string>
<string name="special_access" msgid="3458780842491881155">"વિશેષ ઍપનો ઍક્સેસ"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ઍપ્લિકેશન અપ્રતિબંધિત ડેટાનો ઉપયોગ કરી શકે છે</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> સાથે કનેક્ટ કરેલું છે"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"બહુવિધ ઉપકરણો સાથે કનેક્ટ કરેલું છે"</string>
<string name="demo_mode" msgid="2798762752209330277">"સિસ્ટમ UI ડેમો મોડ"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"રાત્રિ મોડ"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"રાત્રિ મોડ સેટ કરો"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"ઘાટો મોડ"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"ઘાટો મોડ સેટ કરો"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ઝપડી સેટિંગ્સ વિકાસકર્તા ટાઇલ"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope ટ્રેસ"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"કાર્યાલયની પ્રોફાઇલની સેટિંગ્સ"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"સંપર્ક શોધ"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"કૉલર્સ અને સંપર્કોને ઓળખવા માટે તમારી સંસ્થા દ્વારા સંપર્ક શોધની મંજૂરી આપો"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ફોનને જોવા માટે બે વાર ટૅપ કરો"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ટેબ્લેટને જોવા માટે બે વાર ટૅપ કરો"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"ઉપકરણને જોવા માટે બે વાર ટૅપ કરો"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"સમય, સૂચનાના આઇકનો અને અન્ય માહિતી તપાસવા માટે તમારી સ્ક્રીન પર બે વાર ટૅપ કરો."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારી સ્ક્રીન પર બે વાર ટૅપ કરો."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ફોનને જોવા માટે ઉઠાવો"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ટેબ્લેટને જોવા માટે ઉઠાવો"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ઉપકરણને જોવા માટે ઉઠાવો"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"સમય, સૂચનાના આઇકનો અને અન્ય માહિતી તપાસવા માટે તમારો ફોન ઉપાડો."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"સમય, સૂચનાના આઇકનો અને અન્ય માહિતી તપાસવા માટે તમારું ટૅબ્લેટ ઉપાડો."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"સમય, સૂચનાના આઇકનો અને અન્ય માહિતી તપાસવા માટે તમારું ઉપકરણ ઉપાડો."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ડિસ્પ્લેને સક્રિય કરો"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારો ફોન ઉપાડો."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારું ટૅબ્લેટ ઉપાડો."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારું ઉપકરણ ઉપાડો."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"સ્ક્રીન સક્રિય રાખવાનો સંકેત"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"નોટિફિકેશનો માટે ફિંગરપ્રિન્ટને સ્વાઇપ કરો"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ફિંગરપ્રિન્ટને સ્વાઇપ કરો"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"તમારા નોટિફિકેશનને જોવા માટે, તમારા ફોનની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> પ્રયાસ</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> પ્રયાસ</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"આ ઉપકરણના ડેટાનો બૅકઅપ લેવામાં આવી રહ્યો છે"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"આ ઉપકરણ તમારી સંસ્થા દ્વારા સંચાલિત થાય છે."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"આ ઉપકરણનું સંચાલન <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> દ્વારા થાય છે"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"સ્વતઃભરણ સેવા"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"સ્વતઃ, ભરો, સ્વતઃભરણ"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ખાતરી કરો કે તમે આ ઍપ્લિકેશનનો વિશ્વાસ કરો છો</b> <br/> <br/> <xliff:g id=app_name example=Google આપમેળે>%1$s</xliff:g> તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે આપમેળે શું દાખલ થશે."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"આપમેળે ભરવાની સેટિંગ"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"લૉગિંગનું સ્તર"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"સત્ર દીઠ મહત્તમ વિનંતીઓ"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"જોઈ શકાતા મહત્તમ ડેટાસેટની સંખ્યા"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ડિફૉલ્ટ મૂલ્યો પર રીસેટ કરો"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"આપમેળે ભરવાના ડેવલપરના વિકલ્પો રીસેટ કરવામાં આવ્યા છે"</string>
<string name="device_theme" msgid="4571803018917608588">"ઉપકરણની થીમ"</string>
<string name="default_theme" msgid="7085644992078579076">"ડિફૉલ્ટ"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"નેટવર્કનું નામ"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"કૅરિઅર જોગવાઈ ટ્રિગર કરો"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"ખલેલ પાડશો નહીંને અપડેટ કરો"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"ધ્યાન કેન્દ્રિત કરવા માટે નોટિફિકેશન થોભાવો"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"નવું અને રોમાંચક શું છે?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"તમારા નવા ફોનની ઓળખ મેળવો"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"તમારા નવા ટેબ્લેટની ઓળખ મેળવો"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"તમારા નવા ઉપકરણની ઓળખ મેળવો"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"આ ઉપકરણ પર આ સુવિધા ઉપલબ્ધ નથી"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"સંપૂર્ણ GNSS માપને લાગુ કરો"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"કોઈપણ ડ્યૂટી-સાઈક્લિંગ વગર બધા GNSS તારામંડળો અને આવર્તનો ટ્રૅક કરો"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"હંમેશા ક્રૅશ સંવાદ બતાવો"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"જયારે પણ કોઈ ઍપ ક્રૅશ થાય ત્યારે સંવાદ બતાવો"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE દ્વારા ચાલુ ઍપ્લિકેશન પસંદ કરો"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"કોઈ ANGLE દ્વારા ચાલુ ઍપ્લિકેશન સેટ નથી"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE દ્વારા ચાલુ ઍપ્લિકેશન: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ડિરેક્ટરીનો ઍક્સેસ"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ડિરેક્ટરીનો ઍક્સેસ"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"નેટવર્કની વિગતો"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"તમારા ઉપકરણનું નામ તમારા ફોનની ઍપ પર જોઈ શકાય છે. તમે બ્લૂટૂથથી કનેક્ટ કરો અથવા વાઇ-ફાઇ હૉટસ્પૉટને સેટ કરો ત્યારે તે અન્ય લોકોને પણ દેખાઈ શકે છે."</string>
<string name="devices_title" msgid="7701726109334110391">"ઉપકરણો"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"બધી સેટિંગ"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"સૂચનો"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ડેટા"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ડેટા"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"નેટવર્ક પસંદ કરો"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ડિસ્કનેક્ટેડ"</string>
+ <string name="network_connected" msgid="4943925032253989621">"કનેક્ટ થયું"</string>
+ <string name="network_connecting" msgid="76404590784733557">"કનેક્ટ કરી રહ્યાં છીએ..."</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"કનેક્ટ કરી શકાયું નથી"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"કોઈ નેટવર્ક મળ્યું નથી."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"નેટવર્ક શોધી શક્યાં નથી. ફરી પ્રયાસ કરો."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(પ્રતિબંધિત)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"કોઈ સિમ કાર્ડ નથી"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"વિગતવાર કૉલિંગ"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"પસંદગીનો નેટવર્ક મોડ: WCDMA પસંદ કરેલ છે"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"પસંદગીનો નેટવર્ક મોડ: માત્ર GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"પસંદગીનો નેટવર્ક મોડ: માત્ર WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"પસંદગીનો નેટવર્ક મોડ: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"પસંદગીનો નેટવર્ક મોડ: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"પસંદગીનો નેટવર્ક મોડ: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"પસંદગીનો નેટવર્ક મોડ: માત્ર CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"પસંદગીનો નેટવર્ક મોડ: માત્ર EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"પસંદગીનો નેટવર્ક મોડ: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"પસંદગીનો નેટવર્ક મોડ: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"પસંદગીનો નેટવર્ક મોડ: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"પસંદગીનો નેટવર્ક મોડ: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"પસંદગીનો નેટવર્ક મોડ: વૈશ્વિક"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"પસંદગીનો નેટવર્ક મોડ: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"પસંદગીનો નેટવર્ક મોડ: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"પસંદગીનો નેટવર્ક મોડ: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"પસંદગીનો નેટવર્ક મોડ: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"પસંદગીનો નેટવર્ક મોડ: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"પસંદગીનો નેટવર્ક મોડ: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"પસંદગીનો નેટવર્ક મોડ: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"પસંદગીનો નેટવર્ક મોડ: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"પસંદગીનો નેટવર્ક મોડ: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"પસંદગીનો નેટવર્ક મોડ: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"પસંદગીનો નેટવર્ક મોડ: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"પસંદગીનો નેટવર્ક મોડ: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"પસંદગીનો નેટવર્ક મોડ: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (સુઝાવ આપેલ)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (સુઝાવ આપેલ)"</string>
+ <string name="network_global" msgid="959947774831178632">"વૈશ્વિક"</string>
+ <string name="label_available" msgid="1731547832803057893">"ઉપલબ્ધ નેટવર્ક"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"શોધી રહ્યાં છીએ…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g>પર નોંધણી કરી રહ્યાં છીએ…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"તમારું SIM કાર્ડ આ નેટવર્કથી કનેક્શનની મંજૂરી આપતું નથી."</string>
+ <string name="connect_later" msgid="978991102125216741">"હમણાં આ નેટવર્કથી કનેક્ટ કરી શકાતું નથી. થોડા સમય પછી ફરી પ્રયાસ કરો."</string>
+ <string name="registration_done" msgid="4573820010512184521">"નેટવર્ક પર નોંધણી કરી."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"નેટવર્ક ઑટોમૅટિક રીતે પસંદ કરો"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"કૅરિઅર સેટિંગ"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ડેટા સેવા સેટઅપ કરો"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"મોબાઇલ ડેટા"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"મોબાઇલ નેટવર્કનો વપરાશ કરીને ડેટા ઍક્સેસ કરો"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"પસંદગીનો નેટવર્ક પ્રકાર"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"નેટવર્ક ઑપરેટિંગ મોડ બદલો"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"પસંદગીનો નેટવર્ક પ્રકાર"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"કૅરિઅર"</string>
+ <string name="call_category" msgid="8108654745239563833">"કૉલિંગ"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"કૅરિઅર વીડિયો કૉલિંગ"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"સિસ્ટમ પસંદગી"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA રોમિંગ મોડ બદલો"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"સિસ્ટમ પસંદગી"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"નેટવર્ક"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"નેટવર્ક"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA સબસ્ક્રિપ્શન"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM અને NV વચ્ચે બદલો"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"સબસ્ક્રિપ્શન"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ઑટોમૅટિક નોંધણી…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"ડેટા રોમિંગને મંજૂરી આપીએ?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"કિંમત માટે તમારા નેટવર્ક પ્રદાતાનો સંપર્ક કરો."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ઍપ ડેટા વપરાશ"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"અમાન્ય નેટવર્ક મોડ <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. અવગણો."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"જ્યારે <xliff:g id="CARRIER">%1$s</xliff:g> સાથે કનેક્ટ થયેલ હોય, ત્યારે ઉપલબ્ધ નથી"</string>
+ <string name="see_more" msgid="5953815986207345223">"વધુ જુઓ"</string>
+ <string name="see_less" msgid="1250265310929558370">"ઓછું જુઓ"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 4293a04..53c90eb 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"इस कनेक्शन में डेटा से जुड़ी पाबंदी है"</item>
<item msgid="2266114985518865625">"इस कनेक्शन में डेटा से जुड़ी पाबंदी नहीं है"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"डिफ़ॉल्ट (किसी एक MAC का इस्तेमाल करें)"</item>
+ <item msgid="5398461510512959597">"भरोसेमंद"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"नहीं"</item>
<item msgid="3863157480502955888">"हां"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"हमेशा चालू"</item>
<item msgid="6385301106124765323">"हमेशा बंद"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"बंद करें"</item>
+ <item msgid="2182686878828390312">"डीबग"</item>
+ <item msgid="5286514712714822064">"ज़्यादा जानकारी डालें"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"सिर्फ़ होम पेज"</item>
+ <item msgid="5034813753274486448">"अपने आप"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA पसंदीदा"</item>
+ <item msgid="807926878589867564">"सिर्फ़ GSM"</item>
+ <item msgid="488474605709912156">"सिर्फ़ WCDMA"</item>
+ <item msgid="1912421096218750039">"अपने आप GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"अपने आप CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"EvDo के बिना CDMA"</item>
+ <item msgid="4678789463133969294">"सिर्फ़ EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"हर जगह लागू"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"सिर्फ़ TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/सिम"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"हर जगह लागू"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a384800..b16a760 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"बनाएं"</string>
<string name="allow" msgid="3349662621170855910">"अनुमति दें"</string>
<string name="deny" msgid="6947806159746484865">"अस्वीकार करें"</string>
- <string name="dlg_close" msgid="7471087791340790015">"बंद करें"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"स्विच करें"</string>
<string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">अब आप डेवलपर बननेे से <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण दूर हैं.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"आवश्यकता नहीं, आप पहले से ही डेवलपर हैं."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"कृपया पहले डेवलपर के लिए सेटिंग और टूल चालू करें."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"वायरलेस और नेटवर्क"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"कनेक्शन"</string>
- <string name="header_category_device" msgid="4544026001618307754">"डिवाइस"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"व्यक्तिगत"</string>
- <string name="header_category_access" msgid="7580499097416970962">"एक्सेस करें"</string>
<string name="header_category_system" msgid="2816866961183068977">"सिस्टम"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"डेटा कनेक्शन चालू करें"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"डेटा कनेक्शन अक्षम करें"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"डिवाइस का ब्लूटूथ पता: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को डिसकनेक्ट करें?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"अनामित ब्लूटूथ डिवाइस"</string>
<string name="progress_scanning" msgid="192587958424295789">"खोजना"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"आस-पास कोई ब्लूटूथ डिवाइस नहीं मिला."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"कोई ऐप्लिकेशन ब्लूटूथ को चालू करना चाहता है और आपके फ़ोन को अन्य डिवाइस के लिए दृश्यमान बनाना चाहता है. आप इसे बाद में ब्लूटूथ सेटिंग में बदल सकते हैं."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ब्लूटूथ चालू हो रहा है.."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लूटूथ बंद कर रहे हैं…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्वत: कनेक्ट करें"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ब्लूटूथ कनेक्शन अनुरोध"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करने के लिए टैप करें."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"क्या आप \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" से कनेक्ट करना चाहते हैं?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"कॉल की सुविधा वाले उपलब्ध डिवाइस"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"इंटरनेट से जुड़े हुए डिवाइस"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"सेव किए गए डिवाइस"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"डिवाइस जोड़ें"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"दूसरे डिवाइस से जुड़ने के लिए ब्लूटूथ चालू हो जाएगा"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"कनेक्शन की पसंद"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"पहले कनेक्ट किए गए डिवाइस"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"पहले कनेक्ट किए गए डिवाइस"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ब्लूटूथ चालू किया गया"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"सभी देखें"</string>
<string name="date_and_time" msgid="9062980487860757694">"तारीख और समय"</string>
<string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चुनें"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"अभी नहीं"</string>
<string name="next_label" msgid="4693520878012668114">"आगे"</string>
<string name="language_picker_title" msgid="3596315202551687690">"भाषाएं"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"भाषा की पसंद"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"निकालें"</string>
<string name="add_a_language" msgid="2330538812283783022">"भाषा जोड़ें"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"सेटिंग"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"सेटिंग शॉर्टकट"</string>
<string name="airplane_mode" msgid="8837269988154128601">"हवाई जहाज मोड"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"अधिक"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"वायरलेस और नेटवर्क"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"वाई-फ़ाई , ब्लूटूथ, हवाई जहाज़ मोड, मोबाइल नेटवर्क और VPN प्रबंधित करें"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"मोबाइल डेटा"</string>
@@ -388,32 +378,37 @@
<string name="security_passwords_title" msgid="2881269890053568809">"निजता"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"व्यवस्थापक ने अक्षम किया है"</string>
<string name="security_status_title" msgid="5848766673665944640">"सुरक्षा स्थिति"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"स्क्रीन लॉक करने, मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"स्क्रीन लॉक, फ़िंगरप्रिंट"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"स्क्रीन लॉक"</string>
- <!-- no translation found for security_settings_face_preference_summary (1290187225482642821) -->
- <skip />
- <!-- no translation found for security_settings_face_preference_summary_none (5460349732790152186) -->
- <skip />
- <!-- no translation found for security_settings_face_preference_title (7074548721778680481) -->
- <skip />
- <!-- no translation found for security_settings_face_enroll_introduction_cancel (4277182322482408514) -->
- <skip />
- <!-- no translation found for security_settings_face_enroll_introduction_title (2694505011712885439) -->
- <skip />
- <!-- no translation found for security_settings_face_enroll_introduction_title_unlock_disabled (8180330567034286589) -->
- <skip />
- <!-- no translation found for security_settings_face_enroll_introduction_message (6150611993438981458) -->
- <skip />
- <!-- no translation found for security_settings_face_enroll_introduction_message_unlock_disabled (6300341727101929207) -->
- <skip />
- <!-- no translation found for security_settings_face_enroll_introduction_message_setup (5704661081718707858) -->
- <skip />
- <!-- no translation found for face_add_max (2342250989212694454) -->
- <skip />
- <!-- no translation found for face_intro_error_max (160022811747660581) -->
- <skip />
- <!-- no translation found for face_intro_error_unknown (6367721696446677261) -->
- <skip />
+ <string name="security_settings_face_preference_summary" msgid="1290187225482642821">"चेहरा जोड़ा गया"</string>
+ <string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"टैप करके \'चेहरे से अनलॉक\' सेट अप करें"</string>
+ <string name="security_settings_face_preference_title" msgid="7074548721778680481">"चेहरे से अनलॉक करें"</string>
+ <string name="security_settings_face_enroll_introduction_cancel" msgid="4277182322482408514">"रद्द करें"</string>
+ <string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"चेहरे से डिवाइस अनलाॅक करें"</string>
+ <string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"चेहरे के ज़रिए अनलॉक करें"</string>
+ <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"अपने फ़ोन को अनलॉक करने, खरीदारी की मंज़ूरी देने या ऐप्लिकेशन में साइन इन करने के लिए अपने चेहरे का इस्तेमाल करें."</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"फ़ोन का लॉक खोलने या खरीदारियों को मंज़ूरी देने के लिए चेहरे की पहचान इस्तेमाल करें.\n\nध्यान दें: इस डिवाइस का लॉक खोलने के लिए आप अपने चेहरे का इस्तेमाल नहीं कर सकते. ज़्यादा जानकारी के लिए, अपने संगठन के एडमिन से संपर्क करें."</string>
+ <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"अपने फ़ोन को अनलॉक करने, खरीदारी की मंज़ूरी देने या ऐप्लिकेशन में साइन इन करने के लिए अपने चेहरे का इस्तेमाल करें"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"चेहरे को गोल घेरे के बीचों-बीच लाएं"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"बाद में करें"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"आप ज़्यादा से ज़्यादा <xliff:g id="COUNT">%d</xliff:g> चेहरे जोड़ सकते हैं"</string>
+ <string name="face_intro_error_max" msgid="160022811747660581">"लाॅक खोलने के लिए इससे ज़्यादा चेहरे नहीं जोड़े जा सकते"</string>
+ <string name="face_intro_error_unknown" msgid="6367721696446677261">"और चेहरे नहीं जोड़े जा सकते"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"चेहरा जोड़ने की प्रक्रिया पूरी नहीं हो सकी"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ठीक है"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"चेहरा रजिस्टर करने की समय सीमा पूरी हो गई. फिर से कोशिश करें."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"चेहरा रजिस्टर नहीं हो पाया."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"हो गया. सब ठीक लग रहा है."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"हो गया"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"चेहरे के ज़रिए"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"डिवाइस अनलॉक करें"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ऐप्लिकेशन साइन इन और भुगतान"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"अनलॉक करने के लिए आंखें खुली हैं"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"चेहरे की पहचान करते समय, आपकी आंखें खुली होनी चाहिए"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"चेहरे का डेटा हटाएं"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"अपने चेहरे का डेटा अपडेट करें"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"आप अपने चेहरे के ज़रिए अपने डिवाइस को अनलॉक कर सकते हैं और ऐप्लिकेशन एक्सेस कर सकते हैं. "<annotation id="url">"ज़्यादा जानें"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"उंगली की छाप"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"फ़िंगरप्रिंट प्रबंधित करें"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"इनके हेतु फ़िंगरप्रिंट उपयोग करें"</string>
@@ -525,14 +520,12 @@
<string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"टैबलेट की सुरक्षा करें"</string>
<string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"डिवाइस की सुरक्षा करें"</string>
<string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"फ़ोन को सुरक्षित रखें"</string>
- <!-- no translation found for lock_settings_picker_biometrics_added_security_message (1507307757032207572) -->
- <skip />
+ <string name="lock_settings_picker_biometrics_added_security_message" msgid="1507307757032207572">"ज़्यादा सुरक्षा के लिए, अनलॉक करने का एक दूसरा विकल्प भी सेट करें."</string>
<string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस टैबलेट का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
<string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस डिवाइस का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
<string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस फ़ोन का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
<string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"अपनी बैकअप स्क्रीन लॉक विधि चुनें"</string>
- <!-- no translation found for lock_settings_picker_face_message (197106534637556054) -->
- <skip />
+ <string name="lock_settings_picker_face_message" msgid="197106534637556054">"अनलॉक करने का दूसरा तरीका चुनें"</string>
<string name="setup_lock_settings_options_button_label" msgid="8511153243629402929">"स्क्रीन लॉक के विकल्प"</string>
<string name="setup_lock_settings_options_dialog_title" msgid="5058207955455973917">"स्क्रीन लॉक विकल्प"</string>
<string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"स्क्रीन लॉक"</string>
@@ -559,16 +552,11 @@
<string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"फ़िंगरप्रिंट + पासवर्ड"</string>
<string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"फ़िंगरप्रिंट के बिना जारी रखें"</string>
<string name="fingerprint_unlock_title" msgid="2826226740306003991">"आप अपने फ़िंगरप्रिंट का उपयोग करके अपना फ़ोन अनलॉक कर सकते हैं. सुरक्षा के लिए, इस विकल्प के लिए बैकअप स्क्रीन लॉक आवश्यक है."</string>
- <!-- no translation found for face_unlock_set_unlock_pattern (8792301636367000123) -->
- <skip />
- <!-- no translation found for face_unlock_set_unlock_pin (1196620299595657479) -->
- <skip />
- <!-- no translation found for face_unlock_set_unlock_password (223117276773907474) -->
- <skip />
- <!-- no translation found for face_unlock_skip_face (6362883392838482791) -->
- <skip />
- <!-- no translation found for face_unlock_title (9042382084472444316) -->
- <skip />
+ <string name="face_unlock_set_unlock_pattern" msgid="8792301636367000123">"चेहरे की पहचान के अलावा पैटर्न से अनलॉक करें"</string>
+ <string name="face_unlock_set_unlock_pin" msgid="1196620299595657479">"चेहरे की पहचान के अलावा पिन से अनलॉक करें"</string>
+ <string name="face_unlock_set_unlock_password" msgid="223117276773907474">"चेहरे की पहचान के अलावा पासवर्ड से अनलॉक करें"</string>
+ <string name="face_unlock_skip_face" msgid="6362883392838482791">"चेहरे से डिवाइस अनलॉक करने का विकल्प सेट किए बिना आगे बढ़ें"</string>
+ <string name="face_unlock_title" msgid="9042382084472444316">"आप अपने चेहरे के ज़रिए फ़ोन अनलॉक कर सकते हैं. डिवाइस को सुरक्षित रखने के लिए, यह ज़रूरी है कि चेहरे के अलावा अनलॉक करने का दूसरा विकल्प भी सेट किया जाए."</string>
<string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"एडमिन, सुरक्षित करने की नीति या क्रेडेंशियल स्टोरेज ने बंद किया है"</string>
<string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"कोई नहीं"</string>
<string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"स्वाइप करें"</string>
@@ -903,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 गीगाहर्ट्ज़"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"वाई-फ़ाई हॉटस्पॉट से डिवाइस काे जाेड़ने के लिए कम से कम एक बैंड चुनें:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP सेटिंग"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"निजता"</string>
<string name="wifi_shared" msgid="844142443226926070">"अन्य डिवाइस उपयोगकर्ताओं से शेयर करें"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(अपरिवर्तित)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"कृपया चुनें"</string>
@@ -942,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"रद्द करें"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"नेटवर्क की जानकारी हटाएं?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"इस नेटवर्क के सभी पासवर्ड मिटा दिए जाएंगे"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"सेव किए गए नेटवर्क"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d नेटवर्क</item>
<item quantity="other">%d नेटवर्क</item>
@@ -1010,7 +998,7 @@
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"वाई-फ़ाई कॉलिंग"</string>
<string name="wifi_calling_suggestion_title" msgid="5702964371483390024">"वाई-फ़ाई के ज़रिए कॉल करने की सुविधा चालू करें"</string>
<string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"वाई-फ़ाई कॉलिंग चालू करके कॉल करने का एक और विकल्प पाएं"</string>
- <string name="wifi_calling_mode_title" msgid="2164073796253284289">"कॉल को प्राथमिकता"</string>
+ <string name="wifi_calling_mode_title" msgid="2164073796253284289">"कॉल करने का प्राथमिक तरीका"</string>
<string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"वाई-फ़ाई कॉलिंग मोड"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"रोमिंग की प्राथमिकताएं"</string>
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
@@ -1121,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"स्क्रीन की रोशनी"</string>
<string name="brightness_summary" msgid="838917350127550703">"स्क्रीन की रोशनी एडजस्ट करें"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"रोशनी के हिसाब से स्क्रीन की चमक"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"चालू है"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"बंद"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"पसंदीदा स्क्रीन रोशनी का लेवल बहुत कम है"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"पसंदीदा स्क्रीन रोशनी का लेवल कम है"</string>
@@ -1218,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"पिन नहीं बदल सकता.\nसंभवत: गलत पिन."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"सिम पिन सफलतापूर्वक बदला गया"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"सिम कार्ड लॉक स्थिति नहीं बदल सकता.\nसंभवत: गलत पिन."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"पिन को बंद नहीं किया जा सकता."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"पिन को चालू नहीं किया जा सकता."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ठीक है"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"रद्द करें"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"एकाधिक सिम मिलीं"</string>
@@ -1391,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"इसके लिए <xliff:g id="NAME_0">^1</xliff:g> को प्रारूपित किए जाने की आवश्यकता है. \n\n"<b>"प्रारूपित करने से वर्तमान में <xliff:g id="NAME_1">^1</xliff:g> पर संग्रहित सभी डेटा मिट जाता है."</b>" डेटा खोने से बचाने के लिए, उसका बैक अप लेने पर विचार करें."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"मिटाएं और फ़ॉर्मेट करें"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> को फ़ॉर्मेट किया जा रहा है…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"फ़ॉर्मैट किए जाने के दौरान <xliff:g id="NAME">^1</xliff:g> न निकालें."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"फ़ॉर्मैट किए जाने के दौरान <xliff:g id="NAME">^1</xliff:g> न हटाएंं."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"डेटा को नई मेमोरी में ले जाएं"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"आप अपनी फ़ोटो, फ़ाइलें और कुछ ऐप इस नए <xliff:g id="NAME">^1</xliff:g> पर ले जा सकते हैं. \n\nले जाने में लगभग <xliff:g id="TIME">^2</xliff:g>का समय लगता है और इससे डिवाइस की मेमोरी पर <xliff:g id="SIZE">^3</xliff:g> जगह खाली हो जाएगी. इस दौरान कुछ ऐप काम नहीं करेंगे."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"अभी ले जाएं"</string>
@@ -1637,12 +1626,9 @@
<string name="lockpassword_password_set_toast" msgid="4875050283108629383">"पासवर्ड सेट कर दिया गया है"</string>
<string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"पिन सेट कर दिया गया है"</string>
<string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"आकार सेट कर दिया गया है"</string>
- <!-- no translation found for lockpassword_choose_your_password_header_for_face (7876621019688907534) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pattern_header_for_face (8070525076987585344) -->
- <skip />
- <!-- no translation found for lockpassword_choose_your_pin_header_for_face (7304398683609714816) -->
- <skip />
+ <string name="lockpassword_choose_your_password_header_for_face" msgid="7876621019688907534">"चेहरे से लॉक खोलने के लिए पासवर्ड बनाएं"</string>
+ <string name="lockpassword_choose_your_pattern_header_for_face" msgid="8070525076987585344">"चेहरे से लॉक खोलने के लिए पैटर्न बनाएं"</string>
+ <string name="lockpassword_choose_your_pin_header_for_face" msgid="7304398683609714816">"चेहरे से लॉक खोलने के लिए पिन बनाएं"</string>
<string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"जारी रखने के लिए अपने डिवाइस पैटर्न का उपयोग करें"</string>
<string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"जारी रखने के लिए अपना डिवाइस पिन डालें"</string>
<string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"जारी रखने के लिए अपना डिवाइस पासवर्ड डालें"</string>
@@ -1776,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"इंस्टॉल किया गया"</string>
<string name="no_applications" msgid="7336588977497084921">"कोई ऐप्स नहीं."</string>
<string name="internal_storage" msgid="1584700623164275282">"मोबाइल मेमोरी"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"आंतरिक मेमोरी"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB मेमोरी"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD कार्ड मेमोरी"</string>
<string name="recompute_size" msgid="7722567982831691718">"आकार पुन: परिकलित कर रहा है…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"एप्लिकेशन डेटा हटाएं?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"इस ऐप्स का सभी डेटा स्थायी रूप से हटा दिया जाएगा. इसमें सभी फ़ाइलें, सेटिंग, खाते, डेटाबेस आदि शामिल हैं."</string>
@@ -1787,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"इंस्टॉल किए गए ऐप्स की सूची में ऐप्स नहीं मिला."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"ऐप्लिकेशन के लिए मेमोरी खाली नहीं की जा सकी."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"यह ऐप्स आपके टैबलेट पर निम्न में पहुंच सकता है:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"यह ऐप्स आपके फ़ोन पर निम्न पर पहुंच सकता है:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"यह ऐप्स आपके टैबलेट पर इन पर पहुंच सकता है. निष्पादन को बेहतर बनाने और स्मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्ध हैं क्योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"यह ऐप्स आपके फ़ोन पर इन पर पहुंच सकता है. निष्पादन को बेहतर बनाने और स्मृति उपयोग को कम करने के लिए, इनमें से कुछ अनुमतियां <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> को उपलब्ध हैं क्योंकि यह <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> के समान प्रक्रिया में चलता है:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> और <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"यह ऐप्स आपसे शुल्क ले सकता है:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"प्रीमियम मैसेज (एसएमएस) भेजें"</string>
<string name="computing_size" msgid="1599186977475211186">"गणना कर रहा है…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"पैकेज आकार की गणना नहीं की जा सकी."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"आपके पास कोई भी तृतीय-पक्ष ऐप्स इंस्टॉल नहीं है."</string>
<string name="version_text" msgid="9189073826278676425">"वर्शन <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"ले जाएं"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"टैबलेट पर ले जाएं"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"फ़ोन पर ले जाएं"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB मेमोरी में ले जाएं"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD कार्ड में ले जाएं"</string>
- <string name="moving" msgid="6431016143218876491">"ले जा रहा है"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"कोई और डेटा दूसरी जगह भेजा जा रहा है."</string>
<string name="insufficient_storage" msgid="481763122991093080">"मेमोरी में ज़रुरत के मोताबिक जगह नहीं बची है"</string>
<string name="does_not_exist" msgid="1501243985586067053">"ऐप्स मौजूद नहीं है."</string>
@@ -1814,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"डिवाइस व्यवस्थापक ऐप्लिकेशन को बाहरी मीडिया पर इंस्टॉल नहीं किया जा सकता"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"ज़बरदस्ती रोकें?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"अगर आप किसी ऐप को बलपूर्वक रोकते हैं, तो यह गलत व्यवहार कर सकता है."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ऐप्स नहीं ले जाया जा सका. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"इंस्टॉल करने की पसंदीदा जगह"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"नए ऐप के लिए इंस्टॉल करने की पसंदीदा जगह बदलें"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"अंतर्निहित ऐप्स अक्षम करें?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"ऐप को अक्षम करें"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"अगर आप इस ऐप्लिकेशन को अक्षम करते हैं, तो हो सकता है कि Android और दूसरे ऐप्लिकेशन अपेक्षित रूप से काम ना कर पाएं."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा मिटाएं और ऐप को बंद करें?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"यदि आप इस ऐप्लिकेशन को अक्षम करते हैं, तो हो सकता है कि दूसरे ऐप्लिकेशन अपेक्षित रूप से काम ना कर पाएं. आपका डेटा भी हटा दिया जाएगा."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"सूचनाएं मिलनी बंद करें?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"अगर आप इस ऐप के लिए सूचना बंद करते हैं, तो आपको ज़रूरी अलर्ट और अपडेट नहीं मिल पाएंगी."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"स्टोर"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"ऐप का विवरण"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> से इंस्टॉल किया गया ऐप्लिकेशन"</string>
@@ -2017,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"सेवा इस्तेमाल करें"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"रंग में सुधार करने की सुविधा इस्तेमाल करें"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"कैप्शन इस्तेमाल करें"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"जारी रखें"</string>
<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="6371077608778830020">"सुनने में मददगार डिवाइस जोड़ें"</string>
@@ -2160,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"अगर आप ऐप की बैकग्राउंड गतिविधि को सीमित करते हैं, तो हो सकता है यह ठीक ढंग से काम न करे"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ऐप्लिकेशन पर रोक नहीं लगेगी क्योंकि यह बैटरी ऑप्टिमाइज़ नहीं कर सकता.\n\nबैटरी ऑप्टिमाइज़ेशन चालू करके ही ऐसा हो सकता है."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"पूरा चार्ज होने के बाद से अब तक स्क्रीन का इस्तेमाल"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रीन के लिए खपत"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कैनिंग"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"पिछली बार बैटरी पूरी चार्ज करने के बाद, उसके इस्तेमाल से जुड़ी जानकारी"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"पिछली बार पूरी तरह चार्ज होने के बाद से अब तक स्क्रीन के चालू रहने का समय"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"पिछली बार पूरी चार्ज होने के बाद से अब तक का डिवाइस उपयोग"</string>
@@ -2188,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"विवरणों का उपयोग करें"</string>
<string name="controls_subtitle" msgid="390468421138288702">"पावर उपयोग एडजस्ट करें"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"शामिल पैकेज"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ज़्यादा बैटरी खर्च कर रहे ऐप्लिकेशन"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"डिवाइस को सक्रिय रखना"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"डिवाइस को बैकग्राउंड में सक्रिय करना"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"बार-बार जगह का अनुरोध कर रहा है"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ऐप्लिकेशन ठीक से काम नहीं कर रहे हैं"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"ऐप्लिकेशन सामान्य रूप से काम कर रहे हैं"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"फ़ोन पर बैकग्राउंड में सामान्य रूप से बैटरी इस्तेमाल हो रही है"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"टैबलेट पर बैकग्राउंड में सामान्य रूप से बैटरी इस्तेमाल हो रही है"</string>
@@ -2256,6 +2221,7 @@
<item quantity="one">%1$d ऐप्लिकेशन के लिए बैटरी के इस्तेमाल पर रोक लगाई जा रही है</item>
<item quantity="other">%1$d ऐप्लिकेशन के लिए बैटरी के इस्तेमाल पर रोक लगाई जा रही है</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> पाबंदी लगी थी"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"ये ऐप्लिकेशन बैकग्राउंड में बैटरी इस्तेमाल करते रहे हैं. जिन ऐप्लिकेशन पर रोक लगाई गई है, हो सकता है कि वे ठीक तरह से काम न करें और उनके बारे में सूचनाएं देर से मिलें."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"बैटरी मैनेजर का इस्तेमाल करें"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"ऐप्लिकेशन के ज़्यादा बैटरी खर्च करने पर सूचना पाएं"</string>
@@ -2433,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"रद्द करें"</string>
<string name="tts_reset" msgid="2661752909256313270">"रीसेट करें"</string>
<string name="tts_play" msgid="2628469503798633884">"चलाएं"</string>
- <string name="gadget_title" msgid="5519037532720577836">"पावर नियंत्रण"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाई-फ़ाई सेटिंग अपडेट हो रही है"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटूथ सेटिंग अपडेट हो रही है"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"चालू"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"बंद"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"चालू हो रहा है"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद हो रहा है"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"वाई-फ़ाई"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लूटूथ"</string>
- <string name="gadget_location" msgid="2974757497945178165">"जगह"</string>
- <string name="gadget_sync" msgid="858895763714222152">"समन्वयन करें"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"स्क्रीन की रोशनी <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"स्वचालित"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"अधिकतम"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"आधा"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"बंद"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"वीपीएन"</string>
<string name="credentials_title" msgid="4446234003860769883">"क्रेडेंशियल स्टोरेज"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"मेमोरी से इंस्टॉल करें"</string>
@@ -2607,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> में से <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"सभी को चुनें"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"डेटा खर्च"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"डेटा खर्च एेप"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"मोबाइल डेटा और वाई-फ़ाई"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
<string name="data_usage_app" msgid="4970478397515423303">"ऐप्स का उपयोग"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ऐप की जानकारी"</string>
@@ -2984,7 +2933,6 @@
<item quantity="one">छिपे हुए %d आइटम दिखाएं</item>
<item quantity="other">छिपे हुए %d आइटम दिखाएं</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"छोटा करें"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"नेटवर्क और इंटरनेट"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटा खर्च"</string>
@@ -2996,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ब्लूटूथ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ऐप्लिकेशन और सूचनाएं"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"अनुमतियां, डिफ़ॉल्ट ऐप"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"कार्य प्रोफ़ाइल चालू होने पर ऐप्लिकेशन से जुड़ी सूचना नहीं देखी जा सकती है."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"खाते"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"कोई खाता नहीं जोड़ा गया"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"डिफ़ॉल्ट ऐप्लिकेशन"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"भाषाएं, समय, बैकअप, अपडेट"</string>
<string name="search_results_title" msgid="1796252422574886932">"सेटिंग"</string>
- <string name="search_menu" msgid="6283419262313758339">"सेटिंग में खोजें"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"वाईफ़ाई, वाई-फ़ाई, नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वाई फ़ाई"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"वाईफ़ाई, वाई-फ़ाई, टॉगल, नियंत्रण"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"मैसेज, मैसेज करें, मैसेज, मैसेज करना, डिफ़ॉल्ट"</string>
@@ -3046,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"भुगतान करें, टैप करें, भुगतान"</string>
<string name="keywords_backup" msgid="470070289135403022">"बैकअप, बैक अप"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"जेस्चर"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"चेहरा, अनलॉक, अनुमति देना, साइन इन"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl वर्शन, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"नेटवर्क, मोबाइल नेटवर्क किस राज्य का है, सेवा किस राज्य से ली जा रही है, सिग्नल की ताकत, मोबाइल नेटवर्क का प्रकार, रोमिंग, ICCID"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"सीरियल नंबर, हार्डवेयर वर्शन"</string>
@@ -3053,8 +3002,8 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"गहरे रंग वाली थीम"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"गड़बड़ी"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"हमेशा चालू स्क्रीन, लॉक स्क्रीन डिसप्ले"</string>
- <!-- no translation found for keywords_face_settings (7505388678116799329) -->
- <skip />
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"लॉक स्क्रीन सूचना"</string>
+ <string name="keywords_face_settings" msgid="7505388678116799329">"चेहरा"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"फ़िंगरप्रिंट"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"हल्की रोशनी वाली स्क्रीन, टचस्क्रीन, बैटरी, स्मार्ट ब्राइटनेस, डाइनैमिक ब्राइटनेस"</string>
<string name="keywords_auto_rotate" msgid="5620879898668211494">"घुमाएं, फ़्लिप करें, घुमाव, पोर्ट्रेट, लैंडस्केप, स्क्रीन की दिशा, वर्टिकल, हॉरिज़ॉन्टल"</string>
@@ -3095,7 +3044,7 @@
<string name="notification_unknown_sound_title" msgid="2535027767851838335">"ऐप की ओर से दी जाने वाली ध्वनि"</string>
<string name="notification_sound_default" msgid="565135733949733766">"सूचना की डिफ़ॉल्ट टोन"</string>
<string name="alarm_ringtone_title" msgid="6344025478514311386">"अलार्म की डिफ़ॉल्ट आवाज़"</string>
- <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल के लिए भी कंपन (वाइब्रेशन) करें"</string>
+ <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल आने पर वाइब्रेट भी करें"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"अन्य आवाज़ें"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"डायल पैड टोन"</string>
<string name="screen_locking_sounds_title" msgid="1340569241625989837">"स्क्रीन लॉक करने की आवाज़ें"</string>
@@ -3331,7 +3280,7 @@
<string name="notification_content_block_title" msgid="5854232570963006360">"सूचना दिखाएं"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"सूचना कभी भी शेड में या पेरिफ़ेरल डिवाइस पर ना दिखाएं"</string>
<string name="notification_badge_title" msgid="6370122441168519809">"नई सूचनाएं बताने वाले गोल निशान की अनुमति दें"</string>
- <string name="notification_channel_badge_title" msgid="2240827899882847087">"सूचना बिंदु दिखाएं"</string>
+ <string name="notification_channel_badge_title" msgid="2240827899882847087">"नई सूचनाएं बताने वाला गोल निशान दिखाएं"</string>
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'परेशान न करें\' मोड बंद करें"</string>
<string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"\'परेशान न करें\' मोड चालू होने पर भी ये सूचनाएं दिखाना जारी रखें"</string>
<string name="app_notification_visibility_override_title" msgid="7821124557634786985">"लॉक स्क्रीन पर दिखाई दे"</string>
@@ -3472,12 +3421,9 @@
<string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"आप इसके चालू होने से पहले अपना पिन डालना ज़रूरी बनाकर इसे और सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, मैसेज या सूचनाएं नहीं मिल सकती हैं. \n\nइससे खोए या चोरी हो गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में मदद मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
<string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करने के अलावा, आप इसे चालू करने से पहले, पैटर्न डालना ज़रूरी बनाकर इसे और भी सुरक्षित बना सकते हैं. जब तक डिवाइस शुरू नहीं होता, तब तक उसे अलार्म के साथ-साथ कॉल, मैसेज या सूचनाएं नहीं मिल पाएंगी.\n\nइससे खोए या चोरी हो गए डिवाइस पर मौजूद डेटा को सुरक्षित करने में मदद मिलती है. क्या अपने डिवाइस के चालू होने से पहले, पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
<string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"अपने डिवाइस का लॉक खोलने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करने के अलावा, आप इस डिवाइस के चालू होने से पहले अपना पासवर्ड डालना ज़रूरी बनाकर इसे और भी सुरक्षित कर सकते हैं. डिवाइस के चालू होने तक, उस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी और अलार्म भी काम नहीं करेगा.\n\nइससे खोए हुए या चोरी हो गए डिवाइस पर डेटा की सुरक्षा करने में सहायता मिलती है. अपना डिवाइस चालू करने के लिए पासवर्ड डालना ज़रूरी बनाना चाहते हैं?"</string>
- <!-- no translation found for encryption_interstitial_message_pin_for_face (2017438765366716760) -->
- <skip />
- <!-- no translation found for encryption_interstitial_message_pattern_for_face (3551827507967661552) -->
- <skip />
- <!-- no translation found for encryption_interstitial_message_password_for_face (3452793542112093614) -->
- <skip />
+ <string name="encryption_interstitial_message_pin_for_face" msgid="2017438765366716760">"डिवाइस का लॉक खोलने के लिए अपने चेहरे का इस्तेमाल करने के अलावा, आप आगे बताया गया तरीका अपनाकर डिवाइस की सुरक्षा बढ़ा सकते हैं. आप सेट कर सकते हैं कि जब बंद डिवाइस चालू किया जाए, तब वह सेट किए गए पिन से ही खुले. डिवाइस चालू होने तक, उस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी और अलार्म भी नहीं बजेगा.\n\nऐसा करने से आप खोए या चोरी हो चुके डिवाइस का डेटा सुरक्षित रख सकते हैं. डिवाइस चालू करने के लिए पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
+ <string name="encryption_interstitial_message_pattern_for_face" msgid="3551827507967661552">"डिवाइस का लॉक खोलने के लिए अपने चेहरे का इस्तेमाल करने के अलावा, आप आगे बताया गया तरीका अपनाकर डिवाइस की सुरक्षा बढ़ा सकते हैं. आप सेट कर सकते हैं कि जब बंद डिवाइस चालू किया जाए, तब वह सेट किए गए पैटर्न से ही खुले. डिवाइस चालू होने तक, उस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी और अलार्म भी नहीं बजेगा.\n\nऐसा करने से आप खोए या चोरी हो चुके डिवाइस का डेटा सुरक्षित रख सकते हैं. डिवाइस चालू करने के लिए पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
+ <string name="encryption_interstitial_message_password_for_face" msgid="3452793542112093614">"डिवाइस का लॉक खोलने के लिए अपने चेहरे का इस्तेमाल करने के अलावा, आप आगे बताया गया तरीका अपनाकर डिवाइस की सुरक्षा बढ़ा सकते हैं. आप सेट कर सकते हैं कि जब बंद डिवाइस चालू किया जाए, तब वह सेट किए गए पासवर्ड से ही खुले. डिवाइस के चालू होने तक, उस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी और अलार्म भी नहीं बजेगा.\n\nऐसा करने से आप खोए या चोरी हो चुके डिवाइस का डेटा सुरक्षित रख सकते हैं. डिवाइस चालू करने के लिए पासवर्ड डालना ज़रूरी बनाना चाहते हैं?"</string>
<string name="encryption_interstitial_yes" msgid="4439509435889513411">"हां"</string>
<string name="encryption_interstitial_no" msgid="8935031349097025137">"नहीं"</string>
<string name="restricted_true_label" msgid="4761453839409220473">"रोक लगी है"</string>
@@ -3488,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पिन डालते हैं, तो <xliff:g id="SERVICE">%1$s</xliff:g> जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पैटर्न डालते हैं, तो <xliff:g id="SERVICE">%1$s</xliff:g> जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"जब आप इस डिवाइस को प्रारंभ करने के लिए अपना पासवर्ड डालते हैं, तो <xliff:g id="SERVICE">%1$s</xliff:g> जैसी सरल उपयोग सेवाएं अभी भी उपलब्ध नहीं होंगी."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"नोट: पुनः बूट करने के बाद, यह ऐप्लिकेशन तब तक शुरू नहीं हो सकता है जब तक कि आप अपना फ़ोन अनलॉक ना कर लें"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"ध्यान दें: अगर फ़ोन को रीस्टार्ट करते समय उसकी स्क्रीन लॉक है, तो यह ऐप्लिकेशन तब तक शुरू नहीं होगा, जब तक आप फ़ोन को अनलॉक नहीं करते"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI की जानकारी"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI से जुड़ी जानकारी"</string>
<string name="slot_number" msgid="3762676044904653577">"(स्लॉट<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3542,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
<string name="filter_work_apps" msgid="24519936790795574">"कार्यस्थल"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ऐप्लिकेशन: सभी"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ऐप: बंद हैं"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"सूचनाएं बंद कर दी गई हैं"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"श्रेणियां: अत्यंत महत्वपूर्ण"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"श्रेणियां: कम महत्व के"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"श्रेणियां: बंद हैं"</string>
@@ -3603,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"उपयोग संबंधी सूचनाएं"</string>
<string name="show_all_apps" msgid="1512506948197818534">"डिवाइस का पूरा उपयोग दिखाएं"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"ऐप्लिकेशन का उपयोग दिखाएं"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"बहुत अधिक उपयोग"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> ऐप्लिकेशन असामान्य व्यवहार कर रहे हैं</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ऐप्लिकेशन असामान्य व्यवहार कर रहे हैं</item>
@@ -3767,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"डिवाइस की मेमोरी: <xliff:g id="PERCENTAGE">%1$s</xliff:g> इस्तेमाल किया गया - <xliff:g id="FREE_SPACE">%2$s</xliff:g> खाली है"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> तक कोई गतिविधि न होने पर, कम बैटरी मोड में जाएं"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"वॉलपेपर, सुलाएं (कम बैटरी मोड), फ़ॉन्ट आकार"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 मिनट तक कोई गतिविधि ना होने पर कम बैटरी मोड में जाएं"</string>
<string name="memory_summary" msgid="8080825904671961872">"औसतन <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> में से <xliff:g id="USED_MEMORY">%1$s</xliff:g> मेमोरी उपयोग की गई"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> के रूप में प्रवेश किया हुआ है"</string>
@@ -3782,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"मैसेज (एसएमएस) की अनुमति नहीं है"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"कैमरा की अनुमति नहीं है"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"स्क्रीनशॉट की अनुमति नहीं है"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"बैकअप लेने की सुविधा बंद नहीं की जा सकती"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"इस ऐप्लिकेशन को खोला नहीं जा सकता"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"अगर आपके कोई सवाल हैं तो, अपने आईटी एडमिन से संपर्क करें"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"अधिक विवरण"</string>
@@ -3946,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"डिसप्ले कटआउट की नकल करें"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"डिसप्ले कटआउट"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"डिसप्ले कटआउट, नॉच"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"कोई नहीं"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"डिवाइस का डिफ़ॉल्ट कटआउट"</string>
<string name="special_access" msgid="3458780842491881155">"ऐप्लिकेशन के लिए खास एक्सेस"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ऐप्लिकेशन बिना पाबंदी के डेटा का उपयोग कर सकते हैं</item>
@@ -3970,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> से कनेक्ट है"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"कई डिवाइस से कनेक्ट है"</string>
<string name="demo_mode" msgid="2798762752209330277">"सिस्टम यूज़र इंटरफ़ेस (यूआई) डेमो मोड"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"रात वाला मोड"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"रात वाला मोड सेट करें"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"डार्क मोड"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"डार्क मोड सेट करें"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"त्वरित सेटिंग डेवलपर टाइल"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope ट्रेस"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफ़ाइल सेटिंग"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क सर्च"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉल करने वालों (कॉलर) और संपर्कों की पहचान करने के लिए अपने संगठन को संपर्क खोजने दें"</string>
@@ -4015,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"फ़ोन देखने के लिए दो बार टैप करें"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"टैबलेट देखने के लिए दो बार छूएं"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"डिवाइस देखने के लिए दो बार छूएं"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"समय, सूचना के आइकॉन और दूसरी जानकारी देखने के लिए अपनी स्क्रीन पर दो बार टैप करें."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"समय, सूचनाएं और दूसरी जानकारी देखने के लिए, फ़ोन की स्क्रीन पर दो बार टैप करें."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"फ़ोन चेक करने के लिए उसे उठाएं"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"टैबलेट देखने के लिए लिफ़्ट करें"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"डिवाइस देखने के लिए लिफ़्ट करें"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"समय, सूचना के आइकॉन और दूसरी जानकारी देखने के लिए, अपना फ़ोन उठाएं."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"समय, नोटिफ़िकेशन आइकॉन और अन्य जानकारी देखने के लिए, अपना टैबलेट का इस्तेमाल करें."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"समय, नोटिफ़िकेशन आइकॉन और अन्य जानकारी देखने के लिए, अपने डिवाइस का इस्तेमाल करें."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"चालू करने का डिसप्ले"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"समय, सूचनाएं और दूसरी जानकारी देखने के लिए, अपना फ़ोन इस्तेमाल करें."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"समय, सूचनाएं और दूसरी जानकारी देखने के लिए, अपना टैबलेट इस्तेमाल करें."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"समय, सूचनाएं और दूसरी जानकारी देखने के लिए, अपना डिवाइस इस्तेमाल करें."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"चालू लॉक स्क्रीन जेस्चर"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"सूचनाओं के लिए फ़िंगरप्रिंट स्वाइप करें"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"फ़िंगरप्रिंट स्वाइप करें"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"अपनी सूचनाएं देखने के लिए, अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर पर नीचे की तरफ़ स्वाइप करें."</string>
@@ -4101,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> कोशिशें</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> कोशिशें</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"इस डिवाइस के डेटा का बैकअप लिया जा रहा है"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"इस डिवाइस का प्रबंधन आपका संगठन करता है."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> इस डिवाइस को प्रबंधित करता है."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4142,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"ऑटोमैटिक भरने की सेवा"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ऑटो, भरना, ऑटोमैटिक भरना"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>सुनिश्चित करें कि आप इस ऐप्लिकेशन पर भरोसा करते हैं</b> <br/> <br/> <xliff:g id=app_name example=Google ऑटोमैटिक भरना>%1$s</xliff:g> ऑटोमैटिक भरी जा सकने वाली चीज़ें निर्धारित करने के लिए आपकी स्क्रीन पर मौजूद चीज़ों का उपयोग करता है."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"अपने आप भरने की सुविधा (ऑटो फ़िल)"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"लॉग की गई जानकारी का लेवल"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"हर सत्र में ज़्यादा से ज़्यादा इतने अनुरोध शामिल कर सकते हैं"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"दिखने वाले डेटा सेट की ज़्यादा से ज़्यादा संख्या"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"डिफ़ॉल्ट मान पर रीसेट करें"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"डेवलपर के लिए अपने आप भरने की सुविधा (ऑटो फ़िल) सेटिंग और टूल रीसेट हो गए हैं"</string>
<string name="device_theme" msgid="4571803018917608588">"डिवाइस की थीम"</string>
<string name="default_theme" msgid="7085644992078579076">"डिफ़ॉल्ट"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"नेटवर्क का नाम"</string>
@@ -4156,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क ट्रिगर करें"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\'परेशान न करें सुविधा\' अपडेट करें"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"ध्यान भटकने से रोकने के लिए डिवाइस की सूचनाओं को कुछ समय के लिए रोकें"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"नया और रोमांचक क्या है?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"अपने नए फ़ोन के बारे में अच्छी तरह जानें"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"अपने नए टैबलेट के बारे में अच्छी तरह जानें"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"अपने नए डिवाइस के बारे में अच्छी तरह जानें"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"यह सुविधा इस डिवाइस पर उपलब्ध नहीं है"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"जीएनएसएस माप को हर हाल में लागू करें"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"बिना ड्यूटी-साइक्लिंग के जीएनएसएस के सभी तारामंडल (कॉन्स्टलेशन) और फ़्रीक्वेंसी ट्रैक करें"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"क्रैश होने की सूचना हर बार दिखाएं"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"जब भी कोई ऐप्लिकेशन क्रैश हो, उसकी सूचना दिखाएं"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"कोण की सुविधा वाला ऐप्लिकेशन चुनें"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"कोण की सुविधा वाला कोई ऐप्लिकेशन सेट नहीं है"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"कोण की सुविधा वाला ऐप्लिकेशन: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"निर्देशिका का एक्सेस"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"निर्देशिका का एक्सेस"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4205,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"नेटवर्क के बारे में जानकारी"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"आपके फ़ोन पर मौजूद ऐप्लिकेशन, आपके डिवाइस का नाम जान सकते हैं. ब्लूटूथ डिवाइस जोड़ते समय या वाई-फ़ाई हॉटस्पॉट सेटअप करते समय, इसे दूसरे लोग भी देख सकते हैं."</string>
<string name="devices_title" msgid="7701726109334110391">"डिवाइस"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"सभी सेटिंग"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"सुझाव"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS डेटा"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS डेटा"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"नेटवर्क चुनें"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"डिसकनेक्ट किया गया"</string>
+ <string name="network_connected" msgid="4943925032253989621">"कनेक्ट किया गया"</string>
+ <string name="network_connecting" msgid="76404590784733557">"कनेक्ट हो रहा है..."</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"कनेक्ट नहीं किया जा सका"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"कोई नेटवर्क नहीं मिला."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"कोई नेटवर्क नहीं मिला. फिर से कोशिश करें."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(मना है)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"कोई SIM कार्ड नहीं है"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"बेहतर कॉलिंग"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"पसंदीदा नेटवर्क मोड: WCDMA को प्राथमिकता"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"पसंदीदा नेटवर्क मोड: सिर्फ़ GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"पसंदीदा नेटवर्क मोड: सिर्फ़ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"पसंदीदा नेटवर्क मोड: CDMA / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"पसंदीदा नेटवर्क मोड: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"पसंदीदा नेटवर्क मोड: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"पसंदीदा नेटवर्क मोड: सिर्फ़ CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"पसंदीदा नेटवर्क मोड: सिर्फ़ EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"पसंदीदा नेटवर्क मोड: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"पसंदीदा नेटवर्क मोड: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"पसंदीदा नेटवर्क मोड: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"पसंदीदा नेटवर्क मोड: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"पसंदीदा नेटवर्क मोड: सभी जगह लागू"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"पसंदीदा नेटवर्क मोड: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"पसंदीदा नेटवर्क मोड: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"पसंदीदा नेटवर्क मोड: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"पसंदीदा नेटवर्क मोड: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"पसंदीदा नेटवर्क मोड: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"पसंदीदा नेटवर्क मोड: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"पसंदीदा नेटवर्क मोड: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"पसंदीदा नेटवर्क मोड: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"पसंदीदा नेटवर्क मोड: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"पसंदीदा नेटवर्क मोड: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"पसंदीदा नेटवर्क मोड: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"पसंदीदा नेटवर्क मोड: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"पसंदीदा नेटवर्क मोड: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (सुझाया गया)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (सुझाया गया)"</string>
+ <string name="network_global" msgid="959947774831178632">"हर जगह लागू"</string>
+ <string name="label_available" msgid="1731547832803057893">"उपलब्ध नेटवर्क"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"खोज की जा रही है…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> पर रजिस्टर किया जा रहा है…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"इस नेटवर्क पर आपका सिम कार्ड कनेक्शन की अनुमति नहीं देता है."</string>
+ <string name="connect_later" msgid="978991102125216741">"फ़िलहाल इस नेटवर्क से कनेक्ट नहीं कर सकते. कुछ देर बाद कोशिश करके देखें."</string>
+ <string name="registration_done" msgid="4573820010512184521">"नेटवर्क पर रजिस्टर किया गया."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"अपने आप नेटवर्क चुनें"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी से जुड़ी सेटिंग"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"डेटा सेवा सेट अप करें"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"मोबाइल डेटा"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"मोबाइल नेटवर्क का इस्तेमाल करके डेटा एक्सेस करें"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"पसंदीदा नेटवर्क प्रकार"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"नेटवर्क संचालन मोड बदलें"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"पसंदीदा नेटवर्क प्रकार"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी"</string>
+ <string name="call_category" msgid="8108654745239563833">"कॉल करना"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी की वीडियो कॉलिंग सुविधा"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"सिस्टम चुनें"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA रोमिंग मोड बदलें"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"सिस्टम चुनें"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"नेटवर्क"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"नेटवर्क"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA सदस्यता"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/सिम और NV में बदलाव करें"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"सदस्यता"</string>
+ <string name="register_automatically" msgid="518185886971595020">"अपने आप रजिस्ट्रेशन…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"डेटा रोमिंग की अनुमति दें?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"कीमतों की जानकारी के लिए आपको नेटवर्क सेवा देने वाली कंपनी से संपर्क करें."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ऐप्लिकेशन का डेटा इस्तेमाल"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"गलत नेटवर्क मोड <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. अनदेखा करें."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> से कनेक्ट होने पर उपलब्ध नहीं है"</string>
+ <string name="see_more" msgid="5953815986207345223">"ज़्यादा देखें"</string>
+ <string name="see_less" msgid="1250265310929558370">"कम देखें"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 1214ba5..77e77f3 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -241,7 +241,7 @@
<item msgid="6546959730920410907">"izmjena zapisnika poziva"</item>
<item msgid="446877710771379667">"čitanje kalendara"</item>
<item msgid="7674458294386319722">"izmjena kalendara"</item>
- <item msgid="8281201165558093009">"skeniranje Wi-Fi-ja"</item>
+ <item msgid="8281201165558093009">"skeniranje Wi-Fija"</item>
<item msgid="8694611243479480497">"obavijest"</item>
<item msgid="7776439107987345446">"skeniranje ćelije"</item>
<item msgid="514615766544675057">"poziv na telefon"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Mreža s ograničenim prometom"</item>
<item msgid="2266114985518865625">"Mreža bez ograničenja prometa"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Zadano (koristi nasumično određen MAC)"</item>
+ <item msgid="5398461510512959597">"Pouzdani"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ne"</item>
<item msgid="3863157480502955888">"Da"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Uvijek uključeno"</item>
<item msgid="6385301106124765323">"Uvijek isključeno"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Isključeno"</item>
+ <item msgid="2182686878828390312">"Otklanjanje pogrešaka"</item>
+ <item msgid="5286514712714822064">"Opširno"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Samo matično"</item>
+ <item msgid="5034813753274486448">"Automatski"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Preporučeno: GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Samo GSM"</item>
+ <item msgid="488474605709912156">"Samo WCDMA"</item>
+ <item msgid="1912421096218750039">"Automatski GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Automatski CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA bez EvDo-a"</item>
+ <item msgid="4678789463133969294">"Samo EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globalno"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Samo TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globalno"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 667dd46..45176d3 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Izradi"</string>
<string name="allow" msgid="3349662621170855910">"Dopusti"</string>
<string name="deny" msgid="6947806159746484865">"Odbij"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Zatvori"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Promijeni"</string>
<string name="device_info_default" msgid="7847265875578739287">"Nepoznato"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Još <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak i postat ćete razvojni programer.</item>
@@ -33,16 +31,12 @@
<string name="show_dev_already" msgid="2151632240145446227">"Nema potrebe, već ste razvojni programer."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Najprije omogućite opcije za razvojne programere."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Bežično povezivanje i mreže"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Veze"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Uređaj"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Osobno"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Pristup"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sustav"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Omogući podatkovnu vezu"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Onemogući podatkovnu vezu"</string>
<string name="volte_provisioned_switch_string" msgid="7979882929810283786">"VoLTE omogućen"</string>
<string name="vt_provisioned_switch_string" msgid="7876998291744854759">"Pružena usluga videopoziva"</string>
- <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Pružena usluga poziva putem Wi-Fi-ja"</string>
+ <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Pružena usluga poziva putem Wi-Fija"</string>
<string name="eab_provisioned_switch_string" msgid="3482272907448592975">"Pruža se usluga EAB-a/prisutnosti"</string>
<string name="radio_info_radio_power" msgid="7187666084867419643">"Snaga mobilnog radija"</string>
<string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Prikaži imenik SIM-a"</string>
@@ -122,7 +116,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth adresa uređaja: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Želite li prekinuti vezu s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Emitiranje"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Neimenovani Bluetooth uređaj"</string>
<string name="progress_scanning" msgid="192587958424295789">"Pretraživanje"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"U blizini nema Bluetooth uređaja."</string>
@@ -154,7 +147,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Aplikacija želi uključiti Bluetooth i vaš telefon učiniti vidljivim drugim uređajima. To možete kasnije promijeniti u postavkama Bluetootha."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Uključivanje Bluetootha…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Isključivanje Bluetootha?"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatsko povezivanje"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Zatražena je Bluetooth veza"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Dodirnite za povezivanje s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Želite li se povezati s uređajem \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -182,12 +174,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dostupni uređaji za pozive"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Trenutačno povezano"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Spremljeni uređaji"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Dodavanje uređaja"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth će se uključiti radi uparivanja"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Postavke veze"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Prethodno povezani uređaji"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Prethodno povezano"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth je uključen"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Prikaži sve"</string>
<string name="date_and_time" msgid="9062980487860757694">"Datum i vrijeme"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Odabir vremenske zone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -270,7 +262,6 @@
<string name="skip_label" msgid="47510779345218297">"Preskoči"</string>
<string name="next_label" msgid="4693520878012668114">"Dalje"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Jezici"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Postavke jezika"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Ukloni"</string>
<string name="add_a_language" msgid="2330538812283783022">"Dodaj jezik"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -305,7 +296,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Postavke"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Prečac postavki"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Način rada u zrakoplovu"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Više"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bežično povezivanje i mreže"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Upravljanje značajkama Wi-Fi, Bluetooth, način rada u zrakoplovu, mobilne mreže i VPN-ovi"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobilni podaci"</string>
@@ -390,6 +380,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Onemogućio administrator"</string>
<string name="security_status_title" msgid="5848766673665944640">"Sigurnosni status"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Zaključavanje zaslona, otključavanje licem"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Zaključavanje zaslona, otisak prsta"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zaključavanje zaslona"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Lice dodano"</string>
@@ -399,11 +390,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Otključavanje licem"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Autentificirajte se licem"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Licem možete otključati telefon, autorizirati kupnje ili se prijaviti na aplikacije."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Neka vas uređaj prepozna"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Otključajte telefon ili odobrite kupnje svojim licem.\n\nNapomena: ovaj uređaj ne možete otključati licem. Za više informacija obratite se administratoru organizacije."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Licem možete otključati telefon, autorizirati kupnje ili se prijaviti na aplikacije"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Otisaka prstiju ne može se dodati više od <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Postavite lice u središte kruga"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Učinit ću to kasnije"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Ne možete dodati više od <xliff:g id="COUNT">%d</xliff:g> lica"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Dodali ste maksimalan broj lica"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Nije moguće dodati više lica"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registracija nije dovršena"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"U redu"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Isteklo je vremensko ograničenje za registraciju lica. Pokušajte ponovo."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Registracija lica nije uspjela."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Sve je spremno. Izgleda dobro."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Gotovo"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Pomoću lica možete"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Otključajte uređaj"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Prijava u aplikaciju i plaćanja"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Oči otvorene za otključavanje"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Prilikom autentifikacije licem oči moraju biti otvorene"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Ukloni podatke lica"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Poboljšajte podatke o licu"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Za otključavanje uređaja i pristup aplikacijama može se upotrijebiti vaše lice. "<annotation id="url">"Saznajte više"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisak prsta"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Otisci prstiju"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Upotreba otiska prsta"</string>
@@ -803,13 +810,13 @@
<string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
<string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Uključite Wi-Fi"</string>
<string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
- <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Upotreba Wi-Fi-ja"</string>
- <string name="wifi_settings_category" msgid="8719175790520448014">"Postavke Wi-Fi-ja"</string>
+ <string name="wifi_settings_master_switch_title" msgid="4746267967669683259">"Upotreba Wi-Fija"</string>
+ <string name="wifi_settings_category" msgid="8719175790520448014">"Postavke Wi-Fija"</string>
<string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
<string name="wifi_settings_summary" msgid="668767638556052820">"Postavljanje i upravljanje bežičnim pristupnim točkama"</string>
<string name="wifi_select_network" msgid="4210954938345463209">"Odaberite Wi‑Fi mrežu"</string>
- <string name="wifi_starting" msgid="6732377932749942954">"Uključivanje Wi-Fi-ja…"</string>
- <string name="wifi_stopping" msgid="8952524572499500804">"Isključivanje Wi-Fi-ja…"</string>
+ <string name="wifi_starting" msgid="6732377932749942954">"Uključivanje Wi-Fija…"</string>
+ <string name="wifi_stopping" msgid="8952524572499500804">"Isključivanje Wi-Fija…"</string>
<string name="wifi_error" msgid="3207971103917128179">"Pogreška"</string>
<string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"U ovoj zemlji nije dostupna frekvencija od 5 GHz"</string>
<string name="wifi_in_airplane_mode" msgid="8652520421778203796">"U načinu rada u zrakoplovu"</string>
@@ -829,13 +836,13 @@
<string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Za upotrebu odaberite kompatibilnog ocjenjivača mreže"</string>
<string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliranje certifikata"</string>
<string name="wifi_scan_notify_text" msgid="5544778734762998889">"Da bi se poboljšala točnost lokacije, aplikacije i usluge i dalje mogu tražiti Wi‑Fi mreže u bilo kojem trenutku, čak i kada je Wi‑Fi isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji. To možete promijeniti u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama pretraživanja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
- <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Radi poboljšanja preciznosti lokacije uključite traženje Wi-Fi-ja u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama traženja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+ <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Radi poboljšanja preciznosti lokacije uključite traženje Wi-Fija u <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>postavkama traženja<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Ne prikazuj ponovno"</string>
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Zadrži Wi-Fi tijekom mirovanja"</string>
<string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi‑Fi ostaje aktivan u mirovanju"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pojavio se problem s promjenom postavke"</string>
<string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Poboljšaj učinkovitost"</string>
- <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimizacija Wi-Fi-ja"</string>
+ <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimizacija Wi-Fija"</string>
<string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimiziraj potrošnju baterije kad je Wi-Fi uključen"</string>
<string name="wifi_limit_optimizations_summary" msgid="9000801068363468950">"Ograniči bateriju za Wi‑Fi"</string>
<string name="wifi_switch_away_when_unvalidated" msgid="8593144541347373394">"Prijeđi na mobilne podatke ako Wi‑Fi izgubi pristup internetu."</string>
@@ -861,7 +868,7 @@
<string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"Nemate dopuštenje za promjenu Wi‑Fi mreže."</string>
<string name="wifi_more" msgid="3195296805089107950">"Više"</string>
<string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. postavljanje (WPS)"</string>
- <string name="wifi_settings_scanning_required_title" msgid="3815269816331500375">"Uključiti traženje Wi-Fi-ja?"</string>
+ <string name="wifi_settings_scanning_required_title" msgid="3815269816331500375">"Uključiti traženje Wi-Fija?"</string>
<string name="wifi_settings_scanning_required_summary" msgid="6352918945128328916">"Za automatsko uključivanje Wi‑Fi-ja najprije morate uključiti traženje Wi‑Fi-ja."</string>
<string name="wifi_settings_scanning_required_info" msgid="3155631874578023647">"Traženje Wi‑Fi-ja omogućuje aplikacijama i uslugama da traže Wi‑Fi mreže u bilo kojem trenutku, čak i kada je Wi‑Fi isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji."</string>
<string name="wifi_settings_scanning_required_turn_on" msgid="1364287182804820646">"Uključi"</string>
@@ -899,6 +906,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Odaberite barem jedan pojas za žarišnu točku Wi‑Fi-ja:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP postavke"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privatnost"</string>
<string name="wifi_shared" msgid="844142443226926070">"Podijeli s drugim korisnicima uređaja"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nepromijenjeno)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Odaberite"</string>
@@ -938,7 +946,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Odustani"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Zaboraviti mrežu?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Izbrisat će se sve zaporke za tu mrežu"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Spremljene mreže"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d mreža</item>
<item quantity="few">%d mreže</item>
@@ -1118,8 +1125,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Svjetlina"</string>
<string name="brightness_summary" msgid="838917350127550703">"Podesite svjetlinu zaslona"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva svjetlina"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Uključeno"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Isključeno"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Željena je svjetlina vrlo niska"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Željena je svjetlina niska"</string>
@@ -1215,6 +1221,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Nije moguće promijeniti PIN.\nPIN je možda netočan."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Uspješno je promijenjen PIN SIM-a"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Nije moguće promijeniti stanje zaključanosti SIM kartice.\nMožda je PIN pogrešan."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Onemogućivanje PIN-a nije uspjelo."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Omogućivanje PIN-a nije uspjelo."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"U redu"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Odustani"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Pronađeno je više SIM-ova"</string>
@@ -1275,7 +1283,7 @@
<string name="status_signal_strength" msgid="3732655254188304547">"Jakost signala"</string>
<string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
<string name="status_operator" msgid="2274875196954742087">"Mreža"</string>
- <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC adresa Wi-Fi-ja"</string>
+ <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC adresa Wi-Fija"</string>
<string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresa"</string>
<string name="status_serial_number" msgid="2257111183374628137">"Serijski broj"</string>
<string name="status_up_time" msgid="7294859476816760399">"Vrijeme aktivnosti"</string>
@@ -1389,7 +1397,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Za to se <xliff:g id="NAME_0">^1</xliff:g> treba formatirati. \n\n"<b>"Formatiranjem će se izbrisati svi podaci koje <xliff:g id="NAME_1">^1</xliff:g> sadrži."</b>" Da ne biste izgubili podatke, napravite sigurnosnu kopiju."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Izbriši i formatiraj"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatira se <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Ne uklanjajte medij <xliff:g id="NAME">^1</xliff:g> dok se formatira."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Ne uklanjajte medij <xliff:g id="NAME">^1</xliff:g> dok se formatira."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Preselite podatke u novu pohranu"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Možete premjestiti svoje fotografije, datoteke i neke aplikacije na novi medij za pohranu <xliff:g id="NAME">^1</xliff:g>. \n\nPremještanje traje otprilike <xliff:g id="TIME">^2</xliff:g> i oslobodit će <xliff:g id="SIZE">^3</xliff:g> u internoj pohrani. Neke aplikacije neće funkcionirati tijekom tog postupka."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Premjestite odmah"</string>
@@ -1581,7 +1589,7 @@
<string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"Dopustite aplikacijama i uslugama da traže uređaje u blizini u bilo kojem trenutku, čak i kada je Bluetooth isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji."</string>
<string name="location_network_based" msgid="9134175479520582215">"Lokacija Wi-Fi i mob. mreža"</string>
<string name="location_neighborhood_level" msgid="5141318121229984788">"Omogućite aplik. da upotrebljavaju Googleovu uslugu lokacije za brže lociranje. Anonimni podaci prikupljat će se i slati Googleu."</string>
- <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokacija utvrđena pomoću Wi-Fi-ja"</string>
+ <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokacija utvrđena pomoću Wi-Fija"</string>
<string name="location_gps" msgid="8392461023569708478">"GPS sateliti"</string>
<string name="location_street_level" product="tablet" msgid="1669562198260860802">"Omogućite aplikacijama da upotrebljavaju GPS na tabletnom računalu za označavanje vaše lokacije"</string>
<string name="location_street_level" product="default" msgid="4617445745492014203">"Omogućite aplikacijama da upotrebljavaju GPS na vašem telefonu za označavanje vaše lokacije"</string>
@@ -1772,9 +1780,6 @@
<string name="installed" msgid="3070865169422600098">"Instalirano"</string>
<string name="no_applications" msgid="7336588977497084921">"Nema aplikacija."</string>
<string name="internal_storage" msgid="1584700623164275282">"Unutarnja pohrana"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"interna pohrana"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Memorija USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Poh. SD kartice"</string>
<string name="recompute_size" msgid="7722567982831691718">"Ponovni izračun veličine…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Izbrisati podatke aplikacije?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Svi podaci ove aplikacije bit će trajno izbrisani. To uključuje sve datoteke, postavke, račune, baze podataka itd."</string>
@@ -1783,24 +1788,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikacija nije pronađena na popisu instaliranih aplikacija."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Brisanje pohrane za aplikaciju nije uspjelo."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ova aplikacija može pristupiti sljedećem na vašem tabletu:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ova aplikacija može pristupiti sljedećem na vašem telefonu:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ta aplikacija može pristupiti sljedećim stavkama na vašem tabletnom računalu. Radi poboljšanja uspješnosti i smanjenja upotrebe memorije neke od tih dozvola dostupne su aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer izvodi isti proces kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ta aplikacija može pristupiti sljedećim stavkama na vašem telefonu. Radi poboljšanja uspješnosti i smanjenja upotrebe memorije neke od tih dozvola dostupne su aplikaciji <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> jer izvodi isti proces kao i <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> i <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ova aplikacija može naplaćivati upotrebu:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Pošalji premium SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Izračunavanje..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Nije moguće izračunati veličinu paketa."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Nemate instaliranih aplikacija treće strane."</string>
<string name="version_text" msgid="9189073826278676425">"verzija <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Premjesti"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Premjesti na tabletni uređaj"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Premjesti na telefon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Premjesti na USB memoriju"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Premjesti na SD karticu"</string>
- <string name="moving" msgid="6431016143218876491">"Premještanje"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"U tijeku je neko drugo premještanje."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nema dovoljno prostora za pohranu."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplikacija ne postoji."</string>
@@ -1810,17 +1807,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Administrator uređaja ne može se instalirati na vanjski medij"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Prisilno zaustaviti?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ako silom zaustavite aplikaciju, možda će se ponašati nepredviđeno."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Premještanje aplikacije nije uspjelo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Željena lokacije instalacije"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Promijenite željenu lokaciju instalacije za nove aplikacije."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Onemogući ugrađenu aplikaciju?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Onemogući aplikaciju"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ako onemogućite tu aplikaciju, Android i druge aplikacije možda više neće funkcionirati pravilno."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Izbrisati podatke i onemogućiti aplikaciju?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ako onemogućite tu aplikaciju, Android i druge aplikacije možda više neće funkcionirati pravilno, a izbrisat će se i vaši podaci."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Isključiti obavijesti?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obavijesti za ovu aplikaciju, možda ćete propustiti važna upozorenja i ažuriranja."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Trgovina"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Pojedinosti o aplikaciji"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija instalirana iz trgovine <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2013,6 +2006,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Upotreba usluge"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Upotreba korekcije boje"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Upotreba titlova"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Nastavi"</string>
<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="6371077608778830020">"Dodavanje slušnog aparata"</string>
@@ -2164,8 +2158,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ako ograničite pozadinsku aktivnost za aplikaciju, možda će se ponašati nepredviđeno"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplikacija nije postavljena za optimizaciju baterije, pa je ne možete ograničiti.\n\nZa ograničenje uključite optimizaciju."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Upotreba zaslona od potpunog punjenja"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za zaslon"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Pretraživanje mobilnih mreža"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Upotreba baterije od potpunog punjenja"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Količina vremena dok je zaslon bio uključen od posljednjeg punjenja"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Upotreba uređaja od potpunog punjenja"</string>
@@ -2192,11 +2184,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Detalji upotrebe"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Podesi potrošnju energije"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Uključeni paketi"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacije koje prazne bateriju"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Zadržava uređaj u aktivnom stanju"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Aktivira uređaj u pozadini"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Često traži lokaciju"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Aplikacije koje ne funkcioniraju dobro: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikacije se izvode na uobičajen način"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon troši bateriju u pozadini uobičajenom brzinom"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet troši bateriju u pozadini uobičajenom brzinom"</string>
@@ -2266,6 +2253,7 @@
<item quantity="few">Ograničavanje potrošnje baterije za %1$d aplikacije</item>
<item quantity="other">Ograničavanje potrošnje baterije za %1$d aplikacija</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Ograničeno <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Te su aplikacije trošile bateriju u pozadini. Ograničene aplikacije možda neće funkcionirati pravilno i obavijesti mogu kasniti."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Upotreba Battery Managera"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Otkriva kada aplikacije prazne bateriju"</string>
@@ -2330,7 +2318,7 @@
<string name="battery_action_app_details" msgid="7861051816778419018">"Info o aplikaciji"</string>
<string name="battery_action_app_settings" msgid="4570481408106287454">"Postavke aplikacije"</string>
<string name="battery_action_display" msgid="7338551244519110831">"Postavke zaslona"</string>
- <string name="battery_action_wifi" msgid="8181553479021841207">"Postavke Wi-Fi-ja"</string>
+ <string name="battery_action_wifi" msgid="8181553479021841207">"Postavke Wi-Fija"</string>
<string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth postavke"</string>
<string name="battery_desc_voice" msgid="8980322055722959211">"Baterija upotrijebljena uslugom glasovnog poziva"</string>
<string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Upotreba baterije kad je tabletni uređaj u mirovanju"</string>
@@ -2444,23 +2432,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Odustani"</string>
<string name="tts_reset" msgid="2661752909256313270">"Vrati na zadano"</string>
<string name="tts_play" msgid="2628469503798633884">"Reproduciraj"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Nadzor nad napajanjem"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ažuriranje Wi-Fi postavki"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ažuriranje postavke Bluetootha"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"uključeno"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"isključeno"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"uključivanje"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"isključivanje"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Lokacija"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinkronizacija"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Svjetlina <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatski"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"potpuna"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"polovična"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"isključena"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Pohrana vjerodajnica"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instaliraj iz memorije"</string>
@@ -2505,7 +2476,7 @@
<string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
<string name="backup_erase_dialog_message" msgid="5221011285568343155">"Želite li zaustaviti stvaranje sigurnosnih kopija Wi-Fi zaporki, oznaka, drugih postavki i podataka aplikacija te izbrisati sve kopije na Googleovim poslužiteljima?"</string>
<string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Želite li zaustaviti sigurnosno kopiranje podatka s uređaja (kao što su zaporke za Wi-Fi i povijest poziva) i podataka aplikacija (kao što su postavke i datoteke koje aplikacije spremaju) te izbrisati sve kopije na udaljenim poslužiteljima?"</string>
- <string name="fullbackup_data_summary" msgid="960850365007767734">"Daljinski pokrenite automatsku izradu sigurnosne kopije podataka uređaja (kao što su zaporke Wi-Fi-ja i povijest poziva) i podataka aplikacija (kao što su postavke i datoteke koje aplikacije pohranjuju).\n\nKada uključite automatsku izradu sigurnosnih kopija, podaci uređaja i aplikacija periodično se daljinski spremaju. Podaci aplikacije mogu biti bilo koji podaci koje je aplikacija spremila (na temelju postavki razvojnog programera), uključujući potencijalno osjetljive podatke kao što su kontakti, poruke i fotografije."</string>
+ <string name="fullbackup_data_summary" msgid="960850365007767734">"Daljinski pokrenite automatsku izradu sigurnosne kopije podataka uređaja (kao što su zaporke Wi-Fija i povijest poziva) i podataka aplikacija (kao što su postavke i datoteke koje aplikacije pohranjuju).\n\nKada uključite automatsku izradu sigurnosnih kopija, podaci uređaja i aplikacija periodično se daljinski spremaju. Podaci aplikacije mogu biti bilo koji podaci koje je aplikacija spremila (na temelju postavki razvojnog programera), uključujući potencijalno osjetljive podatke kao što su kontakti, poruke i fotografije."</string>
<string name="device_admin_settings_title" msgid="4960761799560705902">"Postavke administratora uređaja"</string>
<string name="active_device_admin_msg" msgid="578748451637360192">"Aplikacija administratora uređaja"</string>
<string name="remove_device_admin" msgid="9207368982033308173">"Deaktiviraj aplikaciju administratora ovog uređaja"</string>
@@ -2618,7 +2589,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Odaberi sve"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Podatkovni promet"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Upotreba podataka za apl."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobilni podaci i Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Potrošnja aplikacije"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIJE O APLIKACIJAMA"</string>
@@ -3000,7 +2971,6 @@
<item quantity="few">Prikaži %d skrivene stavke</item>
<item quantity="other">Prikaži %d skrivenih stavki</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Sažmi"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Mreža i internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilna mreža"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"potrošnja podatkovnog prometa"</string>
@@ -3012,12 +2982,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije i obavijesti"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dopuštenja, zadane aplikacije"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Pristup obavijestima nije dostupan za aplikacije u radnom profilu."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Računi"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nije dodan nijedan račun"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Zadane aplikacije"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Jezici, vrijeme, sigurnosna kopija, ažuriranja"</string>
<string name="search_results_title" msgid="1796252422574886932">"Postavke"</string>
- <string name="search_menu" msgid="6283419262313758339">"Pretraži postavke"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, mrežna veza, internet, bežično, podaci, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, promjena, upravljanje"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"tekstna poruka, slanje tekstnih poruka, poruke, slanje poruka, zadano"</string>
@@ -3062,6 +3032,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"plati, dodir, plaćanja"</string>
<string name="keywords_backup" msgid="470070289135403022">"sigurnosno kopirati, sigurnosna kopija"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"pokret"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"otključavanje, lice, autentifikacija, prijava"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"IMEI, MEID, min, verzija PRL-a, IMEI SV"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"mreža, stanje mobilne mreže, stanje usluge, jačina signala, vrsta mobilne mreže, roaming, ICCID"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serijski broj, verzija hardvera"</string>
@@ -3069,6 +3040,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tamna tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"programska pogreška"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambijentalni zaslon, prikaz zaključanog zaslona"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"obavijest o zaključanom zaslonu"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"lice"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"otisak prsta"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"zatamnjenje zaslona, dodirni zaslon, baterija, pametna svjetlina, dinamična svjetlina"</string>
@@ -3510,7 +3482,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Kada unesete PIN za pokretanje uređaja, usluge pristupačnosti, kao što je <xliff:g id="SERVICE">%1$s</xliff:g>, još neće biti dostupne."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Kada unesete uzorak za pokretanje uređaja, usluge pristupačnosti, kao što je <xliff:g id="SERVICE">%1$s</xliff:g>, još neće biti dostupne."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Kada unesete zaporku za pokretanje uređaja, usluge pristupačnosti, kao što je <xliff:g id="SERVICE">%1$s</xliff:g>, još neće biti dostupne."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Napomena: ova se aplikacija ne može pokrenuti nakon ponovnog pokretanja dok ne otključate telefon"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Napomena: ako ponovo pokrenete telefon i postavite zaključavanje zaslona, ova se aplikacija ne može pokrenuti dok ne otključate telefon"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informacije IMEI-ja"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Relativne informacije IMEI-ja"</string>
<string name="slot_number" msgid="3762676044904653577">"(Utor <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3568,7 +3540,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Osobno"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Posao"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: sve"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacije: isključene"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Isključeno"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorije: hitno"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorije: mala važnost"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorije: isključene"</string>
@@ -3630,7 +3602,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Upozorenja o upotrebi"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Prikaži potpunu upotrebu uređaja"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Prikaži upotrebu aplikacije"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Visoka potrošnja"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacija ne ponaša se na uobičajen način</item>
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacije ne ponašaju se na uobičajen način</item>
@@ -3798,6 +3769,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Interna pohrana: <xliff:g id="PERCENTAGE">%1$s</xliff:g> iskorišteno – <xliff:g id="FREE_SPACE">%2$s</xliff:g> slobodno"</string>
<string name="display_summary" msgid="6737806235882127328">"Mirovanje nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Pozadina, mirovanje, veličina fonta"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Mirovanje nakon 10 minuta neaktivnosti"</string>
<string name="memory_summary" msgid="8080825904671961872">"Iskorišteno je prosječno <xliff:g id="USED_MEMORY">%1$s</xliff:g> od <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kao <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3813,7 +3786,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS nije dopušten"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Fotoaparat nije dopušten"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Snimka zaslona nije dopuštena"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Sigurnosno kopiranje ne može se isključiti"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Aplikacija se ne može otvoriti"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Ako imate pitanja, obratite se administratoru"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Više pojedinosti"</string>
@@ -3832,9 +3804,9 @@
<string name="condition_battery_title" msgid="3272131008388575349">"Štednja baterije je uključena"</string>
<string name="condition_battery_summary" msgid="507347940746895275">"Štednja baterije isključuje neke značajke uređaja i ograničava aplikacije"</string>
<string name="condition_cellular_title" msgid="1327317003797575735">"Mobilni su podaci isključeni"</string>
- <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet je dostupan samo putem Wi-Fi-ja"</string>
+ <string name="condition_cellular_summary" msgid="1818046558419658463">"Internet je dostupan samo putem Wi-Fija"</string>
<string name="condition_bg_data_title" msgid="2483860304802846542">"Štednja podat. prometa uključ."</string>
- <string name="condition_bg_data_summary" msgid="656957852895282228">"Pozadinski podaci dostupni su samo putem Wi-Fi-ja. To može utjecati na neke aplikacije ili usluge kada Wi-Fi nije dostupan."</string>
+ <string name="condition_bg_data_summary" msgid="656957852895282228">"Pozadinski podaci dostupni su samo putem Wi-Fija. To može utjecati na neke aplikacije ili usluge kada Wi-Fi nije dostupan."</string>
<string name="condition_work_title" msgid="7293722361184366648">"Radni je profil isključen"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Isključene su aplikacije, sinkronizacija u pozadini i ostale značajke povezane s vašim radnim profilom."</string>
<string name="condition_device_muted_action_turn_on_sound" msgid="4930240942726349213">"Uključi zvuk"</string>
@@ -3873,7 +3845,7 @@
<string name="usage" msgid="2977875522080448986">"Potrošnja"</string>
<string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobilnih podataka"</string>
<string name="app_cellular_data_usage" msgid="5468472735806533448">"Potrošnja podatkovnog prometa za aplikacije"</string>
- <string name="wifi_data_usage" msgid="771603760674507659">"Potrošnja podatkovnog prometa putem Wi-Fi-ja"</string>
+ <string name="wifi_data_usage" msgid="771603760674507659">"Potrošnja podatkovnog prometa putem Wi-Fija"</string>
<string name="ethernet_data_usage" msgid="5108764537574354616">"Potrošnja ethernet podataka"</string>
<string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
<string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
@@ -3982,9 +3954,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simuliraj prikaz s obrezanom slikom"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ništa"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Zadana postavka uređaja"</string>
<string name="special_access" msgid="3458780842491881155">"Poseban pristup za aplikacije"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može upotrebljavati neograničene podatke</item>
@@ -4007,11 +3979,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezano s uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezano s više uređaja"</string>
<string name="demo_mode" msgid="2798762752209330277">"Demo način korisničkog sučelja sustava"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Noćni način rada"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Postavi noćni način rada"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Tamni način"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Postavite Tamni način"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice brzih postavki za razvojne programere"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope praćenje"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Postavke radnog profila"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pretraživanje kontakata"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Omogućuje pretraživanjima kontakata vaše organizacije da identificiraju pozivatelje i kontakte"</string>
@@ -4055,13 +4026,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dvaput dodirnite da biste provjerili telefon"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dvaput dodirnite da biste provjerili tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvaput dodirnite da biste provjerili uređaj"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, dvaput dodirnite zaslon."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Da biste pogledali vrijeme, obavijesti i druge informacije, dvaput dodirnite zaslon."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podizanje telefona za provjeru"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite da biste provjerili tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite da biste provjerili uređaj"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, podignite telefon."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, podignite tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Da biste pogledali vrijeme, ikone obavijesti i druge informacije, podignite uređaj."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Probudite zaslon"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Da biste pogledali vrijeme, obavijesti i druge informacije, podignite telefon."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Da biste pogledali vrijeme, obavijesti i druge informacije, podignite tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Da biste pogledali vrijeme, obavijesti i druge informacije, podignite uređaj."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Pokret za zaključavanje aktivacije zaslona"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Otisak prsta za obavijesti"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Pokret za otisak prsta"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani telefona."</string>
@@ -4145,7 +4120,6 @@
<item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> pokušaja</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pokušaja</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Podaci s uređaja sigurnosno se kopiraju"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Ovim uređajem upravlja vaša organizacija."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Ovim uređajem upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4189,6 +4163,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Provjerite je li ova aplikacija pouzdana</b> <br/> <br/> <xliff:g id=app_name example=Google automatsko popunjavanje>%1$s</xliff:g> upotrebljava sadržaj na zaslonu za procjenu onoga što se može automatski popuniti."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automatski popuni"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Razina zapisivanja"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maksimalan broj zahtjeva po sesiji"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maksimalan broj vidljivih skupova podataka"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Vrati na zadane vrijednosti"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Opcije automatskog popunjavanja za razvojne programere vraćene su na zadano"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
<string name="default_theme" msgid="7085644992078579076">"Zadano"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Naziv mreže"</string>
@@ -4203,15 +4183,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Pokretanje usluga mobilnog operatera"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Ažuriranje načina Ne uznemiravaj"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pauzirajte obavijesti da biste ostali usredotočeni"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Što je novo i uzbudljivo?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Upoznajte svoj novi telefon"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Upoznajte svoj novi tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Upoznajte svoj novi uređaj"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ova značajka nije dostupna na ovom uređaju"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Primijeni potpuna mjerenja GNSS-a"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Prati sve konstelacije i frekvencije GNSS-a bez određivanja radnog omjera"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Uvijek prikaži dijaloški okvir o rušenju"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Prikaži dijaloški okvir svaki put kada se aplikacija sruši"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Upotrijebite aplikaciju omogućenu za ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nema skupa aplikacija omogućenog za ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplikacija omogućena za ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Pristup direktoriju"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"pristup direktoriju"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4246,10 +4225,92 @@
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Vibriranje"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Isključi zvuk"</string>
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"Ne poduzimaj ništa"</string>
- <string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"Uključi (vibriraj)"</string>
+ <string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"Uključeno (vibracija)"</string>
<string name="prevent_ringing_option_mute_summary" msgid="4472465110708640980">"Uključi (isključi zvuk)"</string>
<string name="prevent_ringing_option_none_summary" msgid="5013718946609276137">"Isključi"</string>
<string name="pref_title_network_details" msgid="7186418845727358964">"Pojedinosti o mreži"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Naziv vašeg uređaja vidljiv je aplikacijama na vašem telefonu. Mogu ga vidjeti i drugi ljudi kada se povežete s Bluetooth uređajima ili postavite Wi-Fi žarišnu točku."</string>
<string name="devices_title" msgid="7701726109334110391">"Uređaji"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Sve postavke"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Prijedlozi"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Podaci CBRS-a"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Podaci CBRS-a"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Odaberite mrežu"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Nije povezano"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Povezano"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Povezivanje…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Povezivanje nije uspjelo"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nije pronađena nijedna mreža."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nije pronađena nijedna mreža. Pokušajte ponovo."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(zabranjeno)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Nema SIM kartice"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Napredno pozivanje"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Način željene mreže: Preferirano WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Način željene mreže: Samo GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Način željene mreže: Samo WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Način željene mreže: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Način željene mreže: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Način željene mreže: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Način željene mreže: Samo CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Način željene mreže: Samo EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferirani mrežni način: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferirani mrežni način: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferirani mrežni način: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferirani mrežni način: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferirani mrežni način: globalni"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferirani mrežni način: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Preferirani način mreže: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Način željene mreže: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferirani mrežni način: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preporučeni mrežni način: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preporučeni mrežni način: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preporučeni mrežni način: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preporučeni mrežni način: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preporučeni mrežni način: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preporučeni mrežni način: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preporučeni mrežni način: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preporučeni mrežni način: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preporučeni mrežni način: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (preporučeno)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (preporučeno)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globalno"</string>
+ <string name="label_available" msgid="1731547832803057893">"Dostupne mreže"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Pretraživanje…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Prijava na mrežu <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Vaša SIM kartica ne dopušta povezivanje s ovom mrežom."</string>
+ <string name="connect_later" msgid="978991102125216741">"Povezivanje s tom mrežom trenutačno nije moguće. Pokušajte kasnije."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registrirano na mreži."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automatski odaberi mrežu"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Post. mobilnog operatera"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Postavljanje podatkovne usluge"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobilni podaci"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Pristupi podacima pomoću mobilne mreže"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Željena vrsta mreže"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Promijenite način rada mreže"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Željena vrsta mreže"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Dostavljač"</string>
+ <string name="call_category" msgid="8108654745239563833">"Pozivanje"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videopozivanje putem mobilnog operatera"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Odabir sustava"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Promijeni način rada CDMA roaminga"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Odabir sustava"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Mreža"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Mreža"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA pretplata"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Izmjenjivanje među RUIM/SIM i NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"pretplata"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatska prijava…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Dopusti roaming podataka?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Podatke o cijeni možete saznati od svojeg mrežnog operatera."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Potrošnja podatkovnog prometa za aplikacije"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Mrežni način <xliff:g id="NETWORKMODEID">%1$d</xliff:g> nije važeći. Zanemarite."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Nedostupno kada je povezano s mobilnim operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Prikaži više"</string>
+ <string name="see_less" msgid="1250265310929558370">"Prikaži manje"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ <item quantity="other">Povezano je <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> uređaja.</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nema povezanih uređaja"</string>
</resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index fe77ec7..ce0a59c 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Kezelje forgalomkorlátosként"</item>
<item msgid="2266114985518865625">"Kezelje nem forgalomkorlátosként"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Alapértelmezett (véletlenszerű MAC-cím használata)"</item>
+ <item msgid="5398461510512959597">"Megbízható"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nem"</item>
<item msgid="3863157480502955888">"Igen"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Mindig bekapcsolva"</item>
<item msgid="6385301106124765323">"Mindig kikapcsolva"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Ki"</item>
+ <item msgid="2182686878828390312">"Hibakeresés"</item>
+ <item msgid="5286514712714822064">"Részletes"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Csak otthoni"</item>
+ <item msgid="5034813753274486448">"Automatikus"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA a preferált"</item>
+ <item msgid="807926878589867564">"Csak GSM"</item>
+ <item msgid="488474605709912156">"Csak WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA – automatikus"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo – automatikus"</item>
+ <item msgid="370391313511477301">"CDMA EvDo nélkül"</item>
+ <item msgid="4678789463133969294">"Csak EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globális"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Csak TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globális"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 744798f..5df9f25 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Létrehozás"</string>
<string name="allow" msgid="3349662621170855910">"Engedélyezés"</string>
<string name="deny" msgid="6947806159746484865">"Elutasítás"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Bezárás"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Váltás"</string>
<string name="device_info_default" msgid="7847265875578739287">"Ismeretlen"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> lépésre van attól, hogy fejlesztő legyen.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Nincs rá szükség, Ön már fejlesztő."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Előbb engedélyeznie kell a fejlesztői beállításokat"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Vezeték nélküli és egyéb hálózatok"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Kapcsolatok"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Eszköz"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Személyes"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Hozzáférés"</string>
<string name="header_category_system" msgid="2816866961183068977">"Rendszer"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Adatkapcsolat engedélyezése"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Adatkapcsolat letiltása"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Az eszköz Bluetooth-címe: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Leválasztja a következőt: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Sugárzás"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Névtelen Bluetooth eszköz"</string>
<string name="progress_scanning" msgid="192587958424295789">"Keresés"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nem található a közelben Bluetooth-eszköz."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Az egyik alkalmazás szeretné bekapcsolni a Bluetooth funkciót, és láthatóvá akarja tenni az Ön telefonját más eszközök számára. Ezt később módosíthatja a Bluetooth-beállításokban."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth bekapcsolása..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kikapcsolása…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatikus csatlakozás"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-kapcsolat kérése"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Koppintson rá a(z) „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” eszközhöz való csatlakozáshoz."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Szeretne csatlakozni a következő eszközhöz: \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Rendelkezésre álló hívóeszközök"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Csatlakoztatva"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Mentett eszközök"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Eszköz hozzáadása"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"A Bluetooth bekapcsol a párosítás végrehajtása érdekében"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Kapcsolati beállítások"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Korábban csatlakoztatott eszközök"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Korábban csatlakoztatva"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth bekapcsolva"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Az összes megtekintése"</string>
<string name="date_and_time" msgid="9062980487860757694">"Dátum és idő"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Válasszon időzónát"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Kihagyás"</string>
<string name="next_label" msgid="4693520878012668114">"Tovább"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Nyelvek"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Nyelvi beállítások"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Eltávolítás"</string>
<string name="add_a_language" msgid="2330538812283783022">"Nyelv hozzáadása"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Beállítások"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Beállítások parancsikon"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Repülési üzemmód"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Továbbiak"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Vezeték nélküli és egyéb hálózatok"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"A Wi-Fi, a Bluetooth, a repülési üzemmód, a mobilhálózatok és a VPN-ek kezelése"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobiladatok"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Adatvédelem"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"A rendszergazda kikapcsolta"</string>
<string name="security_status_title" msgid="5848766673665944640">"Biztonsági állapot"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Képernyőzár, arcalapú feloldás"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Képernyőzár, ujjlenyomat"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Képernyőzár"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Arc hozzáadva"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Feloldás arccal"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Arc használata hitelesítéshez"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Használja arcát telefonja feloldásához, vásárlások engedélyezéséhez és alkalmazásokba való bejelentkezéshez."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Használja arcát"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Használja arcát a telefon feloldásához vagy vásárlások engedélyezéséhez.\n\nMegjegyzés: Nem használhatja arcát az eszköz feloldására. Ha további információra van szüksége, forduljon szervezete rendszergazdájához."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Használja arcát telefonja feloldásához, vásárlások engedélyezéséhez és alkalmazásokba való bejelentkezéshez"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Legfeljebb <xliff:g id="COUNT">%d</xliff:g> ujjlenyomatot adhat hozzá"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Helyezze arcát a körbe"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Később"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Legfeljebb <xliff:g id="COUNT">%d</xliff:g> arcot adhat hozzá"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Elérte a hozzáadható arcok maximális számát"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Nem lehet további arcokat hozzáadni"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"A regisztráció nincs kész"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Letelt az arcregisztráció időkorlátja. Próbálja újra."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Az arc regisztrálása sikertelen volt."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Minden beállítva. Jónak tűnik."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Kész"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Használja arcát"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Az eszköz feloldása"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Alkalmazásbejelentkezés, fizetés"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Feloldás nyitott szemmel"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Az arcalapú hitelesítés használatakor nyitva kell tartania a szemét"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Arcadatok törlése"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Arcadatok javítása"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Lehetősége van az arcát használni az eszköz feloldásához és az alkalmazásokhoz való hozzáféréshez. "<annotation id="url">"További információ"</annotation>"."</string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Ujjlenyomat"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Ujjlenyomatok kezelése"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Ujjlenyomat ehhez:"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Válasszon legalább egy sávot a Wi-Fi-hotspot számára:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP-beállítások"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Adatvédelem"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Kérjük, válasszon"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Mégse"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Az eszköz felejtse el a hálózatot?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"A hálózathoz tartozó összes jelszó törlődik"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Mentett hálózatok"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d hálózat</item>
<item quantity="one">1 hálózat</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Fényerő"</string>
<string name="brightness_summary" msgid="838917350127550703">"A képernyő fényerejének beállítása"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Alkalmazkodó fényerő"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Bekapcsolva"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Kikapcsolva"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Előnyben részesített fényerő: nagyon alacsony"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Előnyben részesített fényerő: alacsony"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Nem lehet megváltoztatni a PIN-kódot.\nLehet, hogy hibás a PIN-kód."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"A SIM-kártya PIN-kódja sikeresen módosításra került"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Nem lehet megváltoztatni a SIM-kártya zárolási állapotát.\nLehet, hogy hibás a PIN-kód."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Nem sikerült letiltani a PIN-kódot."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Nem sikerült engedélyezni a PIN-kódot."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Mégse"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Több SIM kártyát találtunk"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Ehhez a(z) <xliff:g id="NAME_0">^1</xliff:g> formázására lesz szükség. \n\n"<b>"A formázás törli a(z) <xliff:g id="NAME_1">^1</xliff:g> által jelenleg tárolt összes adatot."</b>" Az adatvesztés elkerülése érdekében készítsen biztonsági másolatot."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Törlés és formázás"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"A(z) <xliff:g id="NAME">^1</xliff:g> formázása folyamatban van…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Formázása közben ne vegye ki a(z) <xliff:g id="NAME">^1</xliff:g> adathordozót az eszközből."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Formázás közben ne távolítsa el az eszközt (<xliff:g id="NAME">^1</xliff:g>)."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Áthelyezés az új tárhelyre"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Fotóit, fájljait és egyes alkalmazásait áthelyezheti új tárolóeszközére (<xliff:g id="NAME">^1</xliff:g>). \n\nA művelet időtartama körülbelül <xliff:g id="TIME">^2</xliff:g>, és <xliff:g id="SIZE">^3</xliff:g> tárterületet szabadít fel a belső tárhelyen. Az áthelyezés végrehajtása során egyes alkalmazások nem fognak működni."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Áthelyezés most"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Telepítve"</string>
<string name="no_applications" msgid="7336588977497084921">"Nincsenek alkalmazások."</string>
<string name="internal_storage" msgid="1584700623164275282">"Belső tárhely"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"belső tárhely"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-tár"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kártya"</string>
<string name="recompute_size" msgid="7722567982831691718">"Méret újraszámítása..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Törli az alkalmazás adatait?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Az alkalmazás minden adatát véglegesen törölni fogja. Ez magában foglalja az összes fájlt, beállítást, fiókot, adatbázist stb."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Az alkalmazás nem található a telepített alkalmazások listáján."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Nem sikerült tárhelyet felszabadítani az alkalmazásnak."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ez az alkalmazás a következőkhöz fér hozzá táblagépén:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ez az alkalmazás a következőkhöz fér hozzá a telefonján:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ez az alkalmazás a következőkhöz férhet hozzá táblagépén. Annak érdekében, hogy javítsa a teljesítményt és csökkentse a memóriahasználatot, ezek közül néhány engedély rendelkezésre áll a(z) <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> számára, mivel azonos folyamatban fut, mint <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ez az alkalmazás a következőkhöz férhet hozzá telefonján. Annak érdekében, hogy javítsa a teljesítményt és csökkentse a memóriahasználatot, ezek közül néhány engedély rendelkezésre áll a(z) <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> számára, mivel azonos folyamatban fut, mint <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> és <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ez az alkalmazás díjat számíthat fel:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Emelt díjas SMS küldése"</string>
<string name="computing_size" msgid="1599186977475211186">"Számítás..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"A csomag méretének kiszámítása sikertelen."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Nincsenek telepítve harmadik fél által készített alkalmazások."</string>
<string name="version_text" msgid="9189073826278676425">"Verzió: <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Áthelyezés"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Áthelyezés a táblagépre"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Áthelyezés a telefonra"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Áthelyezés USB-tárra"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Áthelyezés az SD-kártyára"</string>
- <string name="moving" msgid="6431016143218876491">"Áthelyezés"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Már folyamatban van egy másik adatátvitel."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nincs elég tárhely."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Az alkalmazás nem létezik."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Az eszközrendszergazdai alkalmazás nem telepíthető külső tárolóra"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Kényszeríti a leállítást?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ha egy alkalmazást leállásra kényszerít, lehetséges, hogy az hibásan fog működni."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Nem lehet áthelyezni az alkalmazást. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Preferált telepítési hely"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Az új alkalmazások telepítése során előnyben részesített hely módosítása"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Letiltja a beép. alkalmazást?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Alkalmazás letiltása"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ha letiltja ezt az alkalmazást, akkor előfordulhat, hogy az Android- és más alkalmazások nem működnek majd megfelelően."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Szeretné törölni az adatokat és letiltani az alkalmazást?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ha letiltja ezt az alkalmazást, akkor előfordulhat, hogy az Android- és más alkalmazások működnek majd megfelelően. Továbbá az adatok is törlődnek."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Kikapcsolja az értesítéseket?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ha kikapcsolja az erre az alkalmazásra vonatkozó értesítéseket, akkor lemaradhat fontos figyelmeztetésekről és a frissítésekről."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Áruház"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Az alkalmazás adatai"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Alkalmazás telepítve az <xliff:g id="APP_STORE">%1$s</xliff:g> oldaláról"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Szolgáltatás használata"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Színkorrekció használata"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Feliratok használata"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Tovább"</string>
<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="6371077608778830020">"Hallókészülék hozzáadása"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ha korlátozza az alkalmazások háttértevékenységét, lehetséges, hogy hibásan fognak működni"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Az alkalmazás nem korlátozható, mert nincs beállítva az akkumulátor optimalizálására.\n\nA korlátozáshoz kapcsolja be az akkumulátoroptimalizálást."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Képernyőhasználat teljes feltöltés óta"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"A képernyő energiafogyasztása"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobilhálózat keresése"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Akkumulátorhasználat a legutóbbi teljes feltöltés óta"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Képernyőidő teljes töltés óta"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Eszközhasználat teljes feltöltés óta"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Használat részletei"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Az energiafelhasználás beállítása"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Mellékelt csomagok"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Az akkumulátort lemerítő alkalmazások"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Eszköz ébren tartása"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Eszköz felébresztése a háttérben"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Tartózkodási hely gyakori lekérése"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> nem megfelelően működő alkalmazás"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Az alkalmazások megfelelően futnak"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Az akkumulátor háttérben történő használata átlagos ezen a telefonon"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Az akkumulátor háttérben történő használata átlagos ezen a táblagépen"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Az akkumulátorhasználat korlátozása %1$d alkalmazás számára</item>
<item quantity="one">Az akkumulátorhasználat korlátozása %1$d alkalmazás számára</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Korlátozva volt ekkor: <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Ezek az alkalmazások akkumulátort használtak a háttérben. Előfordulhat, hogy a korlátozott alkalmazások ezután nem működnek megfelelően, és késnek az értesítéseik."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Az Akkumulátorkezelő használata"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Az akkumulátort merítő alkalmazások észlelése"</string>
@@ -2355,7 +2343,7 @@
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Automatikus bekapcsolás"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Soha"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> töltöttségnél"</string>
- <string name="battery_percentage" msgid="723291197508049369">"Az akkumulátor töltöttségi szintje (%%)"</string>
+ <string name="battery_percentage" msgid="723291197508049369">"Az akkumulátor töltöttségi szintje"</string>
<string name="battery_percentage_description" msgid="8511658577507384014">"Megjeleníti az akkumulátor százalékban kifejezett töltöttségi szintjét az állapotsoron"</string>
<string name="process_stats_summary_title" msgid="1144688045609771677">"Folyamatstatisztikák"</string>
<string name="process_stats_summary" msgid="109387941605607762">"A futó folyamatok statisztikái"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Mégse"</string>
<string name="tts_reset" msgid="2661752909256313270">"Visszaállítás"</string>
<string name="tts_play" msgid="2628469503798633884">"Lejátszás"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Energiagazdálkodás"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi beállítás frissítése"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth beállítások frissítése"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"be"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ki"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"bekapcsolás"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"kikapcsolás"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Tartózkodási hely"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Szinkronizálás"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Fényerő: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatikus"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"teljes"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"fél"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"ki"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Hitelesítési adatok tárolója"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Telepítés tárhelyről"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>/<xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Az összes kijelölése"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Adathasználat"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Alkalmazás adathasználata"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobiladatok és Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"A szolgáltató adatszámlálási módja eltérhet az eszközétől."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Alkalmazások használata"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ALKALMAZÁSINFORMÁCIÓ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">%d rejtett elem megjelenítése</item>
<item quantity="one">%d rejtett elem megjelenítése</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Összecsukás"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Hálózat és internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"adathasználat"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Alkalmazások és értesítések"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Engedélyek, alapértelmezett alkalmazások"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Az értesítésekhez való hozzáférés a munkaprofil alkalmazásai számára nem áll rendelkezésre."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Fiókok"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nincs hozzáadott fiók"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Alapértelmezett alkalmazások"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Nyelvek, idő, biztonsági másolat, frissítések"</string>
<string name="search_results_title" msgid="1796252422574886932">"Beállítások"</string>
- <string name="search_menu" msgid="6283419262313758339">"Keresés a beállításokban"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"WiFi, Wi-Fi, hálózati kapcsolat, internet, vezeték nélküli, adatok, Wi Fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, kapcsoló, vezérlés"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, SMS-küldés, üzenetek, üzenetküldés, alapértelmezett"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"fizetés, koppintás, kifizetések"</string>
<string name="keywords_backup" msgid="470070289135403022">"biztonsági másolat, biztonsági mentés"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"kézmozdulat"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"arc, feloldás, hitelesítés, bejelentkezés"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl-verzió, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"hálózat, mobilhálózat állapota, szolgáltatás állapota, jelerősség, mobilhálózat típusa, barangolás, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"sorozatszám, hardververzió"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"sötét téma"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"programhiba"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Aktív kijelző, lezárási képernyő"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"lezárási képernyőn megjelenő értesítés"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"arc"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ujjlenyomat"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"képernyő halványítása, érintőképernyő, akkumulátor, okos fényerő, dinamikus fényerő"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Amikor megadja a PIN-kódot az eszköz indításához, a(z) <xliff:g id="SERVICE">%1$s</xliff:g> funkcióhoz hasonló kisegítő lehetőségek még nem lesznek elérhetők."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Amikor megadja a mintát az eszköz indításához, a(z) <xliff:g id="SERVICE">%1$s</xliff:g> funkcióhoz hasonló kisegítő lehetőségek még nem lesznek elérhetők."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Amikor megadja a jelszót az eszköz indításához, a(z) <xliff:g id="SERVICE">%1$s</xliff:g> funkcióhoz hasonló kisegítő lehetőségek még nem lesznek elérhetők."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Megjegyzés: Újraindítás után ez az alkalmazás csak a telefon feloldását követően indul el"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Megjegyzés: Ha újraindítja a telefont, és képernyőzárat állított be, ez az alkalmazás csak a telefon feloldását követően indul el."</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI-információ"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Relatív IMEI-információ"</string>
<string name="slot_number" msgid="3762676044904653577">"(Hely: <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Személyes"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Munkahelyi"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Alkalmazások: Mind"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Alkalmazások: Kikapcsolva"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Kikapcsolva"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategóriák: Sürgős"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategóriák: Kevésbé fontos"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategóriák: Kikapcsolva"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Használati értesítések"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Teljes eszközhasználat megjelenítése"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Alkalmazáshasználat mutatása"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Magas energiafelhasználás"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> alkalmazás szokatlanul működik</item>
<item quantity="one">A(z) <xliff:g id="APP">%1$s</xliff:g> szokatlanul működik</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Belső tárhely: Felhasznált: <xliff:g id="PERCENTAGE">%1$s</xliff:g> – Szabad: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Alvó mód bekapcsolása <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Háttérkép, Alvó mód, betűméret"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Alvó mód bekapcsolása 10 perc inaktivitás után"</string>
<string name="memory_summary" msgid="8080825904671961872">"Átlagosan <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>/<xliff:g id="USED_MEMORY">%1$s</xliff:g> memória használatban"</string>
<string name="users_summary" msgid="1674864467098487328">"Bejelentkezve mint <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Az SMS-ezés nem engedélyezett"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"A kamera használata nem engedélyezett"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Képernyőkép készítése nem engedélyezett"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"A biztonsági mentéseket nem lehet kikapcsolni"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Nem lehet megnyitni az alkalmazást"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Ha kérdése van, forduljon a rendszergazdához"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"További részletek"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Képernyőkivágás szimulálása"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nincs"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Alapértelmezett"</string>
<string name="special_access" msgid="3458780842491881155">"Különleges alkalmazás-hozzáférés"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> alkalmazás rendelkezik korlátlan adathozzáféréssel</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"A(z) <xliff:g id="ID_1">%1$s</xliff:g> eszközhöz csatlakozik"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Több eszközhöz csatlakozik"</string>
<string name="demo_mode" msgid="2798762752209330277">"A rendszer kezelőfelületének demómódja"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Éjszakai mód"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Éjszakai mód beállítása"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Sötét mód"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Sötét mód beállítása"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Fejlesztői gyorsbeállítási csempék"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Munkaprofil beállításai"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Névjegykeresés"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Névjegykeresés engedélyezése a szervezet számára a hívó felek és ismerősök azonosítása érdekében"</string>
@@ -3986,16 +3957,20 @@
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Az alkalmazások közti váltáshoz csúsztassa gyorsan ujját felfelé a Kezdőképernyő gombon. A műveletet megismételve az összes alkalmazást megtekintheti. Minden képernyőn működik. Az Áttekintés gomb többé nem jelenik meg a képernyő jobb alsó sarkában."</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Az új Kezdőképernyő gomb kipróbálása"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Új kézmozdulat bekapcsolása az alkalmazások közti váltáshoz"</string>
- <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Koppintson duplán a telefon képernyőjének megtekintéséhez"</string>
+ <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dupla koppintás a képernyő megtekintéséhez"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Koppintson duplán a táblagép képernyőjének megtekintéséhez"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Koppintson duplán az eszköz képernyőjének megtekintéséhez"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez koppintson kétszer a képernyőre."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Az idő, az értesítések és egyéb információk megtekintéséhez koppintson duplán a képernyőre."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Ellenőrzés felemeléssel"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Ellenőrzés a táblagép felemelésével"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ellenőrzés az eszköz felemelésével"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez vegye a kezébe telefonját."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez vegye a kezébe táblagépét."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Az idő, az értesítési ikonok és egyéb információk megjelenítéséhez vegye a kezébe eszközét."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Kijelző ébresztése"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Az idő, az értesítések és egyéb információk megtekintéséhez vegye kezébe telefonját."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Az idő, az értesítések és egyéb információk megtekintéséhez vegye a kezébe táblagépét."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Az idő, az értesítések és egyéb információk megtekintéséhez vegye kezébe eszközét."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Lezárási képernyőt ébresztő kézmozdulat"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Értesítések ujjlenyomattal"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Ujjlenyomat csúsztatása"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Megtekintheti értesítéseit, ha ujját lefelé húzza a telefonja hátulján található ujjlenyomat-érzékelőn."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> kísérlet</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> kísérlet</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Az eszköz adatairól készül biztonsági másolat"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Az eszközt az Ön szervezete kezeli."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Az eszközt a következő szervezet kezeli: <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Automatikus kitöltés"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatikus kitöltés, automatikus, kitöltés"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Győződjön meg arról, hogy az alkalmazás megbízható.</b> <br/> <br/> A(z) <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> az Ön képernyőjén szereplő információk alapján határozza meg, hogy mit lehet automatikusan kitölteni."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automatikus kitöltés"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Naplózási szint"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Kérelmek maximális száma munkamenetenként"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maximális látható adatkészletek"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Alapértelmezett értékek visszaállítása"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Az automatikus kitöltésre vonatkozó fejlesztői beállítások vissza lettek állítva"</string>
<string name="device_theme" msgid="4571803018917608588">"Eszköztéma"</string>
<string name="default_theme" msgid="7085644992078579076">"Alapértelmezett"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Hálózat neve"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Szolgáltatói ellátás aktiválása"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"A Ne zavarjanak mód frissítése"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Az összpontosításhoz szüneteltetheti az értesítéseket"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Mi új és említésre méltó?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Az új telefon bemutatójának megtekintése"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Az új táblagép bemutatójának megtekintése"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Az új eszköz bemutatójának megtekintése"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ez a funkció nem áll rendelkezésre ezen az eszközön"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Teljes GNSS-mérés indítása"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Az összes GNSS-műhold és -frekvencia nyomon követése aktívciklus-szabályozás nélkül"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Összeomlási párbeszédablak megjelenítése minden alkalommal"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Mindig megjeleníti a párbeszédablakot, amikor valamelyik alkalmazás összeomlik"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE-kompatibilis alkalmazás kiválasztása"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nincs beállítva ANGLE-kompatibilis alkalmazás"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE-kompatibilis alkalmazás: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Mappahozzáférés"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"mappahozzáférés"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Hálózati információk"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Eszköze neve látható a telefonján lévő alkalmazások számára. Mások is láthatják, ha csatlakoztatja telefonját más Bluetooth-eszközökhöz, vagy ha Wi-Fi-hotspotot állít be."</string>
<string name="devices_title" msgid="7701726109334110391">"Eszközök"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Minden beállítás"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Javaslatok"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-adatok"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-adatok"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Hálózat kiválasztása"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Leválasztva"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Csatlakozva"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Csatlakozás…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nem sikerült csatlakozni"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nem található hálózat."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nincs hálózat. Próbálja újra."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(tiltott)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Nincs SIM-kártya"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Továbbfejlesztett telefonhívás"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Előnyben részesített hálózati mód: preferált WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Előnyben részesített hálózati mód: csak GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Előnyben részesített hálózati mód: csak WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Előnyben részesített hálózati mód: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Előnyben részesített hálózati mód: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Előnyben részesített hálózati mód: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Előnyben részesített hálózati mód: csak CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Előnyben részesített hálózati mód: csak EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Előnyben részesített hálózati mód: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Előnyben részesített hálózati mód: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Előnyben részesített hálózati mód: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Előnyben részesített hálózati mód: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Előnyben részesített hálózati mód: globális"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Előnyben részesített hálózati mód: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Előnyben részesített hálózati mód: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Előnyben részesített hálózati mód: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Előnyben részesített hálózati mód: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Előnyben részesített hálózati mód: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Előnyben részesített hálózati mód: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Előnyben részesített hálózati mód: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Előnyben részesített hálózati mód: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Előnyben részesített hálózati mód: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Előnyben részesített hálózati mód: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Előnyben részesített hálózati mód: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Előnyben részesített hálózati mód: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Előnyben részesített hálózati mód: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (javasolt)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (javasolt)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globális"</string>
+ <string name="label_available" msgid="1731547832803057893">"Rendelkezésre álló hálózatok"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Keresés…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Regisztráció a(z) <xliff:g id="NETWORK">%s</xliff:g> hálózaton…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM-kártyája nem teszi lehetővé a kapcsolódást ehhez a hálózathoz."</string>
+ <string name="connect_later" msgid="978991102125216741">"Most nem lehet csatlakozni a hálózathoz. Próbálja meg később."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Regisztrálva a hálózaton."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Hálózat automatikus kiválasztása"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Szolgáltatói beállítások"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Adatszolgáltatás beállítása"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobiladat"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Adathozzáférés a mobilhálózaton keresztül"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Előnyben részesített hálózattípus"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"A hálózati üzemmód megváltoztatása"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Előnyben részesített hálózattípus"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Szolgáltató"</string>
+ <string name="call_category" msgid="8108654745239563833">"Hívás"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Szolgáltatói videohívás"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Rendszer kiválasztása"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"A CDMA-roaming mód módosítása"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Rendszer kiválasztása"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Hálózat"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Hálózat"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA-előfizetés"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Váltás RUIM/SIM és NV között"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"előfizetés"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatikus regisztráció…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Engedélyezi az adatbarangolást?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Az árakat a szolgáltatótól tudhatja meg."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Alkalmazás adathasználata"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Érvénytelen hálózati mód: <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Figyelmen kívül hagyás."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Nem hozzáférhető, amikor a következőhöz csatlakozik: <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Továbbiak"</string>
+ <string name="see_less" msgid="1250265310929558370">"Kevesebb megjelenítése"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> eszköz csatlakoztatva</item>
+ <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> eszköz csatlakoztatva</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nincsenek csatlakoztatott eszközök"</string>
</resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index c53910f..4062a14 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Սահմանափակ"</item>
<item msgid="2266114985518865625">"Անսահմանափակ"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Կանխադրված (օգտագործել պատահական MAC հասցե)"</item>
+ <item msgid="5398461510512959597">"Վստահելի"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ոչ"</item>
<item msgid="3863157480502955888">"Այո"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Միշտ միացված է"</item>
<item msgid="6385301106124765323">"Միշտ անջատած է"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Անջատել"</item>
+ <item msgid="2182686878828390312">"Վրիպազերծում"</item>
+ <item msgid="5286514712714822064">"Մանրամասն"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Միայն տնային ցանցերը"</item>
+ <item msgid="5034813753274486448">"Ավտոմատ"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA (նախընտրելի ռեժիմ)"</item>
+ <item msgid="807926878589867564">"Միայն GSM"</item>
+ <item msgid="488474605709912156">"Միայն WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA ավտոմատ"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo ավտոմատ"</item>
+ <item msgid="370391313511477301">"CDMA առանց EvDo"</item>
+ <item msgid="4678789463133969294">"Միայն EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA+LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Համաշխարհային"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Միայն TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Համաշխարհային"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 97d8aed..199ee8a 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Ստեղծել"</string>
<string name="allow" msgid="3349662621170855910">"Թույլատրել"</string>
<string name="deny" msgid="6947806159746484865">"Մերժել"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Փակել"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Փոխարկել"</string>
<string name="device_info_default" msgid="7847265875578739287">"Անհայտ"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Ծրագրավորող դառնալու համար ձեզ մնացել է կատարել <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> քայլ:</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Կարիք չկա, դուք արդեն իսկ ծրագրավորող եք:"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Խնդրում ենք նախ միացնել մշակողի ընտրանքները:"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Անլար կապ և ցանցեր"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Կապեր"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Սարք"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Անձնական"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Access"</string>
<string name="header_category_system" msgid="2816866961183068977">"Համակարգ"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Միացնել տվյալների կապը"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Անջատել տվյալների կապը"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Սարքի Bluetooth հասցեն՝ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Անջատե՞լ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը:"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Հեռարձակում"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Անանուն Bluetooth սարք"</string>
<string name="progress_scanning" msgid="192587958424295789">"Որոնում"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Bluetooth սարքեր մոտակայքում չեն գտնվել:"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Հավելվածներից մեկը ցանկանում է միացնել Bluetooth-ը և ձեր հեռախոսը տեսանելի դարձնել այլ սարքերի համար: Այս կարգավորումը կարող եք հետագայում փոխել Bluetooth-ի կարգավորումներից:"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth-ը միանում է..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth-ն անջատվում է...."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Ինքուրույն միացնել"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth կապի հայց"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Հպեք` «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»-ին միանալու համար:"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ցանկանու՞մ եք միանալ «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»-ին:"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Հասանելի սարքեր զանգելու համար"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Ընթացիկ միացումներ"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Պահված սարքեր"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Ավելացնել սարք"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth-ը կմիանա"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Միացման կարգավորումներ"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Նախկինում միացված սարքեր"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Նախկինում միացված սարքեր"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth-ը միացված է"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Տեսնել բոլորը"</string>
<string name="date_and_time" msgid="9062980487860757694">"Ամսաթիվ և ժամ"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Ընտրել ժամային գոտին"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -264,12 +256,11 @@
<string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Օգտագործված բայտերը`"</string>
<string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"USB կրիչի սկանավորում՝ մեդիայի համար..."</string>
<string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD քարտը սկանավորվում է` մեդիա գտնելու համար..."</string>
- <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB կրիչը միացված է` միայն ընթերցելու գործառույթով:"</string>
- <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD քարտը միացված է` միայն ընթերցելու գործառույթով:"</string>
+ <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB կրիչը միացված է` միայն կարդալու գործառույթով:"</string>
+ <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD քարտը միացված է` միայն կարդալու գործառույթով:"</string>
<string name="skip_label" msgid="47510779345218297">"Բաց թողնել"</string>
<string name="next_label" msgid="4693520878012668114">"Հաջորդը"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Լեզուներ"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Լեզվի կարգավորումներ"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Հեռացնել"</string>
<string name="add_a_language" msgid="2330538812283783022">"Ավելացնել լեզու"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Կարգավորումներ"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Կարգավորումների դյուրանցում"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Ինքնաթիռի ռեժիմ"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Ավելին"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Անլար կապ և ցանցեր"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Կառավարել WiFi-ը, Bluetooth-ը, թռիչքային ռեժիմը, շարժական ցանցերը, & VPN-ները"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Բջջային ինտերնետ"</string>
@@ -311,10 +301,10 @@
<string name="sms_messages_title" msgid="1778636286080572535">"SMS հաղորդագրություններ"</string>
<string name="cellular_data_summary" msgid="4660351864416939504">"Թույլատրել տվյալների օգտագործումը բջջային ցանցի միջոցով"</string>
<string name="allow_data_usage_title" msgid="2238205944729213062">"Թույլ տալ տվյալների կապի օգտագործումը ռոումինգում"</string>
- <string name="roaming" msgid="3596055926335478572">"Տվյալների ռոումինգ"</string>
+ <string name="roaming" msgid="3596055926335478572">"Բջջային ինտերնետ ռոումինգում"</string>
<string name="roaming_enable" msgid="3737380951525303961">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում"</string>
<string name="roaming_disable" msgid="1295279574370898378">"Միանալ տվյալների փոխանցման ծառայություններին ռոումինգում"</string>
- <string name="roaming_reenable_message" msgid="9141007271031717369">"Դուք կորցրել եք տվյալների կապը, քանի որ անջատված եք թողել ձեր գլխավոր ցանցի տվյալների ռոումինգը:"</string>
+ <string name="roaming_reenable_message" msgid="9141007271031717369">"Ինտերնետ կապ չկա, քանի որ ռոումինգում ինտերնետ կապն անջատված է կարգավորումներից։"</string>
<string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Միացնել"</string>
<string name="roaming_warning" msgid="4275443317524544705">"Դրա համար ձեզանից կարող են խոշոր վճարներ գանձվել:"</string>
<string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Երբ դուք թույլատրում եք տվյալների ռոումինգը, հնարավոր է` ձեզնից գանձվեն զգալի գումարային վճարներ:\n\nԱյս կարգավորումը վերաբերում է պլանշետի բոլոր օգտատերերին:"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Գաղտնիություն"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Անջատվել է ադմինիստրատորի կողմից"</string>
<string name="security_status_title" msgid="5848766673665944640">"Անվտանգության կարգավիճակը"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Էկրանի կողպում, դեմքով ապակողպում"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Էկրանի կողպում, մատնահետք"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Էկրանի կողպում"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Դեմքն ավելացվեց"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Բացեք դեմքի ճանաչման միջոցով"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Օգտագործեք դեմքը՝ նույնականացման համար"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Դեմքի ճանաչման միջոցով ապակողպեք ձեր հեռախոսը, գնումներ կատարեք և մուտք գործեք հավելվածներ:"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Օգտագործեք ձեր դեմքը"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Օգտագործեք ձեր դեմքը՝ հեռախոսն ապակողպելու կամ գնումները թույլատրելու համար:\n\nՆշում. այս սարքն ապակողպելու համար չեք կարող օգտագործել ձեր դեմքը: Լրացուցիչ տեղեկություններ ստանալու համար դիմեք ձեր կազմակերպության ադմինիստրատորին:"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Դեմքի ճանաչման միջոցով ապակողպեք ձեր հեռախոսը, գնումներ կատարեք և մուտք գործեք հավելվածներ"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Դուք կարող եք ավելացնել առավելագույնը <xliff:g id="COUNT">%d</xliff:g> մատնահետք"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Դեմքը պահեք կենտրոնում"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Ավելի ուշ"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Դուք կարող եք ավելացնել առավելագույնը <xliff:g id="COUNT">%d</xliff:g> դեմք"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Դուք ավելացրել եք դեմքերի առավելագույն թույլատրելի քանակը"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Հնարավոր չէ այլ դեմք ավելացնել"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Գրանցումը չի ավարտվել"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Լավ"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Դեմքի գրանցման ժամանակը սպառվել է: Փորձեք նորից:"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Չհաջողվեց գրանցել դեմքը։"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Պատրաստ է։"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Փակել"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Հնարավորություններ"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Ապակողպել"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Մուտք հավելվածներ և վճարումներ"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Ապակողպել, երբ աչքերը բաց են"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Դեմքի ճանաչումը կիրառելիս ձեր աչքերը պետք է բաց լինեն"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Հեռացնել դեմքի տվյալները"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Թարմացնել դեմքի տվյալները"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Ապակողպեք ձեր սարքի էկրանը և բացեք հավելվածները դեմքի ճանաչման միջոցով։ "<annotation id="url">"Մանրամասն"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Մատնահետք"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Մատնահետքերի կառավար"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Օգտագործման նպատակը"</string>
@@ -479,8 +486,8 @@
<string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Գաղտնագրել տվյալները"</string>
<string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Լիցքավորեք մարտկոցն ու նորից փորձեք:"</string>
<string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Միացրեք ձեր լիցքավորիչը և կրկին փորձեք:"</string>
- <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Կողպէկրանի PIN կամ գաղտնաբառ չկա"</string>
- <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Դուք պետք է կարգավորեք էկրանի կողպման PIN-ը կամ գաղտնաբառը գաղտնագրումը սկսելուց առաջ:"</string>
+ <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Էկրանի ապակողպման PIN կամ գաղտնաբառ չկա"</string>
+ <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Դուք պետք է կարգավորեք էկրանի ապակողպման PIN-ը կամ գաղտնաբառը գաղտնագրումը սկսելուց առաջ:"</string>
<string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Գաղտնագրե՞լ:"</string>
<string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"Գաղտնագրման գործողությունը անդարձ է, և այն ընդհատելու դեպքում, տվյալներ կկորցնեք: Գաղտնագրումը մեկ ժամ է տևում, անգամ ավելին, որի ընթացքում սարքը մի քանի անգամ կվերագործարկվի:"</string>
<string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"Գաղտնագրման գործընթացը անհետադարձելի է, և եթե դուք այն ընդհատեք, կկորցնեք բոլոր տվյալները: Գաղտնագրումը տևում է մեկ ժամ կամ ավելի, որի ընթացքում հեռախոսը մի քանի անգամ կվերագործարկվի:"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 ԳՀց"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Ընտրեք նվազագույնը մեկ հաճախականություն Wi‑Fi թեժ կետի համար՝"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP կարգավորումներ"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Գաղտնիություն"</string>
<string name="wifi_shared" msgid="844142443226926070">"Կիսվել այլ սարքերի օգտատերերի հետ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(անփոփոխ)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Ընտրեք"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Չեղարկել"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Հեռացնե՞լ ցանցը"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Այս ցանցի բոլոր գաղտնաբառերը կջնջվեն"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Պահված ցանցեր"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d ցանց</item>
<item quantity="other">%d ցանց</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Պայծառություն"</string>
<string name="brightness_summary" msgid="838917350127550703">"Կարգաբերել էկրանի պայծառությունը"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Հարմարողական պայծառություն"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Միացված է"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Անջատված է"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Նախընտրելի է շատ ցածր պայծառությունը"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Նախընտրելի է ցածր պայծառությունը"</string>
@@ -1126,7 +1132,7 @@
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ժամանակացույց"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Չկա"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Միանում է սահմանված ժամին"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Միանում է մայրամուտից մինչև արևածագ"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Միանում է մայրամուտից մինչև լուսաբաց"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"Սկիզբ"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"Ավարտ"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"Կարգավիճակ"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Չհաջողվեց փոխել PIN-ը:\nՀնարավոր է` PIN-ը սխալ է:"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM քարտի PIN կոդը հաջողությամբ փոխվել է"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Հնարավոր չէ բացել SIM քարտի կողպված կարգավիճակը:\nՀնարավոր է` սխալ PIN է մուտքագրվել:"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Չհաջողվեց անջատել PIN կոդը"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Չհաջողվեց միացնել PIN կոդը"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Հաստատել"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Չեղարկել"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Բազմաթիվ SIM քարտեր են գտնվել"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Հարկավոր է ձևաչափել <xliff:g id="NAME_0">^1</xliff:g>-ը: \n\n"<b>"Ձևաչափման արդյունքում <xliff:g id="NAME_1">^1</xliff:g>-ի վրա պահեստավորած բոլոր տվյալները կջնջվեն:"</b>" Եթե չեք ցանկանում կորցնել տվյալները, նախապես պահուստավորեք դրանք:"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ջնջել և ձևաչափել"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>-ի ձևաչափում…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Չհեռացնեք <xliff:g id="NAME">^1</xliff:g> հիշասարքը ֆորմատավորման ընթացքում:"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Չհեռացնեք հիշասարքը (<xliff:g id="NAME">^1</xliff:g>) ֆորմատավորման ընթացքում:"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Տեղափոխել տվյալները նոր պահեստ"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Կարող եք տեղափոխել ձեր լուսանկարները, ֆայլերը և որոշ հավելվածները այս նոր <xliff:g id="NAME">^1</xliff:g>: \n\nՏեղափոխումը տևելու է մոտ <xliff:g id="TIME">^2</xliff:g> և ներքին հիշողությունում ազատելու է մոտ <xliff:g id="SIZE">^3</xliff:g>: Տեղափոխման ընթացքում որոշ հավելվածներ չեն կարող աշխատել:"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Տեղափոխել հիմա"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Տեղադրված է"</string>
<string name="no_applications" msgid="7336588977497084921">"Հավելվածներ չկան"</string>
<string name="internal_storage" msgid="1584700623164275282">"Ներքին պահոց"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ներքին հիշողություն"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB կրիչ"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD քարտի պահոց"</string>
<string name="recompute_size" msgid="7722567982831691718">"Չափի վերահաշվարկում…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Մաքրե՞լ հավելվածների տվյալները:"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Այս ծրագրի բոլոր տվյալները մշտապես կջնջվեն: Այն կներառի բոլոր ֆայլերը, կարգավորումները, հաշիվները, տվյալների շտեմարանները և այլն:"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Հավելվածը չի գտնվել տեղադրված հավելվածների ցանկում:"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Չհաջողվեց մաքրել հիշողությունը"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Այս հավելվածը պլանշետի վրա կարող է մատչել հետևյալը`"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Այս հավելվածը հեռախոսի վրա կարող է մատչել հետևյալը`"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Այս հավելվածը պլանշետի վրա կարող է մատչել հետևյալը: Աշխատանքը լավացնելու և հիշողության օգտագործումը նվազեցնելու նպատակով` այս թույլտվություններից որոշները հասանելի են <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>-ին, քանի որ այն նույն գործընթացն է իրականացնում, ինչ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>-ը`"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Այս հավելվածը հեռախոսի վրա կարող է մատչել հետևյալը: Աշխատանքը լավացնելու և հիշողության օգտագործումը նվազեցնելու նպատակով` այս թույլտվություններից որոշները հասանելի են <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>-ին, քանի որ այն նույն գործընթացն է իրականացնում, ինչ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>-ը`"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> և <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Այս հավելվածը կարող է գումար գանձել՝"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Ուղարկել պրեմիում SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Հաշվարկում…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Չհաջողվեց հաշվել փաթեթի չափը:"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Դուք չունեք տեղադրված որևէ կողմնակի ծրագիր:"</string>
<string name="version_text" msgid="9189073826278676425">"տարբերակ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Տեղափոխել"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Տեղափոխել պլանշետի վրա"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Տեղափոխել հեռախոս"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Տեղափոխել USB կրիչ"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Տեղափոխել SD քարտ"</string>
- <string name="moving" msgid="6431016143218876491">"Շարժում"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Մեկ այլ տեղաշարժ արդեն ընթացքում է:"</string>
<string name="insufficient_storage" msgid="481763122991093080">"Պահոցի բավարար տարածք չկա:"</string>
<string name="does_not_exist" msgid="1501243985586067053">"Ծրագիրը գոյություն չունի:"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Սարքի ադմինիստրատորի հավելվածը չի կարող տեղադրվել արտաքին կրիչի վրա"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Ստիպողաբար դադարեցնե՞լ"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Հավելվածի ստիպողական դադարեցումը կարող է ազդել դրա աշխատանքի վրա։"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Հնարավոր չեղավ տեղափոխել հավելվածը: <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Տեղադրման նախընտրած վայրը"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Փոխել նոր ծրագրերի համար նախընտրած տեղադրման վայրը"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Անջատե՞լ ներկառուցված ծրագիրը:"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Անջատել հավելվածը"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Եթե անջատեք այս հավելվածը, Android և այլ հավելվածները հնարավոր է սխալ աշխատեն:"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ջնջե՞լ տվյալներն ու ապակատիվացնե՞լ հավելվածը:"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Եթե անջատեք այս հավելվածը, Android և այլ հավելվածները հնարավոր է սխալ աշխատեն: Ձեր տվյալները նույնպես կջնջվեն:"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Անջատե՞լ ծանուցումները:"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Եթե դուք անջատեք ծամուցումները այս ծրագրի համար, հնարավոր է` բաց թողնեք կարևոր զգուշացումները և թարմացումները:"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Խանութ"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Հավելվածի մանրամասները"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Հավելվածը տեղադրվել է <xliff:g id="APP_STORE">%1$s</xliff:g>ից"</string>
@@ -1946,7 +1939,7 @@
<string name="usage_time_label" msgid="295954901452833058">"Օգտագործման ժամանակը"</string>
<string name="accessibility_settings" msgid="3975902491934816215">"Հատուկ գործառույթներ"</string>
<string name="accessibility_settings_title" msgid="2130492524656204459">"Հատուկ գործառույթների կարգավորումներ"</string>
- <string name="accessibility_settings_summary" msgid="981260486011624939">"Էկրանի ընթերցիչներ, էկրան, փոխազդման կառավարման տարրեր"</string>
+ <string name="accessibility_settings_summary" msgid="981260486011624939">"Էկրանի ընթերցիչներ, էկրան, կառավարման տարրեր"</string>
<string name="vision_settings_title" msgid="4204111425716868288">"Տեսողության կարգավորումներ"</string>
<string name="vision_settings_description" msgid="5679491180156408260">"Օգտվեք հատուկ հնարավորություններից՝ հարմար աշխատանքի համար։ Այս գործառույթները կարող եք փոփոխել սարքի կարգավորումներում։"</string>
<string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Փոխել տառաչափը"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Օգտագործել ծառայությունը"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Օգտագործել գունաշտկումը"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Օգտագործել ենթագրերը"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Շարունակել"</string>
<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="6371077608778830020">"Ավելացնել լսողական ապարատ"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Հավելվածի ֆոնային գործողությունների սահմանափակումը կարող է ազդել վերջինիս աշխատանքի վրա"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Մարտկոցի օպտիմալացումն այս հավելվածի համար կարգավորված չէ։\n\nՄիացրեք այն՝ հավելվածը սահմանափակելու համար։"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Էկրանի օգտագործումը վերջին լրիվ լիցքավորումից հետո"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Էկրան"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Բջջային ցանցի որոնում"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Մարտկոցի օգտագործումը լրիվ լիցքավորումից հետո"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Ժամանակը, որի ընթացքում էկրանը միացած է եղել լրիվ լիցքավորումից հետո"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Սարքի օգտագործումը վերջին լրիվ լիցքավորումից հետո"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Օգտագործման մանրամասները"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Կարգավորել հոսանքի օգտագործումը"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Ներառված փաթեթները"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Մարտկոցի լիցքն արագ սպառող հավելվածներ"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Սարքին թույլ չի տալիս անցնել քնի ռեժիմ"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Սարքը հանում է քնի ռեժիմից ֆոնում"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Հայցում է տեղադրության տվյալները շատ հաճախ"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> հավելված ցուցաբերում է արտասովոր պահվածք"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Հավելվածների աշխատանքում շեղումներ չեն հայտնաբերվել"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Հեռախոսի մարտկոցը ֆոնային ռեժիմում օգտագործվում է սովորական ծավալով"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Պլանշետի մարտկոցը ֆոնային ռեժիմում օգտագործվում է սովորական ծավալով"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">Մարտկոցի օգտագործումը սահմանափակված է %1$d հավելվածի համար</item>
<item quantity="other">Մարտկոցի օգտագործումը սահմանափակված է %1$d հավելվածի համար</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Սահմանափակվել է <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Այս հավելվածներն էներգիա են սպառում ֆոնային ռեժիմում։ Արդյունքում հավելվածների աշխատանքը կարող է խաթարվել, իսկ ծանուցումները կարող են ուշացումով ստացվել:"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Օգտագործել մարտկոցի կառավարիչը"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Հայտնաբերել հավելվածները, որոնք արագ սպառում են մարտկոցի լիցքը"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Չեղարկել"</string>
<string name="tts_reset" msgid="2661752909256313270">"Վերակայել"</string>
<string name="tts_play" msgid="2628469503798633884">"Նվագարկել"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Հոսանքի հսկողություն"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi կարգավորումների թարմացում"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth կարգավորումները թարմացվում են"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"միացված"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"անջատված"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"միացում"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"անջատվում է"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Տեղադրություն"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Համաժամել"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Պայծառություն <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ավտոմատ"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"ամբողջական"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"կես"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"անջատված է"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Մուտքի տվյալների պահոց"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Տեղադրել պահոցից"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>-ը <xliff:g id="TOTAL">%2$s</xliff:g>-ից"</string>
<string name="select_all" msgid="1562774643280376715">"Ընտրել բոլորը"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Տվյալների օգտագործում"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ծրագրի տվյալների օգտագործումը"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Բջջային ինտերնետ և Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Օպերատորի հաշվարկները տվյալների կապի օգտագործման վերաբերյալ կարող են տարբերվել սարքի հաշվարկներց:"</string>
<string name="data_usage_app" msgid="4970478397515423303">"Սպառումը ըստ ծրագրի"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"Ծրագրի մասին"</string>
@@ -2593,7 +2564,7 @@
<string name="data_usage_data_limit" msgid="1193930999713192703">"Սահմանել թրաֆիկի օգտագործման սահմանաչափը"</string>
<string name="data_usage_cycle" msgid="5652529796195787949">"Տվյալների օգտագործման աշխատաշրջան"</string>
<string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Սպառումը ըստ ծրագրի"</string>
- <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Տվյալների ռոումինգ"</string>
+ <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Բջջային ինտերնետ ռոումինգում"</string>
<string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Սահմանափակել ֆոնային տվյալները"</string>
<string name="data_usage_menu_allow_background" msgid="2694761978633359223">"Թույլ տալ ֆոնային տվյալները"</string>
<string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Առանձնացնել 4G-ի օգտագործումը"</string>
@@ -2841,7 +2812,7 @@
<string name="user_enable_calling_sms" msgid="9172507088023097063">"Միացնել զանգերն ու SMS-ները"</string>
<string name="user_remove_user" msgid="6490483480937295389">"Հեռացնել օգտատիրոջը"</string>
<string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Միացնե՞լ հեռախոսազանգերը:"</string>
- <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Զանգերի պատմությունը կհամօգտագործվի այս օգտատիրոջ հետ:"</string>
+ <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Զանգերի պատմությունը հասանելի կլինի այս օգտատիրոջը։"</string>
<string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Միացնե՞լ հեռախոսազանգերն ու SMS-ները:"</string>
<string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Զանգերի և SMS-ների պատմությունը հասանելի կլինի այս օգտատիրոջը:"</string>
<string name="emergency_info_title" msgid="208607506217060337">"Անհետաձգելի բուժօգնության տվյալներ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">Show %d hidden items</item>
<item quantity="other">Ցույց տալ %d թաքնված տարրեր</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Կոծկել"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Ցանց և ինտերնետ"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"բջջային"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"տվյալների օգտագործում"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Հավելվածներ և ծանուցումներ"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Թույլտվություններ, կանխադրված հավելվածներ"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Աշխատանքային պրոֆիլի հավելվածներին ծանուցումների օգտագործումը հասանելի չէ:"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Հաշիվներ"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Հաշիվներ չեն ավելացվել"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Կանխադրված հավելվածներ"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Լեզուներ, ժամանակ, պահուստավորում, թարմացումներ"</string>
<string name="search_results_title" msgid="1796252422574886932">"Կարգավորումներ"</string>
- <string name="search_menu" msgid="6283419262313758339">"Կարգավորումների որոնում"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"Wi-Fi, WiFi, ցանցային կապ, ինտերնետ, անլար կապ, բջջային ինտերնետ, Wi Fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, միացնել/անջատել, կառավարել"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"տեքստային հաղորդագրություն, SMS, հաղորդագրություններ, հաղորդագրում, կանխադրված"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"վճարել, հպել, վճարումներ"</string>
<string name="keywords_backup" msgid="470070289135403022">"պահուստավորում, պահուստավորել"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ժեստ"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"դեմք, ապակողպում, ճանաչում, մուտք"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl-ի տարբերակ, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"ցանց, բջջային ցանցի կարգավիճակ, ազդանշանի հզորություն, բջջային ցանցի տեսակ, ռոումինգ, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"սերիական համար, սարքակազմի տարբերակ"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"մուգ թեմա"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"վրիպակ"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ամբիենտ էկրան, կողպէկրան"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"ծանուցում կողպէկրանին"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"դեմք"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"մատնահետք"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"խամրեցված էկրան, հպէկրան, մարտկոց, խելացի պայծառություն, դինամիկ պայծառություն"</string>
@@ -3234,8 +3206,8 @@
<string name="notification_importance_blocked" msgid="7938180808339386300">"Երբեք չցուցադրել ծանուցումները"</string>
<string name="notification_importance_min" msgid="9054819132085066824">"Ցուցադրել անձայն ռեժիմում և ծալել"</string>
<string name="notification_importance_low" msgid="2445139943005315690">"Ցույց տալ անձայն"</string>
- <string name="notification_importance_default" msgid="5958338024601957516">"Ձայն հանել"</string>
- <string name="notification_importance_high" msgid="2082429479238228527">"Ձայն հանել և ցուցադրել էկրանին"</string>
+ <string name="notification_importance_default" msgid="5958338024601957516">"Ձայն"</string>
+ <string name="notification_importance_high" msgid="2082429479238228527">"Ձայն և ելնող պատուհան"</string>
<string name="notification_importance_high_silent" msgid="2667033773703765252">"Ցուցադրել էկրանին"</string>
<string name="notification_importance_min_title" msgid="6974673091137544803">"Ցածր"</string>
<string name="notification_importance_low_title" msgid="8131254047772814309">"Միջին"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Երբ մուտքագրեք ձեր PIN-ը՝ այս սարքը մեկնարկելու համար, մատչելիության ծառայութունները, ինչպես օրինակ՝ <xliff:g id="SERVICE">%1$s</xliff:g>-ը, դեռևս հասանելի չեն լինի:"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Երբ մուտքագրեք ձեր նախշը՝ այս սարքը մեկնարկելու համար, մատչելիության ծառայութունները, ինչպես օրինակ՝ <xliff:g id="SERVICE">%1$s</xliff:g>-ը, դեռևս հասանելի չեն լինի:"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Երբ մուտքագրեք ձեր գաղտնաբառը՝ այս սարքը մեկնարկելու համար, մատչելիության ծառայութունները, ինչպես օրինակ՝ <xliff:g id="SERVICE">%1$s</xliff:g>-ը, դեռևս հասանելի չեն լինի:"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Ուշադրություն. Վերաբեռնումից հետո այս հավելվածը չի գործարկվի մինչև չապակողպեք հեռախոսը"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Ուշադրություն. եթե դուք վերագործարկեք ձեր հեռախոսը, որում սահմանված է էկրանի կողպում, այս հավելվածը չի աշխատի, մինչև չապակողպեք հեռախոսը։"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI կոդ"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI-ին վերաբերող տվյալներ"</string>
<string name="slot_number" msgid="3762676044904653577">"(Սլոտ<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Անձնական"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Աշխատանքային"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Հավելվածներ՝ բոլորը"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Հավելվածներ՝ անջատած"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Ծանուցումներն անջատած են"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Կատեգորիաներ՝ հրատապ կարևորություն"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Կատեգորիաներ՝ ցածր կարևորություն"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Կատեգորիաներ՝ անջատված"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Օգտագործման զգուշացումներ"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Սարքի ամբողջ օգտագործումը"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Ցույց տալ հավելվածների օգտագործումը"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Գերօգտագործում"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> հավելված սխալ է աշխատում</item>
@@ -3597,7 +3568,7 @@
<string name="battery_power_management" msgid="5571519699679107523">"Սնուցման կառավարում"</string>
<string name="no_battery_summary" msgid="3528036835462846814">"Վերջին լրիվ լիցքավորումից հետո մարտկոցը չի օգտագործվել"</string>
<string name="app_notification_preferences" msgid="1599319335092722613">"Հավելվածի կարգավորումներ"</string>
- <string name="system_ui_settings" msgid="579824306467081123">"Ցուցադրել Համակարգի ՕՄ-ի ընդունիչը"</string>
+ <string name="system_ui_settings" msgid="579824306467081123">"Ցուցադրել Համակարգի ՕՄ-ի կարգավորիչը"</string>
<string name="additional_permissions" msgid="6463784193877056080">"Լրացուցիչ թույլտվություններ"</string>
<string name="additional_permissions_more" msgid="3538612272673191451">"Եվս <xliff:g id="COUNT">%1$d</xliff:g>"</string>
<string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"Տրամադրե՞լ վրիպակի զեկույցը:"</string>
@@ -3666,7 +3637,7 @@
<string name="running_frequency" msgid="6622624669948277693">"Հաճախականություն"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Առավելագույն օգտագործումը"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Առանց տվյալների օգտագործման"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Թույլատրե՞լ <xliff:g id="APP">%1$s</xliff:g> հավելվածին միացնել/անջատել «Չանհանգստացնել» գործառույթը:"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Թույլատրե՞լ <xliff:g id="APP">%1$s</xliff:g>-ին օգտագործել «Չանհանգստացնել» ռեժիմը"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Հավելվածը կարող է միացնել/անջատել «Չանհանգստացնել» գործառույթը և փոփոխել նրան առնչվող կարգավորումները:"</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Պետք է միացած մնա, քանի որ ծանուցումների օգտագործումն ակտիվացված է"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Չեղարկե՞լ <xliff:g id="APP">%1$s</xliff:g> հավելվածին տրամադրված «Չանհանգստացնել» գործառույթն օգտագործելու թույլտվությունը:"</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Ներքին հիշողություն՝ <xliff:g id="PERCENTAGE">%1$s</xliff:g> օգտագործված – <xliff:g id="FREE_SPACE">%2$s</xliff:g> ազատ"</string>
<string name="display_summary" msgid="6737806235882127328">"Ակտիվացնել քնի ռեժիմը <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> անգործուն մնալուց հետո"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Պաստառ, քնի ռեժիմ, տառաչափ"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Ակտիվացնել քնի ռեժիմը 10 րոպե անգործուն մնալուց հետո"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>-ից օգտագործվել է <xliff:g id="USED_MEMORY">%1$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Մուտք եք գործել որպես <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-ների ուղարկումն արգելված է"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Տեսախցիկի օգտագործումն արգելված է"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Էկրանի պատկերի պահպանումը արգելված է"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Հնարավոր չէ անջատել պահուստային կրկնօրինակումը"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Հնարավոր չէ բացել հավելվածը"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Եթե հարցեր ունեք, դիմեք ձեր ադմինիստրատորին"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Մանրամասն"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Էկրանի կտրվածքի նմանակում"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Կտրվածք"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"էկրանի կտրվածք, հատում"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Չկա"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Կանխադրված տարբերակ"</string>
<string name="special_access" msgid="3458780842491881155">"Հատուկ հասանելիություն"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Կապակցված է <xliff:g id="ID_1">%1$s</xliff:g>-ին"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Կապակցված է բազմակի շարժական սարքերի"</string>
<string name="demo_mode" msgid="2798762752209330277">"Համակարգի միջերեսի ցուցադրական ռեժիմ"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Գիշերային ռեժիմ"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Կարգավորել գիշերային ռեժիմը"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Մուգ ռեժիմ"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Սահմանել մուգ ռեժիմը"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Մշակողի արագ կարգավորման սալիկներ"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-ի հետագծում"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Աշխատանքային պրոֆիլի կարգավորումներ"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Կոնտակտների որոնում"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Թույլատրել ձեր կազմակերպությանը որոնել կոնտակտներ՝ զանգողներին և կոնտակտները նույնականացնելու համար:"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Կրկնակի հպել՝ հեռախոսը ստուգելու համար"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Կրկնակի հպեք՝ պլանշետը ստուգելու համար"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Կրկնակի հպեք՝ սարքը ստուգելու համար"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Ժամը, ծանուցումների պատկերակները և այլ տեղեկություններ տեսնելու համար երկու անգամ հպեք էկրանին:"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Ժամանակը, ծանուցումները և այլ տեղեկություններ տեսնելու համար կրկնակի հպել էկրանին:"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Բարձրացնել՝ հեռախոսը ստուգելու համար"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Բարձրացրեք՝ պլանշետը ստուգելու համար"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Բարձրացրեք՝ սարքը ստուգելու համար"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ժամանակը, ծանուցումների պատկերակները և այլ տեղեկություններ տեսնելու համար վերցնել հեռախոսը:"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ժամը, ծանուցումների պատկերակները և այլ տեղեկություններ տեսնելու համար բարձրացրեք ձեր պլանշետը:"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ժամը, ծանուցումների պատկերակները և այլ տեղեկություններ տեսնելու համար բարձրացրեք ձեր սարքը:"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Անջատել էկրանի քնի ռեժիմը"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Ժամանակը, ծանուցումները և այլ տեղեկություններ տեսնելու համար վերցնել հեռախոսը:"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Ժամանակը, ծանուցումները և այլ տեղեկություններ տեսնելու համար վերցնել պլանշետը:"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Ժամանակը, ծանուցումները և այլ տեղեկություններ տեսնելու համար վերցնել սարքը:"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Կողպէկրանի քնի ռեժիմի անջատման ժեստ"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Ծանուցումները դիտելու համար օգտագործել մատնահետքերի սկաները"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Մատնահետքերի սկաներ"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ծանուցումները տեսնելու համար՝ մատը սահեցրեք ներքև հեռախոսի հետևի մասում գտնվող մատնահետքերի սկաների վրա"</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> փորձ</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Այս սարքի տվյալները պահուստավորվում են"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Այս սարքի կառավարիչը ձեր կազմակերպությունն է։"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Այս սարքի կառավարիչն է <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> կազմակերպությունը։"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Ինքնալրացման ծառայություն"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ավտոմատ, լրացնել, ինքնալրացում"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Համոզվեք, որ վստահում եք այս հավելվածին</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g>-ն օգտագործում է էկրանի բովանդակությունը՝ որոշելու, թե ինչը կարող է ինքնալրացվել:"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Ինքնալրացում"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Գրանցման մակարդակ"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Առավելագույն հարցումների թիվը աշխատաշրջանի համար"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Տեսանելի տվյալակազմերի առավելագույն քանակը"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Վերականգնել կանխադրված արժեքները"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Ինքնալրացման կարգավորումները վերակայվեցին"</string>
<string name="device_theme" msgid="4571803018917608588">"Սարքի թեման"</string>
<string name="default_theme" msgid="7085644992078579076">"Կանխադրված"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Ցանցի անունը"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Գործարկել օպերատորի նախապատրաստումը"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Թարմացնե՞լ «Չանհանգստացնել» ռեժիմը"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Չցուցադրել շեղող ծանուցումները"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Ի՞նչ նորույթներ կան:"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ծանոթացեք ձեր նոր հեռախոսին"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ծանոթացեք ձեր նոր պլանշետին"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ծանոթացեք ձեր նոր սարքին"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Տվյալ գործառույթը հասանելի չէ այս սարքի վրա"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS-ի չափումների ամբողջական բեռնում"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Հետագծել GNSS-ի բոլոր սխեմաներն ու հաճախականությունները՝ առանց աշխատաշրջանի"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Միշտ ցույց տալ խափանման մասին ծանուցումը"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Ցույց տալ ծանուցումը հավելվածի խափանման դեպքում"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Ընտրեք ANGLE-ի աջակցմամբ հավելված"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE-ի աջակցմամբ հավելված նշված չէ"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE-ի աջակցմամբ հավելված՝ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Գրացուցակի մուտքի թույլտվություն"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"գրացուցակի մուտքի թույլտվություն"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Ցանցի տվյալներ"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Ձեր սարքի անունը տեսանելի է հեռախոսի հավելվածներին։ Այն կարող են տեսնել օգտատերերը, երբ միանում եք Bluetooth սարքերի կամ կարգավորում եք Wi-Fi թեժ կետը։"</string>
<string name="devices_title" msgid="7701726109334110391">"Սարքեր"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Բոլոր կարգավորումները"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Առաջարկներ"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS տվյալներ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS տվյալներ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Ընտրել ցանց"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Անջատած է"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Միացած է"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Միացում…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Չհաջողվեց միանալ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Ցանցեր չեն գտնվել:"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Չհաջողվեց ցանցեր գտնել: Նորից փորձեք:"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(արգելված)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM քարտ չկա"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Ընդլայնված հնարավորություններով զանգեր"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Ցանցի նախընտրելի ռեժիմը՝ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Ցանցի նախընտրելի ռեժիմը՝ միայն GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Ցանցի նախընտրելի ռեժիմը՝ միայն WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Ցանցի նախընտրելի ռեժիմը՝ GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Ցանցի նախընտրելի ռեժիմը՝ CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Ցանցի նախընտրելի ռեժիմը՝ CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Ցանցի նախընտրելի ռեժիմը՝ միայն CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Ցանցի նախընտրելի ռեժիմը՝ միայն EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Ցանցի նախընտրելի ռեժիմը՝ CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Ցանցի նախընտրելի ռեժիմը՝ LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Ցանցի նախընտրելի ռեժիմը՝ GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Ցանցի նախընտրելի ռեժիմը՝ CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Ցանցի նախընտրելի ռեժիմը՝ համաշխարհային"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Ցանցի նախընտրելի ռեժիմը՝ LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Ցանցի նախընտրելի ռեժիմը՝ LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Ցանցի նախընտրելի ռեժիմը` LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Ցանցի նախընտրելի ռեժիմը՝ TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Ցանցի նախընտրելի ռեժիմը՝ TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Ցանցի նախընտրելի ռեժիմը՝ LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Ցանցի նախընտրելի ռեժիմը՝ TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Ցանցի նախընտրելի ռեժիմը՝ LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Ցանցի նախընտրելի ռեժիմը՝ TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Ցանցի նախընտրելի ռեժիմը՝ LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Ցանցի նախընտրելի ռեժիմը՝ LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Ցանցի նախընտրելի ռեժիմը՝ TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Ցանցի նախընտրելի ռեժիմը՝ LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (խորհուրդ է տրվում)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (խորհուրդ է տրվում)"</string>
+ <string name="network_global" msgid="959947774831178632">"Համաշխարհային"</string>
+ <string name="label_available" msgid="1731547832803057893">"Հասանելի ցանցեր"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Որոնում…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Գրանցվում է <xliff:g id="NETWORK">%s</xliff:g>-ում..."</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Ձեր SIM քարտը թույլ չի տալիս այս ցանցին միանալ:"</string>
+ <string name="connect_later" msgid="978991102125216741">"Հնարավոր չէ միանալ այս ցանցին հիմա: Փորձեք ավելի ուշ:"</string>
+ <string name="registration_done" msgid="4573820010512184521">"Գրանցված է ցանցում:"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Ավտոմատ ընտրել ցանցը"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Օպերատորի կարգավորումներ"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Տվյալների փոխանցման կարգավորում"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Բջջային ինտերնետ"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Օգտվել բջջային ինտերնետից"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Ցանցի նախընտրելի տեսակը"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Ցանցի աշխատանքի ռեժիմի փոփոխություն"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Ցանցի նախընտրելի տեսակը"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Օպերատոր"</string>
+ <string name="call_category" msgid="8108654745239563833">"Զանգ"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Տեսազանգեր բջջային ցանցի միջոցով"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Համակարգի ընտրությում"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Փոխել CDMA ռոումինգի ռեժիմը"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Համակարգի ընտրություն"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Ցանց"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Ցանց"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA բաժանորդագրում"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Փոխել RUIM/SIM քարտի և NV-ի միջև"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"բաժանորդագրություն"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Ավտոմատ գրանցում..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Թույլատրե՞լ տվյալների ռոումինգը"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Գների վերաբերյալ տեղեկություններ ստանալու համար դիմեք ձեր օպերատորին:"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Հավելվածների թրաֆիկ"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Ցանցի անվավեր ռեժիմ՝ <xliff:g id="NETWORKMODEID">%1$d</xliff:g>։ Փակել։"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Հասանելի չէ <xliff:g id="CARRIER">%1$s</xliff:g>-ին միանալու դեպքում"</string>
+ <string name="see_more" msgid="5953815986207345223">"Տեսնել ավելին"</string>
+ <string name="see_less" msgid="1250265310929558370">"Տեսնել ավելի քիչ"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 8909468..15b37b7 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Perlakukan sebagai terukur"</item>
<item msgid="2266114985518865625">"Perlakukan sebagai belum terukur"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Default (gunakan MAC acak)"</item>
+ <item msgid="5398461510512959597">"Dipercaya"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Tidak"</item>
<item msgid="3863157480502955888">"Ya"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Selalu aktif"</item>
<item msgid="6385301106124765323">"Selalu nonaktif"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Nonaktif"</item>
+ <item msgid="2182686878828390312">"Debug"</item>
+ <item msgid="5286514712714822064">"Panjang"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Hanya Layar utama"</item>
+ <item msgid="5034813753274486448">"Otomatis"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA dipilih"</item>
+ <item msgid="807926878589867564">"Hanya GSM"</item>
+ <item msgid="488474605709912156">"Hanya WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA otomatis"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo otomatis"</item>
+ <item msgid="370391313511477301">"CDMA tanpa EvDo"</item>
+ <item msgid="4678789463133969294">"Hanya EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Hanya TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 115bbc7..3376e6f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Buat"</string>
<string name="allow" msgid="3349662621170855910">"Izinkan"</string>
<string name="deny" msgid="6947806159746484865">"Tolak"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Tutup"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Beralih"</string>
<string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Tinggal <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> langkah untuk menjadi developer.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, Anda sudah menjadi developer."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Aktifkan opsi developer terlebih dahulu."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Jaringan & nirkabel"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Sambungan"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Perangkat"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Pribadi"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Akses"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Aktifkan Sambungan Data"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Nonaktifkan Sambungan Data"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Alamat Bluetooth perangkat: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Putuskan sambungan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Perangkat Bluetooth tak bernama"</string>
<string name="progress_scanning" msgid="192587958424295789">"Menelusuri"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Tak ada prngkt Bluetooth terdekat."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Sebuah aplikasi ingin mengaktifkan Bluetooth dan menampilkan ponsel Anda di perangkat lain. Anda dapat mengubahnya nanti di setelan Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Menyalakan Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Mematikan Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Sambung-otomatis"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Permintaan sambungan bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tap untuk menyambung ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Sambungkan ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Perangkat panggilan yang tersedia"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Terhubung saat ini"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Perangkat yang tersimpan"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Tambahkan perangkat"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth akan diaktifkan untuk menyambungkan"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferensi sambungan"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Perangkat yang terhubung sebelumnya"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Perangkat yang terhubung sebelumnya"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth diaktifkan"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Lihat semua"</string>
<string name="date_and_time" msgid="9062980487860757694">"Tanggal & waktu"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Pilih zona waktu"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Lewati"</string>
<string name="next_label" msgid="4693520878012668114">"Berikutnya"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Bahasa"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferensi bahasa"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Hapus"</string>
<string name="add_a_language" msgid="2330538812283783022">"Tambahkan bahasa"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Setelan"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Pintasan setelan"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Mode pesawat"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Lainnya"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Jaringan & nirkabel"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Kelola Wi-Fi, Bluetooth, mode pesawat, jaringan seluler, & VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Data seluler"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privasi"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Dinonaktifkan oleh admin"</string>
<string name="security_status_title" msgid="5848766673665944640">"Status keamanan"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Kunci layar, face unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Kunci layar, sidik jari"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Kunci layar"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Wajah ditambahkan"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Buka kunci dengan wajah Anda"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Gunakan wajah Anda untuk mengautentikasi"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Gunakan wajah Anda untuk membuka kunci ponsel, mengizinkan pembelian, atau login ke aplikasi."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Gunakan Anda"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Gunakan sidik jari untuk membuka ponsel atau menyetujui pembelian.\n\nCatatan: Anda tidak dapat menggunakan sidik jari untuk membuka perangkat ini. Untuk informasi selengkapnya, hubungi admin organisasi Anda."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Gunakan wajah Anda untuk membuka kunci ponsel, mengizinkan pembelian, atau login ke aplikasi"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Anda dapat menambahkan maksimal <xliff:g id="COUNT">%d</xliff:g> sidik jari"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Posisikan wajah Anda di tengah lingkaran"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Lakukan nanti"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Anda dapat menambahkan hingga <xliff:g id="COUNT">%d</xliff:g> wajah"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Anda telah menambahkan jumlah maksimum wajah"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Tidak dapat menambahkan wajah lagi"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Pendaftaran tidak selesai"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Ya"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Batas waktu pendaftaran wajah tercapai. Coba lagi."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Pendaftaran wajah gagal."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Selesai. Terlihat bagus."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Selesai"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Gunakan wajah Anda untuk"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Membuka kunci perangkat"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Login apl & pembayaran"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Buka mata untuk membuka kunci"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Saat menggunakan autentikasi wajah, mata Anda harus terbuka"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Hapus data wajah"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Tingkatkan data wajah Anda"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Wajah Anda bisa digunakan untuk membuka kunci perangkat Anda dan mengakses aplikasi. "<annotation id="url">"Pelajari lebih lanjut"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sidik jari"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Mengelola sidik jari"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sidik jari untuk"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Pilih minimal satu pita frekuensi untuk hotspot Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Setelan IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privasi"</string>
<string name="wifi_shared" msgid="844142443226926070">"Berbagi dengan pengguna perangkat lain"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(tidak diubah)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Pilih"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Batal"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Lupakan jaringan?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Semua sandi untuk jaringan ini akan dihapus"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Jaringan tersimpan"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d jaringan</item>
<item quantity="one">1 jaringan</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Kecerahan"</string>
<string name="brightness_summary" msgid="838917350127550703">"Sesuaikan kecerahan layar"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Kecerahan adaptif"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Aktif"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Nonaktif"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Kecerahan yang dipilih sangat rendah"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Kecerahan yang dipilih rendah"</string>
@@ -1122,7 +1128,7 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimalkan tingkat kecerahan untuk cahaya di sekitar. Jika fitur ini diaktifkan, Anda tetap dapat mengatur kecerahan sementara."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"Kecerahan layar akan disesuaikan otomatis dengan lingkungan dan aktivitas Anda. Anda dapat memindahkan penggeser secara manual untuk membantu kecerahan adaptif belajar dari preferensi Anda."</string>
<string name="night_display_title" msgid="2626451512200357686">"Cahaya Malam"</string>
- <string name="night_display_text" msgid="1837277457033025056">"Cahaya Malam memberi rona kuning pada layar. Membuat Anda dapat melihat layar atau membaca dengan lebih mudah saat cahaya redup, serta membantu Anda lebih mudah tidur."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"Cahaya Malam memberikan rona kuning pada layar. Membuat Anda dapat melihat layar atau membaca dengan lebih mudah saat cahaya redup, serta membantu Anda lebih mudah tidur."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Jadwal"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Tidak ada"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Aktifkan pada waktu khusus"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Tidak dapat mengubah PIN.\nPIN mungkin salah."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM berhasil diubah"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Tidak bisa mengubah status kunci kartu SIM.\nPIN Mungkin salah."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Tidak dapat menonaktifkan PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Tidak dapat mengaktifkan PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Oke"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Batal"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Ditemukan beberapa SIM"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> perlu diformat. \n\n"<b>"Memformat akan menghapus semua data yang saat ini disimpan di <xliff:g id="NAME_1">^1</xliff:g>."</b>" Untuk mencegah hilangnya data, pertimbangkan untuk mencadangkannya."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Hapus & format"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Memformat <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Jangan cabut <xliff:g id="NAME">^1</xliff:g> saat sedang diformat."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Jangan cabut <xliff:g id="NAME">^1</xliff:g> saat sedang diformat"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Pindahkan data ke penyimpanan baru"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Anda dapat memindahkan foto, file, dan beberapa aplikasi ke <xliff:g id="NAME">^1</xliff:g> baru ini. \n\nPemindahan berlangsung sekitar <xliff:g id="TIME">^2</xliff:g> dan akan mengosongkan <xliff:g id="SIZE">^3</xliff:g> di perangkat internal. Beberapa aplikasi tidak akan berfungsi saat pemindahan berlangsung."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Pindahkan sekarang"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Terinstal"</string>
<string name="no_applications" msgid="7336588977497084921">"Tidak ada aplikasi."</string>
<string name="internal_storage" msgid="1584700623164275282">"Penyimpanan internal"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"penyimpanan internal"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Penyimpanan USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Penyimpanan kartu SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Menghitung ulang ukuran..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Hapus data aplikasi?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Semua data aplikasi ini akan dihapus secara permanen, termasuk semua file, setelan, akun, basis data, dll."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Apl tersebut tidak ditemukan di dalam daftar apl yang terpasang."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Tidak dapat menghapus penyimpanan untuk aplikasi."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Apl ini dapat mengakses hal berikut pada tablet Anda:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Apl ini dapat mengakses hal berikut dari ponsel Anda:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Aplikasi ini dapat mengakses yang berikut pada tablet Anda. Untuk meningkatkan kinerja dan mengurangi penggunaan memori, beberapa izin ini tersedia untuk <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> karena berjalan dalam proses yang sama seperti <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Aplikasi ini dapat mengakses yang berikut pada ponsel Anda. Untuk meningkatkan kinerja dan mengurangi penggunaan memori, beberapa izin ini tersedia untuk <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> karena berjalan dalam proses yang sama seperti <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> dan <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Aplikasi ini mungkin tidak gratis:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Kirim SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"Menghitung..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Tidak dapat menghitung ukuran paket."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Anda tidak memiliki apl pihak ketiga yang terpasang."</string>
<string name="version_text" msgid="9189073826278676425">"versi <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Pindahkan"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Pindahkan ke tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Pindahkan ke ponsel"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Pindahkan ke penyimpanan USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Pindahkan ke kartu SD"</string>
- <string name="moving" msgid="6431016143218876491">"Memindahkan"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Migrasi lain sedang berlangsung."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Ruang penyimpanan tidak cukup."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Apl tidak ada."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Aplikasi admin perangkat tidak dapat diinstal di media eksternal"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Paksa berhenti?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Jika aplikasi dihentikan paksa, fungsinya mungkin akan terganggu."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Tidak dapat memindahkan apl. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Lokasi pemasangan yang disukai"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Ubah lokasi pemasangan yang diinginkan untuk apl baru."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Nonaktifkan aplikasi built-in?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Menonaktifkan aplikasi"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Jika Anda menonaktifkan aplikasi ini, Android dan aplikasi lain mungkin tidak berfungsi lagi sesuai harapan."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Hapus data dan nonaktifkan aplikasi?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Jika Anda menonaktifkan aplikasi ini, Android dan aplikasi lain mungkin tidak berfungsi lagi sesuai harapan. Data juga akan dihapus."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Matikan notifikasi?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jika Anda mematikan notifikasi untuk aplikasi ini, Anda dapat melewatkan pembaruan dan notifikasi penting."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Toko Aplikasi"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detail aplikasi"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplikasi diinstal dari <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Gunakan layanan"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Gunakan koreksi warna"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Gunakan teks"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Lanjutkan"</string>
<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="6371077608778830020">"Tambahkan alat bantu dengar"</string>
@@ -2130,7 +2124,7 @@
<string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
<string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> tersisa"</string>
<string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> lagi agar terisi penuh"</string>
- <string name="background_activity_title" msgid="8482171736539410135">"Pembatasan background"</string>
+ <string name="background_activity_title" msgid="8482171736539410135">"Pembatasan akses latar belakang"</string>
<string name="background_activity_summary" msgid="8140094430510517362">"Izinkan aplikasi berjalan di latar belakang"</string>
<string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikasi tidak diizinkan berjalan di background"</string>
<string name="background_activity_summary_whitelisted" msgid="1079899502347973947">"Penggunaan background tidak dapat dibatasi"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jika aktivitas background aplikasi dibatasi, mungkin fungsinya terganggu."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Anda tidak dapat membatasi aplikasi karena tidak disetel untuk mengoptimalkan baterai.\n\nAktifkan pengoptimalan baterai untuk membatasi aplikasi."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Penggunaan layar sejak pengisian baterai penuh terakhir"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumsi layar"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Pemindaian jaringan seluler"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Penggunaan baterai sejak pengisian daya penuh terakhir"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Jumlah waktu layar diaktifkan sejak pengisian daya terakhir hingga penuh"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Penggunaan perangkat sejak pengisian baterai penuh terakhir"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Detail penggunaan"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Sesuaikan penggunaan daya"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Termasuk paket"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikasi yang menguras baterai"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Membuat perangkat tetap aktif"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Mengaktifkan perangkat di latar belakang"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Meminta informasi lokasi terlalu sering"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikasi mengalami gangguan"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikasi berjalan normal"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Ponsel memiliki penggunaan baterai yang umum di latar belakang"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet memiliki penggunaan baterai yang umum di latar belakang"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Membatasi penggunaan baterai untuk %1$d aplikasi</item>
<item quantity="one">Membatasi penggunaan baterai untuk %1$d aplikasi</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Dibatasi <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Aplikasi ini telah menggunakan daya baterai di background. Aplikasi yang dibatasi mungkin tidak berfungsi dengan baik dan notifikasi dapat tertunda."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Gunakan Pengelola Baterai"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Mendeteksi jika aplikasi menghabiskan baterai"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Batal"</string>
<string name="tts_reset" msgid="2661752909256313270">"Setel ulang"</string>
<string name="tts_play" msgid="2628469503798633884">"Putar"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Kontrol daya"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Memperbarui setelan Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Memperbarui setelan Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"aktif"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"nonaktif"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"mengaktifkan"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"menonaktifkan"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Lokasi"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinkronisasi"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Kecerahan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"otomatis"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"penuh"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"setengah"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"nonaktif"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Penyimpanan kredensial"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instal dari penyimpanan"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Pilih semua"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Penggunaan data aplikasi"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Kuota & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Penghitungan data operator mungkin berbeda dengan perangkat Anda."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Penggunaan aplikasi"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFO APLIKASI"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Tampilkan %d item tersembunyi</item>
<item quantity="one">Tampilkan %d item tersembunyi</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Ciutkan"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Jaringan & internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"seluler"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"penggunaan data"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikasi & notifikasi"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Izin, aplikasi default"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Akses notifikasi tidak tersedia untuk aplikasi di profil kerja"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Akun"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Tidak ada akun yang ditambahkan"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplikasi default"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Bahasa, waktu, backup, update"</string>
<string name="search_results_title" msgid="1796252422574886932">"Setelan"</string>
- <string name="search_menu" msgid="6283419262313758339">"Telusuri setelan"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, sambungan jaringan, internet, nirkabel, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, beralih, kontrol"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"pesan teks, SMS, pesan, messaging, default"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"bayar, tap, pembayaran"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gestur"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"wajah, buka kunci, autentikasi, login"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versi prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"jaringan, status jaringan seluler, status layanan, kekuatan sinyal, jenis jaringan seluler, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"nomor seri, versi hardware"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema gelap"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Tampilan standby, tampilan Layar kunci"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notifikasi layar kunci"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"wajah"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"sidik jari"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"redupkan layar, layar sentuh, baterai, smart brightness, kecerahan dinamis"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Jika Anda memasukkan PIN untuk memulai perangkat ini, layanan aksesibilitas seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum dapat tersedia."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Jika Anda memasukkan pola untuk memulai perangkat ini, layanan aksesibilitas seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum dapat tersedia."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Jika Anda memasukkan sandi untuk memulai perangkat ini, layanan aksesibilitas seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum dapat tersedia."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Catatan: Setelah boot ulang, aplikasi ini tidak dapat dimulai hingga kunci ponsel dibuka"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Catatan: Jika Anda menyalakan ulang ponsel dan menyetel kunci layar, aplikasi ini tidak dapat dimulai jika Anda tidak membuka kunci ponsel"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informasi IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informasi relatif IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Pribadi"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Kantor"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikasi: Semua"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikasi: Dinonaktifkan"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Dinonaktifkan"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategori: Tingkat kepentingan darurat"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategori: Tingkat kepentingan rendah"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategori: Dinonaktifkan"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Pemberitahuan penggunaan"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Tampilkan semua penggunaan"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Tampilkan penggunaan aplikasi"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Sering dipakai"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikasi berperilaku tidak normal</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> berperilaku tidak normal</item>
@@ -3667,7 +3638,7 @@
<string name="memory_maximum_usage" msgid="6513785462055278341">"Penggunaan maksimum"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Tidak ada data yang digunakan"</string>
<string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Izinkan akses ke status Jangan Ganggu untuk <xliff:g id="APP">%1$s</xliff:g>?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikasi dapat mengaktifkan/menonaktifkan status Jangan Ganggu dan mengubah setelan terkait."</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikasi akan dapat mengaktifkan/menonaktifkan status Jangan Ganggu dan mengubah setelan terkait."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Harus tetap aktif karena akses notifikasi juga aktif"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Cabut akses ke status Jangan Ganggu untuk <xliff:g id="APP">%1$s</xliff:g>?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Semua aturan Jangan Ganggu yang dibuat oleh aplikasi ini akan dihapus."</string>
@@ -3679,15 +3650,15 @@
<string name="app_list_preference_none" msgid="108006867520327904">"Tidak ada"</string>
<string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Menonaktifkan akses penggunaan aplikasi ini tidak mencegah admin melacak penggunaan data aplikasi di profil kerja"</string>
<string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_0">%1$d</xliff:g> dari <xliff:g id="COUNT_1">%2$d</xliff:g> karakter digunakan"</string>
- <string name="draw_overlay" msgid="6564116025404257047">"Tampilkan di atas aplikasi lain"</string>
- <string name="system_alert_window_settings" msgid="8466613169103527868">"Tampilkan di atas aplikasi lain"</string>
+ <string name="draw_overlay" msgid="6564116025404257047">"Tampilkan di atas apl lain"</string>
+ <string name="system_alert_window_settings" msgid="8466613169103527868">"Tampilkan di atas apl lain"</string>
<string name="system_alert_window_apps_title" msgid="7005760279028569491">"Aplikasi"</string>
- <string name="system_alert_window_access_title" msgid="6297115362542361241">"Tampilkan di dalam aplikasi lain"</string>
+ <string name="system_alert_window_access_title" msgid="6297115362542361241">"Tampilkan di dalam apl lain"</string>
<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 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>
<string name="app_permission_summary_allowed" msgid="1505409933012886711">"Diizinkan"</string>
@@ -3709,7 +3680,7 @@
<string name="camera_gesture_desc" msgid="1831390075255870960">"Membuka aplikasi kamera dengan memutar pergelangan tangan dua kali"</string>
<string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tekan tombol daya dua kali untuk kamera"</string>
<string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Membuka kamera dengan cepat tanpa membuka kunci layar"</string>
- <string name="screen_zoom_title" msgid="5233515303733473927">"Ukuran layar"</string>
+ <string name="screen_zoom_title" msgid="5233515303733473927">"Ukuran tampilan"</string>
<string name="screen_zoom_short_summary" msgid="7291960817349834688">"Membuat item di layar menjadi lebih besar atau lebih kecil"</string>
<string name="screen_zoom_keywords" msgid="9176477565403352552">"layar, kepadatan, zoom layar, skala, penskalaan"</string>
<string name="screen_zoom_summary" msgid="6445488991799015407">"Buat item di layar jadi lebih kecil atau lebih besar. Beberapa aplikasi di layar dapat berubah posisi."</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Penyimpanan internal: <xliff:g id="PERCENTAGE">%1$s</xliff:g> digunakan - <xliff:g id="FREE_SPACE">%2$s</xliff:g> kososng"</string>
<string name="display_summary" msgid="6737806235882127328">"Tidur setelah <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> dalam keadaan tidak aktif"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Wallpaper, tidur, ukuran font"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Tidur setelah 10 menit dalam keadaan tidak aktif"</string>
<string name="memory_summary" msgid="8080825904671961872">"Rata-rata <xliff:g id="USED_MEMORY">%1$s</xliff:g> dari <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memori digunakan"</string>
<string name="users_summary" msgid="1674864467098487328">"Login sebagai <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS tidak diizinkan"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kamera tidak diizinkan"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshot tidak diizinkan"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Backup tidak dapat dinonaktifkan"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Aplikasi ini tidak dapat dibuka"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Jika ada pertanyaan, hubungi admin IT"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Detail selengkapnya"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulasikan tampilan dengan potongan"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Potongan layar"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"potongan tampilan, notch"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Tidak ada"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Default perangkat"</string>
<string name="special_access" msgid="3458780842491881155">"Akses aplikasi khusus"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikasi dapat menggunakan data yang tidak dibatasi</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Terhubung ke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Terhubung ke beberapa perangkat"</string>
<string name="demo_mode" msgid="2798762752209330277">"Mode demo UI sistem"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Mode malam"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Setel Mode malam"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Mode gelap"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Setel Mode gelap"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Kotak setelan cepat developer"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Pelacakan Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Setelan profil kerja"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Penelusuran kontak"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Izinkan penelusuran kontak oleh organisasi untuk mengidentifikasi penelepon dan kontak"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tap dua kali untuk memeriksa ponsel"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tap dua kali untuk memeriksa tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tap dua kali untuk memeriksa perangkat"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Untuk memeriksa waktu, ikon notifikasi, dan info lainnya, tap layar dua kali."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Untuk memeriksa waktu, notifikasi, dan info lainnya, tap dua kali layar Anda."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Angkat untuk memeriksa ponsel"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Angkat untuk memeriksa tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Angkat untuk memeriksa perangkat"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Untuk memeriksa waktu, ikon notifikasi, dan info lainnya, ambil ponsel."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Untuk memeriksa waktu, ikon notifikasi, dan info lainnya, ambil tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Untuk memeriksa waktu, ikon notifikasi, dan info lainnya, ambil perangkat."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Aktifkan tampilan"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Untuk memeriksa waktu, notifikasi, dan info lainnya, ambil ponsel Anda."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Untuk memeriksa waktu, notifikasi, dan info lainnya, ambil tablet Anda."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Untuk memeriksa waktu, notifikasi, dan info lainnya, ambil perangkat Anda."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gestur untuk menampilkan layar kunci"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Usapkan sidik jari untuk melihat notifikasi"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Usapkan sidik jari"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk memeriksa notifikasi, usapkan jari ke bawah pada sensor sidik jari di bagian belakang ponsel."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> upaya</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> upaya</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Data perangkat ini sedang di-backup"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Perangkat ini dikelola oleh organisasi."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Perangkat ini dikelola oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Layanan IsiOtomatis"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"otomatis, isi, isiotomatis"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Pastikan Anda memercayai aplikasi ini</b> <br/> <br/> <xliff:g id=app_name example=Google IsiOtomatis>%1$s</xliff:g> menggunakan item yang ada di layar untuk menentukan item apa saja yang dapat diisi otomatis."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"IsiOtomatis"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Level logging"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Permintaan maks per sesi"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Jumlah dataset maks yang terlihat"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Reset ke nilai default"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Opsi developer IsiOtomatis telah direset"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema perangkat"</string>
<string name="default_theme" msgid="7085644992078579076">"Default"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nama jaringan"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Memicu Provisioning Operator"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Perbarui mode Jangan Ganggu"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Jeda notifikasi agar tetap fokus"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Apa yang baru dan menarik?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ikuti tur tentang ponsel baru Anda"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ikuti tur tentang tablet baru Anda"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ikuti tur tentang perangkat baru Anda"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Fitur ini tidak tersedia di perangkat"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Paksa ukuran GNSS penuh"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Lacak semua konstelasi dan frekuensi GNSS tanpa siklus tugas"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Selalu tampilkan dialog error"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Tampilkan dialog setiap kali aplikasi tidak bekerja"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Pilih aplikasi yang berkemampuan ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Tidak ada aplikasi berkemampuan ANGLE yang ditetapkan"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplikasi yang berkemampuan ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Akses direktori"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"akses direktori"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4167,7 +4146,7 @@
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"Tingkatkan masa pakai baterai perangkat"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Tingkatkan masa pakai baterai ponsel"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
- <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Mencegah berdering"</string>
+ <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Cegah berdering"</string>
<string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Tekan tombol Power & Keraskan Volume secara bersamaan"</string>
<string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Pintasan untuk mencegah berdering"</string>
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Getar"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detail jaringan"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Nama perangkat terlihat oleh aplikasi di ponsel, dan juga mungkin dilihat oleh orang lain saat Anda menghubungkan ke perangkat Bluetooth atau menyiapkan hotspot Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Perangkat"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Semua Setelan"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Saran"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Pilih jaringan"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Terputus"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Terhubung"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Menghubungkan…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Tidak dapat terhubung"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Jaringan tidak ditemukan."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Tidak dapat menemukan jaringan. Coba lagi."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(terlarang)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Tidak ada kartu SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Mode Panggilan Lanjutan"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Mode jaringan pilihan: WCDMA dipilih"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Mode jaringan pilihan: hanya GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Mode jaringan pilihan: hanya WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Mode jaringan pilihan: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Mode jaringan pilihan: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Mode jaringan pilihan: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Mode jaringan pilihan: hanya CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Mode jaringan pilihan: hanya EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Mode jaringan pilihan: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Mode jaringan pilihan: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Mode jaringan pilihan: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Mode jaringan pilihan: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Mode jaringan pilihan: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Mode jaringan pilihan: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Mode jaringan pilihan: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Mode jaringan pilihan: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Mode jaringan pilihan: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Mode jaringan pilihan: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Mode jaringan pilihan: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Mode jaringan pilihan: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Mode jaringan pilihan: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Mode jaringan pilihan: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Mode jaringan pilihan: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Mode jaringan pilihan: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Mode jaringan pilihan: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Mode jaringan pilihan: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (disarankan)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (disarankan)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Jaringan yang tersedia"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Mencari..."</string>
+ <string name="register_on_network" msgid="766516026652295941">"Mendaftarkan ke <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Kartu SIM Anda tidak mengizinkan sambungan ke jaringan ini."</string>
+ <string name="connect_later" msgid="978991102125216741">"Tidak dapat terhubung ke jaringan ini sekarang. Coba lagi nanti."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Terdaftar pada jaringan."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Pilih jaringan secara otomatis"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Setelan operator"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Siapkan layanan data"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Kuota"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Akses data menggunakan jaringan seluler"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Jenis jaringan pilihan"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Ubah mode pengoperasian jaringan"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Jenis jaringan pilihan"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operator"</string>
+ <string name="call_category" msgid="8108654745239563833">"Memanggil"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Video call operator"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Pilih sistem"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Mengubah mode roaming CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Pilih sistem"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Jaringan"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Jaringan"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Langganan CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Mengubah antara RUIM/SIM dan NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"langganan"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Pendaftaran otomatis..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Izinkan roaming data?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Hubungi penyedia jaringan untuk mengetahui harganya."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Penggunaan data aplikasi"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Mode Jaringan Tidak Valid <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Abaikan."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Tidak tersedia saat terhubung ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Lihat lainnya"</string>
+ <string name="see_less" msgid="1250265310929558370">"Lihat lebih sedikit"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Tidak ada perangkat yang terhubung"</string>
</resources>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 9053794..69cead3 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Meðhöndla sem mælt"</item>
<item msgid="2266114985518865625">"Meðhöndla sem ótakmarkað"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Sjálfgefið (notaðu MAC-vistfang af handahófi)"</item>
+ <item msgid="5398461510512959597">"Traust"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nei"</item>
<item msgid="3863157480502955888">"Já"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Alltaf kveikt"</item>
<item msgid="6385301106124765323">"Alltaf slökkt"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Slökkt"</item>
+ <item msgid="2182686878828390312">"Kemba"</item>
+ <item msgid="5286514712714822064">"Ítarleg"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Aðeins heimakerfi"</item>
+ <item msgid="5034813753274486448">"Sjálfvirk"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA fyrsta val"</item>
+ <item msgid="807926878589867564">"GSM eingöngu"</item>
+ <item msgid="488474605709912156">"WCDMA eingöngu"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA sjálfvirkt"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo sjálfvirkt"</item>
+ <item msgid="370391313511477301">"CDMA án EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo eingöngu"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Alþjóðlegt"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Aðeins TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Alþjóðlegt"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 2a9f9d0..5783fd5 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Búa til"</string>
<string name="allow" msgid="3349662621170855910">"Leyfa"</string>
<string name="deny" msgid="6947806159746484865">"Hafna"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Loka"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Skipta"</string>
<string name="device_info_default" msgid="7847265875578739287">"Óþekkt"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Nú ertu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> skrefi frá því að gerast þróunaraðili.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Þetta er óþarfi; þú ert nú þegar þróunaraðili."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Virkjaðu valkosti þróunaraðila fyrst."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Þráðlaus net og símkerfi"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Tengingar"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Tæki"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Persónulegt"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Aðgangur"</string>
<string name="header_category_system" msgid="2816866961183068977">"Kerfi"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Kveikja á gagnatengingu"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Slökkva á gagnatengingu"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth-vistfang tækis: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Viltu aftengja <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Útsending"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Ónefnt Bluetooth-tæki"</string>
<string name="progress_scanning" msgid="192587958424295789">"Leitar"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Engin nálæg Bluetooth-tæki fundust."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Forrit vill kveikja á Bluetooth og gera símann þinn sýnilegan öðrum tækjum. Þú getur breytt þessu síðar í stillingum Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Kveikir á Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Slekkur á Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Sjálfvirk tenging"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Beiðni um Bluetooth-tengingu"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Ýttu til að tengjast „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Viltu tengjast „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Tiltæk símtæki"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Tengt"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Vistuð tæki"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Bæta við tæki"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Kveikt verður á Bluetooth til að para"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Tengingarstillingar"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Tæki sem hafa áður verið tengd"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Áður tengt"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Kveikt á Bluetooth"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Sjá allt"</string>
<string name="date_and_time" msgid="9062980487860757694">"Dagsetning og tími"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Veldu tímabelti"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Sleppa"</string>
<string name="next_label" msgid="4693520878012668114">"Áfram"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Tungumál"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Tungumálastillingar"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Fjarlægja"</string>
<string name="add_a_language" msgid="2330538812283783022">"Bæta við tungumáli"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Stillingar"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Flýtileið stillinga"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Flugstilling"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Meira"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Þráðlaus net og símkerfi"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Stjórna Wi‑Fi, Bluetooth, flugstillingu, farsímakerfum og VPN-netum"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Farsímagögn"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Persónuvernd"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Gert óvirkt af kerfisstjóra"</string>
<string name="security_status_title" msgid="5848766673665944640">"Öryggisstaða"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Skjálás, andlitsopnun"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Skjálás, fingrafar"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Skjálás"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Andliti bætt við"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Opna með andliti"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Notaðu andlitið til að staðfesta"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Notaðu andlitið til að taka símann úr lás, heimila kaup eða skrá þig inn í forrit."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Notaðu þig"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Notaðu andlitið til að taka símann þinn úr lás eða staðfesta kaup.\n\nAthugaðu: Þú getur ekki notað andlitið til að opna þetta tæki. Hafðu samband við kerfisstjóra fyrirtækisins þíns til að fá frekari upplýsingar."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Notaðu andlitið til að taka símann úr lás, heimila kaup eða skrá þig inn í forrit."</string>
- <string name="face_add_max" msgid="2342250989212694454">"Þú getur bætt við allt að <xliff:g id="COUNT">%d</xliff:g> fingraförum"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Staðsettu andlit þitt í miðju hringsins"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Gera þetta seinna"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Þú getur bætt við allt að <xliff:g id="COUNT">%d</xliff:g> andlitum"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Þú hefur bætt við hámarksfjölda andlita"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Ekki er hægt að bæta fleiri andlitum við"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Skráningu var ekki lokið"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Í lagi"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Andlitsskráning rann út á tíma. Reyndu aftur."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Andlitsskráning virkaði ekki."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Allt komið og lítur vel út."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Lokið"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Nota andlitið til að"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Taka tækið úr lás"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Innskr. í forrit og greiðslur"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Opin augu til að taka úr lás"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Þegar andlitsgreining er notuð verða augu þín að vera opin"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Fjarl. andlitsgögn"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Bæta andlitsgögn"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Þú getur notað andlitið þitt til að taka símann úr lás og fá aðgang að forritum. "<annotation id="url">"Frekari upplýsingar"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingrafar"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Stjórna fingraförum"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Nota fingrafar fyrir"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Veldu a.m.k. eitt svið fyrir heitan Wi‑Fi reit:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP-stillingar"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Persónuvernd"</string>
<string name="wifi_shared" msgid="844142443226926070">"Deila með öðrum notendum tækisins"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(óbreytt)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Veldu"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Hætta við"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Gleyma netinu?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Öllum aðgangsorðum fyrir þetta net verður eytt"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Vistuð net"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d netkerfi</item>
<item quantity="other">%d netkerfi</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Birtustig"</string>
<string name="brightness_summary" msgid="838917350127550703">"Stilla birtustig skjásins"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Aðlögun birtustigs"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Kveikt"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Slökkt"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Kjörin birta er mjög lítil"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Kjörin birta er lítil"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Ekki er hægt að breyta PIN-númerinu.\nPIN-númerið er hugsanlega rangt."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-númeri SIM-korts var breytt"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Ekki er hægt að breyta stöðu SIM-kortaláss.\nPIN-númerið er hugsanlega rangt."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Ekki er hægt að óvirkja PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Ekki er hægt að virkja PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Í lagi"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Hætta við"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Mörg SIM-kort fundust"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Þetta krefst þess að <xliff:g id="NAME_0">^1</xliff:g> sé forsniðið. \n\n"<b>"Þá er öllum gögnum sem vistuð eru á <xliff:g id="NAME_1">^1</xliff:g> eytt."</b>" Til að forðast að þessi gögn glatist þarftu að taka öryggisafrit af þeim."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Hreinsa og forsníða"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Forsníður <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Ekki fjarlægja <xliff:g id="NAME">^1</xliff:g> á meðan verið er að forsníða það."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Ekki fjarlægja <xliff:g id="NAME">^1</xliff:g> á meðan verið er að forsníða það."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Færðu gögn í nýja geymslu"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Þú getur flutt myndir, skrár og sum forrit yfir á nýtt <xliff:g id="NAME">^1</xliff:g>. \n\nFlutningurinn tekur um það bil <xliff:g id="TIME">^2</xliff:g> og mun losa um <xliff:g id="SIZE">^3</xliff:g> af innra geymsluplássi. Sum forrit virka ekki meðan á flutningi stendur."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Færa núna"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Uppsett"</string>
<string name="no_applications" msgid="7336588977497084921">"Engin forrit."</string>
<string name="internal_storage" msgid="1584700623164275282">"Innbyggð geymsla"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"innbyggð geymsla"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-geymsla"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Rými SD-korts"</string>
<string name="recompute_size" msgid="7722567982831691718">"Endurreiknar stærð…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Eyða forritsgögnum?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Öllum gögnum þessa forrits verður eytt fyrir fullt og allt. Í þessu felast allar skrár, stillingar, reikningar, gagnagrunnar o.s.frv."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Þetta forrit fannst ekki á lista yfir uppsett forrit."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Ekki var hægt að hreinsa geymslu fyrir forrit."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Þetta forrit hefur aðgang að eftirfarandi í spjaldtölvunni:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Þetta forrit hefur aðgang að eftirfarandi í símanum:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Þetta forrit hefur aðgang að eftirfarandi á spjaldtölvunni þinni. Til að auka afköst og draga úr minnisnotkun eru sumar þessara heimilda í boði fyrir <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> þar sem það keyrir sem sama ferli og <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Þetta forrit hefur aðgang að eftirfarandi atriðum í símanum þínum. Til að bæta afköst og draga úr minnisnotkun eru sumar þessara heimilda í boði fyrir <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> vegna þess að það keyrir í sama ferli og <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> og <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Þetta forrit kann að kosta þig peninga:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Senda sérstakt SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Reiknar…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Ekki tókst að reikna út stærð pakka."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Engin forrit frá þriðja aðila hafa verið sett upp."</string>
<string name="version_text" msgid="9189073826278676425">"útgáfa <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Færa"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Færa yfir í spjaldtölvu"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Flytja í síma"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Færa yfir í USB-geymslu"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Færa yfir á SD-kort"</string>
- <string name="moving" msgid="6431016143218876491">"Færir"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Annar flutningur er nú þegar í gangi."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Ekki nægilegt geymslurými."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Forritið er ekki til."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Ekki er hægt að setja upp forrit tækjastjóra á ytri geymslumiðlum"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Þvinga fram lokun?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ef þú þvingar fram lokun forrits gæti það látið illa."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Ekki tókst að flytja forritið. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Valinn uppsetningarstaður"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Breyta valinni staðsetningu fyrir uppsetningu nýrra forrita"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Gera innbyggt forrit óvirkt?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Slökkva á forriti"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ef þú slekkur á þessu forriti getur verið að Android og önnur forrit virki ekki lengur sem skyldi."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Eyða gögnum og slökkva á forriti?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ef þú slekkur á þessu forriti getur verið að Android og önnur forrit virki ekki lengur sem skyldi. Einnig verður gögnunum þínum eytt."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Slökkva á tilkynningum?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ef þú slekkur á tilkynningum fyrir þetta forrit gætirðu misst af mikilvægum viðvörunum og uppfærslum."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Verslun"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Upplýsingar um forrit"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Forrit sett upp af <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Nota þjónustu"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Nota litaleiðréttingu"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Nota skjátexta"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Áfram"</string>
<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="6371077608778830020">"Bæta við heyrnartæki"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ef þú takmarkar bakgrunnsvirkni forrits gæti það látið illa"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Forrit notar ekki fínstillingu á rafhlöðu og því er ekki hægt að takmarka það.\n\nKveiktu á fínstillingu til að takmarka."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Skjánotkun frá síðustu fullu hleðslu"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Orkunotkun skjásins"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Leit að farsímaneti"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Rafhlöðunotkun frá síðustu fullu hleðslu"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Liðinn tími frá síðustu fullu hleðslu"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Tækjanotkun frá síðustu fullu hleðslu"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Notkunarupplýsingar"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Stilla orkunotkun"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Innifaldir pakkar"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Forrit sem nota mikla rafhlöðuorku"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Heldur tækinu vakandi"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Vekur tækið í bakgrunni"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Biður oft um staðsetningu"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> forrit vinna ekki rétt"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Forrit keyra eðlilega"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Síminn notar dæmigerða rafhlöðuorku í bakgrunni"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Spjaldtölvan notar dæmigerða rafhlöðuorku í bakgrunni"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">Takmarka rafhlöðunotkun %1$d forrits</item>
<item quantity="other">Takmarka rafhlöðunotkun %1$d forrita</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Takmarkað <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Þessi forrit hafa verið að nota rafhlöðuna í bakgrunni. Takmörkuð forrit virka hugsanlega ekki rétt og tafir geta orðið á tilkynningum."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Nota rafhlöðustjórnun"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Greina þegar forrit nota mikla rafhlöðuorku"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Hætta við"</string>
<string name="tts_reset" msgid="2661752909256313270">"Endurstilla"</string>
<string name="tts_play" msgid="2628469503798633884">"Spila"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Aflstjórnun"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Uppfærir Wi-Fi stillingu"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Uppfærir Bluetooth-stillingu"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"kveikt"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"slökkt"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"kveikir"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"slekkur"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Staðsetning"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Samstilling"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Birtustig <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"sjálfvirkt"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"fullt"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"hálft"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"slökkt"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Skilríkjageymsla"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Setja upp frá geymslu"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Velja allt"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Gagnanotkun"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Gagnanotkun forrits"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Farsímagögn og Wi-Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Gagnaútreikningur símafyrirtækisins kann að sýna aðra niðurstöðu en tækið þitt."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Forritanotkun"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"UPPLÝSINGAR FORRITS"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">Sýna %d falið atriði</item>
<item quantity="other">Sýna %d falin atriði</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Draga saman"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Netkerfi og internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"farsími"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"gagnanotkun"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Forrit og tilkynningar"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Heimildir, sjálfgefin forrit"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Tilkynningaaðgangur er ekki í boði fyrir forrit í vinnusniði."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Reikningar"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Engum reikningum bætt við"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Sjálfgefin forrit"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Tungumál, tími, öryggisafrit, uppfærslur"</string>
<string name="search_results_title" msgid="1796252422574886932">"Stillingar"</string>
- <string name="search_menu" msgid="6283419262313758339">"Leita í stillingum"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, Wi-Fi, nettenging, internet, þráðlaust, gögn, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, kveikja, slökkva, stjórna"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"textaskilaboð, senda skilaboð, skilaboð, skilaboð, sjálfgefið"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"borga, ýta, greiðslur"</string>
<string name="keywords_backup" msgid="470070289135403022">"afrita, afritun"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"bendingar"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"andlit, opna, taka úr lás, sannvottun, innskráning, skrá inn"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl-útgáfa, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"netkerfi, staða farsímakerfis, staða þjónustu, sendistyrkur, tegund farsímakerfis, reiki, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"raðnúmer, vélbúnaðarútgáfa"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"dökkt þema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"villa"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Umhverfisskjár, Lásskjár"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"tilkynningastillingar fyrir lásskjá"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"andlit"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingrafar"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"myrkva skjá, snertiskjár, rafhlaða, birtuaðlögun, kvikt birtustig"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Þegar þú slærð inn PIN-númerið þitt til að ræsa þetta tæki verður aðgengisþjónusta á borð við <xliff:g id="SERVICE">%1$s</xliff:g> ekki strax í boði."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Þegar þú teiknar mynstrið þitt til að ræsa þetta tæki verður aðgengisþjónusta á borð við <xliff:g id="SERVICE">%1$s</xliff:g> ekki strax í boði."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Þegar þú slærð inn aðgangsorðið þitt til að ræsa þetta tæki verður aðgengisþjónusta á borð við <xliff:g id="SERVICE">%1$s</xliff:g> ekki strax í boði."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Athugaðu: Eftir endurræsingu er ekki hægt að ræsa þetta forrit fyrr en þú tekur símann úr lás"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Athugaðu: Ef þú endurræsir símann og hann er með skjálás er ekki hægt að ræsa þetta forrit fyrr en þú tekur símann úr lás"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI-upplýsingar"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI-tengdar upplýsingar"</string>
<string name="slot_number" msgid="3762676044904653577">"(Rauf<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Persónulegt"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Vinna"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Forrit: Öll"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Forrit: Slökkt"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Slökkt"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Flokkar: Afar áríðandi"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Flokkar: Ekki svo mikilvægt"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Flokkar: Slökkt"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Notkunartilkynningar"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Sýna alla notkun tækis"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Sýna forritanotkun"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Mikil notkun"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> forrit sýnir óeðlilega virkni</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> forrit sýna óeðlilega virkni</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Innra geymslurými: <xliff:g id="PERCENTAGE">%1$s</xliff:g> í notkun – <xliff:g id="FREE_SPACE">%2$s</xliff:g> laus"</string>
<string name="display_summary" msgid="6737806235882127328">"Hvíldarstaða eftir <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> af aðgerðaleysi"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Veggfóður, hvíldarstaða, leturstærð"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Hvíldarstaða eftir tíu mínútur af aðgerðaleysi"</string>
<string name="memory_summary" msgid="8080825904671961872">"Að meðaltali <xliff:g id="USED_MEMORY">%1$s</xliff:g> af <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> minni í notkun"</string>
<string name="users_summary" msgid="1674864467098487328">"Skráð(ur) inn sem <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-skilaboð ekki leyfð"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Myndavél ekki leyfð"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Skjámyndir ekki leyfðar"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Ekki er hægt að slökkva á öryggisafritun"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Ekki er hægt að opna þetta forrit"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Hafðu samband við kerfisstjórann þinn ef spurningar vakna"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Frekari upplýsingar"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Líkja eftir skjá með skurði"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Slökkt"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Sjálfgefin stilling tækis"</string>
<string name="special_access" msgid="3458780842491881155">"Sérstakur forritaaðgangur"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> forrit getur notað ótakmörkuð gögn</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Tengt við <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Tengt við mörg tæki"</string>
<string name="demo_mode" msgid="2798762752209330277">"Prufustilling kerfisviðmóts"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Næturstilling"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Velja næturstillingu"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Dökk stilling"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Velja dökka stillingu"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Reitir fyrir flýtistillingar forritara"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-rakning"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Stillingar vinnusniðs"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Tengiliðaleit"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Leyfa fyrirtækinu þínu að leita í tengiliðum til að bera kennsl á þá sem hringja og tengiliði"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Ýta tvisvar til að skoða"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Ýta tvisvar til að athuga spjaldtölvu"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Ýta tvisvar til að athuga tæki"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Til að sjá hvað klukkan er og sjá tilkynningatákn og aðrar upplýsingar skaltu pikka tvisvar á skjáinn."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Til að sjá hvað klukkan er og sjá tilkynningar og aðrar upplýsingar skaltu ýta tvisvar á skjáinn."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Taka upp til að skoða"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Taka upp til að athuga spjaldtölvu"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Taka upp til að athuga tæki"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Til að sjá hvað klukkan er og sjá tilkynningatákn og aðrar upplýsingar skaltu taka símann upp."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Til að sjá hvað klukkan er og sjá tilkynningatákn og aðrar upplýsingar skaltu taka spjaldtölvuna upp."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Til að sjá hvað klukkan er og sjá tilkynningatákn og aðrar upplýsingar skaltu taka tækið upp."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Skjár sem vaknað er við"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Til að sjá hvað klukkan er og sjá tilkynningar og aðrar upplýsingar skaltu taka símann upp."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Til að sjá hvað klukkan er og sjá tilkynningar og aðrar upplýsingar skaltu taka spjaldtölvuna upp."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Til að sjá hvað klukkan er og sjá tilkynningar og aðrar upplýsingar skaltu taka tækið upp."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Bending fyrir skjávökulás"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Fingrafar til að opna tilkynningar"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Lesa fingrafar"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Strjúktu niður á fingrafaraskynjaranum aftan á símanum til að skoða tilkynningarnar."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> tilraun</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tilraunir</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Verið er að afrita gögn þessa tækis"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Þessu tæki er stýrt af fyrirtækinu þínu."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Þessu tæki er stýrt af <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Sjálfvirk útfyllingarþjónusta"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"sjálfvirk, útfylling, sjálfvirk útfylling"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Gakktu úr skugga um að þú treystir þessu forriti</b> <br/> <br/> <xliff:g id=app_name example=Sjálfvirk útfylling Google>%1$s</xliff:g> notar það sem er á skjánum til að ákvarða hvað er hægt að fylla sjálfkrafa út."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Sjálfvirk útfylling"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Skráningarstig"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Hámarksfjöldi beiðna í hverri lotu"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Hámark sýnilegra gagnasafna"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Endurstilla á sjálfgildi"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Forritunarkostir sjálfvirkrar endurstillingar hafa verið endurstilltir"</string>
<string name="device_theme" msgid="4571803018917608588">"Þema tækisins"</string>
<string name="default_theme" msgid="7085644992078579076">"Sjálfgefið"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Heiti nets"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kveikja á úthlutun símafyrirtækis"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Uppfæra „Ónáðið ekki“"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Gera hlé á tilkynningum svo þær trufli ekki"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Hvað er nýtt og spennandi?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Skoðaðu kynningu á nýja símanum þínum"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Skoðaðu kynningu á nýju spjaldtölvunni þinni"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Skoðaðu kynningu á nýja tækinu þínu"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Þessi eiginleiki er ekki í boði í þessu tæki"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Full GNSS-mæling"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Rekja öll GNSS söfn og tíðnir með engum vinnulotum"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Sýna alltaf hrunglugga"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Sýna glugga í hvert sinn sem forrit hrynur"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Velja forrit sem styður ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Ekkert forrit sem styður ANGLE hefur verið stillt"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Forrit sem styður ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Aðgangur að skráasafni"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"aðgangur að skráasafni"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Upplýsingar um net"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Heiti tækisins þíns er sýnilegt forritum í símanum. Heiti þess er hugsanlega einnig sýnilegt öðru fólki þegar þú tengist Bluetooth-tækjum eða setur upp heitan Wi-Fi reit."</string>
<string name="devices_title" msgid="7701726109334110391">"Tæki"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Allar stillingar"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Tillögur"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-gögn"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-gögn"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Velja símkerfi"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Aftengt"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Tengt"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Tengist…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Ekki tókst að tengjast"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Engin símkerfi fundust."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Ekkert símkerfi fannst. Reyndu aftur."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(bannað)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Ekkert SIM-kort"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Betri símtöl"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Valin símkerfisstilling: WCDMA fyrsta val"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Valin símkerfisstilling: GSM eingöngu"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Valin símkerfisstilling: WCDMA eingöngu"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Valin símkerfisstilling: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Valin símkerfisstilling: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Valin símkerfisstilling: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Valin símkerfisstilling: CDMA eingöngu"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Valin símkerfisstilling: EvDo eingöngu"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Valin símkerfisstilling: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Valin símkerfisstilling: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Valin símkerfisstilling: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Valin símkerfisstilling: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Valin símkerfisstilling: Alþjóðleg"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Valin símkerfisstilling: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Valið símkerfi: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Valin símkerfisstilling: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Valin símkerfisstilling: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Valin símkerfisstilling: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Valin símkerfisstilling: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Valin símkerfisstilling: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Valin símkerfisstilling: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Valin símkerfisstilling: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Valin símkerfisstilling: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Valin símkerfisstilling: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Valin símkerfisstilling: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Valin símkerfisstilling: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (ráðlagt)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (ráðlagt)"</string>
+ <string name="network_global" msgid="959947774831178632">"Alþjóðlegt"</string>
+ <string name="label_available" msgid="1731547832803057893">"Símkerfi í boði"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Leitar…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Skráning á <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM-kortið leyfir ekki tengingu við þetta símkerfi."</string>
+ <string name="connect_later" msgid="978991102125216741">"Ekki næst tenging við þetta kerfi í augnablikinu. Reyndu aftur síðar."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Skráð á símkerfi."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Velja netkerfi sjálfkrafa"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Stillingar símafyrirtækis"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Setja upp gagnaþjónustu"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Farsímagögn"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Aðgangur að gögnum um farsímakerfi"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Valin símkerfistegund"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Breyta virknihætti símkerfis"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Valin símkerfistegund"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Símafyrirtæki"</string>
+ <string name="call_category" msgid="8108654745239563833">"Hringir"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Myndsímtöl um símkerfi"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Kerfisval"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Breyta CDMA-reikistillingu"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Kerfisval"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Netkerfi"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Netkerfi"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA-áskrift"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Skipta milli RUIM/SIM og NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"áskrift"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Sjálfvirk skráning…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Leyfa gagnareiki?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Upplýsingar um verð fást hjá símafyrirtækinu."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Gagnanotkun forrits"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Ógild símkerfisstilling <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Hunsa."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Ekki í boði þegar tenging við <xliff:g id="CARRIER">%1$s</xliff:g> er til staðar"</string>
+ <string name="see_more" msgid="5953815986207345223">"Sjá meira"</string>
+ <string name="see_less" msgid="1250265310929558370">"Sjá minna"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Engin tengd tæki"</string>
</resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 4859f4d..ae9ef2c 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Considera misurata"</item>
<item msgid="2266114985518865625">"Considera non misurata"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Valore predefinito (usa MAC casuale)"</item>
+ <item msgid="5398461510512959597">"Trusted"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"No"</item>
<item msgid="3863157480502955888">"Sì"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Sempre attiva"</item>
<item msgid="6385301106124765323">"Sempre disattivata"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Non attivo"</item>
+ <item msgid="2182686878828390312">"Debug"</item>
+ <item msgid="5286514712714822064">"Dettagliata"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Solo domestica"</item>
+ <item msgid="5034813753274486448">"Automatico"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferito"</item>
+ <item msgid="807926878589867564">"Solo GSM"</item>
+ <item msgid="488474605709912156">"Solo WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automatico"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automatico"</item>
+ <item msgid="370391313511477301">"CDMA senza EvDo"</item>
+ <item msgid="4678789463133969294">"Solo EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globale"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Solo TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globale"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 435910c..2db9ac7 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Crea"</string>
<string name="allow" msgid="3349662621170855910">"Consenti"</string>
<string name="deny" msgid="6947806159746484865">"Rifiuta"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Chiudi"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Cambia"</string>
<string name="device_info_default" msgid="7847265875578739287">"Sconosciuto"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Ora ti mancano <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passaggi per diventare uno sviluppatore.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Non è necessario, sei già uno sviluppatore."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Attiva prima Opzioni sviluppatore."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless e reti"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Connessioni"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personali"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Accesso"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Attiva connessione dati"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Disattiva connessione dati"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Indirizzo Bluetooth del dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnetti <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Trasmissione"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth senza nome"</string>
<string name="progress_scanning" msgid="192587958424295789">"Ricerca"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nessun dispositivo Bluetooth in vicinanze."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Un\'app chiede di attivare il Bluetooth e di rendere il tuo telefono visibile ad altri dispositivi. Puoi modificare questa impostazione in un secondo momento nelle impostazioni Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Attivazione Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Disattivazione Bluetooth..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Connessione automatica"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Richiesta di connessione Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tocca per connetterti a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vuoi connetterti a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivi di chiamata disponibili"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Attualmente connessi"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivi salvati"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Aggiungi dispositivo"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Il Bluetooth verrà attivato per consentire l\'accoppiamento"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferenze di connessione"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivi connessi in precedenza"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Connessi in precedenza"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth attivato"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Mostra tutto"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data e ora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Scegli il fuso orario"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Ignora"</string>
<string name="next_label" msgid="4693520878012668114">"Avanti"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Lingue"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferenze lingua"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Rimuovi"</string>
<string name="add_a_language" msgid="2330538812283783022">"Aggiungi una lingua"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Impostazioni"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Scorciatoia Impostazioni"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Modalità aereo"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Altro"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless e reti"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Gestisci Wi‑Fi, Bluetooth, modalità aereo, reti mobili e VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Dati mobili"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disattivata dall\'amministratore"</string>
<string name="security_status_title" msgid="5848766673665944640">"Stato sicurezza"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Blocco schermo, Sblocco col sorriso"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Blocco schermo, impronta digitale"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Blocco schermo"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Volto aggiunto"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Sblocca con il volto"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Usa il tuo volto per l\'autenticazione"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Usa il tuo volto per sbloccare il telefono, autorizzare gli acquisti o accedere alle app."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Usa il tuo volto"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utilizza il tuo volto per sbloccare il telefono o approvare gli acquisti.\n\nNota: non puoi utilizzare il tuo volto per sbloccare questo dispositivo. Per ulteriori informazioni, contatta l\'amministratore della tua organizzazione."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Usa il tuo volto per sbloccare il telefono, autorizzare gli acquisti o accedere alle app"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Puoi aggiungere fino a <xliff:g id="COUNT">%d</xliff:g> volti"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Inquadra il tuo volto nel cerchio"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Fallo più tardi"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Puoi aggiungere fino a <xliff:g id="COUNT">%d</xliff:g> volti"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Hai aggiunto il numero massimo di volti"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Impossibile aggiungere altri volti"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registrazione non completata"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Raggiunto il tempo limite per la registrazione del volto. Riprova."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Registrazione del volto non riuscita."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Fatto. Tutto OK."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Fine"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Usa il viso per"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Sblocca dispositivo"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Accesso all\'app e pagamenti"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Occhi aperti per sbloccare"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Quando usi l\'autenticazione volti, gli occhi devono essere aperti"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Rimuovi dati viso"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Migliora i dati del viso"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Il tuo viso può essere utilizzato per sbloccare il tuo dispositivo e accedere alle app. "<annotation id="url">"Ulteriori informazioni"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impronta digitale"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gestisci impronte digitali"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Utilizza l\'impronta digitale per"</string>
@@ -494,11 +501,11 @@
<string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Avviso. I dati del dispositivo verranno cancellati dopo altri <xliff:g id="COUNT">^1</xliff:g> tentativi di sblocco non riusciti."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digita la password"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Crittografia non riuscita"</string>
- <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. \n\nPer riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
- <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. \n\nPer riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
+ <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul tablet non sono più accessibili. \n\nPer riprendere a utilizzare il tablet devi effettuare un ripristino dei dati di fabbrica. Quando configuri il tablet dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo Account Google."</string>
+ <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"La crittografia è stata interrotta e non è possibile portarla a termine. Di conseguenza, i dati memorizzati sul telefono non sono più accessibili. \n\nPer riprendere a utilizzare il telefono devi effettuare il ripristino dei dati di fabbrica. Quando configuri il telefono dopo il ripristino, hai la possibilità di ripristinare i dati di cui hai effettuato il backup nel tuo Account Google."</string>
<string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Decrittografia non riuscita"</string>
- <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"La password inserita è corretta ma purtroppo i tuoi dati sono danneggiati. \n\nPer riprendere a utilizzare il tablet, devi eseguire un ripristino dei dati di fabbrica. Durante la configurazione del tablet dopo il ripristino, potrai ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
- <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"La password inserita è corretta ma purtroppo i tuoi dati sono danneggiati. \n\nPer riprendere a utilizzare il telefono, devi eseguire un ripristino dei dati di fabbrica. Durante la configurazione del telefono dopo il ripristino, potrai ripristinare i dati di cui hai effettuato il backup nel tuo account Google."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"La password inserita è corretta ma purtroppo i tuoi dati sono danneggiati. \n\nPer riprendere a utilizzare il tablet, devi eseguire un ripristino dei dati di fabbrica. Durante la configurazione del tablet dopo il ripristino, potrai ripristinare i dati di cui hai effettuato il backup nel tuo Account Google."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"La password inserita è corretta ma purtroppo i tuoi dati sono danneggiati. \n\nPer riprendere a utilizzare il telefono, devi eseguire un ripristino dei dati di fabbrica. Durante la configurazione del telefono dopo il ripristino, potrai ripristinare i dati di cui hai effettuato il backup nel tuo Account Google."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambia metodo di immissione"</string>
<string name="suggested_lock_settings_title" msgid="8498743819223200961">"Proteggi il tuo telefono"</string>
<string name="suggested_lock_settings_summary" product="tablet" msgid="2296800316150748710">"Imposta un blocco schermo per proteggere il tablet"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Scegli almeno una banda per l\'hotspot Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Impostazioni IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacy"</string>
<string name="wifi_shared" msgid="844142443226926070">"Condividi con altri utenti del dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(invariato)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Seleziona un\'opzione"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Annulla"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Vuoi eliminare la rete?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Tutte le password relative a questa rete verranno eliminate"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Reti salvate"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d reti</item>
<item quantity="one">1 rete</item>
@@ -999,7 +1006,7 @@
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Preferenze durante il roaming"</string>
<string-array name="wifi_calling_mode_choices">
<item msgid="2124257075906188844">"Reta preferita: Wi-Fi"</item>
- <item msgid="1335127656328817518">"Modalità preferita: rete mobile"</item>
+ <item msgid="1335127656328817518">"Modalità preferita: dati mobili"</item>
<item msgid="3132912693346866895">"Solo Wi-Fi"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
@@ -1014,7 +1021,7 @@
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
<item msgid="5782108782860004851">"Rete preferita: Wi-Fi"</item>
- <item msgid="5074515506087318555">"Modalità preferita: rete mobile"</item>
+ <item msgid="5074515506087318555">"Modalità preferita: dati mobili"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Luminosità"</string>
<string name="brightness_summary" msgid="838917350127550703">"Regola la luminosità dello schermo"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Luminosità adattiva"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Attiva"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Non attiva"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Luminosità preferita molto bassa"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Luminosità preferita bassa"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Impossibile cambiare il PIN.\nIl PIN potrebbe essere errato."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN della SIM modificato"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Impossibile modificare lo stato di blocco della scheda SIM.\nIl PIN potrebbe essere errato."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Impossibile disattivare PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Impossibile attivare PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Annulla"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Trovate più SIM"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"È necessario formattare la <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"La formattazione cancella tutti i dati attualmente memorizzati sulla <xliff:g id="NAME_1">^1</xliff:g>."</b>" Per evitare di perdere i dati, effettua il backup."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Cancella e formatta"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formattazione della <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Non rimuovere il dispositivo <xliff:g id="NAME">^1</xliff:g> durante la formattazione."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Non rimuovere il dispositivo <xliff:g id="NAME">^1</xliff:g> durante la formattazione."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Sposta dati nella nuova memoria"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Puoi trasferire foto, file e alcune app su questa nuova <xliff:g id="NAME">^1</xliff:g>. \n\nIl trasferimento richiede circa <xliff:g id="TIME">^2</xliff:g> e libererà <xliff:g id="SIZE">^3</xliff:g> di memoria interna. Alcune app non funzioneranno durante la procedura."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Sposta ora"</string>
@@ -1614,7 +1622,7 @@
<string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Le password non corrispondono"</string>
<string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"I PIN non corrispondono"</string>
<string name="lockpassword_draw_your_pattern_again_header" msgid="2872194349688886781">"Traccia di nuovo la sequenza"</string>
- <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Selezione metodo di sblocco"</string>
+ <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Seleziona metodo di sblocco"</string>
<string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Password impostata"</string>
<string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN impostato"</string>
<string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Sequenza impostata"</string>
@@ -1700,7 +1708,7 @@
<string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilità schermo"</string>
<string name="permissions_label" msgid="2605296874922726203">"Autorizzazioni"</string>
<string name="cache_header_label" msgid="1877197634162461830">"Cache"</string>
- <string name="clear_cache_btn_text" msgid="5756314834291116325">"Cancella cache"</string>
+ <string name="clear_cache_btn_text" msgid="5756314834291116325">"Svuota cache"</string>
<string name="cache_size_label" msgid="7505481393108282913">"Cache"</string>
<plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
<item quantity="other">%d elementi</item>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installata"</string>
<string name="no_applications" msgid="7336588977497084921">"Nessuna applicazione."</string>
<string name="internal_storage" msgid="1584700623164275282">"Memoria interna"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"memoria interna"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Archivio USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Arch. scheda SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Ricalcolo dimensioni..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Eliminare i dati dell\'app?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Tutti i dati dell\'app verranno eliminati definitivamente, inclusi tutti i file, le impostazioni, gli account, i database e così via."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Impossibile trovare l\'applicazione nell\'elenco di applicazioni installate."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Impossibile cancellare lo spazio di archiviazione dell\'app."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Contenuti a cui può accedere l\'applicazione sul tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Contenuti a cui può accedere l\'applicazione sul telefono:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Elenco dei contenuti a cui può accedere l\'applicazione sul tablet. Per migliorare le prestazioni e ridurre l\'utilizzo di memoria, alcune di queste autorizzazioni sono disponibili per l\'applicazione <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> perché funziona con la stessa procedura di <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Elenco dei contenuti a cui può accedere l\'applicazione sul telefono. Per migliorare le prestazioni e ridurre l\'utilizzo di memoria, alcune di queste autorizzazioni sono disponibili per l\'applicazione <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> perché funziona con la stessa procedura di <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> e <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Questa applicazione potrebbe addebitarti dei costi:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Invio di SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"Elaborazione..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Impossibile calcolare le dimensioni del pacchetto."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Nessuna applicazione di terze parti installata."</string>
<string name="version_text" msgid="9189073826278676425">"versione <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Sposta"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Sposta sul tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Sposta sul telefono"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Sposta in archivio USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Sposta su scheda SD"</string>
- <string name="moving" msgid="6431016143218876491">"Spostamento"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"È già in corso un\'altra migrazione."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Spazio di archiviazione insufficiente."</string>
<string name="does_not_exist" msgid="1501243985586067053">"L\'applicazione non esiste."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Impossibile installare l\'app di amministrazione del dispositivo su supporti esterni"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Forzare l\'interruzione?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Se forzi l\'interruzione di un\'app, tale app potrebbe funzionare in modo anomalo."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Impossibile spostare l\'applicazione. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Percorso di installazione"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Cambia il percorso preferito per l\'installazione di nuove applicazioni"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Disattivare app integrata?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Disattiva app"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Se disattivi questa app, Android e altre app potrebbero non funzionare più come previsto."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Eliminare i dati e disattivare l\'applicazione?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Se disattivi questa app, Android e altre app potrebbero non funzionare più come previsto. I tuoi dati inoltre saranno eliminati."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Disattivare le notifiche?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se disattivi le notifiche per questa applicazione potresti perdere avvisi e aggiornamenti importanti."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Dettagli sull\'app"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App installata da <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1947,7 +1940,7 @@
<string name="accessibility_settings" msgid="3975902491934816215">"Accessibilità"</string>
<string name="accessibility_settings_title" msgid="2130492524656204459">"Impostazioni di accessibilità"</string>
<string name="accessibility_settings_summary" msgid="981260486011624939">"Screen reader, display, controlli di interazione"</string>
- <string name="vision_settings_title" msgid="4204111425716868288">"Impostazioni vista"</string>
+ <string name="vision_settings_title" msgid="4204111425716868288">"Impostazioni visive"</string>
<string name="vision_settings_description" msgid="5679491180156408260">"Puoi personalizzare questo dispositivo in base alle tue esigenze. Queste funzioni di accessibilità possono essere modificate in un secondo momento nelle Impostazioni."</string>
<string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Cambia dimensioni carattere"</string>
<string name="screen_reader_category_title" msgid="7739154903913400641">"Screen reader"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilizza servizio"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Usa correzione del colore"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilizza sottotitoli"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continua"</string>
<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="6371077608778830020">"Aggiungi un apparecchio acustico"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Se limiti l\'attività in background per un\'app, tale app potrebbe funzionare in modo anomalo"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Per limitare l\'app,\n\ndevi prima attivare l\'ottimizzazione della batteria."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Utilizzo dello schermo dall\'ultima ricarica completa"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo dello schermo"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Scansione rete mobile"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Uso della batteria dalla ricarica completa"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tempo per cui la schermata è rimasta attiva dalla ricarica completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Utilizzo del dispositivo dall\'ultima ricarica completa"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Dettagli di utilizzo"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Regola consumo alimentazione"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Pacchetti inclusi"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"App che consumano la batteria"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantenimento del dispositivo attivo"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Attivazione del dispositivo in background"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Richiesta della posizione frequentemente"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> app con comportamenti anomali"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Le app funzionano normalmente"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Il telefono ha un consumo tipico della batteria in background"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Il tablet ha un consumo tipico della batteria in background"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Limitazione del consumo della batteria per %1$d app</item>
<item quantity="one">Limitazione del consumo della batteria per %1$d app</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"L\'app è stata limitata <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Queste app stanno usando batteria in background. Le app con limitazioni potrebbero non funzionare correttamente e potresti ricevere le relative notifiche in ritardo."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Usa Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Rileva quando le app scaricano la batteria"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Annulla"</string>
<string name="tts_reset" msgid="2661752909256313270">"Reimposta"</string>
<string name="tts_play" msgid="2628469503798633884">"Riproduci"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Controllo risparmio energia"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Aggiornamento impostazione Wi‑Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aggiornamento impostazione Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ON"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"Off"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"attivazione"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"disattivazione"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Posizione"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sincronizzazione"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Luminosità: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"massima"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"media"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"Off"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Archivio credenziali"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installa da archivio"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> su <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Seleziona tutti"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizzo dati"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilizzo dati delle app"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Dati mobili e Wi-Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"I dati dell\'operatore potrebbero differire da quelli del dispositivo."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Utilizzo di app"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMAZIONI APP"</string>
@@ -2640,8 +2611,8 @@
<string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Questa funzione può causare l\'interruzione del funzionamento di un\'applicazione che dipende dai dati in background quando sono disponibili solo le reti mobili.\n\nPuoi trovare controlli di utilizzo dei dati più appropriati nelle impostazioni disponibili all\'interno dell\'applicazione."</string>
<string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"La limitazione dei dati in background è possibile solo se hai impostato un limite per i dati mobili."</string>
<string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Attivare sincron. automatica?"</string>
- <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul tablet.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul tablet. Gli account Google funzionano in questo modo."</string>
- <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul telefono.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul telefono. Gli account Google funzionano in questo modo."</string>
+ <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul tablet.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul tablet. Gli Account Google funzionano in questo modo."</string>
+ <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Tutte le modifiche che apporti ai tuoi account sul Web verranno automaticamente copiate sul telefono.\n\nAlcuni account potrebbero inoltre copiare automaticamente sul Web tutte le modifiche che apporti sul telefono. Gli Account Google funzionano in questo modo."</string>
<string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Disattivare sincron. automatica?"</string>
<string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"In questo modo limiterai l\'utilizzo di dati e della batteria, ma dovrai sincronizzare ciascun account manualmente per ottenere le informazioni recenti. Inoltre non riceverai notifiche di aggiornamenti disponibili."</string>
<string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data reimpostazione ciclo utilizzo"</string>
@@ -2860,7 +2831,7 @@
<string name="nfc_payment_favor_open" msgid="1923314062109977944">"Tranne quando è aperta un\'altra app per il pagamento"</string>
<string name="nfc_payment_pay_with" msgid="7524904024378144072">"Se è disponibile un terminale Tocca e paga, paga con:"</string>
<string name="nfc_how_it_works_title" msgid="1984068457698797207">"Pagamento al terminale"</string>
- <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Configura un\'app per il pagamento e appoggia il retro del telefono su qualsiasi terminale con il simbolo del pagamento senza contatto."</string>
+ <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Configura un\'app per il pagamento e appoggia il retro del telefono su qualsiasi terminale con il simbolo del pagamento contactless."</string>
<string name="nfc_how_it_works_got_it" msgid="259653300203217402">"OK"</string>
<string name="nfc_more_title" msgid="815910943655133280">"Altro..."</string>
<string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Impostare come preferenza?"</string>
@@ -2871,7 +2842,7 @@
<string name="restriction_menu_change_pin" msgid="740081584044302775">"Cambia PIN"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra notifiche"</string>
<string name="help_label" msgid="6886837949306318591">"Guida e feedback"</string>
- <string name="support_summary" msgid="2705726826263742491">"Articoli della guida, assistenza telefonica e chat, guida introduttiva"</string>
+ <string name="support_summary" msgid="2705726826263742491">"Guida, assistenza telefonica e chat, primi passi"</string>
<string name="user_account_title" msgid="1127193807312271167">"Account per i contenuti"</string>
<string name="user_picture_title" msgid="7297782792000291692">"ID foto"</string>
<string name="extreme_threats_title" msgid="6549541803542968699">"Minacce estreme"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Mostra %d elementi nascosti</item>
<item quantity="one">Mostra %d elemento nascosto</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Comprimi"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Rete e Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rete mobile"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilizzo dei dati"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"App e notifiche"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorizzazioni, app predefinite"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"L\'accesso alle notifiche non è disponibile per le app nel profilo di lavoro."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Account"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nessun account aggiunto"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"App predefinite"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Lingue, ora, backup, aggiornamenti"</string>
<string name="search_results_title" msgid="1796252422574886932">"Impostazioni"</string>
- <string name="search_menu" msgid="6283419262313758339">"Cerca nelle impostazioni"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, connessione di rete, internet, wireless, dati, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, attivazione/disattivazione, controllo"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, inviare SMS, messaggi, inviare messaggi, predefinita"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"paga, tocca, pagamenti"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"viso, sblocco, autenticazione, accesso"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versione prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"rete, stato rete mobile, stato servizio, intensità segnale, tipo di rete mobile, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"numero di serie, versione hardware"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema scuro"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Display ambient, display della schermata di blocco"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notifica schermata di blocco"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"volto"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"impronta digitale"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"attenuazione schermo, touchscreen, batteria, luminosità intelligente, luminosità dinamica"</string>
@@ -3218,7 +3190,7 @@
<string name="locked_work_profile_notification_title" msgid="8327882003361551992">"Con profilo di lavoro bloccato"</string>
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tutti i contenuti delle notifiche"</string>
<string name="lock_screen_notifications_summary_hide" msgid="8301305044690264958">"Nascondi contenuti sensibili"</string>
- <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Non visualizzare del tutto le notifiche"</string>
+ <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Non mostrare le notifiche"</string>
<string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Quando il dispositivo è bloccato, come desideri che vengano visualizzate le notifiche?"</string>
<string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifiche"</string>
<string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Mostra tutti i contenuti delle notifiche di lavoro"</string>
@@ -3355,7 +3327,7 @@
<string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Giorni"</string>
<string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Nessuno"</string>
<string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Ogni giorno"</string>
- <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"La sveglia può sostituire l\'ora di fine"</string>
+ <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"La sveglia può ignorare l\'ora di fine"</string>
<string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Interrompi all\'ora di fine o alla prossima sveglia, a seconda dell\'evento che si verifica per primo"</string>
<string name="summary_divider_text" msgid="7228986578690919294">", "</string>
<string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Quando inserisci il tuo codice PIN per avviare questo dispositivo, i servizi di accessibilità quali <xliff:g id="SERVICE">%1$s</xliff:g> non saranno ancora disponibili."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Quando inserisci un pattern per avviare questo dispositivo, i servizi di accessibilità quali <xliff:g id="SERVICE">%1$s</xliff:g> non saranno ancora disponibili."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Quando inserisci una password per avviare questo dispositivo, i servizi di accessibilità quali <xliff:g id="SERVICE">%1$s</xliff:g> non saranno ancora disponibili."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Nota: dopo il riavvio, devi sbloccare il telefono per poter avviare l\'app."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Nota: se riavvii il telefono ed è impostato un blocco schermo, l\'app non può avviarsi fin quando non sblocchi il telefono"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Dati IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Dati relativi all\'IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personali"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Lavoro"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"App: Tutte"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"App: disattivate"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Disattivate"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorie: Importanza urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorie: Importanza scarsa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorie: Disattivate"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Avvisi sul livello di carica"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Mostra utilizzo completo del dispositivo"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Mostra utilizzo delle app"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Utilizzo elevato"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> app si comportano in modo anomalo</item>
<item quantity="one">L\'app <xliff:g id="APP">%1$s</xliff:g> si comporta in modo anomalo</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Memoria interna: <xliff:g id="PERCENTAGE">%1$s</xliff:g> in uso - <xliff:g id="FREE_SPACE">%2$s</xliff:g> disponibile"</string>
<string name="display_summary" msgid="6737806235882127328">"Sospendi dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Sfondo, sospensione, dimensione carattere"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Sospendi dopo 10 minuti di inattività"</string>
<string name="memory_summary" msgid="8080825904671961872">"Utilizzo medio di <xliff:g id="USED_MEMORY">%1$s</xliff:g> di memoria su <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Accesso eseguito come <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS non consentiti"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Fotocamera non consentita"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshot non consentiti"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Impossibile disattivare i backup"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Impossibile aprire questa app"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Se hai domande, contatta l\'amministratore IT"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Altri dettagli"</string>
@@ -3791,7 +3763,7 @@
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Programma Luminosità notturna"</string>
<string name="night_display_suggestion_summary" msgid="228346372178218442">"Riduci automaticamente la luminosità dello schermo ogni notte"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"Luminosità notturna attiva"</string>
- <string name="condition_night_display_summary" msgid="5443722724310650381">"Lo schermo è diventato color ambra. Potrebbe conciliare il sonno."</string>
+ <string name="condition_night_display_summary" msgid="5443722724310650381">"Lo schermo è diventato color ambra per aiutare a conciliare il sonno."</string>
<string name="suggestions_title_v2" msgid="5601181602924147569">"Consigliate per te"</string>
<string name="suggestions_title" msgid="7280792342273268377">"Suggerimenti"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+ <xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simula un display con ritaglio"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Ritaglio display"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ritaglio display, tacca"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nessuno"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predefinita dispositivo"</string>
<string name="special_access" msgid="3458780842491881155">"Accesso speciale alle app"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> app possono usare dati senza limitazioni</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Connesso a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Connesso a più dispositivi"</string>
<string name="demo_mode" msgid="2798762752209330277">"Modalità demo dell\'interfaccia utente di sistema"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Modalità notturna"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Imposta la modalità notturna"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Modalità Scuro"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Imposta la modalità Scuro"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Riquadri sviluppatore per impostazioni rapide"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Traccia Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Impostazioni profilo di lavoro"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Ricerca di contatti"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Consenti ricerche di contatti in base all\'organizzazione per identificare chiamanti e contatti"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocca due volte per controllare il telefono"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocca due volte il tablet per controllare le notifiche"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocca due volte il dispositivo per controllare le notifiche"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Per controllare l\'ora, le icone di notifica e altre informazioni, tocca due volte lo schermo."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Per controllare l\'ora, le notifiche e altre informazioni, tocca due volte lo schermo."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Solleva per controllare il telefono"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Solleva il tablet per controllare le notifiche"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Solleva il dispositivo per controllare le notifiche"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Per controllare l\'ora, le icone di notifica e altre informazioni, solleva il telefono."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Per controllare l\'ora, le icone di notifica e altre informazioni, solleva il tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Per controllare l\'ora, le icone di notifica e altre informazioni, solleva il dispositivo."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Riattiva schermo"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Per controllare l\'ora, le notifiche e altre informazioni, solleva il telefono."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Per controllare l\'ora, le notifiche e altre informazioni, solleva il tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Per controllare l\'ora, le notifiche e altre informazioni, solleva il dispositivo."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gesto sullo schermo per wakelock"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Usa l\'impronta digitale per le notifiche"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Usa l\'impronta digitale"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte digitali sul retro del telefono."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativi</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativo</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Backup dei dati del dispositivo in corso"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Questo dispositivo è gestito dalla tua organizzazione."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Questo dispositivo è gestito da <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Compilazione automatica"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatico, compilazione, compilazione automatica"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Verifica che questa app sia attendibile</b> <br/> <br/> <xliff:g id=app_name example=La Compilazione Automatica di Google>%1$s</xliff:g> usa ciò che è presente nella schermata per stabilire quali contenuti possono essere compilati automaticamente."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Compilazione automatica"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Livello di registrazione"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Numero richieste massime per sessione"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Set di dati visibili massimi"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Reimposta i valori predefiniti"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Le opzioni di compilazione automatica per gli sviluppatori sono state reimpostate"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
<string name="default_theme" msgid="7085644992078579076">"Valore predefinito"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nome della rete"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Attiva provisioning operatore"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Aggiorna modalità Non disturbare"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Metti in pausa le notifiche per mantenere la concentrazione"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Quali entusiasmanti novità ti attendono?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Scopri il tuo nuovo telefono"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Scopri il tuo nuovo tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Scopri il tuo nuovo dispositivo"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Questa funzione non è disponibile su questo dispositivo"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forza esecuzione completa delle misurazioni GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Monitora tutte le costellazioni e le frequenze GNSS senza ciclo di lavoro utile"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Mostra sempre finestra di dialogo di arresti anomali"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Mostra finestra di dialogo a ogni arresto anomalo delle app"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Seleziona le app che supportano ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nessuna app che supporta ANGLE impostata"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"App che supporta ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Accesso alla directory"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"accesso alla directory"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Dettagli rete"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Il nome del tuo dispositivo è visibile alle app installate sul telefono. Potrebbe essere visibile anche ad altre persone se ti connetti a dispositivi Bluetooth o configuri un hotspot Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Dispositivi"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Tutte le impostazioni"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suggerimenti"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dati CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dati CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Scegli rete"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Scollegato"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Connessi"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Connessione…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Impossibile collegarsi"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nessuna rete trovata."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Impossibile trovare reti. Riprova."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(vietato)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Nessuna scheda SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Chiamata avanzata"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Modalità di rete preferita: WCDMA (preferita)"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Modalità di rete preferita: solo GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Modalità di rete preferita: solo WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Modalità di rete preferita: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Modalità di rete preferita: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Modalità di rete preferita: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Modalità di rete preferita: solo CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Modalità di rete preferita: solo EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Modalità di rete preferita: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Modalità di rete preferita: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Modalità di rete preferita: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Modalità di rete preferita: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Modalità di rete preferita: globale"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Modalità di rete preferita: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Modalità di rete preferita: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Modalità di rete preferita: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Modalità di rete preferita: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Modalità di rete preferita: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Modalità di rete preferita: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Modalità di rete preferita: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Modalità di rete preferita: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Modalità di rete preferita: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Modalità di rete preferita: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Modalità di rete preferita: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Modalità di rete preferita: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Modalità di rete preferita: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (opzione consigliata)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (opzione consigliata)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globale"</string>
+ <string name="label_available" msgid="1731547832803057893">"Reti disponibili"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Ricerca…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registrazione su <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"La scheda SIM non consente la connessione a questa rete."</string>
+ <string name="connect_later" msgid="978991102125216741">"Impossibile connettersi a questa rete in questo momento. Riprova più tardi."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registrato sulla rete."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Seleziona rete automaticamente"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Impostazioni operatore"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Imposta servizio dati"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Dati mobili"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Accedi ai dati tramite la rete mobile"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tipo di rete preferito"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Cambia la modalità di funzionamento della rete"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tipo di rete preferito"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operatore"</string>
+ <string name="call_category" msgid="8108654745239563833">"Chiamata"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videochiamata dell\'operatore"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Selezione sistema"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Cambia la modalità roaming CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Selezione sistema"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Rete"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Rete"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Abbonamento CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Cambia tra RUIM/SIM e NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"abbonamento"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Registrazione automatica..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Consentire il roaming dei dati?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Verifica i costi con il tuo fornitore di rete."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Utilizzo dati dell\'app"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Modalità di rete <xliff:g id="NETWORKMODEID">%1$d</xliff:g> non valida. Ignora."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Non disponibile se è attiva la connessione a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Altro"</string>
+ <string name="see_less" msgid="1250265310929558370">"Comprimi"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nessun dispositivo connesso"</string>
</resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 32e23c8..d739820 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -309,7 +309,7 @@
<item msgid="6093344633066170692">"קרא יומן"</item>
<item msgid="1334886368750347692">"שנה יומן"</item>
<item msgid="1638204101698708656">"מיקום"</item>
- <item msgid="2154671955760380322">"פרסם התראה"</item>
+ <item msgid="2154671955760380322">"פירסום התראה"</item>
<item msgid="4282477730595931828">"מיקום"</item>
<item msgid="4891423912898525905">"שיחת טלפון"</item>
<item msgid="2623604824935968113">"קרא SMS/MMS"</item>
@@ -336,7 +336,7 @@
<item msgid="7983336752371254444">"עוצמת קול של צלצול"</item>
<item msgid="7878027809189330917">"עוצמת קול של מדיה"</item>
<item msgid="7260546305036218513">"עוצמת קול של התראה"</item>
- <item msgid="9103719301075748925">"עוצמת קול של הודעות"</item>
+ <item msgid="9103719301075748925">"עוצמת קול של התראות"</item>
<item msgid="7025966722295861512">"עוצמת קול של Bluetooth"</item>
<item msgid="4665183401128289653">"שמור במצב פעיל"</item>
<item msgid="8584357129746649222">"מיקום"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"יש להתייחס כרשת נמדדת"</item>
<item msgid="2266114985518865625">"יש להתייחס כרשת לא נמדדת"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ברירת מחדל (בחירה ב-MAC אקראי)"</item>
+ <item msgid="5398461510512959597">"מהימן"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"לא"</item>
<item msgid="3863157480502955888">"כן"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"פועל תמיד"</item>
<item msgid="6385301106124765323">"כבוי תמיד"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"כבוי"</item>
+ <item msgid="2182686878828390312">"ניפוי באגים"</item>
+ <item msgid="5286514712714822064">"מרובה-מילים"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"בית בלבד"</item>
+ <item msgid="5034813753274486448">"אוטומטי"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA מועדפת"</item>
+ <item msgid="807926878589867564">"GSM בלבד"</item>
+ <item msgid="488474605709912156">"WCDMA בלבד"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA אוטומטית"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo אוטומטית"</item>
+ <item msgid="370391313511477301">"CDMA ללא EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo בלבד"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"כללי"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA בלבד"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"כללי"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1a599c7..7e6075f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"צור"</string>
<string name="allow" msgid="3349662621170855910">"כן, זה בסדר"</string>
<string name="deny" msgid="6947806159746484865">"דחה"</string>
- <string name="dlg_close" msgid="7471087791340790015">"סגור"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"עבור אל"</string>
<string name="device_info_default" msgid="7847265875578739287">"לא ידוע"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="two">אתה כעת במרחק של <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> צעדים מלהיות מפתח.</item>
@@ -34,10 +32,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"אין צורך, אתה כבר מפתח."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"קודם עליך להפעיל את אפשרויות המפתח."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"רשתות ותקשורת אלחוטית"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"חיבורים"</string>
- <string name="header_category_device" msgid="4544026001618307754">"מכשיר"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"אישי"</string>
- <string name="header_category_access" msgid="7580499097416970962">"גישה"</string>
<string name="header_category_system" msgid="2816866961183068977">"מערכת"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"הפעל חיבור נתונים"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"השבת חיבור נתונים"</string>
@@ -123,7 +117,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"כתובת המכשיר לחיבור דרך Bluetooth: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"האם לנתק את <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"שידור"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"מכשיר Bluetooth ללא שם"</string>
<string name="progress_scanning" msgid="192587958424295789">"מחפש"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"לא נמצאו מכשירי Bluetooth בקרבת מקום."</string>
@@ -155,7 +148,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"אפליקציה מסוימת רוצה להפעיל את ה-Bluetooth ולהפוך את הטלפון שלך לגלוי בפני מכשירים אחרים. ניתן לשנות זאת מאוחר יותר בהגדרות ה-Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"מפעיל Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth נכבה…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"חיבור אוטומטי"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"בקשה לחיבור Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"הקש כדי להתחבר אל \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"האם ברצונך להתחבר אל \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -183,12 +175,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"מכשירי התקשרות זמינים"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"מחובר כעת"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"מכשירים שמורים"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"הוספת מכשיר"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth יופעל לצורך התאמה"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"העדפות חיבור"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"מכשירים שהיו מחוברים בעבר"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"מכשירים שחוברו בעבר"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth הופעל"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"הצגת הכל"</string>
<string name="date_and_time" msgid="9062980487860757694">"תאריך ושעה"</string>
<string name="choose_timezone" msgid="1362834506479536274">"בחירת אזור זמן"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -271,7 +263,6 @@
<string name="skip_label" msgid="47510779345218297">"דילוג"</string>
<string name="next_label" msgid="4693520878012668114">"הבא"</string>
<string name="language_picker_title" msgid="3596315202551687690">"שפות"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"העדפות שפה"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"הסר"</string>
<string name="add_a_language" msgid="2330538812283783022">"הוספת שפה"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -307,7 +298,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"הגדרות"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"קיצור דרך של הגדרות"</string>
<string name="airplane_mode" msgid="8837269988154128601">"מצב טיסה"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"עוד"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"אלחוטי ורשתות"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"ניהול Wi-Fi, Bluetooth, מצב טיסה, רשתות סלולריות ורשתות VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"חבילת גלישה"</string>
@@ -392,6 +382,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"פרטיות"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"הושבת על ידי מנהל המכשיר"</string>
<string name="security_status_title" msgid="5848766673665944640">"סטטוס אבטחה"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"נעילת מסך, שחרור נעילה על ידי זיהוי פנים"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"נעילת מסך, טביעת אצבע"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"נעילת מסך"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"הפנים נוספו"</string>
@@ -401,11 +392,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"ביטול נעילה באמצעות אימות פנים"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"שימוש באימות פנים"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ניתן להשתמש באימות פנים כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"להשתמש באימות פנים"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"שימוש בפנים כדי לבטל את הנעילה של הטלפון או לאשר רכישות.\n\nהערה: לא ניתן להשתמש בפנים כדי לבטל את הנעילה של המכשיר הזה. לקבלת מידע נוסף, אפשר לפנות למנהל המערכת של הארגון."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ניתן להשתמש באימות פנים כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות"</string>
- <string name="face_add_max" msgid="2342250989212694454">"ניתן להוסיף עד <xliff:g id="COUNT">%d</xliff:g> טביעות אצבע"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"צריך למקם את הפנים בתוך העיגול"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"מאוחר יותר"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"ניתן להוסיף עד <xliff:g id="COUNT">%d</xliff:g> פנים"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"הוספת את המספר המרבי של פנים לאימות"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"לא ניתן להוסיף עוד פנים לאימות"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"ההרשמה לא הושלמה"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"אישור"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"חלף הזמן הקצוב להרשמה באמצעות פנים. יש לנסות שוב."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ההרשמה באמצעות הפנים נכשלה."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"הכול מוכן. אפשר לצאת לדרך."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"סיום"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"שימוש בנתוני הפנים"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"ביטול נעילת המכשיר"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"כניסה לאפליקציה ותשלומים"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"עיניים פקוחות לביטול נעילה"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"כשמשתמשים באימות פנים, יש לפקוח עיניים"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"הסרת נתוני הפנים"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"שיפור נתוני הפנים"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"ניתן להשתמש בפנים שלך כדי לבטל את נעילת המכשיר ולגשת לאפליקציות. "<annotation id="url">"מידע נוסף"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"טביעת אצבע"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"נהל טביעות אצבע"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"השתמש בטביעות אצבע ל-"</string>
@@ -828,7 +835,7 @@
<string name="wifi_error" msgid="3207971103917128179">"שגיאה"</string>
<string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"רצועת התדרים של 5 GHz אינה זמינה במדינה זו"</string>
<string name="wifi_in_airplane_mode" msgid="8652520421778203796">"במצב טיסה"</string>
- <string name="wifi_notify_open_networks" msgid="76298880708051981">"הודעה על רשתות פתוחות"</string>
+ <string name="wifi_notify_open_networks" msgid="76298880708051981">"התראה על רשתות פתוחות"</string>
<string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"הצג הודעה כאשר רשת ציבורית באיכות גבוהה זמינה"</string>
<string name="wifi_wakeup" msgid="8815640989361538036">"הפעל Wi‑Fi באופן אוטומטי"</string>
<string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi יחזור לפעול בסביבת רשתות שמורות באיכות גבוהה, כמו הרשת הביתית שלך"</string>
@@ -914,6 +921,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"יש לבחור תדר אחד לכל הפחות לנקודת Wi‑Fi לשיתוף אינטרנט:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"הגדרות IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"פרטיות"</string>
<string name="wifi_shared" msgid="844142443226926070">"שתף עם משתמשים אחרים במכשיר"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ללא שינוי)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"בחר"</string>
@@ -953,7 +961,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"ביטול"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"למחוק את הרשת?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"כל הסיסמאות עבור רשת זו יימחקו"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"רשתות שנשמרו"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="two">%d רשתות</item>
<item quantity="many">%d רשתות</item>
@@ -1089,7 +1096,7 @@
<string name="audio_record_proc_title" msgid="4271091199976457534">"ביטול רעש"</string>
<string name="volume_media_description" msgid="7949355934788807863">"פריטי מוזיקה, סרטוני וידאו, משחקים ומדיה נוספת"</string>
<string name="volume_ring_description" msgid="5936851631698298989">"רינגטונים והודעות"</string>
- <string name="volume_notification_description" msgid="5810902320215328321">"הודעות"</string>
+ <string name="volume_notification_description" msgid="5810902320215328321">"התראות"</string>
<string name="volume_alarm_description" msgid="8322615148532654841">"התראות"</string>
<string name="volume_ring_mute" msgid="3018992671608737202">"השתק רינגטון והודעות"</string>
<string name="volume_media_mute" msgid="3399059928695998166">"השתק מוזיקה וסוגי מדיה אחרים"</string>
@@ -1134,8 +1141,7 @@
<string name="brightness_title" msgid="5746272622112982836">"בהירות"</string>
<string name="brightness_summary" msgid="838917350127550703">"התאם את בהירות המסך"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"בהירות מותאמת"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"פועלת"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"כבויה"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"הבהירות המועדפת נמוכה מאוד"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"הבהירות המועדפת נמוכה"</string>
@@ -1205,7 +1211,7 @@
<string name="doze_title" msgid="2375510714460456687">"הודעות חדשות"</string>
<string name="doze_summary" msgid="3846219936142814032">"המסך יתעורר כשמתקבלות הודעות"</string>
<string name="doze_always_on_title" msgid="1046222370442629646">"פועל תמיד"</string>
- <string name="doze_always_on_summary" msgid="6978257596231155345">"הצגה של השעה, סמלי ההודעות ופרטים אחרים. צריכה מוגברת של הסוללה."</string>
+ <string name="doze_always_on_summary" msgid="6978257596231155345">"הצגה של השעה, סמלי ההתראות ופרטים אחרים. צריכה מוגברת של הסוללה."</string>
<string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
<string name="short_summary_font_size" msgid="6819778801232989076">"הגדלה או הקטנה של גודל הטקסט"</string>
<string name="sim_lock_settings" msgid="3392331196873564292">"הגדרות נעילת כרטיס SIM"</string>
@@ -1231,6 +1237,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"לא ניתן לשנות את קוד הגישה.\nכנראה שקוד הגישה שגוי."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"קוד הגישה של ה-SIM השתנה בהצלחה"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"לא ניתן לשנות מצב נעילה של כרטיס SIM.\nקוד הגישה שגוי."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"לא ניתן להשבית את קוד האימות."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"לא ניתן להפעיל את קוד האימות."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"אישור"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"ביטול"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"נמצאו מספר כרטיסי SIM"</string>
@@ -1406,7 +1414,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"יש לפרמט את <xliff:g id="NAME_0">^1</xliff:g> כדי לבצע את הפעולה הזו. \n\n"<b>"פרמוט מוחק את כל הנתונים המאוחסנים ב<xliff:g id="NAME_1">^1</xliff:g>."</b>" מומלץ לגבות את הנתונים כדי לא לאבד אותם."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"מחק ופרמט"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"מפרמט את <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"אין להסיר את <xliff:g id="NAME">^1</xliff:g> במהלך הפרמוט."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"אין להסיר את <xliff:g id="NAME">^1</xliff:g> במהלך הפרמוט."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"העברת נתונים לאחסון חדש"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"תוכל להעביר את התמונות, הקבצים וחלק מהאפליקציות אל ה-<xliff:g id="NAME">^1</xliff:g> החדש הזה. \n\nההעברה אורכת כ-<xliff:g id="TIME">^2</xliff:g> ותפנה <xliff:g id="SIZE">^3</xliff:g> מהאחסון הפנימי. אפליקציות מסוימות לא יעבדו במהלך ההעברה."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ביצוע העברה עכשיו"</string>
@@ -1790,9 +1798,6 @@
<string name="installed" msgid="3070865169422600098">"מותקנת"</string>
<string name="no_applications" msgid="7336588977497084921">"אין אפליקציות."</string>
<string name="internal_storage" msgid="1584700623164275282">"אחסון פנימי"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"אחסון פנימי"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"אחסון USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"אחסון בכרטיס SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"מחשב גודל מחדש..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"למחוק את נתוני האפליקציה?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"כל נתוני האפליקציה יימחקו לתמיד. נתונים אלה כוללים את כל הקבצים, ההגדרות, החשבונות, מסדי הנתונים וכדומה."</string>
@@ -1801,24 +1806,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"האפליקציה לא נמצאת ברשימת האפליקציות המותקנות."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"לא ניתן לפנות שטח אחסון לאפליקציה."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"אפליקציה זו יכולה לגשת לפריטים הבאים בטאבלט שלך:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"אפליקציה זו יכולה לגשת לפריטים הבאים בטלפון:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"אפליקציה זו יכולה לגשת ליכולות הבאות בטאבלט שלך. על מנת לשפר את הביצועים ולהפחית את השימוש בזיכרון, חלק מהרשאות אלה זמינות ל-<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> מפני שהוא פועל באותו תהליך יחד עם <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"אפליקציה זו יכולה לגשת ליכולות הבאות בטלפון שלך. על מנת לשפר את הביצועים ולהפחית את השימוש בזיכרון, חלק מהרשאות אלה זמינות ל-<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> מפני שהוא פועל באותו תהליך יחד עם <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> וגם <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"אפליקציה זו עשויה לחייב אותך בכסף:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"האם לשלוח SMS פרימיום?"</string>
<string name="computing_size" msgid="1599186977475211186">"מחשב..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"לא ניתן לחשב את גודל החבילה."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"לא מותקנים במכשיר שלך אפליקציות של צד שלישי."</string>
<string name="version_text" msgid="9189073826278676425">"גרסה <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"העבר"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"העבר לטאבלט"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"העבר לטלפון"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"העבר לאמצעי אחסון מסוג USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"העבר לכרטיס SD"</string>
- <string name="moving" msgid="6431016143218876491">"מעביר"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"העברה אחרת מתבצעת כבר."</string>
<string name="insufficient_storage" msgid="481763122991093080">"אין מספיק שטח אחסון."</string>
<string name="does_not_exist" msgid="1501243985586067053">"האפליקציה לא קיימת."</string>
@@ -1828,17 +1825,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"אין אפשרות להתקין את אפליקציית מנהל המכשיר על מדיה חיצונית"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"לאלץ עצירה?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"אם אתה מפסיק את פעילות האפליקציה בצורה מאולצת, ייתכן שהיא לא תפעל כהלכה."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"לא ניתן להעביר את האפליקציה. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"מיקום התקנה מועדף"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"שנה את מיקום ההתקנה המועדף עבור אפליקציות חדשות."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"להשבית אפליקציה מובנית?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"השבת את האפליקציה"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"אם תשבית את האפליקציה הזו, ייתכן ש-Android ואפליקציות אחרות לא יפעלו כצפוי."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"האם למחוק נתונים ולהשבית את האפליקציה?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"אם תשבית את האפליקציה הזו, ייתכן ש-Android ואפליקציות אחרות לא יפעלו כצפוי. בנוסף, הנתונים שלך יימחקו."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"האם לבטל הודעות?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"אם תבטל התרעות עבור אפליקציה זו, אתה עלול להחמיץ התרעות ועדכונים חשובים."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"חנות"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"פרטי האפליקציה"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"האפליקציה הותקנה מ-<xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2026,11 +2019,12 @@
<string name="accessibility_autoclick_description" msgid="4908960598910896933">"אם נעשה שימוש בעכבר, אפשר להגדיר את הסמן כך שינקוט פעולה באופן אוטומטי כשהוא מפסיק לזוז למשך פרק זמן מסוים."</string>
<string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"השהייה לפני לחיצה"</string>
<string name="accessibility_vibration_settings_title" msgid="3453277326300320803">"רטט"</string>
- <string name="accessibility_notification_vibration_title" msgid="660829933960942244">"רטט של צלצול והודעות"</string>
+ <string name="accessibility_notification_vibration_title" msgid="660829933960942244">"רטט של צלצול והתראות"</string>
<string name="accessibility_touch_vibration_title" msgid="7931823772673770492">"רטט מגע"</string>
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"שימוש בשירות"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"שימוש בתיקון צבע"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"שימוש בכתוביות"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"המשך"</string>
<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="6371077608778830020">"הוספה של מכשיר שמיעה"</string>
@@ -2080,10 +2074,10 @@
<item quantity="one">השהיה ארוכה מאוד (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> מילישנייה)</item>
</plurals>
<string name="accessibility_vibration_summary" msgid="1372393829668784669">"צלצול <xliff:g id="SUMMARY_RING">%1$s</xliff:g>, מגע <xliff:g id="SUMMARY_TOUCH">%2$s</xliff:g>"</string>
- <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"רטט כבוי לצלצול ולהודעות"</string>
- <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"צלצול והודעות בעוצמה נמוכה"</string>
- <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"צלצול והודעות בעוצמה בינונית"</string>
- <string name="accessibility_vibration_summary_high" msgid="3239807793182635729">"צלצול והודעות בעוצמה גבוהה"</string>
+ <string name="accessibility_vibration_summary_off" msgid="1753566394591809629">"רטט כבוי לצלצול ולהתראות"</string>
+ <string name="accessibility_vibration_summary_low" msgid="7628418309029013867">"צלצול והתראות בעוצמה נמוכה"</string>
+ <string name="accessibility_vibration_summary_medium" msgid="3422136736880414093">"צלצול והתראות בעוצמה בינונית"</string>
+ <string name="accessibility_vibration_summary_high" msgid="3239807793182635729">"צלצול והתראות בעוצמה גבוהה"</string>
<string name="accessibility_vibration_intensity_off" msgid="4613890213008630847">"כבוי"</string>
<string name="accessibility_vibration_intensity_low" msgid="2017572546489862987">"נמוכה"</string>
<string name="accessibility_vibration_intensity_medium" msgid="3782136025830279769">"בינונית"</string>
@@ -2190,8 +2184,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"הגבלת הפעילות של אפליקציה ברקע עלולה לשבש את פעולתה"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"מכיוון שהאפליקציה לא מוגדרת לאופטימיזציה של הסוללה, לא ניתן להגבילה.\n\nכדי להגביל אותה, תחילה יש להפעיל אופטימיזציה של הסוללה."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"שימוש במסך מאז הטעינה המלאה"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"צריכת החשמל של המסך"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"סריקה של רשתות סלולריות"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"השימוש בסוללה מאז הטעינה המלאה"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"משך הזמן שבו המסך פעל מאז הטעינה המלאה"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"שימוש במכשיר מאז הטעינה המלאה"</string>
@@ -2218,11 +2210,6 @@
<string name="details_subtitle" msgid="32593908269911734">"פרטי שימוש"</string>
<string name="controls_subtitle" msgid="390468421138288702">"התאמת צריכת סוללה"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"חבילות כלולות"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"אפליקציות שמרוקנות את הסוללה"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"המכשיר אינו יכול לעבור למצב שינה"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"המכשיר יוצא ממצב שינה ברקע"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"בקשות מיקום בתדירות גבוהה"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> אפליקציות פועלות בצורה חריגה"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"האפליקציות פועלות כרגיל"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"דפוס השימוש בסוללה בטלפון זה של אפליקציות הפועלות ברקע הוא אופייני"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"דפוס השימוש בסוללה בטאבלט זה של אפליקציות הפועלות ברקע הוא אופייני"</string>
@@ -2298,6 +2285,7 @@
<item quantity="other">מגביל שימוש בסוללה של %1$d אפליקציות</item>
<item quantity="one">מגביל שימוש בסוללה של אפליקציה אחת (%1$d)</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"הוגבל <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"אפליקציות אלה השתמשו בסוללה ברקע. ייתכן שאפליקציות מוגבלות לא יפעלו כראוי ושיהיה עיכוב בקבלת הודעות."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"שימוש במנהל הסוללה"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"זיהוי אפליקציות שגורמות להתרוקנות הסוללה"</string>
@@ -2477,23 +2465,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"ביטול"</string>
<string name="tts_reset" msgid="2661752909256313270">"איפוס המכשיר"</string>
<string name="tts_play" msgid="2628469503798633884">"הפעלה"</string>
- <string name="gadget_title" msgid="5519037532720577836">"בקרת צריכת חשמל"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"מעדכן את הגדרת ה-Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"מעדכן הגדרת Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"פועל"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"כבוי"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"מפעיל"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"מכבה"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"מיקום"</string>
- <string name="gadget_sync" msgid="858895763714222152">"סנכרון"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"בהירות <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"אוטומטי"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"מלא"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"חצי"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"כבוי"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"אחסון אישורים"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"התקן מאמצעי אחסון"</string>
@@ -2559,7 +2530,7 @@
<string name="admin_disabled_other_options" msgid="7712694507069054530">"אפשרויות אחרות מושבתות על ידי מנהל המכשיר."</string>
<string name="admin_more_details" msgid="7901420667346456102">"פרטים נוספים"</string>
<string name="sound_category_sound_title" msgid="1488759370067953996">"כללי"</string>
- <string name="notification_log_title" msgid="3766148588239398464">"יומן הודעות"</string>
+ <string name="notification_log_title" msgid="3766148588239398464">"יומן התראות"</string>
<string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"צלצול ורטט שיחה"</string>
<string name="sound_category_system_title" msgid="1480844520622721141">"מערכת"</string>
<string name="wifi_setup_title" msgid="2970260757780025029">"הגדרת Wi-Fi"</string>
@@ -2651,7 +2622,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"בחר הכל"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"שימוש בנתונים"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"שימוש בנתונים באפליקציות"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"חבילת גלישה ו-Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר."</string>
<string name="data_usage_app" msgid="4970478397515423303">"שימוש באפליקציות"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"פרטי אפליקציות"</string>
@@ -3040,7 +3011,6 @@
<item quantity="other">הצג %d פריטים מוסתרים</item>
<item quantity="one">הצג פריט %d מוסתר</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"כיווץ"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"רשת ואינטרנט"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"סלולרית"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"שימוש בנתונים"</string>
@@ -3052,12 +3022,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"אפליקציות והודעות"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"הרשאות ואפליקציות המוגדרות כברירת מחדל"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"הגישה להתראות אינה זמינה לאפליקציות בפרופיל העבודה."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"חשבונות"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"לא נוספו חשבונות"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"אפליקציות ברירת מחדל"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"שפות, זמן, גיבוי, עדכונים"</string>
<string name="search_results_title" msgid="1796252422574886932">"הגדרות"</string>
- <string name="search_menu" msgid="6283419262313758339">"חפש בהגדרות"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, Wi-Fi, חיבור רשת, אינטרנט, אלחוטי, נתונים, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, Wi-Fi, החלפת מצב, שליטה"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"הודעת טקסט, שליחת הודעות טקסט, הודעות, העברת הודעות, ברירת מחדל"</string>
@@ -3102,6 +3072,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"שלם, הקש, תשלומים"</string>
<string name="keywords_backup" msgid="470070289135403022">"גיבוי, לגבות, backup, back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"תנועה"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"פנים, ביטול נעילה, אימות, כניסה"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, גרסת prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"רשת, מצב הרשת הסלולרית, מצב השירות, עוצמת האות, סוג הרשת הסלולרית, נדידה, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"מספר סידורי, גרסת חומרה"</string>
@@ -3109,6 +3080,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"עיצוב כהה"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"באג"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"תצוגה רגישה לסביבה, תצוגה של מסך נעילה"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"התראות במסך הנעילה"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"פנים"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"טביעת אצבע"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"עמעום מסך, מסך מגע, סוללה, בהירות חכמה, בהירות דינמית"</string>
@@ -3123,7 +3095,7 @@
<string name="keywords_default_browser" msgid="8324486019657636744">"ברירת מחדל, דפדפן ברירת המחדל"</string>
<string name="keywords_default_payment_app" msgid="3838565809518896799">"תשלום, ברירת מחדל"</string>
<string name="keywords_default_links" msgid="5830406261253835547">"ברירת מחדל"</string>
- <string name="keywords_ambient_display" msgid="3103487805748659132">"הודעה נכנסת"</string>
+ <string name="keywords_ambient_display" msgid="3103487805748659132">"התראה נכנסת"</string>
<string name="keywords_hotspot_tethering" msgid="1137511742967410918">"שיתוף אינטרנט בין מכשירים ב-USB, שיתוף אינטרנט בין מכשירים ב-Bluetooth, נקודת Wi-Fi לשיתוף אינטרנט"</string>
<string name="keywords_touch_vibration" msgid="5983211715076385822">"פיזי, רטט, מסך, רגישות"</string>
<string name="keywords_ring_vibration" msgid="2393528037008999296">"פיזי, רטט, טלפון, שיחה, רגישות"</string>
@@ -3144,12 +3116,12 @@
<string name="call_volume_option_title" msgid="1265865226974255384">"עוצמת קול של שיחות"</string>
<string name="alarm_volume_option_title" msgid="8219324421222242421">"עוצמת קול של התראה"</string>
<string name="ring_volume_option_title" msgid="6767101703671248309">"עוצמת צלצול"</string>
- <string name="notification_volume_option_title" msgid="6064656124416882130">"עוצמת קול של הודעות"</string>
+ <string name="notification_volume_option_title" msgid="6064656124416882130">"עוצמת קול של התראות"</string>
<string name="ringtone_title" msgid="5379026328015343686">"רינגטון של טלפון"</string>
- <string name="notification_ringtone_title" msgid="4468722874617061231">"צליל ברירת המחדל להודעות"</string>
+ <string name="notification_ringtone_title" msgid="4468722874617061231">"צליל ברירת המחדל להתראות"</string>
<string name="notification_unknown_sound_title" msgid="2535027767851838335">"צליל שסיפקה האפליקציה"</string>
- <string name="notification_sound_default" msgid="565135733949733766">"צליל ברירת המחדל להודעות"</string>
- <string name="alarm_ringtone_title" msgid="6344025478514311386">"צליל ברירת המחדל להתראה"</string>
+ <string name="notification_sound_default" msgid="565135733949733766">"צליל ברירת המחדל להתראות"</string>
+ <string name="alarm_ringtone_title" msgid="6344025478514311386">"צליל לשעון מעורר"</string>
<string name="vibrate_when_ringing_title" msgid="3806079144545849032">"הפעלת רטט גם עבור שיחות"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"צלילים אחרים"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"צלילים של לוח חיוג"</string>
@@ -3195,7 +3167,7 @@
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"חסימת הפרעות חזותיות"</string>
<string name="zen_mode_visual_signals_settings_subtitle" msgid="6308824824208120508">"הפעלת אותות חזותיים"</string>
<string name="zen_mode_settings_category" msgid="3982039687186952865">"כשמצב \'נא לא להפריע\' פועל"</string>
- <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"הודעות"</string>
+ <string name="zen_mode_restrict_notifications_title" msgid="478040192977063582">"התראות"</string>
<string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"ללא צליל מהודעות"</string>
<string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"יוצגו הודעות במסך"</string>
<string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"כשיגיעו הודעות, הטלפון לא ישמיע צליל ולא יפעיל רטט."</string>
@@ -3216,9 +3188,9 @@
<string name="zen_mode_block_effect_light" msgid="8106976110224107316">"אל תציג אור מהבהב"</string>
<string name="zen_mode_block_effect_peek" msgid="6836997464098657115">"אל תציג הודעות קופצות במסך"</string>
<string name="zen_mode_block_effect_status" msgid="6642532634292373081">"הסתרה של סמלי שורת הסטטוס"</string>
- <string name="zen_mode_block_effect_badge" msgid="4656911773512844243">"הסתרה של סימני ההודעות"</string>
+ <string name="zen_mode_block_effect_badge" msgid="4656911773512844243">"הסתרה של סימני ההתראות"</string>
<string name="zen_mode_block_effect_ambient" msgid="4704755879961212658">"אני לא רוצה להציג הודעות"</string>
- <string name="zen_mode_block_effect_list" msgid="3882541635576592530">"הסתרה מרשימת ההודעות"</string>
+ <string name="zen_mode_block_effect_list" msgid="3882541635576592530">"הסתרה מרשימת ההתראות"</string>
<string name="zen_mode_block_effect_summary_none" msgid="2617875282623486256">"אף פעם"</string>
<string name="zen_mode_block_effect_summary_screen_off" msgid="1230265589026355094">"כאשר המסך כבוי"</string>
<string name="zen_mode_block_effect_summary_screen_on" msgid="6017536991063513394">"כאשר המסך פועל"</string>
@@ -3276,12 +3248,12 @@
<string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"ללא צליל מהודעות"</string>
<string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"הודעות לא יוצגו ולא יושמעו. מותרות שיחות מאנשי קשר שמסומנים בכוכב וממתקשרים חוזרים."</string>
<string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(ההגדרה הנוכחית)"</string>
- <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"האם לשנות את ההגדרות של ההודעות במצב \'נא לא להפריע\'?"</string>
+ <string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"האם לשנות את ההגדרות של ההתראות במצב \'נא לא להפריע\'?"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"צלילי פרופיל עבודה"</string>
<string name="work_use_personal_sounds_title" msgid="1148331221338458874">"השתמש בצלילי הפרופיל האישי"</string>
<string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"הצלילים זהים עבור הפרופיל האישי ופרופיל העבודה"</string>
<string name="work_ringtone_title" msgid="5806657896300235315">"רינגטון של טלפון מהעבודה"</string>
- <string name="work_notification_ringtone_title" msgid="6081247402404510004">"צליל ברירת המחדל להודעת עבודה"</string>
+ <string name="work_notification_ringtone_title" msgid="6081247402404510004">"צליל ברירת המחדל להתראת עבודה"</string>
<string name="work_alarm_ringtone_title" msgid="1441926676833738891">"צליל ברירת המחדל להתראת עבודה"</string>
<string name="work_sound_same_as_personal" msgid="3123383644475266478">"זהה לצלילים של הפרופיל האישי"</string>
<string name="work_sync_dialog_title" msgid="7123973297187354813">"להחליף צלילים?"</string>
@@ -3291,34 +3263,34 @@
<string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"קובץ זה יועתק לתיקייה <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
<string name="ringtones_category_preference_title" msgid="5675912303120102366">"רינגטונים"</string>
<string name="other_sound_category_preference_title" msgid="2521096636124314015">"צלילים אחרים ורטט"</string>
- <string name="configure_notification_settings" msgid="7616737397127242615">"הודעות"</string>
+ <string name="configure_notification_settings" msgid="7616737397127242615">"התראות"</string>
<string name="recent_notifications" msgid="5660639387705060156">"נשלחו לאחרונה"</string>
<string name="recent_notifications_see_all_title" msgid="8572160812124540326">"הצגת כל האפליקציות מ-7 הימים האחרונים"</string>
<string name="advanced_section_header" msgid="8833934850242546903">"אפשרויות מתקדמות"</string>
<string name="profile_section_header" msgid="2320848161066912001">"הודעות עבודה"</string>
- <string name="notification_badging_title" msgid="5938709971403474078">"הצגה של סימני הודעות"</string>
+ <string name="notification_badging_title" msgid="5938709971403474078">"הצגה של סימני התראות"</string>
<string name="notification_pulse_title" msgid="1905382958860387030">"אור מהבהב"</string>
<string name="lock_screen_notifications_title" msgid="2583595963286467672">"במסך הנעילה"</string>
<string name="locked_work_profile_notification_title" msgid="8327882003361551992">"כשפרופיל העבודה נעול"</string>
- <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"תוכן ההודעות יופיע במלואו"</string>
+ <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"תוכן ההתראות יופיע במלואו"</string>
<string name="lock_screen_notifications_summary_hide" msgid="8301305044690264958">"הסתרה של תוכן רגיש"</string>
<string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"לא יוצגו הודעות בכלל"</string>
<string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"איך להציג הודעות כשהמכשיר נעול?"</string>
- <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"הודעות"</string>
- <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"הצג את כל התוכן של הודעות מהעבודה"</string>
+ <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"התראות"</string>
+ <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"הצג את כל התוכן של התראות מהעבודה"</string>
<string name="lock_screen_notifications_summary_hide_profile" msgid="2005907007779384635">"הסתרה של תוכן עבודה רגיש"</string>
<string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"כיצד אתה רוצה שיוצגו הודעות פרופיל כאשר המכשיר נעול?"</string>
<string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"הודעות פרופיל"</string>
- <string name="notifications_title" msgid="8086372779371204971">"הודעות"</string>
- <string name="app_notifications_title" msgid="5810577805218003760">"הודעות אפליקציה"</string>
+ <string name="notifications_title" msgid="8086372779371204971">"התראות"</string>
+ <string name="app_notifications_title" msgid="5810577805218003760">"התראות אפליקציה"</string>
<string name="notification_channel_title" msgid="2260666541030178452">"קטגוריית הודעות"</string>
- <string name="notification_group_title" msgid="7180506440133859601">"קבוצת קטגוריות של הודעות"</string>
+ <string name="notification_group_title" msgid="7180506440133859601">"קבוצת קטגוריות של התראות"</string>
<string name="notification_importance_title" msgid="4368578960344731828">"התנהגות"</string>
<string name="notification_importance_unspecified" msgid="6622173510486113958">"הפעלת צליל"</string>
<string name="notification_importance_blocked" msgid="7938180808339386300">"לעולם אל תציג הודעות"</string>
<string name="notification_importance_min" msgid="9054819132085066824">"יש להציג באופן שקט וממוזער"</string>
<string name="notification_importance_low" msgid="2445139943005315690">"הצג ללא צליל"</string>
- <string name="notification_importance_default" msgid="5958338024601957516">"השמע צליל"</string>
+ <string name="notification_importance_default" msgid="5958338024601957516">"עם צליל"</string>
<string name="notification_importance_high" msgid="2082429479238228527">"השמע צליל והצג במסך"</string>
<string name="notification_importance_high_silent" msgid="2667033773703765252">"הצג במסך"</string>
<string name="notification_importance_min_title" msgid="6974673091137544803">"נמוכה"</string>
@@ -3332,11 +3304,11 @@
<string name="notification_channel_summary_default" msgid="1111749130423589931">"חשיבות גבוהה"</string>
<string name="notification_channel_summary_high" msgid="2085017556511003283">"חשיבות דחופה"</string>
<string name="notification_switch_label" msgid="6843075654538931025">"הצגת הודעות"</string>
- <string name="default_notification_assistant" msgid="7631945224761430146">"אסיסטנט ההודעות"</string>
+ <string name="default_notification_assistant" msgid="7631945224761430146">"אסיסטנט ההתראות"</string>
<string name="notifications_sent_daily" msgid="3584506541352710975">"~<xliff:g id="NUMBER">%1$s</xliff:g> ביום"</string>
<string name="notifications_sent_weekly" msgid="1030525736746720584">"~<xliff:g id="NUMBER">%1$s</xliff:g> בשבוע"</string>
<string name="notifications_sent_never" msgid="1001964786456700536">"אף פעם"</string>
- <string name="manage_notification_access_title" msgid="7510080164564944891">"גישה אל הודעות"</string>
+ <string name="manage_notification_access_title" msgid="7510080164564944891">"גישה אל התראות"</string>
<string name="work_profile_notification_access_blocked_summary" msgid="8748026238701253040">"הגישה להודעות של פרופיל העבודה חסומה"</string>
<string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"אפליקציות לא יכולות לקרוא הודעות"</string>
<plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -3345,8 +3317,8 @@
<item quantity="other">%d אפליקציות יכולות לקרוא הודעות</item>
<item quantity="one">אפליקציה %d יכולה לקרוא הודעות</item>
</plurals>
- <string name="no_notification_listeners" msgid="3487091564454192821">"אין אפליקציות מותקנות שביקשו גישה להודעות."</string>
- <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"האם להתיר ל-<xliff:g id="SERVICE">%1$s</xliff:g> לגשת אל הודעות?"</string>
+ <string name="no_notification_listeners" msgid="3487091564454192821">"אין אפליקציות מותקנות שביקשו גישה להתראות."</string>
+ <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"האם להתיר ל-<xliff:g id="SERVICE">%1$s</xliff:g> לגשת אל התראות?"</string>
<string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> יוכל לקרוא את כל ההודעות, כולל מידע אישי כמו שמות של אנשי קשר והודעות טקסט שתקבל. הוא יוכל גם לבטל הודעות או להפעיל לחצני פעולה שהן כוללות. \n\nכמו כן, הדבר יאפשר לאפליקציה להפעיל או לכבות את התכונה \'נא לא להפריע\' ולשנות הגדרות קשורות."</string>
<string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"אם תכבה ל-<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> את הגישה להודעות, ניתן יהיה לכבות גם את הגישה לתכונה \'נא לא להפריע\'."</string>
<string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"כבה"</string>
@@ -3395,12 +3367,12 @@
</plurals>
<string name="notification_toggle_on" msgid="650145396718191048">"מופעל"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"כבוי"</string>
- <string name="app_notification_block_title" msgid="4069351066849087649">"חסום הכל"</string>
+ <string name="app_notification_block_title" msgid="4069351066849087649">"לחסום הכל"</string>
<string name="app_notification_block_summary" msgid="4744020456943215352">"לעולם אל תציג את ההודעות האלה"</string>
<string name="notification_content_block_title" msgid="5854232570963006360">"הצג הודעות"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"אף פעם אל תציג הודעות בהצללה או במכשירים היקפיים"</string>
- <string name="notification_badge_title" msgid="6370122441168519809">"הצגה של סימן ההודעות"</string>
- <string name="notification_channel_badge_title" msgid="2240827899882847087">"הצגה של סימן ההודעות"</string>
+ <string name="notification_badge_title" msgid="6370122441168519809">"הצגה של סימן ההתראות"</string>
+ <string name="notification_channel_badge_title" msgid="2240827899882847087">"הצגה של סימן ההתראות"</string>
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ביטול / שינוי של \'נא לא להפריע\'"</string>
<string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"הודעות אלה יוכלו להמשיך ולהפריע כשמצב \'נא לא להפריע\' מופעל"</string>
<string name="app_notification_visibility_override_title" msgid="7821124557634786985">"במסך הנעילה"</string>
@@ -3524,7 +3496,7 @@
<string name="zen_mode_screen_off" msgid="3144446765110327937">"כאשר המסך כבוי"</string>
<string name="zen_mode_screen_off_summary" msgid="7430034620565812258">"הודעות שהושתקו במצב \'נא לא להפריע\' יפעילו את המסך ואת האור המהבהב"</string>
<string name="zen_mode_screen_off_summary_no_led" msgid="2826121465026642017">"הודעות שהושתקו במצב \'נא לא להפריע\' יפעילו את המסך"</string>
- <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
+ <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרת התראות"</string>
<string name="suggestion_button_text" msgid="3275010948381252006">"אישור"</string>
<string name="device_feedback" msgid="3238056036766293294">"שליחת משוב על המכשיר הזה"</string>
<string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"הזן את קוד הגישה של מנהל המכשיר"</string>
@@ -3560,7 +3532,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"כשתזין את קוד הגישה להפעלת המכשיר הזה, שירותי נגישות כמו <xliff:g id="SERVICE">%1$s</xliff:g> עדיין לא יהיו זמינים."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"כשתזין את קו ביטול הנעילה להפעלת המכשיר הזה, שירותי נגישות כמו <xliff:g id="SERVICE">%1$s</xliff:g> עדיין לא יהיו זמינים."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"כשתזין את הסיסמה להפעלת המכשיר הזה, שירותי נגישות כמו <xliff:g id="SERVICE">%1$s</xliff:g> עדיין לא יהיו זמינים."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"שים לב: לאחר הפעלה מחדש של המכשיר, ניתן להפעיל את האפליקציה רק לאחר שתבטל את נעילת הטלפון"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"הערה: אם ביצעת הפעלה מחדש לטלפון ונעילת המסך מוגדרת, לא ניתן יהיה להפעיל את האפליקציה הזו לפני ביטול נעילת המסך של הטלפון"</string>
<string name="imei_information_title" msgid="8499085421609752290">"פרטי IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"מידע הקשור ל-IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(חריץ <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3578,7 +3550,7 @@
<string name="storage_used" msgid="7128074132917008743">"שטח אחסון מנוצל"</string>
<string name="change" msgid="6657848623929839991">"שינוי"</string>
<string name="change_storage" msgid="600475265207060436">"שינוי אחסון"</string>
- <string name="notifications_label" msgid="2872668710589600731">"הודעות"</string>
+ <string name="notifications_label" msgid="2872668710589600731">"התראות"</string>
<string name="notifications_enabled" msgid="6983396130566021385">"מופעל"</string>
<string name="notifications_enabled_with_info" msgid="5669544704839269901">"<xliff:g id="NOTIFICATIONS_SENT">%1$s</xliff:g> / <xliff:g id="NOTIFICATIONS_CATEGORIES_OFF">%2$s</xliff:g>"</string>
<string name="notifications_disabled" msgid="1262114548434938079">"כבויות"</string>
@@ -3622,7 +3594,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"אישיות"</string>
<string name="filter_work_apps" msgid="24519936790795574">"עבודה"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"אפליקציות: הכל"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"אפליקציות: כבויות"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ההודעות הושבתו"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"קטגוריות: חשיבות דחופה"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"קטגוריות: חשיבות נמוכה"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"קטגוריות: כבויות"</string>
@@ -3685,7 +3657,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"התראות על ניצול סוללה"</string>
<string name="show_all_apps" msgid="1512506948197818534">"הצג נתונים מלאים על השימוש במכשיר"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"הצג את נתוני השימוש באפליקציה"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"צריכה גבוהה"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="two"><xliff:g id="NUMBER">%2$d</xliff:g> אפליקציות מתנהגות באופן חריג</item>
<item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> אפליקציות מתנהגות באופן חריג</item>
@@ -3857,6 +3828,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"אחסון פנימי: <xliff:g id="PERCENTAGE">%1$s</xliff:g> בשימוש - <xliff:g id="FREE_SPACE">%2$s</xliff:g> פנוי"</string>
<string name="display_summary" msgid="6737806235882127328">"עבור למצב שינה לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"טפטים, שינה וגודל הגופן"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"עבור למצב שינה לאחר 10 דקות של חוסר פעילות"</string>
<string name="memory_summary" msgid="8080825904671961872">"ממוצע של <xliff:g id="USED_MEMORY">%1$s</xliff:g> מתוך <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> זיכרון בשימוש"</string>
<string name="users_summary" msgid="1674864467098487328">"מחובר בתור <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3872,7 +3845,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"לא ניתן לשלוח הודעות SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"לא ניתן להשתמש במצלמה"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"לא ניתן לצלם צילומי מסך"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"לא ניתן לכבות את הגיבויים"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"לא ניתן לפתוח את האפליקציה הזו"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"יש לך שאלות נוספות? כדאי ליצור קשר עם מנהל ה-IT"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"פרטים נוספים"</string>
@@ -4046,9 +4018,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"הדמיית תצוגה עם חיתוך"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"מגרעת במסך"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"הצגת חיתוך תצוגה, חריץ"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ללא"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ברירת המחדל של המכשיר"</string>
<string name="special_access" msgid="3458780842491881155">"גישה מיוחדת"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="two"><xliff:g id="COUNT">%d</xliff:g> אפליקציות יכולות להשתמש בנתונים בלתי מוגבלים</item>
@@ -4061,7 +4033,7 @@
<string name="reset_shortcut_manager_throttling" msgid="6495066467198668994">"אפס הגבלת דירוג ב-ShortcutManager"</string>
<string name="reset_shortcut_manager_throttling_complete" msgid="1826770872063707900">"אופסה הגבלת דירוג ב-ShortcutManager"</string>
<string name="notification_suggestion_title" msgid="387052719462473500">"בחירת הפרטים שמופיעים במסך הנעילה"</string>
- <string name="notification_suggestion_summary" msgid="8521159741445416875">"הצג או הסתר תוכן הודעה"</string>
+ <string name="notification_suggestion_summary" msgid="8521159741445416875">"הצגה או הסתרה של תוכן ההתראה"</string>
<string name="page_tab_title_summary" msgid="4070309266374993258">"הכול"</string>
<string name="page_tab_title_support" msgid="4407600495101788249">"טיפים ותמיכה"</string>
<string name="developer_smallest_width" msgid="7516950434587313360">"הרוחב הקטן ביותר"</string>
@@ -4072,11 +4044,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"מחובר אל <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"מחובר לכמה התקנים"</string>
<string name="demo_mode" msgid="2798762752209330277">"מצב הדגמה בממשק המשתמש של המערכת"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"מצב לילה"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"הגדרת מצב לילה"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"מצב כהה"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"הגדרת מצב כהה"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"משבצות מפתח להגדרות מהירות"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"מעקב Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"הגדרות של פרופיל עבודה"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"חיפוש אנשי קשר"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"אפשר לחיפושי אנשי קשר שמבצע הארגון לזהות מתקשרים ואנשי קשר"</string>
@@ -4123,13 +4094,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"הקשה כפולה להצצה"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"הקשה כפולה לבדיקת הטאבלט"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"הקשה כפולה לבדיקת המכשיר"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להקיש פעמיים על המסך."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"כדי להתעדכן מה השעה, לבדוק הודעות ולהציג מידע נוסף, צריך להקיש פעמיים על המסך."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"הרמה להצצה"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"הרמה לבדיקת הטאבלט"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"הרמה לבדיקת המכשיר"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להרים את הטלפון."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להרים את הטאבלט."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"כדי לבדוק מה השעה, לבדוק אם יש סמלי הודעות ולראות מידע נוסף, פשוט צריך להרים את המכשיר."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Wake up display"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"כדי להתעדכן מה השעה, לבדוק הודעות ולהציג מידע נוסף, צריך להרים את הטלפון."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"כדי להתעדכן מה השעה, לבדוק הודעות ולהציג מידע נוסף, צריך להרים את הטאבלט."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"כדי להתעדכן מה השעה, לבדוק הודעות ולהציג מידע נוסף, צריך להרים את המכשיר."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Wake lock screen gesture"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"החלקת טביעת אצבע לקריאת הודעות"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"החלקה של טביעת אצבע"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"כדי לבדוק הודעות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטלפון."</string>
@@ -4217,7 +4192,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ניסיונות</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ניסיון</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"מתבצע גיבוי לנתונים של מכשיר זה"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"מכשיר זה מנוהל על ידי הארגון שלך."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"מכשיר זה מנוהל על ידי <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4264,6 +4238,12 @@
<string name="autofill_app" msgid="7338387238377914374">"שירות מילוי אוטומטי"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"אוטומטי, אוטומטית, מילוי, מילוי אוטומטי, autofill"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ודא שאתה סומך על האפליקציה הזו</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ניגשת למידע המופיע במסך כדי לזהות אילו שדות אפשר למלא באופן אוטומטי."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"מילוי אוטומטי"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"רמת רישום ביומן"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"מספר מרבי של בקשות לסשן"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"מקסימום מערכי נתונים גלויים"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"איפוס לערכי ברירת המחדל"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"האפשרויות למפתחים למילוי האוטומטי אופסו"</string>
<string name="device_theme" msgid="4571803018917608588">"עיצוב המכשיר"</string>
<string name="default_theme" msgid="7085644992078579076">"ברירת מחדל"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"שם הרשת"</string>
@@ -4278,15 +4258,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"הפעל ניהול תצורה של ספק סלולרי"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"עדכון המצב \'נא לא להפריע\'"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"אפשר להשהות את ההודעות כדי לשמור על ריכוז"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"מה חדש ומעניין?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"סיור היכרות עם הטלפון החדש"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"סיור היכרות עם הטאבלט החדש"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"סיור היכרות עם המכשיר החדש"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"התכונה לא זמינה במכשיר הזה"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"אילוץ של הרצה מלאה של מדידות Gnss"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"מעקב אחר כל מערכות הניווט והתדרים של GNSS ללא מחזור פעילות"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"הצג תמיד דו-שיח של קריסות מחשב"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"הצג דו-שיח בכל פעם שאפליקציה קורסת"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"בחירת אפליקציה המותאמת ל-ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"לא הוגדרה אפליקציה המותאמת ל-ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"אפליקציה המותאמת ל-ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"גישה לספרייה"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"גישה ספרייה"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4327,4 +4306,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"פרטי הרשת"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"שם המכשיר שלך גלוי לאפליקציות בטלפון שלך. כמו כן, ייתכן שאנשים אחרים יראו אותו בהתחברות למכשירי Bluetooth או כשמגדירים נקודת Wi-Fi לשיתוף אינטרנט."</string>
<string name="devices_title" msgid="7701726109334110391">"מכשירים"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"כל ההגדרות"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"הצעות"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"נתוני CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"נתוני CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"בחירת רשת"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"מנותק"</string>
+ <string name="network_connected" msgid="4943925032253989621">"מחובר"</string>
+ <string name="network_connecting" msgid="76404590784733557">"מתחבר…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"לא ניתן להתחבר"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"לא נמצאו רשתות."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"לא נמצאו רשתות. אפשר לנסות שוב."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(אסור)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"אין כרטיס SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"שיחה משופרת"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"מצב רשת מועדפת: WCDMA מועדף"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"מצב רשת מועדפת: GSM בלבד"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"מצב רשת מועדפת: WCDMA בלבד"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"מצב רשת מועדפת: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"מצב רשת מועדפת: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"מצב רשת מועדפת: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"מצב רשת מועדפת: CDMA בלבד"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"מצב רשת מועדפת: EvDo בלבד"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"מצב רשת מועדפת: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"מצב רשת מועדפת: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"מצב רשת מועדפת: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"מצב רשת מועדפת: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"מצב רשת מועדפת: גלובלי"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"מצב רשת מועדפת: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"מצב רשת מועדפת: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"מצב רשת מועדפת: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"מצב רשת מועדפת: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"מצב רשת מועדפת: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"מצב רשת מועדפת: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"מצב רשת מועדפת: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"מצב רשת מועדפת: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"מצב רשת מועדפת: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"מצב רשת מועדפת: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"מצב רשת מועדפת: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"מצב רשת מועדפת: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"מצב רשת מועדפת: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (מומלץ)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (מומלץ)"</string>
+ <string name="network_global" msgid="959947774831178632">"כללי"</string>
+ <string name="label_available" msgid="1731547832803057893">"רשתות זמינות"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"מחפש…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"מתבצע רישום ב-<xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"כרטיס ה-SIM לא מאפשר חיבור לרשת זו."</string>
+ <string name="connect_later" msgid="978991102125216741">"לא ניתן להתחבר לרשת זו כעת. יש לנסות שוב מאוחר יותר."</string>
+ <string name="registration_done" msgid="4573820010512184521">"רשום ברשת."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"בחירה אוטומטית של הרשת"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"הגדרות ספק"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"הגדרת שירות נתונים"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"חבילת גלישה"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"שימוש בחבילת הגלישה דרך הרשת הסלולרית"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"סוג רשת מועדפת"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"שינוי מצב ההפעלה של הרשת"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"סוג רשת מועדפת"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"ספק"</string>
+ <string name="call_category" msgid="8108654745239563833">"שיחות"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"שיחות וידאו באמצעות הספק הסלולרי"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"בחירת מערכת"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"שינוי מצב נדידת CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"בחירת מערכת"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"רשת"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"רשת"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"הרשמה ל-CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"החלפה בין RUIM/SIM ל-NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"מינוי"</string>
+ <string name="register_automatically" msgid="518185886971595020">"רישום אוטומטי…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"האם לאפשר נדידה?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"למידע נוסף על המחירים, יש לפנות לספק השירות."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"שימוש בחבילת גלישה באפליקציה"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"מצב רשת לא חוקי <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. התעלמות."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"לא זמין כשהמכשיר מחובר ל-<xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"הצגת פריטים נוספים"</string>
+ <string name="see_less" msgid="1250265310929558370">"הצג פחות"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index d75a8d5..6cd7f4e 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"従量制として処理"</item>
<item msgid="2266114985518865625">"定額制として処理"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"デフォルト（ランダムな MAC を使用）"</item>
+ <item msgid="5398461510512959597">"信頼済み"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"いいえ"</item>
<item msgid="3863157480502955888">"はい"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"常に ON"</item>
<item msgid="6385301106124765323">"常に OFF"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"OFF"</item>
+ <item msgid="2182686878828390312">"デバッグ"</item>
+ <item msgid="5286514712714822064">"詳細"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"ホームのみ"</item>
+ <item msgid="5034813753274486448">"自動"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM / WCDMA を優先"</item>
+ <item msgid="807926878589867564">"GSM のみ"</item>
+ <item msgid="488474605709912156">"WCDMA のみ"</item>
+ <item msgid="1912421096218750039">"GSM / WCDMA 自動"</item>
+ <item msgid="5072198667819683600">"CDMA / EV-DO 自動"</item>
+ <item msgid="370391313511477301">"CDMA（EV-DO 非準拠）"</item>
+ <item msgid="4678789463133969294">"EV-DO のみ"</item>
+ <item msgid="3960210542349075517">"CDMA / EV-DO / GSM / WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA+LTE / EV-DO"</item>
+ <item msgid="8008611169788556519">"GSM / WCDMA / LTE"</item>
+ <item msgid="4486851520863433847">"グローバル"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA のみ"</item>
+ <item msgid="8373504428469988469">"TDSCDMA / WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE / TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA / GSM"</item>
+ <item msgid="131738018826229696">"LTE / TDSCDMA / GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA / GSM / WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE / TDSCDMA / WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE / TDSCDMA / GSM / WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA / CDMA / EV-DO / GSM / WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE / TDSCDMA / CDMA / EV-DO / GSM / WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM / SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"グローバル"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 15843e2..f9ce187 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"作成"</string>
<string name="allow" msgid="3349662621170855910">"許可"</string>
<string name="deny" msgid="6947806159746484865">"許可しない"</string>
- <string name="dlg_close" msgid="7471087791340790015">"閉じる"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"切り替え"</string>
<string name="device_info_default" msgid="7847265875578739287">"不明"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">デベロッパーになるまであと<xliff:g id="STEP_COUNT_1">%1$d</xliff:g>ステップです。</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"開発者向けオプションが既に有効です。"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"まず開発者向けオプションを有効にしてください。"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"無線とネットワーク"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"接続"</string>
- <string name="header_category_device" msgid="4544026001618307754">"端末"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ユーザー設定"</string>
- <string name="header_category_access" msgid="7580499097416970962">"アクセス"</string>
<string name="header_category_system" msgid="2816866961183068977">"システム"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"データ接続を有効にする"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"データ接続を無効にする"</string>
@@ -88,7 +82,7 @@
<string name="font_size_preview_text_headline" msgid="7955317408475392247">"サンプル テキスト"</string>
<string name="font_size_preview_text_title" msgid="1310536233106975546">"オズの魔法使い"</string>
<string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"第 11 章: オズの不思議なエメラルド シティ"</string>
- <string name="font_size_preview_text_body" msgid="2846183528684496723">"緑のメガネで目を守っていても、ドロシーとその仲間たちは不思議なシティの輝きに最初はくらくらしました。通りには緑色の大理石造りの美しい家々が建ち並び、どの家にもキラキラしたエメラルドがいたるところにはめ込んでありました。足元の敷石も同じ緑色の大理石で、ブロックの継ぎ目にはエメラルドがすきまなく並び、太陽を反射してギラギラしていました。窓のガラスも緑色、空の色も緑色、太陽の光も緑色でした。\n\n男の人、女の人、子どもなど、たくさんの人が歩いていて、だれもかれもが緑色の服を着て、肌の色も緑がかっていました。みんなドロシーとその奇妙な寄せ集めの仲間たちに不思議そうな目を向け、子どもたちはライオンを見るなり、逃げ出してお母さんの後ろに隠れてしまいましたが、誰一人として話しかけてくる人はいませんでした。通りにはお店がたくさんあって、ドロシーはそこで売られている品物も緑色をしていることに気づきました。キャンディーも、ポップコーンも、靴も、帽子も、服もみんな緑色でした。男の人が売っている緑色のレモネードを子どもたちが買うときに出したお金も緑色だったことにドロシーは気づきました。\n\nT馬などの動物はいないようでした。荷物は小さな緑色の手押し車で自分たちで運んでいました。みんな幸せで、満たされ、裕福そうな様子でした。"</string>
+ <string name="font_size_preview_text_body" msgid="2846183528684496723">"緑のメガネで目を守っていても、ドロシーとその仲間たちは不思議なシティの輝きに最初はくらくらしました。通りには緑色の大理石造りの美しい家々が建ち並び、どの家にもキラキラしたエメラルドがいたるところにはめ込んでありました。足元の敷石も同じ緑色の大理石で、ブロックの継ぎ目にはエメラルドがすきまなく並び、太陽を反射してギラギラしていました。窓のガラスも緑色、空の色も緑色、太陽の光も緑色でした。\n\n男の人、女の人、子どもなど、たくさんの人が歩いていて、だれもかれもが緑色の服を着て、肌の色も緑がかっていました。みんなドロシーとその奇妙な寄せ集めの仲間たちに不思議そうな目を向け、子どもたちはライオンを見るなり、逃げ出してお母さんの後ろに隠れてしまいましたが、誰一人として話しかけてくる人はいませんでした。通りにはお店がたくさんあって、ドロシーはそこで売られている品物も緑色をしていることに気づきました。キャンディーも、ポップコーンも、靴も、帽子も、服もみんな緑色でした。男の人が売っている緑色のレモネードを子どもたちが買うときに出したお金も緑色だったことにドロシーは気づきました。\n\n馬などの動物はいないようでした。荷物は小さな緑色の手押し車で自分たちで運んでいました。みんな幸せで、満たされ、裕福そうな様子でした。"</string>
<string name="font_size_save" msgid="3450855718056759095">"OK"</string>
<string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USBストレージ"</string>
<string name="sdcard_setting" product="default" msgid="5922637503871474866">"SDカード"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"端末の Bluetooth アドレス: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>を切断しますか？"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"ブロードキャスト"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"名前のないBluetoothデバイス"</string>
<string name="progress_scanning" msgid="192587958424295789">"検索中"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"周辺にBluetoothデバイスが見つかりません"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"アプリが Bluetooth を ON にして他のデバイスにこのスマートフォンを表示しようとしています。これは後から Bluetooth の設定で変更できます。"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"BluetoothをONにしています..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"BluetoothをOFFにしています..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動接続"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth接続リクエスト"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に接続するにはタップしてください。"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」に接続してもよろしいですか？"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"利用可能な通話デバイス"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"現在接続されている端末"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"保存済みの端末"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"端末の追加"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"ペア設定できるよう Bluetooth が ON になります"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"接続の設定"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"以前接続されていたデバイス"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"以前に接続"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth を ON にしました"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"すべて表示"</string>
<string name="date_and_time" msgid="9062980487860757694">"日付と時刻"</string>
<string name="choose_timezone" msgid="1362834506479536274">"タイムゾーンの選択"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"スキップ"</string>
<string name="next_label" msgid="4693520878012668114">"次へ"</string>
<string name="language_picker_title" msgid="3596315202551687690">"言語"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"言語の設定"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"削除"</string>
<string name="add_a_language" msgid="2330538812283783022">"言語を追加"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"設定のショートカット"</string>
<string name="airplane_mode" msgid="8837269988154128601">"機内モード"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"もっと見る"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線とネットワーク"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi、Bluetooth、機内モード、モバイルネットワーク、VPNの設定"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"モバイルデータ"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"プライバシー"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"管理者により無効にされています"</string>
<string name="security_status_title" msgid="5848766673665944640">"セキュリティ ステータス"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"画面ロック、フェイス アンロック"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"画面ロック、指紋"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"画面ロック"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"顔を追加しました"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"顔認証でロックを解除"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"顔で認証"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"顔認証を使用して、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます。"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"顔認証を使用できます"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"顔を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 顔を使ってこの端末のロックを解除することはできません。詳しくは、組織の管理者にお問い合わせください。"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"顔認証を使用して、スマートフォンのロック解除、購入の許可、アプリへのログインを行うことができます"</string>
- <string name="face_add_max" msgid="2342250989212694454">"最大で <xliff:g id="COUNT">%d</xliff:g> 個の指紋を追加できます"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"顔が円の中央にくるようにしてください"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"後で"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"最大で <xliff:g id="COUNT">%d</xliff:g> 個の顔を追加できます"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"追加された顔の数が上限に達しました"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"これ以上、顔を追加できません"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"登録を完了できませんでした"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"顔の登録がタイムアウトになりました。もう一度お試しください。"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"顔を登録できませんでした。"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"登録が完了しました。"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"完了"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"顔認証による操作"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"端末のロック解除"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"アプリのログインと支払い"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"目を開いた状態でロック解除"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"顔認証時には目を開いていなければなりません"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"顔認証データを削除"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"顔認証データの改善"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"顔認証で端末のロックを解除したり、アプリにアクセスしたりできます。"<annotation id="url">"詳細"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"指紋"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"指紋の管理"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"指紋の用途"</string>
@@ -496,7 +503,7 @@
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"暗号化できませんでした"</string>
<string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"暗号化処理が中断されて完了できなかったためタブレット上のデータにアクセスできなくなりました。\n\nタブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
<string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"暗号化処理が中断されて完了できなかったため端末上のデータにアクセスできなくなりました。\n\n端末の使用を再開するには出荷時設定にリセットする必要があります。リセット後、端末のセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
- <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"復号化の失敗"</string>
+ <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"復号の失敗"</string>
<string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"入力したパスワードは正しいのですが、データが破損しています。\n\nタブレットの使用を再開するには出荷時設定にリセットする必要があります。リセット後、タブレットのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
<string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"入力したパスワードは正しいのですが、データが破損しています。\n\nスマートフォンの使用を再開するには出荷時設定にリセットする必要があります。リセット後、スマートフォンのセットアップの段階で、Googleアカウントにバックアップしたデータの復元を選択できます。"</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"入力方法の切り替え"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi‑Fi アクセス ポイントの帯域幅を少なくとも 1 つ選択してください。"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP設定"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"プライバシー"</string>
<string name="wifi_shared" msgid="844142443226926070">"他の端末ユーザーと共有する"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"（変更なし）"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"選択してください"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"キャンセル"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"ネットワークを削除"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"このネットワークのすべてのパスワードを削除します"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"保存済みネットワーク"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">ネットワーク: %d 件</item>
<item quantity="one">ネットワーク: 1 件</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"明るさ"</string>
<string name="brightness_summary" msgid="838917350127550703">"画面の明るさを調整する"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"明るさの自動調節"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ON"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"OFF"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"優先する明るさは「非常に低い」です"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"優先する明るさは「低」です"</string>
@@ -1121,8 +1127,8 @@
<string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"電池使用量が増えます"</string>
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"周囲に合わせて明るさを最適化します。この機能が ON の場合でも、一時的に明るさを調整できます。"</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"画面の明るさは環境やアクティビティに応じて自動的に調整されます。スライダーを手動で動かして、明るさの自動調節機能に設定を学習させることもできます。"</string>
- <string name="night_display_title" msgid="2626451512200357686">"読書灯"</string>
- <string name="night_display_text" msgid="1837277457033025056">"読書灯を利用すると画面が黄味がかった色になります。薄明かりの下でも画面を見やすくなり、寝付きを良くする効果も期待できます。"</string>
+ <string name="night_display_title" msgid="2626451512200357686">"夜間モード"</string>
+ <string name="night_display_text" msgid="1837277457033025056">"夜間モードを利用すると画面が黄味がかった色になります。薄明かりの下でも画面を見やすくなり、寝付きを良くする効果も期待できます。"</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"スケジュール"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"使用しない"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"指定した時間に ON"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PINを変更できません。\nPINが正しくない可能性があります。"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PINが変更されました"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIMカードのロック状態を変更できません。\nPINが正しくない可能性があります。"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN を無効にできません。"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN を有効にできません。"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"キャンセル"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"複数のSIMが見つかりました"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g>をフォーマットする必要があります。\n\n"<b>"フォーマットを行うと、現在<xliff:g id="NAME_1">^1</xliff:g>に保存されているすべてのデータが消去されます。"</b>"データの喪失を防ぐため、バックアップを取ることを検討してください。"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"消去してフォーマット"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>をフォーマット中…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"フォーマット中は <xliff:g id="NAME">^1</xliff:g>を取り外さないでください。"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"フォーマット中は <xliff:g id="NAME">^1</xliff:g>を取り外さないでください。"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"データを新しいストレージに移動"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"写真、ファイル、一部のアプリをこの新しい<xliff:g id="NAME">^1</xliff:g>に移動できます。\n\n移動には約<xliff:g id="TIME">^2</xliff:g>かかります。これにより内部ストレージの空き容量が<xliff:g id="SIZE">^3</xliff:g>増えます。移動中は一部のアプリが使用できなくなります。"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"今すぐ移動"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"インストール済み"</string>
<string name="no_applications" msgid="7336588977497084921">"アプリはありません。"</string>
<string name="internal_storage" msgid="1584700623164275282">"内部ストレージ"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"内部ストレージ"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USBストレージ"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SDカードストレージ"</string>
<string name="recompute_size" msgid="7722567982831691718">"サイズを再計算中..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"アプリのデータを削除しますか？"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"このアプリのすべてのデータ（ファイル、設定、アカウント、データベースを含む）が完全に削除されます。"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"インストール済みアプリのリストに、このアプリはありません。"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"アプリのストレージを消去できませんでした。"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"このアプリは下記にアクセスする場合があります。"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"このアプリは下記にアクセスする場合があります。"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"このアプリはタブレット上で下記にアクセスすることがあります。パフォーマンスの向上とメモリ使用量の削減のために、これらの権限の一部は<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>で使用しています。これは<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>と同じプロセスで実行されるためです:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"このアプリはモバイル端末上で下記にアクセスすることがあります。パフォーマンスの向上とメモリ使用量の削減のために、これらの権限の一部は<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>で使用しています。これは<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>と同じプロセスで実行されるためです:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>と<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>、<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"このアプリでは料金が請求される場合があります:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"プレミアムSMSを送信"</string>
<string name="computing_size" msgid="1599186977475211186">"計算中..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"パッケージのサイズを計算できませんでした。"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"サードパーティ製のアプリはインストールされていません。"</string>
<string name="version_text" msgid="9189073826278676425">"バージョン<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"移動"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"タブレットに移動"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"モバイル端末に移動"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USBストレージに移動"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SDカードに移動"</string>
- <string name="moving" msgid="6431016143218876491">"移動中"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"別の移行を既に実行しています。"</string>
<string name="insufficient_storage" msgid="481763122991093080">"十分な空き容量がありません。"</string>
<string name="does_not_exist" msgid="1501243985586067053">"アプリが存在しません。"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"端末管理アプリは外部メディアにはインストールできません"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"強制停止しますか？"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"アプリを強制停止すると、アプリが正常に機能しないことがあります。"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"アプリを移動できませんでした。<xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"優先インストール先"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"新しいアプリの優先インストール先を変更する"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"内蔵アプリを無効にしますか？"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"アプリを無効にする"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"このアプリを無効にすると、Android などの他のアプリが正しく動作しなくなる恐れがあります。"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"データを削除し、アプリを無効にしますか？"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"このアプリを無効にすると、Android などの他のアプリが正しく動作しなくなる恐れがあります。データも削除されます。"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"通知をOFFにしますか？"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"このアプリの通知をOFFにすると、重要なアラートや更新を見逃すおそれがあります。"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"ストア"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"アプリの詳細"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> からインストールしたアプリ"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"サービスの使用"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"色補正の使用"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"字幕の使用"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"続行"</string>
<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="6371077608778830020">"補聴器の追加"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"アプリのバックグラウンド アクティビティを制限すると、アプリが正常に機能しないことがあります"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"このアプリは、電池の最適化が設定されていないため、制限することはできません。\n\nこのアプリを制限するには、電池の最適化を ON にしてください。"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"フル充電時の使用可能時間"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"画面消費"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"モバイル ネットワークのスキャン"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"フル充電以降の電池使用"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"フル充電以降の画面がオンの時間"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"フル充電以降の端末の電池使用状況"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"使用状況の詳細"</string>
<string name="controls_subtitle" msgid="390468421138288702">"消費電力の調整"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"含まれているパッケージ"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"電池を消費しているアプリ"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"端末がスリープ状態に移行しないようにします"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"バックグラウンドで端末をスリープ状態から復帰させています"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"位置情報を頻繁にリクエストしています"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個のアプリの動作に問題があります"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"アプリは正常に実行されています"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"スマートフォンのバックグラウンドでの電池使用量は正常です"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"タブレットのバックグラウンドでの電池使用量は正常です"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d 個のアプリの電池使用を制限しています</item>
<item quantity="one">%1$d 個のアプリの電池使用を制限しています</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"制限ありに指定: <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"このアプリがバックグラウンドで電池を使用していました。制限したアプリは正常に動作しないことがあります。また、通知が遅れる可能性もあります。"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"バッテリー マネージャの使用"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"アプリの電池使用量が多いかどうかを検出します"</string>
@@ -2411,27 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"キャンセル"</string>
<string name="tts_reset" msgid="2661752909256313270">"リセット"</string>
<string name="tts_play" msgid="2628469503798633884">"再生"</string>
- <string name="gadget_title" msgid="5519037532720577836">"電源管理"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi設定の更新"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth設定の更新"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ON"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"OFF"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ONにしています"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"OFFにしています"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"現在地"</string>
- <string name="gadget_sync" msgid="858895763714222152">"同期"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"画面の明るさ<xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"自動"</string>
- <!-- String.format failed for translation -->
- <!-- no translation found for gadget_brightness_state_full (6814570109772137631) -->
- <skip />
- <!-- String.format failed for translation -->
- <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
- <skip />
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"OFF"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"認証情報ストレージ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ストレージからのインストール"</string>
@@ -2589,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"すべて選択"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"データ使用量"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"アプリのデータ使用"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"モバイルデータと Wi-Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"端末で記録されるデータ使用量と携帯通信会社のデータ使用量は異なる場合があります。"</string>
<string name="data_usage_app" msgid="4970478397515423303">"アプリの使用状況"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"アプリ情報"</string>
@@ -2966,7 +2933,6 @@
<item quantity="other">%d 件の非表示のアイテムを表示</item>
<item quantity="one">%d 件の非表示のアイテムを表示</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"折りたたむ"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"ネットワークとインターネット"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"モバイル"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"データ使用量"</string>
@@ -2978,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"アプリと通知"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"権限、デフォルト アプリ"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"仕事用プロファイルのアプリには通知へのアクセス権限はありません。"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"アカウント"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"アカウントが追加されていません"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"デフォルト アプリ"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"言語、時間、バックアップ、アップデート"</string>
<string name="search_results_title" msgid="1796252422574886932">"設定"</string>
- <string name="search_menu" msgid="6283419262313758339">"検索"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, ネットワーク接続, インターネット, ワイヤレス, データ, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, 切り替え, 管理"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"テキスト メッセージ, テキスト送信, メッセージ, メッセージ送信, デフォルト"</string>
@@ -3028,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"支払い, タップ, ペイメント"</string>
<string name="keywords_backup" msgid="470070289135403022">"バックアップ, バック アップ"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"操作"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"顔, フェイス, ロック解除, アンロック, 認証, ログイン"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"IMEI, MEID, MIN, PRL バージョン, IMEI SV"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"ネットワーク, モバイル ネットワークの状態, サービスの状態, 電波強度, モバイル ネットワークの種類, ローミング, ICCID"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"シリアル番号, ハードウェア バージョン"</string>
@@ -3035,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ダークテーマ"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"バグ"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"アンビエント表示, ロック画面表示"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"ロック画面の通知"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"顔"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"指紋"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"画面を暗くする, タッチスクリーン, 電池, スマート ブライトネス, ダイナミック ブライトネス"</string>
@@ -3065,7 +3033,7 @@
<string name="sound_dashboard_summary" msgid="3402435125958012986">"音量、バイブレーション、マナーモード"</string>
<string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"バイブレーション着信に設定"</string>
<string name="sound_settings_summary_silent" msgid="5074529767435584948">"マナーモード着信に設定"</string>
- <string name="sound_settings_example_summary" msgid="2404914514266523165">"着信音の音量: 80%%"</string>
+ <string name="sound_settings_example_summary" msgid="2404914514266523165">"着信音の音量: 80%"</string>
<string name="media_volume_option_title" msgid="2811531786073003825">"メディアの音量"</string>
<string name="call_volume_option_title" msgid="1265865226974255384">"通話音量"</string>
<string name="alarm_volume_option_title" msgid="8219324421222242421">"アラームの音量"</string>
@@ -3076,7 +3044,7 @@
<string name="notification_unknown_sound_title" msgid="2535027767851838335">"アプリの通知音"</string>
<string name="notification_sound_default" msgid="565135733949733766">"デフォルトの通知音"</string>
<string name="alarm_ringtone_title" msgid="6344025478514311386">"デフォルトのアラーム音"</string>
- <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"着信時もバイブレーションON"</string>
+ <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"着信時にバイブレーションもON"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"その他の音"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"ダイヤルパッドの操作音"</string>
<string name="screen_locking_sounds_title" msgid="1340569241625989837">"画面ロック音"</string>
@@ -3238,8 +3206,8 @@
<string name="notification_importance_blocked" msgid="7938180808339386300">"通知を表示しない"</string>
<string name="notification_importance_min" msgid="9054819132085066824">"マナーモードで表示し最小化"</string>
<string name="notification_importance_low" msgid="2445139943005315690">"マナーモードで表示する"</string>
- <string name="notification_importance_default" msgid="5958338024601957516">"音声で知らせる"</string>
- <string name="notification_importance_high" msgid="2082429479238228527">"音声とポップアップで知らせる"</string>
+ <string name="notification_importance_default" msgid="5958338024601957516">"音で知らせる"</string>
+ <string name="notification_importance_high" msgid="2082429479238228527">"音とポップアップで知らせる"</string>
<string name="notification_importance_high_silent" msgid="2667033773703765252">"ポップアップ"</string>
<string name="notification_importance_min_title" msgid="6974673091137544803">"低"</string>
<string name="notification_importance_low_title" msgid="8131254047772814309">"中"</string>
@@ -3313,8 +3281,8 @@
<string name="notification_content_block_summary" msgid="7746185794438882389">"シェードにも周辺端末にも通知を表示しない"</string>
<string name="notification_badge_title" msgid="6370122441168519809">"通知ドットの許可"</string>
<string name="notification_channel_badge_title" msgid="2240827899882847087">"通知ドットの表示"</string>
- <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"マナーモードのオーバーライド"</string>
- <string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"マナーモードが ON の場合もこの通知を引き続き表示します"</string>
+ <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"ミュートの例外"</string>
+ <string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"ミュートが ON の場合もこの通知を引き続き表示します"</string>
<string name="app_notification_visibility_override_title" msgid="7821124557634786985">"ロック画面上"</string>
<string name="app_notification_row_banned" msgid="5983655258784814773">"ブロック済み"</string>
<string name="app_notification_row_priority" msgid="7723839972982746568">"優先"</string>
@@ -3466,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"PINを入力してこの端末を開始しても、<xliff:g id="SERVICE">%1$s</xliff:g>のようなユーザー補助サービスはまだご利用になれません。"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"パターンを入力してこの端末を開始しても、<xliff:g id="SERVICE">%1$s</xliff:g>のようなユーザー補助サービスはまだご利用になれません。"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"パスワードを入力してこの端末を開始する場合、<xliff:g id="SERVICE">%1$s</xliff:g>のようなユーザー補助サービスはまだご利用になれません。"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"注: 再起動後、スマートフォンのロックを解除するまでこのアプリを起動することはできません"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"注: スマートフォンを再起動したときに画面ロックが設定されている場合は、スマートフォンのロックを解除するまでこのアプリは起動できません"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI情報"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI関連情報"</string>
<string name="slot_number" msgid="3762676044904653577">"（スロット<xliff:g id="SLOT_NUM">%1$d</xliff:g>）"</string>
@@ -3520,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"個人用"</string>
<string name="filter_work_apps" msgid="24519936790795574">"仕事用"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"アプリ: すべて"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"アプリ: OFF"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"OFF にしました"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"カテゴリ: 重要度「緊急」"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"カテゴリ: 重要度「低」"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"カテゴリ: OFF"</string>
@@ -3581,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"使用状況に関する通知"</string>
<string name="show_all_apps" msgid="1512506948197818534">"フル充電以降の電池使用状況を表示"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"アプリの使用状況を表示"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"使用量が多いアイテム"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> 個のアプリが正常に動作していません</item>
<item quantity="one">「<xliff:g id="APP">%1$s</xliff:g>」が正常に動作していません</item>
@@ -3745,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"内部ストレージ: 使用済み <xliff:g id="PERCENTAGE">%1$s</xliff:g> - 空き容量 <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"操作が行われない状態で <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過するとスリープ状態になります"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"壁紙、スリープ、フォントサイズ"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"操作が行われない状態で 10 分経過するとスリープ状態になります"</string>
<string name="memory_summary" msgid="8080825904671961872">"平均で<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>のうち<xliff:g id="USED_MEMORY">%1$s</xliff:g>を使用しています"</string>
<string name="users_summary" msgid="1674864467098487328">"ログイン名: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3760,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS は許可されていません"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"カメラは許可されていません"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"スクリーンショットは許可されていません"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"バックアップを無効にすることはできません"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"このアプリを開くことはできません"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"ご不明な点がある場合は、IT 管理者にお問い合わせください"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"詳細"</string>
@@ -3792,9 +3760,9 @@
<string name="condition_device_vibrate_title" product="default" msgid="1087633233379991925">"スマートフォンはバイブレーションに設定されています"</string>
<string name="condition_device_vibrate_summary" product="tablet" msgid="433514444618164607">"着信と通知を端末のバイブレーションで知らせます"</string>
<string name="condition_device_vibrate_summary" product="default" msgid="5877034997839162763">"着信と通知をスマートフォンのバイブレーションで知らせます"</string>
- <string name="night_display_suggestion_title" msgid="6602129097059325291">"読書灯のスケジュールの設定"</string>
+ <string name="night_display_suggestion_title" msgid="6602129097059325291">"夜間モードのスケジュールの設定"</string>
<string name="night_display_suggestion_summary" msgid="228346372178218442">"夜間に画面の色みを自動的に変えて見やすくします"</string>
- <string name="condition_night_display_title" msgid="5599814941976856183">"読書灯 ON"</string>
+ <string name="condition_night_display_title" msgid="5599814941976856183">"夜間モード ON"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"画面が黄味がかった色になります。寝付きを良くする効果も期待できます。"</string>
<string name="suggestions_title_v2" msgid="5601181602924147569">"おすすめ"</string>
<string name="suggestions_title" msgid="7280792342273268377">"候補"</string>
@@ -3924,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"カットアウトがあるディスプレイのシミュレート"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ディスプレイ カットアウト"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ディスプレイ カットアウト, ノッチ"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"なし"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"端末のデフォルト"</string>
<string name="special_access" msgid="3458780842491881155">"特別なアプリアクセス"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other">データの無制限使用が可能なアプリは <xliff:g id="COUNT">%d</xliff:g> 個です</item>
@@ -3948,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> に接続しました"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"複数のデバイスに接続しました"</string>
<string name="demo_mode" msgid="2798762752209330277">"システム UI デモモード"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"夜間モード"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"夜間モードの設定"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"ダークモード"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"ダークモードの設定"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"クイック設定開発者用タイル"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"ウィンスコープ トレース"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"仕事用プロファイルの設定"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"連絡先の検索"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"発信者や連絡先を特定するために組織による連絡先の検索を許可します"</string>
@@ -3993,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"端末の画面をダブルタップして通知をチェック"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"タブレットの画面をダブルタップして通知をチェック"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"端末の画面をダブルタップして通知をチェック"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"時刻、通知アイコンなどの情報を確認するには、画面をダブルタップします。"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"時刻、通知などの情報を確認するには、画面をダブルタップします。"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"端末を持ち上げて通知をチェック"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"タブレットを持ち上げて通知をチェック"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"端末を持ち上げて通知をチェック"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"時刻、通知アイコンなどの情報を確認するには、スマートフォンを持ち上げます。"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"時刻、通知アイコンなどの情報を確認するには、タブレットを持ち上げます。"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"時刻、通知アイコンなどの情報を確認するには、端末を持ち上げます。"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ディスプレイの復帰"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"時刻、通知などの情報を確認するには、スマートフォンを持ち上げます。"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"時刻、通知などの情報を確認するには、タブレットを持ち上げます。"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"時刻、通知などの情報を確認するには、端末を持ち上げます。"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"wake lock 画面のジェスチャー"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"指紋センサーをスワイプして通知を表示"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"指紋センサーのスワイプ"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"通知を確認するには、スマートフォンの背面にある指紋認証センサーを下にスワイプします。"</string>
@@ -4079,7 +4050,6 @@
<item quantity="other">パスワードの入力回数: <xliff:g id="COUNT_1">%d</xliff:g></item>
<item quantity="one">パスワードの入力回数: <xliff:g id="COUNT_0">%d</xliff:g></item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"この端末のデータはバックアップされます"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"この端末は組織によって管理されています。"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"この端末は <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> により管理されています。"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4120,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"自動入力サービス"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"自動, 入力, 自動入力"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>このアプリが信頼できることを確認してください</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> は画面上の内容に基づいて、入力可能な情報を判別します。"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"自動入力"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"ロギングレベル"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"セッションごとの最大リクエスト数"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"表示するデータセットの最大数"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"デフォルト値にリセット"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"自動入力の開発者向けオプションをリセットしました"</string>
<string name="device_theme" msgid="4571803018917608588">"端末のテーマ"</string>
<string name="default_theme" msgid="7085644992078579076">"デフォルト"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"ネットワーク名"</string>
@@ -4134,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"携帯通信会社のプロビジョニングをトリガー"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"マナーモードの更新"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"集中するために通知を一時停止する"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"注目の新機能"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"新しいスマートフォンの使い方をご紹介します"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新しいタブレットの使い方をご紹介します"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"新しい端末の使い方をご紹介します"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"この機能は、お使いの端末ではご利用いただけません"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS 計測の完全な実行"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"デューティ サイクリングを無効にした状態で、すべての GNSS コンステレーションと頻度をトラッキングします"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"クラッシュ ダイアログを常に表示"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"アプリのクラッシュが発生するごとにダイアログを表示します"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE 対応のアプリを選択してください"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE 対応のアプリは設定されていません"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE 対応のアプリ: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ディレクトリへのアクセス"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ディレクトリ アクセス"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g>（<xliff:g id="DIRECTORY">%2$s</xliff:g>）"</string>
@@ -4183,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"ネットワークの詳細"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"端末名がスマートフォンのアプリに表示されます。また、Bluetooth デバイスに接続したり Wi-Fi アクセス ポイントを設定したりすると、他のユーザーも端末名を確認できるようになります。"</string>
<string name="devices_title" msgid="7701726109334110391">"端末"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"すべての設定"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"おすすめの設定"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS データ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS データ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ネットワークを選択"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"接続が解除されました"</string>
+ <string name="network_connected" msgid="4943925032253989621">"接続しました"</string>
+ <string name="network_connecting" msgid="76404590784733557">"接続しています…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"接続できませんでした"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ネットワークが見つかりません。"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ネットワークが見つかりませんでした。もう一度お試しください。"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"（禁止）"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM カードなし"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"拡張モードでの通話"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"優先ネットワーク モード: WCDMA 優先"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"優先ネットワーク モード: GSM のみ"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"優先ネットワーク モード: WCDMA のみ"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"優先ネットワーク モード: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"優先ネットワーク モード: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"優先ネットワーク モード: CDMA / EV-DO"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"優先ネットワーク モード: CDMA のみ"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"優先ネットワーク モード: EV-DO のみ"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"優先ネットワーク モード: CDMA / EV-DO / GSM / WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"優先ネットワーク モード: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"優先ネットワーク モード: GSM / WCDMA / LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"優先ネットワーク モード: CDMA+LTE / EV-DO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"優先ネットワーク モード: グローバル"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"優先ネットワーク モード: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"推奨ネットワーク モード: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"優先ネットワーク モード: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"優先ネットワーク モード: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"優先ネットワーク モード: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"優先ネットワーク モード: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"優先ネットワーク モード: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"優先ネットワーク モード: LTE / GSM / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"優先ネットワーク モード: TDSCDMA / GSM / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"優先ネットワーク モード: LTE / TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"優先ネットワーク モード: LTE / TDSCDMA / GSM / WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"優先ネットワーク モード: TDSCDMA / CDMA / EV-DO / GSM / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"優先ネットワーク モード: LTE / TDSCDMA / CDMA / EV-DO / GSM / WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE（推奨）"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G（推奨）"</string>
+ <string name="network_global" msgid="959947774831178632">"グローバル"</string>
+ <string name="label_available" msgid="1731547832803057893">"利用可能なネットワーク"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"検索しています…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> に登録しています…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"お使いの SIM カードではこのネットワークに接続できません。"</string>
+ <string name="connect_later" msgid="978991102125216741">"現在このネットワークに接続できません。しばらくしてからもう一度お試しください。"</string>
+ <string name="registration_done" msgid="4573820010512184521">"ネットワークに登録しました。"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"ネットワークを自動的に選択"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"携帯通信会社の設定"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"データサービスの設定"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"モバイルデータ"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"モバイル ネットワーク経由でデータにアクセス"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"優先ネットワークの種類"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"ネットワーク動作モードの変更"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"優先ネットワークの種類"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"携帯通信会社"</string>
+ <string name="call_category" msgid="8108654745239563833">"通話"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"携帯通信会社のビデオ通話"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"システムの選択"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA ローミング モードを変更する"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"システムの選択"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"ネットワーク"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"ネットワーク"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA 登録"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM / SIM と NV を切り替える"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"登録"</string>
+ <string name="register_automatically" msgid="518185886971595020">"自動登録..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"データ ローミングを許可しますか？"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"価格設定については、ネットワーク プロバイダにお問い合わせください。"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"アプリのデータ使用量"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"ネットワーク モード <xliff:g id="NETWORKMODEID">%1$d</xliff:g> は無効です。無視してください。"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> への接続時は利用できません"</string>
+ <string name="see_more" msgid="5953815986207345223">"詳細"</string>
+ <string name="see_less" msgid="1250265310929558370">"一部を表示"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 729eba9..8db4b90 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"ლიმიტირებულად ჩათვლა"</item>
<item msgid="2266114985518865625">"არალიმიტირებულად ჩათვლა"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ნაგულისხმევი (შემთხვევითი MAC-მისამართის გამოყენება)"</item>
+ <item msgid="5398461510512959597">"სანდო"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"არა"</item>
<item msgid="3863157480502955888">"დიახ"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"ყოველთვის ჩართული"</item>
<item msgid="6385301106124765323">"ყოველთვის გამორთული"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"გამორთვა"</item>
+ <item msgid="2182686878828390312">"შეცდომების გამართვა"</item>
+ <item msgid="5286514712714822064">"დაწვრილებითი"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"მხოლოდ საშინაო"</item>
+ <item msgid="5034813753274486448">"ავტომატური"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"სასურველია GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"მხოლოდ GSM"</item>
+ <item msgid="488474605709912156">"მხოლოდ WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA ავტომატური"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo ავტომატური"</item>
+ <item msgid="370391313511477301">"CDMA, EvDo-ს გარეშე"</item>
+ <item msgid="4678789463133969294">"მხოლოდ EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"გლობალური"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"მხოლოდ TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"გლობალური"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 9bef15c..5a8539c 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"შექმნა"</string>
<string name="allow" msgid="3349662621170855910">"ნების დართვა"</string>
<string name="deny" msgid="6947806159746484865">"უარყოფა"</string>
- <string name="dlg_close" msgid="7471087791340790015">"დახურვა"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"გადართვა"</string>
<string name="device_info_default" msgid="7847265875578739287">"უცნობი"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">დეველოპერობამდე <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ნაბიჯი დაგრჩათ.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"არ არის საჭირო, თქვენ უკვე დეველოპერი ხართ."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"გთხოვთ, ჯერ ჩართოთ დეველოპერთა პარამეტრები."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"უსადენო კავშირი და ქსელები"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"კავშირები"</string>
- <string name="header_category_device" msgid="4544026001618307754">"მოწყობილობა"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"პირადი"</string>
- <string name="header_category_access" msgid="7580499097416970962">"წვდომა"</string>
<string name="header_category_system" msgid="2816866961183068977">"სისტემა"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"მობილური ინტერნეტის ჩართვა"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"მობილური ინტერნეტის გათიშვა"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"მოწყობილობის Bluetooth-მისამართი: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"გაწყდეს კავშირი <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"მაუწყებლობა"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"უსახელო Bluetooth მოწყობილობა"</string>
<string name="progress_scanning" msgid="192587958424295789">"მიმდინარეობს ძიება"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ახლომახლო Bluetooth მოწყობილობების მოძიება ვერ მოხერხდა."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"აპს სურს, ჩართოს Bluetooth და გახადოს თქვენი ტელეფონი ხილვადი სხვა მოწყობილობებისთვის. ამის მოგვიანებით შეცვლა Bluetooth-ის პარამეტრებში შეგიძლიათ."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth-ის ჩართვა…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth-ის გათიშვა…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"ავტომატური დაკავშირება"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-ის დაკავშირების თხოვნა"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"შეეხეთ „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“-თან დასაკავშირებლად."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"გსურთ „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“-თან დაკავშირება?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"ხელმისაწვდომი დასარეკი მოწყობილობები"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"ამჟამად დაკავშირებულია"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"შენახული მოწყობილობები"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"მოწყობილობის დამატება"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"დასაწყვილებლად ჩაირთვება Bluetooth"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"კავშირის პარამეტრები"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"წარსულში დაკავშირებული მოწყობილობები"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"წარსულში დაკავშირებული"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth ჩაირთო"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"ყველას ნახვა"</string>
<string name="date_and_time" msgid="9062980487860757694">"თარიღი და დრო"</string>
<string name="choose_timezone" msgid="1362834506479536274">"დროის ზონის არჩევა"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"გამოტოვება"</string>
<string name="next_label" msgid="4693520878012668114">"შემდეგი"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ენები"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ენის პარამეტრები"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"ამოშლა"</string>
<string name="add_a_language" msgid="2330538812283783022">"ენის დამატება"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"პარამეტრები"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"პარამეტრების მალსახმობი"</string>
<string name="airplane_mode" msgid="8837269988154128601">"თვითმფრინავის რეჟიმი"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"დამატებით"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"უსადენო კავშირი და ქსელები"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, Bluetooth, თვითმფრინავის რეჟიმის, მობილურ ქსელებთან კავშირის და VPN-ების მართვა"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"მობილური ინტერნეტი"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"კონფიდენციალურობა"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"გათიშულია ადმინისტრატორის მიერ"</string>
<string name="security_status_title" msgid="5848766673665944640">"უსაფრთხოების სტატუსი"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"ეკრანის დაბლოკვა, განბლოკვა სახით"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"ეკრანის დაბლოკვა, თითის ანაბეჭდი"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ეკრანის დაბლოკვა"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"სახე დამატებულია"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"განბლოკეთ სახის მეშვეობით"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"გამოიყენეთ თქვენი სახე ავტორიზაციისთვის"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"გამოიყენეთ თქვენი სახე ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვის თუ აპებში შესასვლელად."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"გამოიყენეთ თქვენი სახე"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"გამოიყენეთ თქვენი სახე ტელეფონის განსაბლოკად ან შენაძენების დასადასტურებლად.\n\nგაითვალისწინეთ: ამ მოწყობილობას სახით ვერ განბლოკავთ. დამატებითი ინფორმაციისთვის დაუკავშირდით თქვენი ორგანიზაციის ადმინისტრატორს."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"გამოიყენეთ თქვენი სახე ტელეფონის განსაბლოკად, შენაძენების ავტორიზაციისთვის თუ აპებში შესასვლელად"</string>
- <string name="face_add_max" msgid="2342250989212694454">"შეგიძლიათ დაამატოთ მაქსიმუმ <xliff:g id="COUNT">%d</xliff:g> თითის ანაბეჭდი"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"მოაქციეთ თქვენი სახე წრეში"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"მოგვიანებით გაკეთება"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"შეგიძლიათ დაამატოთ მაქსიმუმ <xliff:g id="COUNT">%d</xliff:g> სახე"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"თქვენ უკვე დაამატეთ სახეების მაქსიმალური რაოდენობა"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"მეტი სახის დამატება ვერ ხერხდება"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"რეგისტრაცია ვერ დასრულდა"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"კარგი"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"სახის რეგისტრაციის დრო ამოიწურა. ცადეთ ისევ."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"სახის რეგისტრაცია ვერ მოხერხდა."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"ყველაფერი დაყენებულია."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"მზადაა"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"სახის გამოყენება"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"თქვენი მოწყობილობის განბლოკვა"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"აპებში შესვლა და გადახდა"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"განსაბლოკად გახელილი თვალები"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"სახის ამოცნობის გამოყენებისას თვალები გახელელი უნდა იყოს"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"სახის მონაცემების ამოშლა"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"სახის მონაცემების გაუმჯობესება"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"სახის გამოყენება შეგიძლიათ მოწყობილობის განბლოკვის და აპებზე წვდომის მიზნით. "<annotation id="url">"შეიტყვეთ მეტი"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"თითის ანაბეჭდი"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ანაბეჭდების მართვა"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ანაბეჭდების გამოყენება"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 გჰც"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"აირჩიეთ მინიმუმ ერთი დიაპაზონი Wi‑Fi უსადენო ქსელისთვის:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP პარამეტრები"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"კონფიდენციალურობა"</string>
<string name="wifi_shared" msgid="844142443226926070">"მოწყობილობის სხვა მომხმარებლებთან გაზიარება"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(უცვლელი)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"გთხოვთ, აირჩიოთ"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"გაუქმება"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"გსურთ ქსელის დავიწყება?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ამ ქსელის ყველა პაროლი წაიშლება"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"დამახსოვრებული ქსელები"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d ქსელი</item>
<item quantity="one">1 ქსელი</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"სიკაშკაშე"</string>
<string name="brightness_summary" msgid="838917350127550703">"ეკრანის სინათლის შესწორება"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"მორგებადი სიკაშკაშე"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ჩართული"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"გამორთული"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"სიკაშკაშის სასურველ დონედ დაყენებულია ძალიან დაბალი"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"სიკაშკაშის სასურველ დონედ დაყენებულია დაბალი"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN-ის შეცვლა შეუძლებელია.\nშესაძლოა შეყვანილია არასწორი PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-ის PIN-ი წარმატებით შეიცვალა"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"შეუძლებელი იყო SIM-ბარათის დაბლოკვის მდგომარეობის ცვლილება.\nშესაძლებელია, PIN-კოდი არასწორია."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN-კოდის გათიშვა ვერ მოხერხდა."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN-კოდის ჩართვა ვერ მოხერხდა."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"კარგი"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"გაუქმება"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"მოიძებნა სხვადასხვა SIM-ები"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ეს მოითხოვს <xliff:g id="NAME_0">^1</xliff:g>-ის ფორმატირებას. \n\n"<b>"ფორმატირების შედეგად წაიშლება <xliff:g id="NAME_1">^1</xliff:g>-ზე ამჟამად შენახული ყველა მონაცემი."</b>" მონაცემთა დაკარგვის თავიდან ასაცილებლად რეკომენდირებულია დამარქაფება."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"წაშლა და დაფორმატება"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>-ის დაფორმატება…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"არ ამოიღოთ <xliff:g id="NAME">^1</xliff:g> დაფორმატებისას."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"არ ამოიღოთ <xliff:g id="NAME">^1</xliff:g> დაფორმატებისას."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"გადააადგილეთ მონაც. ახალ საცავში"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"შეგიძლიათ გადაიტანოთ თქვენი ფოტოები, ფაილები და ზოგიერთი აპი ამ ახალ <xliff:g id="NAME">^1</xliff:g>-ში. \n\nგადატანას სჭირდება დაახლოებით <xliff:g id="TIME">^2</xliff:g> და <xliff:g id="SIZE">^3</xliff:g> გათავისუფლდება შიდა მეხსიერებაში. ზოგიერთი აპი არ იმუშავებს ვიდრე გადატანა მიმდინარეობს."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ახლავე გადაადგილება"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"დაინსტალირებულია"</string>
<string name="no_applications" msgid="7336588977497084921">"არ არის აპები."</string>
<string name="internal_storage" msgid="1584700623164275282">"შიდა მეხსიერება"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"შიდა მეხსიერება"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB მეხსიერება"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD მეხსიერება."</string>
<string name="recompute_size" msgid="7722567982831691718">"ზომის გადათვლა…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"წაიშალოს აპის მონაცემები?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"აპლიკაციის მონაცემები, მათ შორის ყველა ფაილი, პარამეტრი, ანგარიში, მონაცემთა ბაზა და ა.შ. სამუდამოდ წაიშლება."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"დაყენებული აპების სიაში ეს აპი ვერ მოიძებნა."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"აპის მეხსიერების გასუფთავება ვერ მოხერხდა."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ამ აპლიკაციას თქვენს ტაბლეტზე შემდეგ მონაცემებზე წვდომა შეუძლია:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"ამ აპლიკაციას თქვენს ტელეფონზე შემდეგ მონაცემებზე წვდომა შეუძლია:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ამ აპლიკაციას თქვენს ტაბლეტზე შემდეგ მონაცემებზე წვდომა შეუძლია. მუშაობის გასაუმჯობესებლად და მეხსიერებით სარგებლობის შესამცირებლად ზოგიერთი მოცემული ნებართვა ხელმისაწვდომია <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>-თვის ვინაიდან ის იმავე პროცესში მუშაობს, რაც <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ამ აპლიკაციას თქვენს ტელეფონზე შემდეგ მონაცემებზე წვდომა შეუძლია. მუშაობის გასაუმჯობესებლად და მეხსიერებით სარგებლობის შესამცირებლად ზოგიერთი მოცემული ნებართვა ხელმისაწვდომია <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>-თვის ვინაიდან ის იმავე პროცესში მუშაობს, რაც <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> და <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"ამ აპმა შესაძლოა შეცვალოს თქვენი ფული:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"გავაგზავნოთ SMS?"</string>
<string name="computing_size" msgid="1599186977475211186">"გამოთვლა…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"პაკეტის ზომის გამოთვლა ვერ მოხერხდა."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"თქვენ არ გაქვთ დაყენებული მესამე მხარის აპები."</string>
<string name="version_text" msgid="9189073826278676425">"ვერსია <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"გადაადგილება"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ტაბლეტში გადატანა"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ტელეფონში გადატანა"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"გადაიტანე USB მეხსიერებაში"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD ბარათზე გადატანა"</string>
- <string name="moving" msgid="6431016143218876491">"გადაადგილდება"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"მიგრაციის სხვა პროცესი უკვე მიმდინარეობს."</string>
<string name="insufficient_storage" msgid="481763122991093080">"არ არის საკმარისი სივრცე შესანახად."</string>
<string name="does_not_exist" msgid="1501243985586067053">"აპი არ არსებობს."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"მოწყობილობის ადმინისტრატორის აპის გარე მედიაზე ინსტალაცია ვერ მოხერხდება"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"იძულებითი შეჩერება"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"თუ აპს შეწყვეტას აიძულებთ, შესაძლოა, მან ცუდად განაგრძოს მუშაობა."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"აპის გადატანა ვერ მოხერხდა. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"დაყენების ადგილი"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"შეცვალეთ ახალი აპების დაყენებისთვის შერჩეული მდებარეობა"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"გამოირთოს ჩაშენებული აპი?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"აპის გამორთვა"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"ამ აპის გათიშვის შემთხვევაში, Android-მა და სხვა აპებმა შეიძლება გამართულად აღარ იმუშაოს."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"გსურთ, მონაცემების წაშლა და აპის გამორთვა?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ამ აპის გათიშვის შემთხვევაში, Android-მა და სხვა აპებმა შეიძლება გამართულად აღარ იმუშაოს. თქვენი მონაცემებიც წაიშლება."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"გამოვრთოთ შეტყობინებები?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ამ აპის შეტყობინებების გამორთვის შემთხვევაში შეიძლება გამოგრჩეთ მნიშვნელოვანი გაფრთხილებები და განახლებები."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"მაღაზია"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"აპის შესახებ"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"აპის წყარო: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"სერვისის გამოყენება"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ფერის კორექციის გამოყენება"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"სუბტიტრების გამოყენება"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"გაგრძელება"</string>
<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="6371077608778830020">"სმენის აპარატის დამატება"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"აპისთვის ფონური აქტივობის შეზღუდვის შემთხვევაში, მან შეიძლება არასათანადოდ იმუშაოს"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"რადგან ეს აპი ბატარეის ოპტიმიზებისთვის დაყენებული არაა, მას ვერ შეზღუდავთ.\n\nჩართეთ ბატარეის ოპტიმიზაცია აპის შესაზღუდავად."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"ეკრანის მოხმარება ბოლო სრული დატენვიდან"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"ეკრანის მოხმარება"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"მობილური ქსელის სკანირება"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"ბატარეის მოხმარება ბოლო სრული დატენვიდან"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"დროის ხანგრძლივობა სრული დატენვიდან, რომლის განმავლობაშიც ეკრანი ჩართული იყო"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"მოწყობილობის მოხმარება ბოლო სრული დატენვიდან"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"გამოყენების დეტალები"</string>
<string name="controls_subtitle" msgid="390468421138288702">"ენერგიის მოხმარების მორგება"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"შესული პაკეტები"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ბატარეის მხარჯავი აპები"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"მოწყობილობას გამოღვიძებულ რეჟიმში ტოვებს"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"მოწყობილობის გამოღვიძება ფონურ რეჟიმში"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ხშირად ითხოვს მდებარეობას"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> აპი არასათანადოდ მუშაობს"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"აპები გაშვებულია ჩვეულებრივად"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ტელეფონი ბატარეის ტიპური ფონური მოხმარებით ხასიათდება"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ტაბლეტი ბატარეის ტიპური ფონური მოხმარებით ხასიათდება"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">მიმდინარეობს ბატარეის მოხმარების შეზღუდვა %1$d აპისთვის</item>
<item quantity="one">მიმდინარეობს ბატარეის მოხმარების შეზღუდვა %1$d აპისთვის</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"შეიზღუდა <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"ეს აპები ბატარეას ფონურ რეჟიმში მოიხმარდა. შეზღუდულმა აპებმა შესაძლოა გამართულად არ იმუშაოს და დაგვიანდეს შეტყობინებები."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Battery Manager-ის გამოყენება"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"ამოცნობა, როცა აპები ბატარეას ცლის"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"გაუქმება"</string>
<string name="tts_reset" msgid="2661752909256313270">"გადაყენება"</string>
<string name="tts_play" msgid="2628469503798633884">"დაკვრა"</string>
- <string name="gadget_title" msgid="5519037532720577836">"კვების მართვა"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi პარამეტრების განახლება"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth-ის პარამეტრების განახლება"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ჩართული"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"(გამორთულია)"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ჩართვა..."</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"გამორთვა"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"მდებარეობა"</string>
- <string name="gadget_sync" msgid="858895763714222152">"სინქრონიზაცია"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"სიკაშკაშე <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ავტომატურად"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"მაქსიმუმი"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"ნახევრად"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"გამორთული"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ავტორიზაციის მონაცემთა საცავი"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ინსტალაცია საცავიდან"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> სულ <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"ყველას არჩევა"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"მონაცემთა გადაცემა"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"აპის მონაცემთა გამოყენება"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"მობილური ინტერნეტი და Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"ოპერატორის მიერ მონაცემთა აღრიცხვა შესაძლოა თქვენი მოწყობილობის აღრიცხვისგან განსხვავდებოდეს."</string>
<string name="data_usage_app" msgid="4970478397515423303">"აპის გამოყენება"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"აპის მონაცემები"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">%d დამალული ერთეულის ჩვენება</item>
<item quantity="one">%d დამალული ერთეულის ჩვენება</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ჩაკეცვა"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"ქსელი და ინტერნეტი"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"მობილური"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"მონაცემთა მოხმარება"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"აპები და შეტყობინებები"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ნებართვები, ნაგულისხმევი აპები"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"შეტყობინებებზე წვდომა სამსახურის პროფილში არსებული აპებისთვის მიუწვდომელია."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"ანგარიშები"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"ანგარიშები დამატებული არ არის"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ნაგულისხმევი აპები"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ენები, დრო, სარეზერვო კოპირება, განახლებები"</string>
<string name="search_results_title" msgid="1796252422574886932">"პარამეტრები"</string>
- <string name="search_menu" msgid="6283419262313758339">"ძიების პარამეტრები"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"WiFi, Wi-Fi, ქსელის კავშირი, ინტერნეტი, უსადენო, მონაცემები, Wi Fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"WiFi, Wi-Fi, გადართვა, მართვა"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"ტექსტური შეტყობინება, ტექსტურ შეტყობინებათა გაგზავნა, შეტყობინებები, მიმოწერა, ნაგულისხმევი"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"გადახდა, შეხება, გადახდები"</string>
<string name="keywords_backup" msgid="470070289135403022">"სარეზერვო ასლი, სარეზერვო ასლის შექმნა"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ჟესტი"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"სახე, განბლოკვა, ავტორიზაცია, შესვლა"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"IMEI, MEID, MIN, PRL ვერსია, IMEI SV"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"ქსელი, მობილური ქსელის მდგომარეობა, სერვისის მდგომარეობა, სიგნალის სიძლიერე, მობილური ქსელის ტიპი, როუმინგი, ICCID"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"სერიული ნომერი, აპარატურის ვერსია"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"მუქი თემა"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ხარვეზი"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ემბიენტური ეკრანი, ჩაკეტილი ეკრანი"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"შეტყობინება ჩაკეტილ ეკრანზე"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"სახე"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"თითის ანაბეჭდი"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ეკრანის გამქრქალება, სენსორული ეკრანი, ბატარეა, გონივრული სიკაშკაშე, დინამიკური სიკაშკაშე"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"როდესაც ამ მოწყობილობის ჩასართავად თქვენს PIN-ს შეიყვანთ, მარტივი წვდომის სერვისები, როგორიცაა <xliff:g id="SERVICE">%1$s</xliff:g> ხელმისაწვდომი ჯერ არ იქნება."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"როდესაც ამ მოწყობილობის ჩასართავად თქვენს ნიმუშს შეიყვანთ, მარტივი წვდომის სერვისები, როგორიცაა <xliff:g id="SERVICE">%1$s</xliff:g> ხელმისაწვდომი ჯერ არ იქნება."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"როდესაც ამ მოწყობილობის ჩასართავად თქვენს პაროლს შეიყვანთ, მარტივი წვდომის სერვისები, როგორიცაა <xliff:g id="SERVICE">%1$s</xliff:g> ხელმისაწვდომი ჯერ არ იქნება."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"შენიშვნა: გადატვირთვის შემდეგ, ეს აპი ვერ გაეშვება, სანამ ტელეფონს არ განბლოკავთ"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"შენიშვნა: თუ ეკრანის დაბლოკვის მეთოდს იყენებთ, ტელეფონის გადატვირთვის შემდეგ ეს აპი ვერ გაეშვება, სანამ ტელეფონს არ განბლოკავთ"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI ინფორმაცია"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI შესაბამისი ინფორმაცია"</string>
<string name="slot_number" msgid="3762676044904653577">"(სლოტი<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"პირადი"</string>
<string name="filter_work_apps" msgid="24519936790795574">"სამუშაო"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"აპები: ყველა"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"აპები: გამორთული"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"გამორთული"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"კატეგორიები: გადაუდებელი"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"კატეგორიები: დაბალი პრიორიტეტი"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"კატეგორიები: გამორთული"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"მოხმარების გაფრთხილებები"</string>
<string name="show_all_apps" msgid="1512506948197818534">"მოხმარების სრულად ჩვენება"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"აპების მოხმარების ჩვენება"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"მაღალი მოხმარება"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> აპი არასათანადოდ მუშაობს</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> არასათანადოდ მუშაობს</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"შიდა მეხსიერება: გამოყენებულია <xliff:g id="PERCENTAGE">%1$s</xliff:g> — თავისუფალია <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> უმოქმედობის შემდეგ ძილის რეჟიმზე გადასვლა"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"ფონი, ძილი, შრიფტის ზომა"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10-წუთიანი უმოქმედობის შემდეგ ძილის რეჟიმზე გადასვლა"</string>
<string name="memory_summary" msgid="8080825904671961872">"გამოყენებულია საშ. <xliff:g id="USED_MEMORY">%1$s</xliff:g> / <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>დან"</string>
<string name="users_summary" msgid="1674864467098487328">"შესული ხართ, როგორც <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS შეტყობინებები არ არის დაშვებული"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"კამერა არ არის დაშვებული"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ეკრანის ანაბეჭდები არ არის დაშვებული"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"სარეზერვო ასლების გამორთვა ვერ ხერხდება"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"ამ აპის გახსნა ვერ ხერხდება"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"თუ შეკითხვები გაქვთ, დაუკავშირდით თქვენს IT ადმინისტრატორს"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"დაწვრილებით"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"ეკრანის ამოჭრით სიმულაცია"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ეკრანის ამოჭრა"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ეკრანის ამოჭრა, ჭრილი"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"არცერთი"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"მოწყობილობის ნაგულისხმევი"</string>
<string name="special_access" msgid="3458780842491881155">"აპების სპეციალური წვდომა"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other">მონაცემთა შეუზღუდავად გამოყენება <xliff:g id="COUNT">%d</xliff:g> აპს შეუძლია</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"დაკავშირებულია <xliff:g id="ID_1">%1$s</xliff:g>-თან"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"დაკავშირებულია რამდენიმე მოწყობილობასთან"</string>
<string name="demo_mode" msgid="2798762752209330277">"სისტემის UI-ს დემო-რეჟიმი"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"ღამის რეჟიმი"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"ღამის რეჟიმის დაყენება"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"მუქი რეჟიმი"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"მუქი რეჟიმის დაყენება"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"დეველოპერის სწრაფი პარამეტრების მოზაიკები"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-ის კვალის მიდევნება"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> — <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"სამსახურის პროფილის პარამეტრები"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"კონტაქტების ძიება"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"აბონენტებისა და კონტაქტების ამოცნობის მიზნით, თქვენი ორგანიზაციისთვის კონტაქტების ძიების დაშვება"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ტელეფონის შესამოწმებლად, შეეხეთ ორმაგად"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ტაბლეტის შესამოწმებლად, შეეხეთ ორმაგად"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"მოწყობილობის შესამოწმებლად, შეეხეთ ორმაგად"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"დროის, შეტყობინების ხატულებისა და სხვა ინფორმაციის სანახავად, ორმაგად შეეხეთ ეკრანს."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"ორმაგად შეეხეთ ეკრანს დროის, შეტყობინებებისა და სხვა ინფორმაციის სანახავად."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ასწიეთ ტელეფონის შესამოწმებლად"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ასწიეთ ტაბლეტის შესამოწმებლად"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ასწიეთ მოწყობილობის შესამოწმებლად"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"დროის, შეტყობინების ხატულებისა და სხვა ინფორმაციის სანახავად, აიღეთ ტელეფონი."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"დროის, შეტყობინების ხატულებისა და სხვა ინფორმაციის სანახავად, აიღეთ ტაბლეტი."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"დროის, შეტყობინების ხატულებისა და სხვა ინფორმაციის სანახავად, აიღეთ მოწყობილობა."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ეკრანის გამოღვიძება"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"დროის, შეტყობინებებისა და სხვა ინფორმაციის სანახავად, აიღეთ ტელეფონი."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"დროის, შეტყობინებებისა და სხვა ინფორმაციის სანახავად, აიღეთ ტაბლეტი."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"დროის, შეტყობინებებისა და სხვა ინფორმაციის სანახავად, აიღეთ მოწყობილობა."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"ჩაკეტილი ეკრანის გამოღვიძების ჟესტი"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"თითის ანაბეჭდით გადაფურცვლა შეტყობინებების შესამოწმებლად"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ანაბეჭდით გადაფურცვლა"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"თქვენი შეტყობინებების შესამოწმებლად, ჩამოუსვით თითი თითის ანაბეჭდის სენსორს, რომელიც თქვენი ტელეფონის უკანა ნაწილზე მდებარეობს."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> მცდელობა</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> მცდელობა</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"მიმდინარეობს ამ მოწყობილობის მონაცემთა სარეზერვო ასლის შექმნა"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"ამ მოწყობილობას მართავს თქვენი ორგანიზაცია."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"ამ მოწყობილობას მართავს <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"ავტომატური შევსების სერვისი"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ავტომატური, შევსება, ავტოშევსება"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>დარწმუნდით, რომ ენდობით ამ აპს</b> <br/> <br/> <xliff:g id=app_name example=Google-ის ავტომატური შევსება>%1$s</xliff:g> იყენებს თქვენს ეკრანზე არსებულ კონტენტს, რათა გაარკვიოს, რა შეიძლება შეივსოს ავტომატურად."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"ავტომატური შევსება"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"აღრიცხვის დონე"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"მოთხოვნების მაქსიმალური რაოდენობა ერთ სესიაში"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"მონაცემთა ნაკრებების მაქსიმალური რაოდენობა"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ნაგულისხმევ მნიშვნელობებზე გადაყენება"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"ავტომატური შევსების დეველოპერის პარამეტრები გადაყენებულია"</string>
<string name="device_theme" msgid="4571803018917608588">"მოწყობილობის თემა"</string>
<string name="default_theme" msgid="7085644992078579076">"ნაგულისხმევი"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"ქსელის სახელი"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ოპერატორის უზრუნველყოფის გაშვება"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"„არ შემაწუხოთ“ რეჟიმის განახლება"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"შეტყობინებების დაპაუზება კონცენტრირების შესანარჩუნებლად"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"რა არის ახალი და გამორჩეული?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ისარგებლეთ თქვენი ახალი ტელეფონის გაცნობითი ტურით"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ისარგებლეთ თქვენი ახალი ტაბლეტის გაცნობითი ტურით"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ისარგებლეთ თქვენი ახალი მოწყობილობის გაცნობითი ტურით"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"ამ მოწყობილობაზე ეს ფუნქცია მიუწვდომელია"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"სრული GNSS გაზომვის განხორციელების იძულება"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ყველა GNSS კონსტელაციისა და სიხშირის აღრიცხვა, დატვირთვის კოეფიციენტის გარეშე"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"ავარიულად გათიშვის დიალოგური ფანჯრის ყოველთვის ჩვენება"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"დიალოგური ფანჯრის ყოველთვის ჩვენება, როცა აპი ავარიულად ითიშება"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"აირჩიეთ ANGLE-ის მხარდაჭერის მქონე აპი"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE-ის მხარდაჭერის მქონე აპლიკაცია არ არის მითითებული"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE-ის მხარდაჭერის მქონე აპლიკაცია: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"კატალოგზე წვდომა"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"კატალოგზე წვდომა"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"ქსელის დეტალები"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"თქვენი მოწყობილობის სახელი ხილულია თქვენს ტელეფონზე არსებული აპებისთვის. მისი დანახვას ასევე შეძლებენ სხვა პირები, როცა Bluetooth მოწყობილობებს დაუკავშირდებით ან Wi-Fi უსადენო ქსელით ისარგებლებთ."</string>
<string name="devices_title" msgid="7701726109334110391">"მოწყობილობები"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"ყველა პარამეტრი"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"შემოთავაზებები"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS მონაცემები"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS მონაცემები"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ქსელის არჩევა"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"კავშირი გაწყვეტილია"</string>
+ <string name="network_connected" msgid="4943925032253989621">"დაკავშირებულია"</string>
+ <string name="network_connecting" msgid="76404590784733557">"მიმდინარეობს დაკავშირება…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"დაკავშირება ვერ მოხერხდა"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ქსელები ვერ მოიძებნა."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ქსელები ვერ მოიძებნა. ცადეთ ხელახლა."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(აკრძალული)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM ბარათი არ არის"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"გაფართოებული დარეკვა"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"ქსელის სასურველი რეჟიმი: სასურველია WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"ქსელის სასურველი რეჟიმი: მხოლოდ GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"ქსელის სასურველი რეჟიმი: მხოლოდ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"ქსელის სასურველი რეჟიმი: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"ქსელის სასურველი რეჟიმი: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"ქსელის სასურველი რეჟიმი: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"ქსელის სასურველი რეჟიმი: მხოლოდ CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"ქსელის სასურველი რეჟიმი: მხოლოდ EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"ქსელის სასურველი რეჟიმი: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"ქსელის სასურველი რეჟიმი: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"ქსელის სასურველი რეჟიმი: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"ქსელის სასურველი რეჟიმი: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"ქსელის სასურველი რეჟიმი: გლობალური"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"ქსელის სასურველი რეჟიმი: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"სასურველი ქსელის რეჟიმი: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"ქსელის სასურველი რეჟიმი: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"ქსელის სასურველი რეჟიმი: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"ქსელის სასურველი რეჟიმი: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"ქსელის სასურველი რეჟიმი: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"ქსელის სასურველი რეჟიმი: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"ქსელის სასურველი რეჟიმი: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"ქსელის სასურველი რეჟიმი: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"ქსელის სასურველი რეჟიმი: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"ქსელის სასურველი რეჟიმი: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"ქსელის სასურველი რეჟიმი: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"ქსელის სასურველი რეჟიმი: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (რეკომენდებული)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (რეკომენდებული)"</string>
+ <string name="network_global" msgid="959947774831178632">"გლობალური"</string>
+ <string name="label_available" msgid="1731547832803057893">"ხელმისაწვდომი ქსელები"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"მიმდინარეობს ძიება…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"მიმდინარეობს <xliff:g id="NETWORK">%s</xliff:g>-ზე რეგისტრაცია…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"თქვენი SIM ბარათი ამ ქსელთან დაკავშირების უფლებას არ იძლევა."</string>
+ <string name="connect_later" msgid="978991102125216741">"ამჟამად ამ ქსელთან დაკავშირება ვერ ხერხდება. ცადეთ მოგვიანებით."</string>
+ <string name="registration_done" msgid="4573820010512184521">"რეგისტრირებულია ქსელში."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"ქსელის ავტომატურად არჩევა"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"ოპერატორის პარამეტრები"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"მონაცემთა სერვისის დაყენება"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"მობილური ინტერნეტი"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"მობილურ ინტერნეტზე წვდომა მობილური ქსელით"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"ქსელის სასურველი ტიპი"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"ქსელის მუშაობის რეჟიმის შეცვლა"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"ქსელის სასურველი ტიპი"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"ოპერატორი"</string>
+ <string name="call_category" msgid="8108654745239563833">"დარეკვა"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"ვიდეო დარეკვა ოპერატორით"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"სისტემის არჩევა"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA როუმინგის რეჟიმის შეცვლა"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"სისტემის არჩევა"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"ქსელი"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"ქსელი"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA აბონირება"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM-სა და NV-ს შორის მონაცვლეობა"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"აბონირება"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ავტომატური რეგისტრაცია…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"გსურთ, ჩაირთოს მობილური ინტერნეტის როუმინგი?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"ფასები შეამოწმეთ თქვენს ოპერატორთან."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"აპის მიერ მონაცემთა მოხმარება"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"ქსელის რეჟიმი (<xliff:g id="NETWORKMODEID">%1$d</xliff:g>) არასწორია. იგნორირება."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"მიუწვდომელია, როცა დაკავშირებულია <xliff:g id="CARRIER">%1$s</xliff:g>-თან"</string>
+ <string name="see_more" msgid="5953815986207345223">"მეტის ნახვა"</string>
+ <string name="see_less" msgid="1250265310929558370">"ნაკლების ნახვა"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index df61552..2e0f0c9 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Шектеулі"</item>
<item msgid="2266114985518865625">"Шектеусіз"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Әдепкі (кездейсоқ MAC қолдану)"</item>
+ <item msgid="5398461510512959597">"Сенімді"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Жоқ"</item>
<item msgid="3863157480502955888">"Иә"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Үнемі қосулы"</item>
<item msgid="6385301106124765323">"Үнемі өшірулі"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Өшіру"</item>
+ <item msgid="2182686878828390312">"Түзету"</item>
+ <item msgid="5286514712714822064">"Толық ақпарат"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Тек үй желісі"</item>
+ <item msgid="5034813753274486448">"Автоматты"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA (оңтайлы режим)"</item>
+ <item msgid="807926878589867564">"Тек GSM"</item>
+ <item msgid="488474605709912156">"Тек WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA (aвтоматты)"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo (автоматты)"</item>
+ <item msgid="370391313511477301">"EvDo-сыз CDMA"</item>
+ <item msgid="4678789463133969294">"Тек EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Бүкіл әлем"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Тек TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM картасы"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Бүкіл әлем"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 2de6b6c..db8cd91 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Жасау"</string>
<string name="allow" msgid="3349662621170855910">"Рұқсат беру"</string>
<string name="deny" msgid="6947806159746484865">"Бас тарту"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Жабу"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Ауысу"</string>
<string name="device_info_default" msgid="7847265875578739287">"Белгісіз"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Сіз қазір әзірлеуші болудан <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> қадам қашықсыз.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Қажет емес, сіз қазір әзірлеушісіз."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Алдымен әзірлеуші опцияларын қосыңыз."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Сымсыз желілер"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Байланыстар"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Құрылғы"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Жеке"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Қатынасу"</string>
<string name="header_category_system" msgid="2816866961183068977">"Жүйе"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Деректер байланысын қосу"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Деректер байланысын өшіру"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Құрылғының Bluetooth мекенжайы: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ажырату керек пе?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Хабар тарату"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Атауы жоқ Bluetooth құрылғысы"</string>
<string name="progress_scanning" msgid="192587958424295789">"Іздеуде..."</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Маңайдан Bluetooth құрылғылары табылмалды."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Қолданба Bluetooth қызметін қосып, телефоныңызды басқа құрылғыларға көрсетуді сұрайды. Мұны кейін Bluetooth параметрлері арқылы өзгертуге болады."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth қосылуда…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth байланысын өшіруде…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Aвто-жалғау"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth байланысына өтініш"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" қосылу үшін түртіңіз."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" құрылғысына жалғануды қалайсыз ба?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Қолжетімді қоңырау шалу құрылғылары"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Қазір байланыста тұрғандар"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Сақталған құрылғылар"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Құрылғы қосу"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth жұптау үшін қосылады"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Байланыс параметрлері"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Бұрын байланысқан құрылғылар"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Бұрын қосылған"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth қосылды"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Барлығын көру"</string>
<string name="date_and_time" msgid="9062980487860757694">"Күн және уақыт"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Уақыт аймағын таңдау"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Өткізіп жіберу"</string>
<string name="next_label" msgid="4693520878012668114">"Келесі"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Тілдер"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Тіл параметрлері"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Жою"</string>
<string name="add_a_language" msgid="2330538812283783022">"Тілді қосу"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Параметрлер"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Параметрлердің төте пернелері"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Ұшақ режимі"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Басқалары"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Сымсыз желілер"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, ұшақ режимі, ұялы желілер және ВЖЖ басқару"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Мобильдік деректер"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Құпиялылық"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Әкімші өшірген"</string>
<string name="security_status_title" msgid="5848766673665944640">"Қауіпсіздік күйі"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Экранды құлыптау, Face Unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Экранды құлыптау, саусақ ізі"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Экранды құлыптау"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Бет енгізілді"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Құлыпты бет көрсетіп ашу"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Бет арқылы тану мүмкіндігін пайдаланыңыз"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Телефоныңыздың құлпын ашу, сатып алу транзакцияларына рұқсат беру немесе қолданбаларға кіру үшін бетті тану функциясын қолданыңыз."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Бетіңізді қолданыңыз"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Бетіңіз арқылы телефон құлпын ашыңыз не сатып алған нәрсені мақұлдаңыз.\n\nЕскертпе: бұл құрылғының құлпын бетіңіз арқылы аша алмайсыз. Қосымша ақпарат алу үшін ұйым әкімшісіне хабарласыңыз."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Телефоныңыздың құлпын ашу, сатып алу транзакцияларына рұқсат беру немесе қолданбаларға кіру үшін бетті тану функциясын қолданыңыз"</string>
- <string name="face_add_max" msgid="2342250989212694454">"<xliff:g id="COUNT">%d</xliff:g> саусақ ізіне дейін енгізуге болады"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Бетіңізді шеңбердің ортасына дәлдеңіз"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Кейінірек"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"<xliff:g id="COUNT">%d</xliff:g> бетке дейін енгізуге болады"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Беттерді енгізуге болатын мүмкіндіктердің барлығын қолданып қойдыңыз"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Енді бет енгізу мүмкін емес"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Тіркеу аяқталмады"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Жарайды"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Бетті тіркеу уақыты бітті. Әрекетті қайталаңыз."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Бет тіркелмеді."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Дайын болды. Бәрі дұрыс сияқты."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Дайын"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Мүмкіндіктер"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Құрылғы құлпын ашу"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Қолданбаға кіру және төлемдер"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Құлыпты ашу үшін көзіңізді ашыңыз"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Бет аутентификациясын пайдаланған кезде көздеріңізді ашып тұрыңыз"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Бет деректерін өшіру"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Бет деректерін жақсарту"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Бетіңіз арқылы құрылғы құлпын ашуға және қолданбаларға кіруге болады. "<annotation id="url">"Толығырақ"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Саусақ ізі"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Саусақ таңбасын бас-у"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Саусақ таңбасын пайд-у"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 ГГц"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi‑Fi хотспоты үшін кемінде бір диапазонды таңдаңыз:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP параметрлері"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Құпиялылық"</string>
<string name="wifi_shared" msgid="844142443226926070">"Басқа құрылғы пайдаланушыларымен бөлісу"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(өзгермеген)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Таңдаңыз"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Бас тарту"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Желі ұмытылсын ба?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Бұл желіге арналған барлық құпия сөздер жойылады"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Сақталған желілер"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d желі</item>
<item quantity="one">1 желі</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Жарықтығы"</string>
<string name="brightness_summary" msgid="838917350127550703">"Экранның жарықтығын реттеу"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Бейімделгіш жарықтық"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Қосулы"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Өшірулі"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Өте төмен жарық деңгейі таңдалған"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Төмен жарық деңгейі таңдалған"</string>
@@ -1122,7 +1128,7 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"Қолжетімді жарықтандыруға сәйкес жарық деңгейін оңтайландырыңыз. Бұл функция қосулы кезде, жарық деңгейін уақытша реттей аласыз."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"Экран жарықтығы қоршаған ортаға және әрекеттерге автоматты түрде бейімделеді. Бейімделгіш жарықтық параметрлерде сақталуы үшін, жүгірткіні қолмен жылжытуыңызға болады."</string>
<string name="night_display_title" msgid="2626451512200357686">"Түнгі жарық"</string>
- <string name="night_display_text" msgid="1837277457033025056">"Түнгі жарық функциясы экраныңызға ашық сары реңк береді. Бұл қараңғыда экранға қарауды жеңілдетеді әрі жылдам ұйықтауға да көмектесуі мүмкін."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"\"Түнгі жарық\" функциясы экраныңызға ашық сары реңк береді. Бұл қараңғыда экранға қарауды жеңілдетеді әрі жылдам ұйықтауға да көмектесуі мүмкін."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Уақыт кестесі"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ешқашан"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Арнаулы уақытта қосылады"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN өзгерту мүмкін емес.\nPIN қате болуы ықтимал."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN коды сәтті өзгертілді"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM картаны бекіту күйін өзгерту мүмкін емес. \nPIN коды қате болуы мүмкін."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN кодын ажырату мүмкін емес."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN кодын қосу мүмкін емес."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Жарайды"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Бас тарту"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Бірнеше SIM картасы табылды"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Бұл үшін <xliff:g id="NAME_0">^1</xliff:g> құрылғысын пішімдеу қажет. \n\n"<b>"Пішімдегеннен кейін <xliff:g id="NAME_1">^1</xliff:g> ішінде сақталып тұрған деректердің барлығы өшеді."</b>" Жоғалып қалмауы үшін деректердің сақтық көшірмесін жасаңыз."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Өшіру және пішімдеу"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> пішімделуде…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Форматталу барысында <xliff:g id="NAME">^1</xliff:g> ұясынан шығарылмауы керек."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g> құрылғысын форматтау барысында оны алып тастауға болмайды."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Деректерді жаңа жадқа аудару"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Фотосуреттеріңізді, файлдарыңызды және кейбір қолданбаларыңызды осы жаңа <xliff:g id="NAME">^1</xliff:g> ішіне тасымалдауға болады. \n\nТасымалдауға шамамен <xliff:g id="TIME">^2</xliff:g> жұмсалады және ішкі жадтың <xliff:g id="SIZE">^3</xliff:g> көлемін босатады. Тасымалданып жатқан кезде, кейбір қолданбалар жұмыс істемейді."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Қазір аудару"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Орнатылды"</string>
<string name="no_applications" msgid="7336588977497084921">"Қолданбалар жоқ"</string>
<string name="internal_storage" msgid="1584700623164275282">"Ішкі жад"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ішкі жад"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB жады"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD карта жады"</string>
<string name="recompute_size" msgid="7722567982831691718">"Өлшемін қайта есептеуде…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Қолданба деректері жойылсын ба?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Бұл қолданбаның барлық деректері мүлдем өшіріледі. Бұған барлық файлдар, параметрлер, есептік жазбалар, дерекқорлар және т.б кіреді."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Қолданба орнатылған қолданбалар тізімінен табылмады."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Қолданба үшін жад тазартылмады."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Бұл қолданбаның планшеттегі келесі нәрселерге қол жетімділігі бар:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Бұл қолданбаның телефондағы келесі нәрселерге қол жетімділігі бар:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Бұл қолданба планшетіңіздегі келесі нәрселерге кіре алады. Жұмысын жақсарту үшін және жад қолданысын азайту үшін бұл рұқсаттардың кейбіреуі <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> қолданбасына қол жетімді, себебі ол <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> жұмыс істейтін үрдісте жұмыс істейді:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Бұл қолданба телефоныңыздағы келесі деректерге кіре алады. Жұмысын жақсарту үшін және жад қолданысын азайту үшін бұл рұқсаттардың кейбіреуі <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> үшін қол жетімді, себебі ол <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> сияқты жұмыс істейді:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> және <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Бұл қолданба төлем талап ету мүмкін:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Ерекеш SMS хабарын жіберу"</string>
<string name="computing_size" msgid="1599186977475211186">"Есептеуде…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Жинақ өлшемін есептей алмады."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Сізде орнатылған үшінші жақ қолданбалары жоқ."</string>
<string name="version_text" msgid="9189073826278676425">"<xliff:g id="VERSION_NUM">%1$s</xliff:g> нұсқасы"</string>
<string name="move_app" msgid="5042838441401731346">"Жылжыту"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Таблетке жіберу"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Телефонға жылжыту"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB жадына жіберу"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD картаға жіберу"</string>
- <string name="moving" msgid="6431016143218876491">"Жіберуде"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Басқа көшіру орындалуда."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Жадта орын жеткіліксіз."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Қолданба жоқ."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Құрылғы әкімшісі қолданбасы сыртқы медиаларға орнатылмайды"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Тоқтатылсын ба?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Егер қолданбаны күштеп тоқтатсаңыз, күтпеген әрекет көрсетуі мүмкін."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Қолданбаны жылжыта алмады. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Қалаулы орнату аймағы"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Жаңа қолданбаны орнату үшін қаланған аймақты өзгерту"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Орнатылған қолданба істен шығарылсын ба?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Қолданбаны өшіру"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Бұл қолданбаны өшірсеңіз, Android жүйесі мен басқа қолданбалар тиісінше жұмыс істемеуі мүмкін."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Деректер жойылып, қолданба істен шығарылсын ба?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Бұл қолданбаны өшірсеңіз, Android жүйесі мен басқа қолданбалар тиісінше жұмыс істемеуі мүмкін. Оған қоса деректер де жойылады."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Хабарлар өшірілісін бе?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Бұл қолданбаның хабарларын өшірсеңіз, маңызды дабылдар мен жаңартулар сізге жеткізілмейді."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Дүкен"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Қолданба туралы толығырақ ақпарат"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Қолданба <xliff:g id="APP_STORE">%1$s</xliff:g> дүкенінен орнатылды"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Қызметті пайдалану"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Түсті түзету функциясын пайдалану"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Субтитр пайдалану"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Жалғастыру"</string>
<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="6371077608778830020">"Есту аппаратын енгізу"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Қолданбаның фондық режимдегі әрекетін шектесеңіз, күтпеген әрекет көрсетуі мүмкін."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Бұл қолданба батареяны оңтайландыруға реттелмегендіктен, оны шектей алмайсыз. \n\nБұл үшін батареяны оңтайландыруды қосыңыз."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Толық зарядталғаннан кейін экранның зарядты тұтынуы"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Экран жарығына жұмсалатын заряд шығыны"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Мобильдік желіні сканерлеу"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Толық зарядталғаннан кейін батареяның пайдаланылуы"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Толық зарядталғаннан кейін экран қосулы болған уақыт мөлшері"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Толық зарядталғаннан кейін құрылғының пайдаланылуы"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Қолдану деректері"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Қуат қолданысын бейімдеу"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Қамтылған орамдар"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Батареяны отырғызатын қолданбалар"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Құрылғы қосулы тұрады"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Құрылғыны фондық режимде ояту"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Орналасу орны ақпаратын жиі сұрауда"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> қолданба оғаш әрекет етуде"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Қолданбалар қалыпты жұмыс істеп тұр"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Телефон фондық режимде батарея зарядын қалыпты күйде пайдаланады"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Планшет фондық режимде батарея зарядын қалыпты күйде пайдаланады"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Батарея %1$d қолданба үшін ғана қолданылады</item>
<item quantity="one">Батарея %1$d қолданба үшін ғана қолданылады</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> шектелген"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Бұл қолданбалар батареяны фондық режимде пайдаланып келуде. Шектелген қолданбалар дұрыс жұмыс істемеуі және хабарландырулар кешігіп келуі мүмкін."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Battery Manager функциясын пайдалану"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Батарея зарядын жылдам тауысатын қолданбаларды анықтау"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Бас тарту"</string>
<string name="tts_reset" msgid="2661752909256313270">"Бастапқы күйге қайтару"</string>
<string name="tts_play" msgid="2628469503798633884">"Ойнату"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Қуатты басқару"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi параметрін жаңартуда"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth параметрлерін жаңарту"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"қосулы"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"өшірулі"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"қосуда"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"өшіруде"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Орналасу"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Синхрондау"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Жарықтығы - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"Авто"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"толық"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"жартылай"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"өшірулі"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Тіркелу деректерінің жады"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Жадтан орнату"</string>
@@ -2457,7 +2428,7 @@
<string name="emergency_tone_summary" msgid="722259232924572153">"Төтенше қоңырау шалу әрекетін орнату"</string>
<string name="privacy_settings_title" msgid="2978878794187459190">"Сақтық көшірме"</string>
<string name="backup_summary_state_on" msgid="6407084627816231202">"Қосу"</string>
- <string name="backup_summary_state_off" msgid="7388321532624105594">"Өшіру"</string>
+ <string name="backup_summary_state_off" msgid="7388321532624105594">"Өшірулі"</string>
<string name="backup_section_title" msgid="7952232291452882740">"Сақтық көшірме жасау және қалпына келтіру"</string>
<string name="personal_data_section_title" msgid="7815209034443782061">"Жеке деректер"</string>
<string name="backup_data_title" msgid="1239105919852668016">"Деректердің сақтық көшірмесін жасау"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>, барлығы <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Барлығын таңдау"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Дерек шығыны"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Қолданбаның дерек шығыны"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Мобильдік дерек пен Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Оператордың деректер есебі құрылғыңыздан басқаша болуы мүмкін."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Қолданбаны пайдалану"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ҚОЛДАНБА ТУРАЛЫ АҚПАРАТ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">%d жасырын элементті көрсету</item>
<item quantity="one">%d жасырын элементті көрсету</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Жию"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Желі және интернет"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобильдік желі"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дерек шығыны"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Қолданбалар мен хабарландырулар"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Рұқсаттар, әдепкі қолданбалар"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Жұмыс профиліндегі қолданбалар үшін хабарландырулар қолжетімді емес."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Есептік жазбалар"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Ешқандай есептік жазба қосылмаған"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Әдепкі қолданбалар"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Тілдер, уақыт, сақтық көшірме, жаңартылған нұсқалар"</string>
<string name="search_results_title" msgid="1796252422574886932">"Параметрлер"</string>
- <string name="search_menu" msgid="6283419262313758339">"Параметрлерді іздеу"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"WiFi, Wi-Fi, желілік байланыс, интернет, сымсыз, дерек, Wi Fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, қосу/өшіру, басқару"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"мәтіндік хабар, хат жазу, хабарлар, хабар алмасу, әдепкі"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"төлеу, түрту, төлемдер"</string>
<string name="keywords_backup" msgid="470070289135403022">"сақтық көшірме, сақтық көшірме жасау"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"қимыл"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"бет, құлыпты ашу, авторизация, кіру"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, мин, prl нұсқасы, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"желі, мобильдік желі күйі, қызмет күйі, сигнал күші, мобильдік желі түрі, роуминг, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериялық нөмір, жабдық нұсқасы"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"күңгірт тақырып"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"қате"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Қосулы экран, құлып экраны"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"құлып экранындағы хабарландыру"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"бет"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"саусақ ізі"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"күңгірт экран, сенсорлық экран, батарея, ақылды жарықтық, динамикалық жарықтық"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Осы құрылғыны іске қосу үшін PIN кодын енгізгенде <xliff:g id="SERVICE">%1$s</xliff:g> сияқты арнайы мүмкіндіктер қызметтері әлі қол жетімді болмайды."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Осы құрылғыны іске қосу үшін өрнекті енгізгенде <xliff:g id="SERVICE">%1$s</xliff:g> сияқты арнайы мүмкіндіктер қызметтері әлі қол жетімді болмайды."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Осы құрылғыны іске қосу үшін құпия сөзді енгізгенде <xliff:g id="SERVICE">%1$s</xliff:g> сияқты арнайы мүмкіндіктер қызметтері әлі қол жетімді болмайды."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Ескертпе: қайта жүктегеннен кейін, телефонның құлпын ашпайынша, бұл қолданба іске қосылмайды"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Ескертпе: телефоныңызды қайта қоссаңыз және экран құлыпталса, телефонның құлпы ашылмайынша, қолданба іске қосылмайды."</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI ақпараты"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI кодына қатысты ақпарат"</string>
<string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g> ұяшығы)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Жұмыс"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Қолданбалар: барлығы"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Қолданбалар: өшірілген"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Өшірулі"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Санаттар: аса маңызды"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Санаттар: маңыздылығы төмен"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Санаттар: өшірілген"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Пайдаланушы ескертулері"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Қолданыс туралы толық ақпарат"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Қолданбаны пайдалануды көрсету"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Қуатты көп жұмсайды"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> қолданба дұрыс жұмыс істемей тұр</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> қолданбасы дұрыс жұмыс істемей тұр</item>
@@ -3666,7 +3637,7 @@
<string name="running_frequency" msgid="6622624669948277693">"Жиілік"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Ең көп пайдалануы"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Деректер пайдаланылмаған"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> үшін «Мазаламау» режиміне кіру рұқсатын бересіз бе?"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> қолданбасына «Мазаламау» режиміне кіруге бола ма?"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Қолданба «Мазаламау» режимін қосуы/өшіруі және қатысты параметрлерге өзгерістер енгізуі мүмкін."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Хабарландыру параметрі қосулы болғандықтан, міндетті түрде қосулы болуы тиіс"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> үшін \"Мазаламау\" режиміне қатынасты қайтару керек пе?"</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Ішкі жад: <xliff:g id="PERCENTAGE">%1$s</xliff:g> пайдаланылды, <xliff:g id="FREE_SPACE">%2$s</xliff:g> бос"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> уақыт әрекетсіздіктен кейін ұйқы режиміне өту"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Тұсқағаз, ұйқы режимі, қаріп өлшемі"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 минут әрекетсіздіктен кейін ұйқы режиміне өту"</string>
<string name="memory_summary" msgid="8080825904671961872">"Орташа алғанда <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ішінен <xliff:g id="USED_MEMORY">%1$s</xliff:g> жад пайдаланылған"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> болып кірдіңіз"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS жіберуге рұқсат берілмеген"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Камераны пайдалануға рұқсат берілмеген"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Скриншот жасауға рұқсат берілмеген"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Сақтық көшірмелер өшірілмейді"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Бұл қолданба ашылмайды"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Сұрақтарыңыз болса, әкімшіге хабарласыңыз"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Қосымша мәліметтер"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Ойығы бар дисплей симуляциясы"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Экран ойығы"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"экран кесіндісі, кесік"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ешқайсысы"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Құрылғыны әдепкісінше реттеу"</string>
<string name="special_access" msgid="3458780842491881155">"Арнайы рұқсат"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> қолданба деректерді шексіз пайдалана алады</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> құрылғысына қосылған"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Түрлі құрылғыларға қосылған"</string>
<string name="demo_mode" msgid="2798762752209330277">"Жүйе интерфейсінің демо режимі"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Түнгі режим"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Түнгі режимді орнату"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Күңгірт режим"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Күңгірт режимді орнату"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Жылдам реттеудің әзірлеу бөлшектері"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope трассасы"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Жұмыс профилінің параметрлері"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Контакт іздеу"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Қоңырау шалушылар мен контактілерді анықтау үшін ұйым бойынша контакт іздеуге рұқсат беру"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Телефонды тексеру үшін екі рет түрту"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Планшетті тексеру үшін екі рет түртіңіз"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Құрылғыны тексеру үшін екі рет түртіңіз"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін экранды екі рет түртіңіз."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Уақытты, хабарландыруларды және басқа ақпаратты көру үшін экранды екі рет түртіңіз."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Телефонды тексеру үшін көтеру"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Планшетті тексеру үшін оны көтеріңіз"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Құрылғыны тексеру үшін оны көтеріңіз"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін телефонды көтеріңіз."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін планшетті көтеріңіз."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Уақытты, хабарландыру белгішелерін және басқа ақпаратты тексеру үшін құрылғыны көтеріңіз."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Экранды ояту"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Уақытты, хабарландыруларды және басқа ақпаратты көру үшін телефоныңызды таңдаңыз."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Уақытты, хабарландыруларды және басқа ақпаратты көру үшін планшетіңізді таңдаңыз."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Уақытты, хабарландыруларды және басқа ақпаратты көру үшін құрылғыңызды таңдаңыз."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Құлып экранын ояту қимылы"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Хабарландыруларды көру үшін саусақ ізін пайдалану"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Саусақ ізі сканері"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Хабарландыруларды көру үшін телефонның артындағы саусақ ізін оқу сканерін саусақпен төмен қарай сипап өтіңіз."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> әрекет</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> әрекет</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Бұл құрылғы деректерінің сақтық көшірмесі жасалып жатыр"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Бұл құрылғыны ұйым басқарады."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Бұл құрылғыны <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> басқарады."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Автотолтыру қызметі"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"авто, толтыру, автотолтыру"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Осы қолданбаның қауіпсіз екеніне көз жеткізіңіз</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> экранда көрсетілгенді пайдаланып, нені автоматты түрде толтыруға болатынын анықтайды."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Aвтотолтыру"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Тіркеу деңгейі"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Бір сеансқа рұқсат етілетін максималды сұраулар саны"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Көрсетілетін деректердің максималды көлемі"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Әдепкі мәндерге қайтару"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Автотолтыру бойынша Developer Options бастапқы күйіне қайтарылды"</string>
<string name="device_theme" msgid="4571803018917608588">"Құрылғы тақырыбы"</string>
<string name="default_theme" msgid="7085644992078579076">"Әдепкі"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Желі атауы"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Операторды инциализациялауды іске қосу"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\"Мазаламау\" режимін жаңарту"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Алаңдататын хабарландыруларды кідірту"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Қандай қызық жаңа мүмкіндік бар?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Жаңа телефонның ішін аралаңыз"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңа планшеттің ішін аралаңыз"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Жаңа құрылғының ішін аралаңыз"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Бұл мүмкіндік құрылғыда жоқ"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS толық өлшемдерін қосу"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Жұмыс циклінсіз барлық GNSS тізбектері мен жиіліктерін қадағалау"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Ақау туралы хабарларды әрдайым көрсету"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Қолданбада ақау болған сайын, диалог көрсету"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE қолдайтын қолданбаны таңдау"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE қолдайтын ешқандай қолданба орнатылмады"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE қолдайтын қолданба: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Каталогке кіру"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"каталогке кіру"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Желі деректері"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Құрылғыңыздың аты телефоныңыздағы қолданбаларға көрінеді. Сонымен қатар Bluetooth құрылғыларына қосылғанда немесе Wi-Fi хотспотын орнатқанда, басқа адамдарға көрінуі мүмкін."</string>
<string name="devices_title" msgid="7701726109334110391">"Құрылғылар"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Барлық параметрлер"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Ұсыныстар"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS деректері"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS деректері"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Желі таңдау"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Ажыратылған"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Жалғанған"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Жалғануда…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Жалғанбады"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Ешқандай желілер табылмады."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Желілер табылмады. Қайталап көріңіз."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(тыйым салынған)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM картасы салынбаған"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Қосымша қоңырау шалу мүмкіндіктері"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Оңтайлы желі режимі: WCDMA таңдалды"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Оңтайлы желі режимі: тек GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Оңтайлы желі режимі: тек WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Оңтайлы желі режимі: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Оңтайлы желі режимі: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Оңтайлы желі режимі: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Оңтайлы желі режимі: тек CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Оңтайлы желі режимі: тек EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Оңтайлы желі режимі: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Оңтайлы желі режимі: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Оңтайлы желі режимі: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Оңтайлы желі режимі: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Оңтайлы желі режимі: бүкіл әлем"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Оңтайлы желі режимі: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Оңтайлы желі режимі: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Оңтайлы желі режимі: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Оңтайлы желі режимі: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Оңтайлы желі режимі: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Оңтайлы желі режимі: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Оңтайлы желі режимі: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Оңтайлы желі режимі: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Оңтайлы желі режимі: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Оңтайлы желі режимі: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Оңтайлы желі режимі: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Оңтайлы желі режимі: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Оңтайлы желі режимі: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (ұсынылады)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (ұсынылады)"</string>
+ <string name="network_global" msgid="959947774831178632">"Бүкіл әлем"</string>
+ <string name="label_available" msgid="1731547832803057893">"Қолжетімді желілер"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Іздеу..."</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> желісіне тіркелуде…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM картаңыз бұл желіге қосылуға рұқсат бермейді."</string>
+ <string name="connect_later" msgid="978991102125216741">"Дәл қазір бұл желіге қосылу мүмкін емес. Кейінірек қайталап көріңіз."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Желіге тіркелді."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Желіні автоматты түрде таңдау"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Оператор параметрлері"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Деректер қызметін реттеу"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Мобильдік деректер"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Интернетке мобильдік желі арқылы кіру"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Оңтайлы желі түрі"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Желі жұмысының режимін өзгерту"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Оңтайлы желі түрі"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Оператор"</string>
+ <string name="call_category" msgid="8108654745239563833">"Қоңырау"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Оператор желісімен жасалатын бейне қоңыраулар"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Жүйе таңдау"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA роумингі режимін өзгерту"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Жүйе таңдау"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Желі"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Желі"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA жазылымы"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM және NV арасында ауысу"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"жазылым"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Aвтоматты тіркелу…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Деректер роумингіне рұқсат етілсін бе?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Бағасын желі провайдерінен біліңіз."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Қолданбаның дерек трафигі"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"<xliff:g id="NETWORKMODEID">%1$d</xliff:g> желі режимі дұрыс емес. Мән бермеңіз."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> операторына қосылып тұрғанда қолжетімді емес"</string>
+ <string name="see_more" msgid="5953815986207345223">"Басқаларын көру"</string>
+ <string name="see_less" msgid="1250265310929558370">"Азырақ көру"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 537c3b3..763940e 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"ចាត់ទុកថាមានការកំណត់"</item>
<item msgid="2266114985518865625">"ចាត់ទុកថាមិនមានការកំណត់ទេ"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"លំនាំដើម (ប្រើ MAC ចៃដន្យ)"</item>
+ <item msgid="5398461510512959597">"ជឿទុកចិត្ត"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"ទេ"</item>
<item msgid="3863157480502955888">"បាទ/ចាស"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"បើកជានិច្ច"</item>
<item msgid="6385301106124765323">"បិទជានិច្ច"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"បិទ"</item>
+ <item msgid="2182686878828390312">"ជួសជុល"</item>
+ <item msgid="5286514712714822064">"រៀបរាប់"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"ផ្ទះប៉ុណ្ណោះ"</item>
+ <item msgid="5034813753274486448">"ស្វ័យប្រវត្តិ"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"ប្រើ GSM/WCDMA ជាអាទិភាព"</item>
+ <item msgid="807926878589867564">"GSM ប៉ុណ្ណោះ"</item>
+ <item msgid="488474605709912156">"WCDMA ប៉ុណ្ណោះ"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA ស្វ័យប្រវត្តិ"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo ស្វ័យប្រវត្តិ"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo ប៉ុណ្ណោះ"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"សកល"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA ប៉ុណ្ណោះ"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/ស៊ីម"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"សកល"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index cb2cc6f..e2e68ba 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"បង្កើត"</string>
<string name="allow" msgid="3349662621170855910">"អនុញ្ញាត"</string>
<string name="deny" msgid="6947806159746484865">"បដិសេធ"</string>
- <string name="dlg_close" msgid="7471087791340790015">"បិទ"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"បិទ/បើក"</string>
<string name="device_info_default" msgid="7847265875578739287">"មិនស្គាល់"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">ឥឡូវនេះអ្នកនៅសល់ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ជំហានទៀតដើម្បីក្លាយជាអ្នកអភិវឌ្ឍន៍។</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"មិនចាំបាច់ទេ អ្នកជាអ្នកអភិវឌ្ឍរួចហើយ។"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"សូមបើកជម្រើសសម្រាប់អ្នកអភិវឌ្ឍន៍ជាមុនសិន។"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"ឥតខ្សែ & បណ្ដាញ"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"ការតភ្ជាប់"</string>
- <string name="header_category_device" msgid="4544026001618307754">"ឧបករណ៍"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ផ្ទាល់ខ្លួន"</string>
- <string name="header_category_access" msgid="7580499097416970962">"ចូលដំណើរការ"</string>
<string name="header_category_system" msgid="2816866961183068977">"ប្រព័ន្ធ"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"បើកដំណើរការតភ្ជាប់ទិន្នន័យ"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"បិទដំណើរការតភ្ជាប់ទិន្នន័យ"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"អាសយដ្ឋានប៊្លូធូសរបស់ឧបករណ៍៖ <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ផ្ដាច់ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"ការផ្សាយ"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"ឧបករណ៍ប៊្លូធូសគ្មានឈ្មោះ"</string>
<string name="progress_scanning" msgid="192587958424295789">"ស្វែងរក"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"រកមិនឃើញឧបករណ៍ប៊្លូធូសដែលនៅជិត។"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"កម្មវិធីចង់បើកប៊្លូធូស និងធ្វើឲ្យឧបករណ៍ផ្សេងទៀតអាចមើលឃើញទូរសព្ទរបស់អ្នក។ អ្នកអាចផ្លាស់ប្តូរសកម្មភាពនេះពេលក្រោយនៅក្នុងការកំណត់ប៊្លូធូស។"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"កំពុងបើកប៊្លូធូស…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"កំពុងបិទប៊្លូធូស…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"តភ្ជាប់ស្វ័យប្រវត្តិ"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ស្នើតភ្ជាប់ប៊្លូធូស"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"ប៉ះដើម្បីតភ្ជាប់ជាមួយ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"តើអ្នកចង់តភ្ជាប់ទៅ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"ឧបករណ៍ហៅទូរសព្ទដែលអាចប្រើបាន"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"បានភ្ជាប់បច្ចុប្បន្ននេះ"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"ឧបករណ៍ដែលបានរក្សាទុក"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"បញ្ចូលឧបករណ៍"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"ប៊្លូធូសនឹងបើកដើម្បីផ្គូផ្គង"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"ចំណូលចិត្តនៃការភ្ជាប់"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"ឧបករណ៍ដែលបានភ្ជាប់ពីមុន"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"បានភ្ជាប់ពីមុន"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"បានបើកប៊្លូធូស"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"មើលទាំងអស់"</string>
<string name="date_and_time" msgid="9062980487860757694">"កាលបរិច្ឆេទ និង ម៉ោង"</string>
<string name="choose_timezone" msgid="1362834506479536274">"ជ្រើសតំបន់ពេលវេលា"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"រំលង"</string>
<string name="next_label" msgid="4693520878012668114">"បន្ទាប់"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ភាសា"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ចំណូលចិត្តភាសា"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"យកចេញ"</string>
<string name="add_a_language" msgid="2330538812283783022">"បន្ថែមភាសា"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"ការកំណត់"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"កំណត់ផ្លូវកាត់"</string>
<string name="airplane_mode" msgid="8837269988154128601">"ពេលជិះយន្តហោះ"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"ច្រើនទៀត"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"ឥតខ្សែ & បណ្ដាញ"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"គ្រប់គ្រងវ៉ាយហ្វាយ, ប៊្លូធូស, របៀបពេលជិះយន្តហោះ, បណ្ដាញចល័ត & VPNs"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"ទិន្នន័យទូរសព្ទចល័ត"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"ឯកជនភាព"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"បិទដោយអ្នកគ្រប់គ្រង"</string>
<string name="security_status_title" msgid="5848766673665944640">"ស្ថានភាពសុវត្ថិភាព"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"ការចាក់សោអេក្រង់ ការដោះសោតាមទម្រង់មុខ"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"ការចាក់សោអេក្រង់ ស្នាមម្រាមដៃ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ការចាក់សោអេក្រង់"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"បានបញ្ចូលមុខ"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"ដោះសោដោយប្រើមុខរបស់អ្នក"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"ប្រើមុខរបស់អ្នកដើម្បីផ្ទៀងផ្ទាត់"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ប្រើមុខរបស់អ្នក ដើម្បីដោះសោទូរសព្ទ អនុញ្ញាតការទិញ ឬចូលកម្មវិធី។"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"ប្រើអ្នក"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ប្រើមុខរបស់អ្នកដើម្បីដោះសោទូរសព្ទរបស់អ្នក ឬយល់ព្រមលើការទិញ។\n\nចំណាំ៖ អ្នកមិនអាចប្រើមុខរបស់អ្នក ដើម្បីដោះសោឧបករណ៍នេះបានឡើយ។ សម្រាប់ព័ត៌មានបន្ថែម សូមទាក់ទងអ្នកគ្រប់គ្រងរបស់ស្ថាប័នអ្នក។"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ប្រើមុខរបស់អ្នក ដើម្បីដោះសោទូរសព្ទ អនុញ្ញាតការទិញ ឬចូលកម្មវិធី"</string>
- <string name="face_add_max" msgid="2342250989212694454">"អ្នកអាចបញ្ចូលស្នាមម្រាមដៃរហូតដល់ <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ដាក់មុខរបស់អ្នកឱ្យចំកណ្ដាលរង្វង់"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ចុះឈ្មោះនៅពេលក្រោយ"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"អ្នកអាចបញ្ចូលផ្ទៃមុខបានរហូតដល់ <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"អ្នកបានបញ្ចូលមុខដល់ចំនួនអតិបរមាហើយ"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"មិនអាចបញ្ចូលមុខបានទៀតទេ"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"ការចុះឈ្មោះមិនបានបញ្ចប់ទេ"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"យល់ព្រម"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"រយៈពេលកំណត់សម្រាប់ការចុះឈ្មោះផ្ទៃមុខបានអស់ម៉ោងហើយ។ សូមព្យាយាមម្តងទៀត។"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ការចុះឈ្មោះផ្ទៃមុខមិនដំណើរការទេ។"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"រួចហើយ។ គ្មានបញ្ហាអ្វីទេ។"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"រួចរាល់"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"ប្រើមុខរបស់អ្នកដើម្បី"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"ដោះសោឧបករណ៍របស់អ្នក"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ការចូលកម្មវិធី និងការទូទាត់ប្រាក់"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"បើកភ្នែកដើម្បីដោះសោ"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"អ្នកត្រូវបើកភ្នែក នៅពេលប្រើការផ្ទៀងផ្ទាត់មុខ"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"លុបទិន្នន័យមុខ"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"កែលម្អទិន្នន័យមុខរបស់អ្នក"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"មុខរបស់អ្នកអាចប្រើដើម្បីដោះសោឧបករណ៍របស់អ្នក និងចូលប្រើកម្មវិធីបាន។ "<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ស្នាមម្រាមដៃ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"គ្រប់គ្រងស្នាមម្រាមដៃ"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ប្រើស្នាមម្រាមដៃសម្រាប់"</string>
@@ -610,7 +617,7 @@
<string name="lock_failed_attempts_now_wiping_device" msgid="5047439819181833824">"ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក ទិន្នន័យរបស់ឧបករណ៍នេះនឹងត្រូវបានលុប។"</string>
<string name="lock_failed_attempts_now_wiping_user" msgid="6188180643494518001">"ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក អ្នកប្រើប្រាស់នេះនឹងត្រូវបានលុប។"</string>
<string name="lock_failed_attempts_now_wiping_profile" msgid="1745475043685915442">"ដោយសារមានការព្យាយាមដោះសោមិនត្រឹមត្រូវច្រើនដងពេក កម្រងព័ត៌មានការងារនេះ និងទិន្នន័យរបស់វានឹងត្រូវបានលុប។"</string>
- <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"បដិសេធ"</string>
+ <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="8246716090548717312">"ច្រានចោល"</string>
<plurals name="lockpassword_password_too_short" formatted="false" msgid="1957883871187697796">
<item quantity="other">ត្រូវតែមានយ៉ាងហោចណាស់ <xliff:g id="COUNT_1">%d</xliff:g> តួ</item>
<item quantity="one">ត្រូវតែមានយ៉ាងហោចណាស់ <xliff:g id="COUNT_0">%d</xliff:g> តួ</item>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"សូមជ្រើសរើសប៊ែនយ៉ាងហោចណាស់មួយសម្រាប់ហតស្ប៉ត Wi‑Fi៖"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"ការកំណត់ IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"ឯកជនភាព"</string>
<string name="wifi_shared" msgid="844142443226926070">"ចែករំលែកជាមួយអ្នកប្រើឧបករណ៍ផ្សេងទៀត"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(មិនផ្លាស់ប្ដូរ)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"សូមជ្រើសរើស"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"បោះបង់"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"បំភ្លេចបណ្ដាញ?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ពាក្យសម្ងាត់ទាំងអស់សម្រាប់បណ្តាញនេះនឹងត្រូវបានលុប"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"បណ្ដាញបានរក្សាទុក"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">បណ្តាញ %d</item>
<item quantity="one">បណ្តាញ 1</item>
@@ -992,13 +999,13 @@
<string name="wifi_calling_suggestion_title" msgid="5702964371483390024">"ពង្រីកវិសាលភាពនៃការហៅទូសព្ទតាម Wi‑Fi"</string>
<string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"បើកការហៅតាម Wi‑Fi ដើម្បីពង្រីកដែនសេវា"</string>
<string name="wifi_calling_mode_title" msgid="2164073796253284289">"ចំណូលចិត្តលើការហៅ"</string>
- <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"របៀបហៅតាម Wi-Fi"</string>
+ <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"មុខងារហៅតាម Wi-Fi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"ចំណូលចិត្តរ៉ូមីង"</string>
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ចំណូលចិត្តរ៉ូមីង"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"គួរប្រើ Wi-Fi"</item>
+ <item msgid="2124257075906188844">"Wi-Fi ជាអាទិភាព"</item>
<item msgid="1335127656328817518">"បានជ្រើសរើសប្រើទិន្នន័យចល័ត"</item>
<item msgid="3132912693346866895">"Wi-Fi តែប៉ុណ្ណោះ"</item>
</string-array>
@@ -1013,7 +1020,7 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"ប្រើ Wi-Fi"</item>
+ <item msgid="5782108782860004851">"Wi-Fi ជាអាទិភាព"</item>
<item msgid="5074515506087318555">"បានជ្រើសរើសប្រើទិន្នន័យចល័ត"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"ពន្លឺ"</string>
<string name="brightness_summary" msgid="838917350127550703">"កែពន្លឺអេក្រង់"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"ពន្លឺដែលចេះសម្របខ្លួន"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"បើក"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"បិទ"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"ពន្លឺដែលពេញចិត្តមានកម្រិតទាបណាស់"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"ពន្លឺដែលពេញចិត្តមានកម្រិតទាប"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"មិនអាចប្ដូរកូដ PIN ។\nប្រហែលជាកូដ PIN មិនត្រឹមត្រូវ។"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"បានប្ដូរកូដ PIN ស៊ីមកាត់ដោយជោគជ័យ"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"មិនអាចប្ដូរស្ថានភាពការចាក់សោស៊ីមកាត។\nប្រហែលជាកូដ PIN មិនត្រឹមត្រូវ។"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"មិនអាចបិទកូដ PIN បានទេ។"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"មិនអាចបើកកូដ PIN បានទេ។"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"យល់ព្រម"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"បោះបង់"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"បានរកឃើញស៊ីមជាច្រើន"</string>
@@ -1232,7 +1240,7 @@
<string name="device_status_summary" product="tablet" msgid="3292717754497039686">"ស្ថានភាពថ្ម បណ្ដាញ និងព័ត៌មានផ្សេងៗ"</string>
<string name="device_status_summary" product="default" msgid="2599162787451519618">"លេខទូរស័ព្ទ សញ្ញា ។ល។"</string>
<string name="storage_settings" msgid="4211799979832404953">"ទំហំផ្ទុក"</string>
- <string name="storage_usb_settings" msgid="7293054033137078060">"ឧបករណ៍ផ្ទុក"</string>
+ <string name="storage_usb_settings" msgid="7293054033137078060">"ទំហំផ្ទុក"</string>
<string name="storage_settings_title" msgid="8746016738388094064">"កំណត់ការផ្ទុក"</string>
<string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"ផ្ដាច់ឧបករណ៍ផ្ទុកយូអេសប៊ី មើលទំហំដែលមាន"</string>
<string name="storage_settings_summary" product="default" msgid="9176693537325988610">"ផ្ដាច់កាតអេសឌី មើលទំហំដែលមាន"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"វាតម្រូវឲ្យសម្អាត <xliff:g id="NAME_0">^1</xliff:g>។ \n\n"<b>"ការសម្អាតការលុបទិន្នន័យទាំងអស់ដែលបានផ្ទុកនៅលើ <xliff:g id="NAME_1">^1</xliff:g> ពេលបច្ចុប្បន្ន។"</b>" ដើម្បីជៀសវាងការបាត់បង់ទិន្នន័យ សូមពិចារណាធ្វើការបម្រុងទុក។"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"លុប និងសម្អាត"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"កំពុងសម្អាត <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"កុំយក <xliff:g id="NAME">^1</xliff:g> ចេញ ខណៈពេលកំពុងធ្វើការសម្អាត។"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"កុំយក <xliff:g id="NAME">^1</xliff:g> ចេញ ខណៈពេលកំពុងធ្វើការសម្អាត។"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ផ្លាស់ទីទិន្នន័យទៅឧបករណ៍ផ្ទុកថ្មី"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"អ្នកអាចផ្លាស់ទីរូបភាព ឯកសារ និងកម្មវិធីមួយចំនួនរបស់អ្នកទៅ <xliff:g id="NAME">^1</xliff:g> ថ្មីនេះ។ \n\nការផ្លាស់ទីនេះអាចចំណាយពេល <xliff:g id="TIME">^2</xliff:g> និងធ្វើឲ្យឧបករណ៍ផ្ទុកខាងក្នុងទំនេរ <xliff:g id="SIZE">^3</xliff:g>។ កម្មវិធីមួយចំនួននឹងមិនដំណើរការទេ ខណៈពេលវាកំពុងផ្លាស់ទី។"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ផ្លាស់ទីឥឡូវនេះ"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"បានដំឡើង"</string>
<string name="no_applications" msgid="7336588977497084921">"គ្មានកម្មវិធី"</string>
<string name="internal_storage" msgid="1584700623164275282">"ឧបករណ៍ខាងក្នុង"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ឧបករណ៍ផ្ទុកខាងក្នុង"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"ឧបករណ៍ផ្ទុកយូអេសប៊ី"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"ឧបករណ៍ផ្ទុកកាតអេសឌី"</string>
<string name="recompute_size" msgid="7722567982831691718">"កំពុងគណនាទំហំឡើងវិញ…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"លុបទិន្នន័យកម្មវិធី?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"ទិន្នន័យរបស់កម្មវិធីនេះទាំងអស់នឹងត្រូវបានលុបជាអចិន្ត្រៃយ៍។ រួមមាន ឯកសារទាំងអស់, ការកំណត់, គណនី, មូលដ្ឋានទិន្នន័យ ។ល។"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"រកមិនឃើញកម្មវិធីក្នុងបញ្ជីកម្មវិធីបានដំឡើង។"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"មិនអាចសម្អាតទំហំផ្ទុកសម្រាប់កម្មវិធីបានទេ។"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"កម្មវិធីនេះអាចចូលដំណើរការក្នុងកុំព្យូទ័របន្ទះរបស់អ្នក៖"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"កម្មវិធីនេះអាចចូលដំណើរការក្នុងទូរស័ព្ទរបស់អ្នក៖"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"កម្មវិធីនេះអាចចូលដំណើរការកុំព្យូទ័ររបស់អ្នក។ ដើម្បីបង្កើនការអនុវត្ត និងកាត់បន្ថយការប្រើអង្គចងចាំ សិទ្ធិមួយចំនួនក្នុងចំណោមសិទ្ធិទាំងនេះអាចប្រើបានចំពោះ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ព្រោះវាដំណើរការក្នុងដំណើរការតែមួយជា <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ៖"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"កម្មវិធីនេះអាចចូលដំណើរការទូរស័ព្ទរបស់អ្នក។ ដើម្បីបង្កើនការអនុវត្ត និងកាត់បន្ថយការប្រើអង្គចងចាំ សិទ្ធិមួយចំនួនក្នុងចំណោមសិទ្ធិទាំងនេះអាចប្រើបានចំពោះ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ព្រោះវាដំណើរការក្នុងដំណើរការតែមួយជា <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ៖"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> និង <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"កម្មវិធីនេះអាចកាត់លុយអ្នក៖"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ផ្ញើ SMS បង់ប្រាក់"</string>
<string name="computing_size" msgid="1599186977475211186">"កំពុងគណនា..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"មិនអាចគណនាទំហំកញ្ចប់។"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"អ្នកមិនបានដំឡើងកម្មវិធីភាគីទីបីទេ។"</string>
<string name="version_text" msgid="9189073826278676425">"កំណែ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"ផ្លាស់ទី"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ផ្លាស់ទីទៅកុំព្យូទ័របន្ទះ"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ផ្លាស់ទីទៅទូរស័ព្ទ"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"ផ្លាស់ទីទៅឧបករណ៍ផ្ទុកយូអេសប៊ី"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"ផ្លាស់ទីទៅកាតអេសឌី"</string>
- <string name="moving" msgid="6431016143218876491">"ផ្លាស់ទី"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"ការផ្លាស់ទីផ្សេងទៀតស្ថិតក្នុងដំណើរការរួចទៅហើយ។"</string>
<string name="insufficient_storage" msgid="481763122991093080">"ទំហំផ្ទុកមិនគ្រប់គ្រាន់។"</string>
<string name="does_not_exist" msgid="1501243985586067053">"មិនមានកម្មវិធី។"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"កម្មវិធីអ្នកគ្រប់គ្រងឧបករណ៍មិនអាចដំឡើងនៅលើឧបករណ៍មេឌៀផ្នែកខាងក្រៅបានទេ"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"បង្ខំឲ្យឈប់?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"បើអ្នកបង្ខំឲ្យកម្មវិធីឈប់ វាអាចដំណើរការមិនត្រឹមត្រូវ។"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"មិនអាចផ្លាស់ទីកម្មវិធី។ <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"ទីតាំងដំឡើងដែលពេញចិត្ត"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"ប្ដូរទីតាំងដំឡើងដែលពេញចិត្តសម្រាប់កម្មវិធីថ្មីៗ"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"បិទកម្មវិធីជាប់ជាមួយ?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"បិទដំណើរការកម្មវិធី"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"ប្រសិនបើអ្នកបិទកម្មវិធីនេះ Android និងកម្មវិធីផ្សេងទៀតអាចនឹងលែងដំណើរការដូចដែលអ្នកចង់បានទៀតឡើយ។"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"លុបទិន្នន័យ និងបិទកម្មវិធី?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ប្រសិនបើអ្នកបិទកម្មវិធីនេះ Android និងកម្មវិធីផ្សេងទៀតអាចនឹងលែងដំណើរការដូចដែលអ្នកចង់បានទៀតឡើយ។ ទិន្នន័យរបស់អ្នកនឹងត្រូវបានលុបផងដែរ។"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"បិទការជូនដំណឹង?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"បើអ្នកបិទការជូនដំណឹងសម្រាប់កម្មវិធីនេះ អ្នកអាចបាត់ការជូនដំណឹង និងបច្ចុប្បន្នភាពសំខាន់ៗ។"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"ហាង"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"ព័ត៌មានលម្អិតកម្មវិធី"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"កម្មវិធីបានដំឡើងពី <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ប្រើសេវាកម្ម"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ប្រើការកែតម្រូវពណ៌"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ប្រើអក្សររត់"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"បន្ត"</string>
<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="6371077608778830020">"បញ្ចូលឧបករណ៍ជំនួយការស្តាប់"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ប្រសិនបើអ្នកដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយសម្រាប់កម្មវិធី វាអាចនឹងដំណើរការខុសប្រក្រតី"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ដោយសារកម្មវិធីនេះមិនត្រូវបានកំណត់ ដើម្បីបង្កើនប្រសិទ្ធភាពថ្ម អ្នកមិនអាចដាក់កំហិតវាបានទេ។\n\nដើម្បីដាក់កំហិតកម្មវិធី សូមបើកការបង្កើនប្រសិទ្ធភាពថ្មជាមុនសិន។"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"ការប្រើប្រាស់អេក្រង់ចាប់តាំងពីសាកថ្មពេញ"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"ការប្រើប្រាស់អេក្រង់"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"ការស្កេនបណ្ដាញទូរសព្ទចល័ត"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"ការប្រើប្រាស់ថ្មចាប់តាំងពីសាកពេញ"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"អេក្រង់រយៈពេលបានបើកចាប់តាំងពីសាកថ្មពេញ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ការប្រើប្រាស់ឧបករណ៍ចាប់តាំងពីសាកថ្មពេញ"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"ព័ត៌មានលម្អិតនៃការប្រើ"</string>
<string name="controls_subtitle" msgid="390468421138288702">"កែការប្រើថាមពល"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"កញ្ចប់រួមបញ្ចូល"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"កម្មវិធីកំពុងប្រើថាមពលថ្ម"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"កំពុងធ្វើឲ្យឧបករណ៍នៅបន្តភ្ញាក់"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"កំពុងដាស់ឧបករណ៍នៅផ្ទៃខាងក្រោយ"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"កំពុងស្នើទីកន្លែងច្រើនដងហើយ"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"កម្មវិធី <xliff:g id="NUMBER">%1$d</xliff:g> កំពុងដំណើរការខុសធម្មតា"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"កម្មវិធីកំពុងដំណើរការជាធម្មតា"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ទូរសព្ទប្រើប្រាស់ថ្មនៅផ្ទៃខាងក្រោយធម្មតា"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ថេប្លេតប្រើប្រាស់ថ្មនៅផ្ទៃខាងក្រោយធម្មតា"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">ការកម្រិតការប្រើប្រាស់ថ្មសម្រាប់កម្មវិធី %1$d</item>
<item quantity="one">ការកម្រិតការប្រើប្រាស់ថ្មសម្រាប់កម្មវិធី %1$d</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"បានរឹតបន្តឹង <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"កម្មវិធីទាំងនេះកំពុងប្រើប្រាស់ថ្មនៅផ្ទៃខាងក្រោយ។ កម្មវិធីដែលបានដាក់កំហិតអាចដំណើរការខុសប្រក្រតី ហើយការជូនដំណឹងអាចមានការពន្យារពេល។"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"ប្រើកម្មវិធីគ្រប់គ្រងថ្ម"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"រកឃើញនៅពេលកម្មវិធីធ្វើឱ្យឆាប់អស់ថ្ម"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"បោះបង់"</string>
<string name="tts_reset" msgid="2661752909256313270">"កំណត់ឡើងវិញ"</string>
<string name="tts_play" msgid="2628469503798633884">"លេង"</string>
- <string name="gadget_title" msgid="5519037532720577836">"ពិនិត្យថាមពល"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"ធ្វើបច្ចុប្បន្នភាពការកំណត់វ៉ាយហ្វាយ"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ធ្វើបច្ចុប្បន្នភាពការកំណត់ប៊្លូធូស"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"បើក"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"បិទ"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"បើក"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"បិទ"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ប៊្លូធូស"</string>
- <string name="gadget_location" msgid="2974757497945178165">"ទីតាំង"</string>
- <string name="gadget_sync" msgid="858895763714222152">"ធ្វើសមកាលកម្ម"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"ពន្លឺ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ស្វ័យប្រវត្តិ"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"ពេញ"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"ពាក់កណ្ដាល"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"បិទ"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ឧបករណ៍ផ្ទុកអត្តសញ្ញាណ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ដំឡើងពីឧបករណ៍ផ្ទុក"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> នៃ <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"ជ្រើសទាំងអស់"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ការប្រើប្រាស់ទិន្នន័យ"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ការប្រើទិន្នន័យកម្មវិធី"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"ទិន្នន័យទូរសព្ទចល័ត និង Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"ការគណនាទិន្នន័យរបស់ក្រុមហ៊ុនផ្ដល់សេវាទូរស័ព្ទអាចខុសគ្នាពីឧបករណ៍របស់អ្នក។"</string>
<string name="data_usage_app" msgid="4970478397515423303">"ការប្រើប្រាស់កម្មវិធី"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ព័ត៌មានកម្មវិធី"</string>
@@ -2701,7 +2672,7 @@
<string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"អាសយដ្ឋានម៉ាស៊ីនមេ DNS ត្រូវតែជាលេខសម្រាប់ VPN ដែលបើកជានិច្ច"</string>
<string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"ព័ត៌មានដែលបានបញ្ចូលមិនស្គាល់ VPN ដែលបើកជានិច្ចទេ"</string>
<string name="vpn_cancel" msgid="1979937976123659332">"បោះបង់"</string>
- <string name="vpn_done" msgid="8678655203910995914">"បដិសេធ"</string>
+ <string name="vpn_done" msgid="8678655203910995914">"ច្រានចោល"</string>
<string name="vpn_save" msgid="4233484051644764510">"រក្សាទុក"</string>
<string name="vpn_connect" msgid="8469608541746132301">"តភ្ជាប់"</string>
<string name="vpn_replace" msgid="5442836256121957861">"ជំនួស"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">បង្ហាញធាតុ %d ដែលបានលាក់</item>
<item quantity="one">បង្ហាញធាតុ %d ដែលបានលាក់</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"បង្រួម"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"បណ្តាញ និងអ៊ីនធឺណិត"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ទូរសព្ទចល័ត"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ការប្រើទិន្នន័យ"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ប៊្លូធូស"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"កម្មវិធី និងការជូនដំណឹង"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ការអនុញ្ញាត កម្មវិធីលំនាំដើម"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"មិនអាចចូលប្រើការជូនដំណឹងបានទេសម្រាប់កម្មវិធីនៅក្នុងកម្រងព័ត៌មានការងារ។"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"គណនី"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"មិនមានការបញ្ចូលគណនីទេ"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"កម្មវិធីលំនាំដើម"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ភាសា ពេលវេលា ការបម្រុងទុក កំណែថ្មី"</string>
<string name="search_results_title" msgid="1796252422574886932">"ការកំណត់"</string>
- <string name="search_menu" msgid="6283419262313758339">"ស្វែងរកការកំណត់"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, ការតភ្ជាប់បណ្តាញ អ៊ីនធឺណិត ឥតខ្សែ ទិន្នន័យ, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, បិទ/បើក, គ្រប់គ្រង"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"សារជាអក្សរ ការសរសេរសារ សារ ការផ្ញើសារ លំនាំដើម"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"បង់ប្រាក់, ចុច, ការបង់ប្រាក់"</string>
<string name="keywords_backup" msgid="470070289135403022">"ការបម្រុងទុក បម្រុងទុក"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ចលនា"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"មុខ ដោះសោ ផ្ទៀងផ្ទាត់ ចូល"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, កំណែ prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"បណ្តាញ, ស្ថានភាពបណ្តាញទូរសព្ទចល័ត, ស្ថានភាពសេវាកម្ម, កម្លាំងរលកសញ្ញា, ប្រភេទបណ្តាញទូរសព្ទចល័ត, រ៉ូមីង, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"លេខស៊េរី កំណែផ្នែករឹង"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"រចនាប័ទ្មងងឹត"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"បញ្ហា"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"មុខងារអេក្រង់សម្ងំ មុខងារអេក្រង់ចាក់សោ"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"ការជូនដំណឹងលើអេក្រង់ចាក់សោ"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"មុខ"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ស្នាមម្រាមដៃ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"អេក្រង់ខ្សោយពន្លឺ អេក្រង់ចុច ថ្ម ពន្លឺឆ្លាតវៃ ពន្លឺឌីណាមិក"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"នៅពេលអ្នកបញ្ចូលកូដ PIN ដើម្បីចាប់ផ្ដើមឧបករណ៍នេះ សេវាកម្មភាពងាយស្រួលដូចជា <xliff:g id="SERVICE">%1$s</xliff:g> នឹងមិនអាចប្រើបាននៅឡើយទេ។"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"នៅពេលអ្នកបញ្ចូលលំនាំដើម្បីចាប់ផ្ដើមឧបករណ៍នេះ សេវាកម្មភាពងាយស្រួលដូចជា <xliff:g id="SERVICE">%1$s</xliff:g> នឹងមិនអាចប្រើបាននៅឡើយទេ។"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"នៅពេលអ្នកបញ្ចូលពាក្យសម្ងាត់ដើម្បីចាប់ផ្ដើមឧបករណ៍នេះ សេវាកម្មភាពងាយស្រួលដូចជា <xliff:g id="SERVICE">%1$s</xliff:g> នឹងមិនអាចប្រើបាននៅឡើយទេ។"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ចំណាំ៖ បន្ទាប់ពីបិទបើកឡើងវិញហើយ កម្មវិធីនេះមិនអាចចាប់ផ្តើមបានទេ រហូតទាល់តែអ្នកដោះសោទូរស័ព្ទរបស់អ្នក"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"ចំណាំ៖ ប្រសិនបើអ្នកចាប់ផ្ដើមទូរសព្ទរបស់អ្នកឡើងវិញ និងបានកំណត់ការចាក់សោលើអេក្រង់ កម្មវិធីនេះនឹងមិនអាចចាប់ផ្តើមបានទេ រហូតទាល់តែអ្នកដោះសោទូរសព្ទរបស់អ្នក"</string>
<string name="imei_information_title" msgid="8499085421609752290">"ព័ត៌មាន IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"ព័ត៌មានទាក់ទងនឹង IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(រន្ធ <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ផ្ទាល់ខ្លួន"</string>
<string name="filter_work_apps" msgid="24519936790795574">"កន្លែងធ្វើការ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"កម្មវិធី៖ ទាំងអស់"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"កម្មវិធី៖ បិទ"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"បានបិទ"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ប្រភេទ៖ សំខាន់ជាបន្ទាន់"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ប្រភេទ៖ មិនសូវសំខាន់"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ប្រភេទ៖ បិទ"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"ការដាស់តឿនលើការប្រើប្រាស់"</string>
<string name="show_all_apps" msgid="1512506948197818534">"បង្ហាញការប្រើប្រាស់ឧបករណ៍ពេញលេញ"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"បង្ហាញការប្រើប្រាស់កម្មវិធី"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ការប្រើប្រាស់កម្រិតខ្ពស់"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> កំពុងដំណើរការខុសពីធម្មតា</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> កំពុងដំណើរការខុសពីធម្មតា</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"ទំហំផ្ទុកផ្នែកខាងក្នុង៖ ប្រើអស់ <xliff:g id="PERCENTAGE">%1$s</xliff:g> និងនៅសល់ <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"ដេកបន្ទាប់ពីអសកម្មរយៈពេល <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"ផ្ទាំងរូបភាព ដេក ទំហំពុម្ពអក្សរ"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"ដេកបន្ទាប់ពីអសកម្មរយៈពេល 10 នាទី"</string>
<string name="memory_summary" msgid="8080825904671961872">"អង្គចងចាំត្រូវបានប្រើអស់ជាមធ្យម <xliff:g id="USED_MEMORY">%1$s</xliff:g> នៃ <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"ចូលជា <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"មិនអនុញ្ញាតសារ SMS ទេ"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"មិនអនុញ្ញាតឲ្យប្រើកាមេរ៉ាទេ"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"មិនអនុញ្ញាតឲ្យប្រើមុខងារថតអេក្រង់ទេ"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"មិនអាចបិទការបម្រុងទុកបានទេ"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"មិនអាចបើកកម្មវិធីនេះបានទេ"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"ប្រសិនបើអ្នកមានសំណួរ សូមទាក់ទងទៅអ្នកគ្រប់គ្រងព័ត៌មានវិទ្យារបស់អ្នក"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ព័ត៌មានលម្អិតបន្ថែម"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"ត្រាប់អេក្រង់ដែលមានក្បាលឆក"</string>
- <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ស្នាមចោះផ្ទាំងអេក្រង់ ស្នាមក្រិត"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"គ្មាន"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"សក់សេះ"</string>
+ <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"សក់សេះ, ក្បាលឆក"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"លំនាំដើមរបស់ឧបករណ៍"</string>
<string name="special_access" msgid="3458780842491881155">"ការចូលប្រើប្រាស់កម្មវិធីពិសេស"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other">កម្មវិធី <xliff:g id="COUNT">%d</xliff:g> អាចប្រើទិន្នន័យដែលគ្មានការដាក់កំហិត</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"បានភ្ជាប់ទៅ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"បានភ្ជាប់ទៅឧបករណ៍ច្រើន"</string>
<string name="demo_mode" msgid="2798762752209330277">"មុខងារសាកល្បង UI ប្រព័ន្ធ"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"មុខងារយប់"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"កំណត់មុខងារយប់"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"មុខងារងងឹត"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"កំណត់មុខងារងងឹត"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ប្រអប់ការកំណត់រហ័សសម្រាប់អ្នកអភិវឌ្ឍន៍"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"ដាន Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"ការកំណត់ប្រវត្តិរូបការងារ"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ការស្វែងរកទំនាក់ទំនង"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"អនុញ្ញាតការស្វែងរកទំនាក់ទំនងដោយស្ថាប័នរបស់អ្នកដើម្បីកំណត់អត្តសញ្ញាណអ្នកហៅ និងលេខទំនាក់ទំនង"</string>
@@ -3976,7 +3947,7 @@
<string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងទូរស័ព្ទរបស់អ្នក"</string>
<string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងថេប្លេតរបស់អ្នក"</string>
<string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"ធ្វើកាយវិការរហ័សដើម្បីគ្រប់គ្រងឧបករណ៍របស់អ្នក"</string>
- <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"លោតទៅកាមេរ៉ា"</string>
+ <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"ប្តូរទៅកាមេរ៉ា"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"ដើម្បីបើកកាមេរ៉ាឲ្យបានរហ័ស សូមចុចប៊ូតុងថាមពលពីរដង។ ដំណើរការនៅលើអេក្រង់ណាមួយក៏បាន។"</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"បើកកាមេរ៉ាយ៉ាងរហ័ស"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"ត្រឡប់កាមេរ៉ា"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ចុចពីរដងដើម្បីពិនិត្យទូរសព្ទ"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ប៉ះពីរដងដើម្បីពិនិត្យថេប្លេត"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"ប៉ះពីរដងដើម្បីពិនិត្យឧបករណ៍"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"ដើម្បីពិនិត្យមើលម៉ោង រូបជូនដំណឹង និងព័ត៌មានផ្សេងទៀត សូមចុចអេក្រង់របស់អ្នកពីរដង។"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"ដើម្បីពិនិត្យមើលម៉ោង ការជូនដំណឹង និងព័ត៌មានផ្សេងទៀត សូមចុចអេក្រង់របស់អ្នកពីរដង។"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"លើកដើម្បីពិនិត្យទូរសព្ទ"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"លើកដើម្បីពិនិត្យថេប្លេត"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"លើកដើម្បីពិនិត្យឧបករណ៍"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ដើម្បីពិនិត្យមើលម៉ោង រូបជូនដំណឹង និងព័ត៌មានផ្សេងទៀត សូមលើកទូរសព្ទរបស់អ្នក។"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ដើម្បីពិនិត្យមើលម៉ោង រូបជូនដំណឹង និងព័ត៌មានផ្សេងទៀត សូមជ្រើសរើសថេប្លេតរបស់អ្នក។"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ដើម្បីពិនិត្យមើលម៉ោង រូបជូនដំណឹង និងព័ត៌មានផ្សេងទៀត សូមជ្រើសរើសឧបករណ៍របស់អ្នក។"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ដាស់ផ្ទាំងអេក្រង់"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"ដើម្បីពិនិត្យមើលម៉ោង ការជូនដំណឹង និងព័ត៌មានផ្សេងទៀត សូមជ្រើសរើសទូរសព្ទរបស់អ្នក។"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"ដើម្បីពិនិត្យមើលម៉ោង ការជូនដំណឹង និងព័ត៌មានផ្សេងទៀត សូមជ្រើសរើសថេប្លេតរបស់អ្នក។"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"ដើម្បីពិនិត្យមើលម៉ោង ការជូនដំណឹង និងព័ត៌មានផ្សេងទៀត សូមជ្រើសរើសឧបករណ៍របស់អ្នក។"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"ចលនាដាស់អេក្រង់ចាក់សោ"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"អូសលើឧបករណ៍ចាប់ស្នាមម្រាមដៃសម្រាប់ការជូនដំណឹង"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"អូសស្នាមម្រាមដៃ"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នក សូមអូសចុះក្រោមនៅលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ ដែលស្ថិតនៅផ្នែកខាងក្រោយទូរសព្ទរបស់អ្នក។"</string>
@@ -4075,7 +4050,6 @@
<item quantity="other">ការព្យាយាមចូល <xliff:g id="COUNT_1">%d</xliff:g> ដង</item>
<item quantity="one">ការព្យាយាមចូល <xliff:g id="COUNT_0">%d</xliff:g> ដង</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"ទិន្នន័យរបស់ឧបករណ៍នេះកំពុងត្រូវបានបម្រុងទុក"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"ឧបករណ៍នេះស្ថិតក្រោមការគ្រប់គ្រងរបស់ស្ថាប័នអ្នក។"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"ឧបករណ៍នេះស្ថិតក្រោមការគ្រប់គ្រងរបស់ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ។"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"សេវាកម្មបំពេញដោយស្វ័យប្រវត្តិ"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ស្វ័យប្រវត្តិ បំពេញ បំពេញស្វ័យប្រវត្តិ"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ត្រូវប្រាកដថាអ្នកជឿជាក់លើកម្មវិធីនេះ</b> <br/> <br/> <xliff:g id=app_name example=Google បំពេញស្វ័យប្រវត្តិ>%1$s</xliff:g> ប្រើប្រាស់អ្វីដែលមាននៅលើអេក្រង់របស់អ្នក ដើម្បីកំណត់អ្វីដែលអាចបំពេញដោយស្វ័យប្រវត្តិ។"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"បំពេញដោយស្វ័យប្រវត្តិ"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"កម្រិតកត់ត្រា"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"សំណើអតិបរមាក្នុងមួយវគ្គ"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"សំណុំទិន្នន័យមើលឃើញអតិបរមា"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"កំណត់ឡើងវិញទៅតម្លៃលំនាំដើម"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"បំពេញជម្រើសអ្នកអភិវឌ្ឍន៍ដែលបានកំណត់ឡើងវិញ"</string>
<string name="device_theme" msgid="4571803018917608588">"រចនាប័ទ្មឧបករណ៍"</string>
<string name="default_theme" msgid="7085644992078579076">"លំនាំដើម"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"ឈ្មោះបណ្តាញ"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ជំរុញការផ្តល់ទិន្នន័យរបស់ក្រុមហ៊ុនបម្រើសេវាទូរសព្ទ"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"ធ្វើបច្ចុប្បន្នភាពមុខងារកុំរំខាន"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"ផ្អាកការជូនដំណឹងដើម្បីផ្តោតអារម្មណ៍"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"តើមានអ្វីដែលថ្មី និងគួរឲ្យចាប់អារម្មណ៍ដែរទេ?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"មើលការណែនាំទូរសព្ទថ្មីរបស់អ្នក"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"មើលការណែនាំថេប្លេតថ្មីរបស់អ្នក"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"មើលការណែនាំឧបករណ៍ថ្មីរបស់អ្នក"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"មុខងារនេះមិនមាននៅលើឧបករណ៍នេះទេ"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ជំរុញការវាស់ GNSS ពេញលេញ"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"តាមដានក្រុមរូបថត និងហ្រេ្វកង់ GNSS ទាំងអស់ដែលគ្មានការបែងចែករយៈពេលដំណើរការ"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"បង្ហាញប្រអប់បញ្ចូលនៃការគាំងជានិច្ច"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"បង្ហាញប្រអប់បញ្ចូលរាល់ពេលដែលកម្មវិធីគាំង"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ជ្រើសរើសកម្មវិធីដែលអាចប្រើ ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"មិនមានការកំណត់កម្មវិធីដែលអាចប្រើ ANGLE ទេ"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"កម្មវិធីដែលអាចប្រើ ANGLE៖ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ការចូលប្រើបញ្ជី"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ការចូលប្រើបញ្ជី"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"ព័ត៌មានលម្អិតនៃបណ្ដាញ"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"ឈ្មោះឧបករណ៍របស់អ្នកអាចឱ្យកម្មវិធីនៅលើទូរសព្ទរបស់អ្នកមើលឃើញ។ វាក៏អាចឱ្យអ្នកដទៃមើលឃើញផងដែរ នៅពេលដែលអ្នកភ្ជាប់ទៅឧបករណ៍ប៊្លូធូស ឬរៀបចំហតស្ប៉ត Wi-Fi ។"</string>
<string name="devices_title" msgid="7701726109334110391">"ឧបករណ៍"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"ការកំណត់ទាំងអស់"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"ការណែនាំ"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"ទិន្នន័យ CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"ទិន្នន័យ CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ជ្រើសរើសបណ្តាញ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"បានផ្ដាច់"</string>
+ <string name="network_connected" msgid="4943925032253989621">"បានភ្ជាប់"</string>
+ <string name="network_connecting" msgid="76404590784733557">"កំពុងភ្ជាប់…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"មិនអាចភ្ជាប់បានទេ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"រកបណ្ដាញមិនឃើញទេ។"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"រកបណ្ដាញមិនឃើញទេ។ សូមព្យាយាមម្ដងទៀត។"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ហាម)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"គ្មានស៊ីមកាតទេ"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"ការហៅទូរសព្ទកម្រិតខ្ពស់"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ ប្រើ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ GSM ប៉ុណ្ណោះ"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ WCDMA ប៉ុណ្ណោះ"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ CDMA ប៉ុណ្ណោះ"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ EvDo ប៉ុណ្ណោះ"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ សកល"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"មុខងារបណ្ដាញដែលប្រើជាអាទិភាព៖ LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (បានណែនាំ)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (បានណែនាំ)"</string>
+ <string name="network_global" msgid="959947774831178632">"សកល"</string>
+ <string name="label_available" msgid="1731547832803057893">"បណ្ដាញដែលអាចប្រើបាន"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"កំពុងស្វែងរក…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"កំពុងចុះឈ្មោះនៅលើ <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"មិនអនុញ្ញាតឱ្យស៊ីមកាតរបស់អ្នកភ្ជាប់បណ្ដាញនេះទេ។"</string>
+ <string name="connect_later" msgid="978991102125216741">"មិនអាចភ្ជាប់បណ្ដាញនេះនៅពេលនេះបានទេ។ សូមព្យាយាមម្ដងទៀតនៅពេលក្រោយ។"</string>
+ <string name="registration_done" msgid="4573820010512184521">"បានចុះឈ្មោះនៅលើបណ្ដាញ។"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"ជ្រើសរើសបណ្ដាញដោយស្វ័យប្រវត្តិ"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"ការកំណត់ក្រុមហ៊ុនសេវាទូរសព្ទ"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"រៀបចំសេវាកម្មទិន្នន័យ"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"ទិន្នន័យទូរសព្ទចល័ត"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"ចូលប្រើទិន្នន័យដោយប្រើបណ្ដាញទូរសព្ទចល័ត"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"ប្រភេទបណ្ដាញដែលប្រើជាអាទិភាព"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"ប្ដូរមុខងារប្រតិបត្តិការបណ្ដាញ"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"ប្រភេទបណ្ដាញដែលប្រើជាអាទិភាព"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"ក្រុមហ៊ុនសេវាទូរសព្ទ"</string>
+ <string name="call_category" msgid="8108654745239563833">"ការហៅទូរសព្ទ"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"ការហៅជាវីដេអូតាមរយៈក្រុមហ៊ុនសេវាទូរសព្ទ"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"ការជ្រើសរើសប្រព័ន្ធ"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"ប្ដូរមុខងាររ៉ូមីង CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"ការជ្រើសរើសប្រព័ន្ធ"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"បណ្ដាញ"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"បណ្ដាញ"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"ការជាវ CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"ប្ដូររវាង RUIM /ស៊ីម និង NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"ការជាវ"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ការចុះឈ្មោះដោយស្វ័យប្រវត្តិ…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"អនុញ្ញាតឱ្យប្រើការរ៉ូមីងទិន្នន័យ?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"ពិនិត្យមើលតម្លៃជាមួយក្រុមហ៊ុនផ្ដល់សេវាបណ្ដាញរបស់អ្នក។"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ការប្រើទិន្នន័យកម្មវិធី"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"មុខងារបណ្ដាញមិនត្រឹមត្រូវ <xliff:g id="NETWORKMODEID">%1$d</xliff:g>។ សូមកុំអើពើ។"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"មិនអាចប្រើបានទេ នៅពេលភ្ជាប់ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"មើលច្រើនទៀត"</string>
+ <string name="see_less" msgid="1250265310929558370">"មើលតិចជាង"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index c8f5888..69e6527 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"ಮೀಟರ್ ಮಾಡಿದೆ ಎಂದು ಪರಿಗಣಿಸಿ"</item>
<item msgid="2266114985518865625">"ಮೀಟರ್ ಮಾಡಲಾಗಿಲ್ಲ ಎಂದು ಪರಿಗಣಿಸಿ"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ಡೀಫಾಲ್ಟ್ (ಯಾದೃಚ್ಛಿಕವಾದ MAC ಅನ್ನು ಬಳಸಿ)"</item>
+ <item msgid="5398461510512959597">"ವಿಶ್ವಾಸಾರ್ಹ"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"ಇಲ್ಲ"</item>
<item msgid="3863157480502955888">"ಹೌದು"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"ಯಾವಾಗಲೂ ಆನ್"</item>
<item msgid="6385301106124765323">"ಯಾವಾಗಲೂ ಆಫ್"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"ಆಫ್ ಮಾಡಿ"</item>
+ <item msgid="2182686878828390312">"ಡೀಬಗ್ ಮಾಡಿ"</item>
+ <item msgid="5286514712714822064">"ಅತಿಯಾದ ಮಾತು"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"ಹೋಮ್ ಮಾತ್ರ"</item>
+ <item msgid="5034813753274486448">"ಸ್ವಯಂಚಾಲಿತ"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</item>
+ <item msgid="807926878589867564">"GSM ಮಾತ್ರ"</item>
+ <item msgid="488474605709912156">"WCDMA ಮಾತ್ರ"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA ಸ್ವಯಂ"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo ಸ್ವಯಂ"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo ಮಾತ್ರ"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"ಜಾಗತಿಕ"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA ಮಾತ್ರ"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/ಸಿಮ್"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"ಜಾಗತಿಕ"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 4539dc4..18372eb 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"ರಚಿಸು"</string>
<string name="allow" msgid="3349662621170855910">"ಅನುಮತಿಸಿ"</string>
<string name="deny" msgid="6947806159746484865">"ನಿರಾಕರಿಸಿ"</string>
- <string name="dlg_close" msgid="7471087791340790015">"ಮುಚ್ಚು"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"ಸ್ವಿಚ್"</string>
<string name="device_info_default" msgid="7847265875578739287">"ಅಪರಿಚಿತ"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">ಡೆವಲಪರ್ ಆಗಲು ಇದೀಗ ನೀವು ಕೇವಲ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ಹೆಜ್ಜೆಗಳು ದೂರದಲ್ಲಿರುವಿರಿ.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"ಅಗತ್ಯವಿಲ್ಲ, ನೀವು ಈಗಾಗಲೇ ಡೆವಲಪರ್ ಆಗಿರುವಿರಿ."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ಮೊದಲು ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"ವೈರ್ಲೆಸ್ & ನೆಟ್ವರ್ಕ್ಗಳು"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"ಸಂಪರ್ಕಗಳು"</string>
- <string name="header_category_device" msgid="4544026001618307754">"ಸಾಧನ"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ವೈಯಕ್ತಿಕ"</string>
- <string name="header_category_access" msgid="7580499097416970962">"ಪ್ರವೇಶ"</string>
<string name="header_category_system" msgid="2816866961183068977">"ಸಿಸ್ಟಂ"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ಡೇಟಾ ಸಂಪರ್ಕ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ಡೇಟಾ ಸಂಪರ್ಕ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ಸಾಧನದ ಬ್ಲೂಟೂತ್ ವಿಳಾಸ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"ಪ್ರಸಾರ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"ಹೆಸರಿಲ್ಲದ ಬ್ಲೂಟೂತ್ ಸಾಧನ"</string>
<string name="progress_scanning" msgid="192587958424295789">"ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ಯಾವುದೇ ಸಮೀಪದ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳು ಕಂಡುಬಂದಿಲ್ಲ."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"ಬ್ಲೂಟೂತ್ ಆನ್ ಮಾಡಲು ಮತ್ತು ಇತರ ಸಾಧನಗಳಿಗೆ ನಿಮ್ಮ ಫೋನ್ ಗೋಚರಿಸುವಂತೆ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್ ಬಯಸುತ್ತದೆ. ನೀವು ಇದನ್ನು ನಂತರದಲ್ಲಿ ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಿಕೊಳ್ಳಬಹುದು."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ಬ್ಲೂಟೂತ್ ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ಬ್ಲೂಟೂತ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"ಸ್ವಯಂ-ಸಂಪರ್ಕ"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ಬ್ಲೂಟೂತ್ ಸಂಪರ್ಕ ವಿನಂತಿ"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ನೀವು ಬಯಸುವಿರಾ?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"ಲಭ್ಯವಿರುವ ಕರೆ ಸಾಧನಗಳು"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"ಪ್ರಸ್ತುತ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"ಉಳಿಸಿರುವ ಸಾಧನಗಳು"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"ಸಾಧನ ಸೇರಿಸಿ"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"ಜೋಡಿಸಲು ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗುತ್ತದೆ"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"ಸಂಪರ್ಕ ಆದ್ಯತೆಗಳು"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"ಹಿಂದೆ ಸಂಪರ್ಕಗೊಂಡಿದ್ದ ಸಾಧನಗಳು"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ಹಿಂದೆ ಸಂಪರ್ಕಗೊಂಡಿದ್ದ"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ಬ್ಲೂಟೂತ್ ಆನ್ ಮಾಡಲಾಗಿದೆ"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"ಎಲ್ಲವನ್ನೂ ನೋಡಿ"</string>
<string name="date_and_time" msgid="9062980487860757694">"ದಿನಾಂಕ & ಸಮಯ"</string>
<string name="choose_timezone" msgid="1362834506479536274">"ಸಮಯದ ವಲಯವನ್ನು ಆರಿಸಿ"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"ಸ್ಕಿಪ್"</string>
<string name="next_label" msgid="4693520878012668114">"ಮುಂದೆ"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ಭಾಷೆಗಳು"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ಭಾಷೆ ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"ತೆಗೆದುಹಾಕಿ"</string>
<string name="add_a_language" msgid="2330538812283783022">"ಭಾಷೆ ಸೇರಿಸಿ"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"ಸೆಟ್ಟಿಂಗ್ಗಳ ಶಾರ್ಟ್ಕಟ್"</string>
<string name="airplane_mode" msgid="8837269988154128601">"ಏರ್ಪ್ಲೇನ್ ಮೋಡ್"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"ಇನ್ನಷ್ಟು"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"ವಯರ್ಲೆಸ್ & ನೆಟ್ವರ್ಕ್ಗಳು"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"ವೈ-ಫೈ, ಬ್ಲೂಟೂತ್, ಏರೋಪ್ಲೇನ್ ಮೋಡ್, ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ಗಳು, & VPN ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"ಮೊಬೈಲ್ ಡೇಟಾ"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"ಗೌಪ್ಯತೆ"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string>
<string name="security_status_title" msgid="5848766673665944640">"ಭದ್ರತೆ ಸ್ಥಿತಿ"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"ಸ್ಕ್ರೀನ್ ಲಾಕ್, ಫೇಸ್ ಅನ್ಲಾಕ್"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"ಪರದೆ ಲಾಕ್, ಫಿಂಗರ್ ಪ್ರಿಂಟ್"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ಪರದೆ ಲಾಕ್"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ಮುಖ ಸೇರಿಸಲಾಗಿದೆ"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"ನಿಮ್ಮ ಮುಖ ಬಳಸಿ ಅನ್ಲಾಕ್ ಮಾಡಿ"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"ಗುರುತಿಸುವಿಕೆಗೆ ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"ನಿಮ್ಮನ್ನು ಬಳಸಿಕೊಳ್ಳಿ"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ.\n\nಗಮನಿಸಿ: ಈ ಸಾಧನವನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖವನ್ನು ನೀವು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ಲಾಕ್ ಮಾಡಲು, ಖರೀದಿಗಳನ್ನು ದೃಢೀಕರಿಸಲು ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ"</string>
- <string name="face_add_max" msgid="2342250989212694454">"ನೀವು <xliff:g id="COUNT">%d</xliff:g> ಫಿಂಗರ್ಪ್ರಿಂಟ್ಗಳವರೆಗೂ ಸೇರಿಸಬಹುದು"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ವೃತ್ತದ ಮಧ್ಯದಲ್ಲಿ ನಿಮ್ಮ ಮುಖವನ್ನು ಇರಿಸಿ"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ನಂತರ ಮಾಡಿ"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"ನೀವು <xliff:g id="COUNT">%d</xliff:g> ಮುಖಗಳವರೆಗೂ ಸೇರಿಸಬಹುದು"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"ನೀವು ಗರಿಷ್ಠ ಸಂಖ್ಯೆಯ ಮುಖಗಳನ್ನು ಸೇರಿಸಿರುವಿರಿ"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"ಹೆಚ್ಚಿನ ಮುಖಗಳನ್ನು ಸೇರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"ನೋಂದಣಿ ಪೂರ್ಣಗೊಂಡಿಲ್ಲ"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ಸರಿ"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"ಮುಖ ನೋಂದಣಿ ಸಮಯ ಮಿತಿಯನ್ನು ಮೀರಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ಮುಖ ನೋಂದಣೆ ಮಾಡುವಿಕೆಯು ಕಾರ್ಯ ನಿರ್ವಹಿಸುತ್ತಿಲ್ಲ"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"ಎಲ್ಲವನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ. ನೋಡಲು ಚೆನ್ನಾಗಿ ಕಾಣುತ್ತಿದೆ."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"ಮುಗಿದಿದೆ"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"ಇದಕ್ಕೆ ಮುಖ ಬಳಸಿ"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಿ"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ಆ್ಯಪ್ ಸೈನ್ ಇನ್ & ಪಾವತಿಗಳು"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"ಅನ್ಲಾಕ್ ಮಾಡಲು ಕಣ್ಣು ತೆರೆಯಿರಿ"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"ಮುಖ ದೃಢೀಕರಣವನ್ನು ಬಳಸುವಾಗ, ನಿಮ್ಮ ಕಣ್ಣುಗಳು ತೆರೆದಿರಬೇಕು"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"ಮುಖ ಡೇಟಾ ತೆಗೆದುಹಾಕಿ"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"ನಿಮ್ಮ ಮುಖದ ಡೇಟಾವನ್ನು ಸುಧಾರಿಸಿ"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"ನಿಮ್ಮ ಸಾಧನ ಮತ್ತು ಪ್ರವೇಶ ಆ್ಯಪ್ಗಳನ್ನು ಅನ್ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಬಹುದು. "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿದುಕೊಳ್ಳಿ"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ಬೆರಳಚ್ಚು"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ಬೆರಳಚ್ಚು ನಿರ್ವ."</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ಬೆರಳಚ್ಚು ಬಳಸಿ"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"ವೈ-ಫೈ ಹಾಟ್ಸ್ಪಾಟ್ಗಾಗಿ ಕನಿಷ್ಠ ಒಂದು ಬ್ಯಾಂಡ್ ಆಯ್ಕೆಮಾಡಿ:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"ಗೌಪ್ಯತೆ"</string>
<string name="wifi_shared" msgid="844142443226926070">"ಇತರ ಸಾಧನ ಬಳಕೆದಾರರ ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಿ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ಬದಲಾವಣೆಯಾಗದ)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"ದಯವಿಟ್ಟು ಆಯ್ಕೆಮಾಡಿ"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"ರದ್ದುಮಾಡಿ"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"ನೆಟ್ವರ್ಕ್ ಮರೆತಿರುವಿರಾ?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ಈ ನೆಟ್ವರ್ಕ್ಗಾಗಿ ಎಲ್ಲಾ ಪಾಸ್ವರ್ಡ್ಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"ಉಳಿಸಿದ ನೆಟ್ವರ್ಕ್"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d ನೆಟ್ವರ್ಕ್ಗಳು</item>
<item quantity="other">%d ನೆಟ್ವರ್ಕ್ಗಳು</item>
@@ -998,7 +1005,7 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"ರೋಮಿಂಗ್ ಪ್ರಾಶಸ್ತ್ಯ"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"ವೈ-ಫೈಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</item>
+ <item msgid="2124257075906188844">"ವೈ-ಫೈಗೆ ಆದ್ಯತೆ"</item>
<item msgid="1335127656328817518">"ಮೊಬೈಲ್ಗೆ ಆದ್ಯತೆ"</item>
<item msgid="3132912693346866895">"ವೈ-ಫೈ ಮಾತ್ರ"</item>
</string-array>
@@ -1013,7 +1020,7 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"ವೈ-ಫೈಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</item>
+ <item msgid="5782108782860004851">"ವೈ-ಫೈಗೆ ಆದ್ಯತೆ"</item>
<item msgid="5074515506087318555">"ಮೊಬೈಲ್ಗೆ ಆದ್ಯತೆ"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"ಪ್ರಖರತೆ"</string>
<string name="brightness_summary" msgid="838917350127550703">"ಪರದೆಯ ಪ್ರಖರತೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"ಅಡಾಪ್ಟಿವ್ ಪ್ರಖರತೆ"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ಆನ್"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ಆಫ್"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"ಆದ್ಯತೆಯ ಹೊಳಪಿನ ಮಟ್ಟವನ್ನು ಅತಿ ಕಡಿಮೆ ಎಂದು ಹೊಂದಿಸಲಾಗಿದೆ"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"ಆದ್ಯತೆಯ ಹೊಳಪಿನ ಮಟ್ಟವನ್ನು ಕಡಿಮೆ ಎಂದು ಹೊಂದಿಸಲಾಗಿದೆ"</string>
@@ -1125,8 +1131,8 @@
<string name="night_display_text" msgid="1837277457033025056">"ನೈಟ್ ಲೈಟ್ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಕಡು ಕಂದು ಬಣ್ಣಕ್ಕೆ ತಿರುಗಿಸುತ್ತದೆ. ಇದರಿಂದಾಗಿ ಮಂದ ಬೆಳಕಿನಲ್ಲಿಯೂ ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೋಡಲು ಅಥವಾ ಓದಲು ಸುಲಭವಾಗುತ್ತದೆ ಮತ್ತು ಸುಲಭವಾಗಿ ನಿದ್ರಿಸಲು ಇದು ನಿಮಗೆ ಸಹಾಯ ಮಾಡಬಹುದು."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"ಅವಧಿ"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"ಯಾವುದೂ ಅಲ್ಲ"</string>
- <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ಕಸ್ಟಮ್ ಸಮಯದಲ್ಲಿ ಆನ್ ಮಾಡಿ"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"ಸೂರ್ಯಾಸ್ತದಿಂದ ಸೂರ್ಯೋದಯದವರೆಗೂ ಆನ್ ಮಾಡಿರುತ್ತದೆ"</string>
+ <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ಕಸ್ಟಮ್ ಸಮಯದಲ್ಲಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"ಸೂರ್ಯಾಸ್ತದಿಂದ ಸೂರ್ಯೋದಯದವರೆಗೂ ಆನ್ ಆಗಿರುತ್ತದೆ"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"ಪ್ರಾರಂಭದ ಸಮಯ"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"ಮುಕ್ತಾಯದ ಸಮಯ"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"ಸ್ಥಿತಿ"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"ಪಿನ್ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\nಬಹುಶಃ ತಪ್ಪಾದ ಪಿನ್."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"ಸಿಮ್ ಪಿನ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಬದಲಾಯಿಸಲಾಗಿದೆ"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"ಸಿಮ್ ಕಾರ್ಡ್ ಲಾಕ್ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\nಬಹುಶಃ ತಪ್ಪಾದ ಪಿನ್."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"ಪಿನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"ಪಿನ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ಸರಿ"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"ರದ್ದುಮಾಡಿ"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"ಬಹು ಸಿಮ್ ಗಳು ಕಂಡುಬಂದಿವೆ"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ಇದಕ್ಕೆ <xliff:g id="NAME_0">^1</xliff:g> ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಬೇಕಾಗುತ್ತದೆ. \n\n"<b>" ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡುವುದರಿಂದ <xliff:g id="NAME_1">^1</xliff:g>ನಲ್ಲಿ ಪ್ರಸ್ತುತ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</b>" ಡೇಟಾ ನಷ್ಟವಾಗುವುದನ್ನು ತಪ್ಪಿಸಲು, ಅದನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿಕೊಳ್ಳುವುದು ಒಳ್ಳೆಯದು."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ಅಳಿಸಿ & ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡು"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g> ಫಾರ್ಮ್ಯಾಟ್ ಆಗುತ್ತಿರುವಾಗ ಅದನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g> ಫಾರ್ಮ್ಯಾಟ್ ಆಗುತ್ತಿರುವಾಗ ಅದನ್ನು ತೆಗೆದುಹಾಕಬೇಡಿ."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ಡೇಟಾವನ್ನು ಹೊಸ ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸಿ"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"ನೀವು ಈ ಹೊಸ <xliff:g id="NAME">^1</xliff:g> ಗೆ ನಿಮ್ಮ ಫೋಟೊಗಳು, ಫೈಲ್ಗಳು ಮತ್ತು ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ಸರಿಸಬಹುದು. \n\n ಸರಿಸಲು <xliff:g id="TIME">^2</xliff:g> ಸಮಯವನ್ನು ತೆಗೆದುಕೊಳ್ಳಬಹುದು ಮತ್ತು ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿ <xliff:g id="SIZE">^3</xliff:g> ನಷ್ಟು ತೆರವುಗೊಳಿಸುತ್ತದೆ. ಅದು ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿರುವಾಗ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್ಗಳು ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ಇದೀಗ ಸರಿಸಿ"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
<string name="no_applications" msgid="7336588977497084921">"ಅಪ್ಲಿಕೇಶನ್ಗಳು ಇಲ್ಲ."</string>
<string name="internal_storage" msgid="1584700623164275282">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB ಸಂಗ್ರಹಣೆ"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD ಕಾರ್ಡ್ ಸಂಗ್ರಹಣೆ"</string>
<string name="recompute_size" msgid="7722567982831691718">"ಗಾತ್ರವನ್ನು ಮರುಗಣನೆ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾ ಅಳಿಸುವುದೇ?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"ಈ ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್ನ ಡೇಟಾವನ್ನು ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ. ಇದರಲ್ಲಿ ಎಲ್ಲ ಫೈಲ್ಗಳು, ಸೆಟ್ಟಿಂಗ್ಗಳು, ಖಾತೆಗಳು, ಡೇಟಾಬೇಸ್ಗಳು ಇತರೆ ಒಳಗೊಂಡಿರುತ್ತದೆ."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ಸ್ಥಾಪಿಸಲಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್ಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್ ಕಂಡುಬಂದಿಲ್ಲ."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"ಅಪ್ಲಿಕೇಶನ್ಗಾಗಿ ಸಂಗ್ರಹಣೆಯನ್ನು ತೆರವುಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಕೆಳಗಿನದನ್ನು ಪ್ರವೇಶಿಸಬಹುದು:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ ಕೆಳಗಿನದನ್ನು ಪ್ರವೇಶಿಸಬಹುದು:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ನಲ್ಲಿ ಕೆಳಗಿನವುಗಳನ್ನು ಪ್ರವೇಶಿಸಬಹುದು. ಕಾರ್ಯಕ್ಷಮತೆಯನ್ನು ಸುಧಾರಿಸುವ ಸಲುವಾಗಿ ಮತ್ತು ಸ್ಮರಣೆ ಬಳಕೆಯನ್ನು ಕಡಿಮೆ ಮಾಡಲು, ಕೆಲವೊಂದು ಅನುಮತಿಗಳು <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ಗೆ ಲಭ್ಯವಿರುತ್ತವೆ ಏಕೆಂದರೆ ಇದು <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ರಂತೆಯೇ ಒಂದೇ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ ಚಾಲನೆಯಾಗುತ್ತದೆ:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಕೆಳಗಿನವುಗಳನ್ನು ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ ಪ್ರವೇಶಿಸಬಹುದು. ಕಾರ್ಯಕ್ಷಮತೆಯನ್ನು ಸುಧಾರಿಸಲು ಮತ್ತು ಸ್ಮರಣೆಯ ಬಳಕೆಯನ್ನು ಕಡಿಮೆಗೊಳಿಸಲು, ಈ ಕೆಲವು ಅನುಮತಿಗಳು <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ಗೆ ಲಭ್ಯ ಇವೆ ಏಕೆಂದರೆ ಇದು <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ರಂತೆ ಅದೇ ರೀತಿಯ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ ರನ್ ಆಗುತ್ತದೆ:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ಮತ್ತು <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮಗೆ ದರವನ್ನು ವಿಧಿಸಬಹುದು:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ಪ್ರೀಮಿಯಂ SMS ಕಳುಹಿಸಿ"</string>
<string name="computing_size" msgid="1599186977475211186">"ಗಣನೆ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"ಪ್ಯಾಕೇಜ್ನ ಗಾತ್ರವನ್ನು ಲೆಕ್ಕ ಮಾಡಲಾಗಲಿಲ್ಲ."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"ಸ್ಥಾಪಿಸಿದ ಯಾವುದೇ ಮೂರನೇ ವ್ಯಕ್ತಿಯ ಅಪ್ಲಿಕೇಶನ್ಗಳನ್ನು ನೀವು ಹೊಂದಿಲ್ಲ."</string>
<string name="version_text" msgid="9189073826278676425">"ಆವೃತ್ತಿ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"ಸರಿಸು"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ಟ್ಯಾಬ್ಲೆಟ್ಗೆ ಸರಿಸು"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ಫೋನ್ಗೆ ಸರಿಸು"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸು"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD ಕಾರ್ಡ್ಗೆ ಸರಿಸು"</string>
- <string name="moving" msgid="6431016143218876491">"ಸರಿಸಲಾಗುತ್ತಿದೆ"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"ಮತ್ತೊಂದು ರವಾನೆ ಈಗಾಗಲೇ ಪ್ರಗತಿಯಲ್ಲಿದೆ."</string>
<string name="insufficient_storage" msgid="481763122991093080">"ಸಾಕಷ್ಟು ಸಂಗ್ರಹಣೆ ಸ್ಥಳ ಇಲ್ಲ"</string>
<string name="does_not_exist" msgid="1501243985586067053">"ಅಪ್ಲಿಕೇಶನ್ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"ಸಾಧನ ನಿರ್ವಹಣಾ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಬಾಹ್ಯ ಮಾಧ್ಯಮದಲ್ಲಿ ಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"ಬಲವಂತವಾಗಿ ಸ್ಥಗಿತಗೊಳಿಸುವುದೇ?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಬಲವಂತವಾಗಿ ಸ್ಥಗಿತಗೊಳಿಸಿದರೆ, ಅದು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಸರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"ಅಪೇಕ್ಷಿತ ಸ್ಥಾಪನೆ ಸ್ಥಳ"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"ಹೊಸ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗಾಗಿ ಪ್ರಾಶಸ್ತ್ಯದ ಸ್ಥಾಪನೆ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸಿ"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"ಅಂತರ್ನಿರ್ಮಿತ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"ಅಪ್ಲಿಕೇಶನ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ, ಇನ್ನು ಮುಂದೆ Android ಮತ್ತು ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಉದ್ದೇಶಿಸಿದಂತೆ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ಡೇಟಾವನ್ನು ಅಳಿಸಿ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ನೀವು ಈ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದರೆ, ಇನ್ನು ಮುಂದೆ Android ಮತ್ತು ಇತರ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಉದ್ದೇಶಿಸಿದಂತೆ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು. ನಿಮ್ಮ ಡೇಟಾವನ್ನು ಸಹ ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ಈ ಅಪ್ಲಿಕೇಶನ್ಗಾಗಿ ನೀವು ಅಧಿಸೂಚನೆಗಳನ್ನು ಆಫ್ ಮಾಡಿದರೆ, ನೀವು ಪ್ರಮುಖ ಎಚ್ಚರಿಕೆಗಳು ಮತ್ತು ನವೀಕರಣಗಳನ್ನು ಕಳೆದುಕೊಳ್ಳಬಹುದು."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"ಅಂಗಡಿ"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"ಅಪ್ಲಿಕೇಶನ್ ವಿವರಗಳು"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> ನಿಂದ ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ಸೇವೆಯನ್ನು ಬಳಸಿ"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ಬಣ್ಣ ತಿದ್ದುಪಡಿಯನ್ನು ಬಳಸಿ"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ಶೀರ್ಷಿಕೆಗಳನ್ನು ಬಳಸಿ"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"ಮುಂದುವರಿಸಿ"</string>
<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="6371077608778830020">"ಶ್ರವಣ ಸಾಧನವನ್ನು ಸೇರಿಸಿ"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ಒಂದು ಅಪ್ಲಿಕೇಶನ್ನ ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ನೀವು ಸೀಮಿತಗೊಳಿಸಿದರೆ, ಅದು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ಬ್ಯಾಟರಿ ಅನ್ನು ಆಪ್ಟಿಮೈಜ್ ಮಾಡಲು ಈ ಅಪ್ಲಿಕೇಶನ್ ಹೊಂದಿಸದ ಕಾರಣ, ನೀವು ಇದನ್ನು ನಿರ್ಬಂಧಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\n ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿರ್ಬಂಧಿಸಲು, ಮೊದಲು ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್ ಅನ್ನು ಆನ್ ಮಾಡಿ."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"ಕೊನೆಯ ಬಾರಿ ಪೂರ್ಣ ಚಾರ್ಜ್ ಬಳಿಕ ಪರದೆಯ ಬಳಕೆ"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"ಪರದೆ ಬಳಕೆ ಮಾಡಿದ್ದು"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಸ್ಕ್ಯಾನ್ ಮಾಡುವುದು"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ನಂತರದಿಂದ ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ಬಳಿಕ ಪರದೆ ಆನ್ ಆಗಿದ್ದ ಅವಧಿ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ಕೊನೆಯ ಬಾರಿ ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಮಾಡಿದ ನಂತರದಿಂದ ಸಾಧನದ ಬಳಕೆ"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"ಬಳಕೆಯ ವಿವರಗಳು"</string>
<string name="controls_subtitle" msgid="390468421138288702">"ವಿದ್ಯುತ್ ಬಳಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"ಒಳಗೊಂಡ ಪ್ಯಾಕೇಜ್ಗಳು"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ಬ್ಯಾಟರಿಯನ್ನು ಕ್ಷೀಣಿಸುತ್ತಿರುವ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ಸಾಧನವನ್ನು ಎಚ್ಚರದಲ್ಲಿ ಇರಿಸಲಾಗಿದೆ"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ಸಾಧನವನ್ನು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿದೆ"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ಆಗಾಗ್ಗೆ ಸ್ಥಳವನ್ನು ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"ಅನುಚಿತವಾಗಿ ವರ್ತಿಸುತ್ತಿರುವ <xliff:g id="NUMBER">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"ಅಪ್ಲಿಕೇಶನ್ಗಳು ಸಾಮಾನ್ಯವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತಿವೆ"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ಫೋನ್ ವಿಶಿಷ್ಟ ಹಿನ್ನೆಲೆ ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಹೊಂದಿದೆ"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ಟ್ಯಾಬ್ಲೆಟ್ ವಿಶಿಷ್ಟ ಹಿನ್ನೆಲೆ ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಹೊಂದಿದೆ"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">%1$d ಅಪ್ಲಿಕೇಶನ್ಗೆ ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಸೀಮಿತಗೊಳಿಸಲಾಗಿದೆ</item>
<item quantity="other">%1$d ಅಪ್ಲಿಕೇಶನ್ಗೆ ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಸೀಮಿತಗೊಳಿಸಲಾಗಿದೆ</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"ಈ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಬ್ಯಾಟರಿಯನ್ನು ಬಳಸುತ್ತಿದೆ. ನಿರ್ಬಂಧಿತ ಅಪ್ಲಿಕೇಶನ್ಗಳು ಸರಿಯಾಗಿ ಕೆಲಸ ಮಾಡದಿರಬಹುದು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು ವಿಳಂಬವಾಗಬಹುದು."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"ಬ್ಯಾಟರಿ ನಿರ್ವಾಹಕವನ್ನು ಬಳಸಿ"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"ಅಪ್ಲಿಕೇಶನ್ಗಳು ಯಾವಾಗ ಬ್ಯಾಟರಿಯನ್ನು ಬರಿದಾಗಿಸುತ್ತದೆ ಎಂಬುದನ್ನು ಪತ್ತೆ ಮಾಡಿ"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"ರದ್ದುಮಾಡಿ"</string>
<string name="tts_reset" msgid="2661752909256313270">"ಮರುಹೊಂದಿಸಿ"</string>
<string name="tts_play" msgid="2628469503798633884">"ಪ್ಲೇ"</string>
- <string name="gadget_title" msgid="5519037532720577836">"ವಿದ್ಯುತ್ ನಿಯಂತ್ರಣ"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi ಸೆಟ್ಟಿಂಗ್ ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ಬ್ಲೂಟೂತ್ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ಆನ್"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ಆಫ್"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"ಆಫ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ಬ್ಲೂಟೂತ್"</string>
- <string name="gadget_location" msgid="2974757497945178165">"ಸ್ಥಳ"</string>
- <string name="gadget_sync" msgid="858895763714222152">"ಸಿಂಕ್"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"ಪ್ರಕಾಶಮಾನ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ಸ್ವಯಂ"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"ಪೂರ್ಣ"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"ಅರ್ಧ"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"ಆಫ್"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ಸಂಗ್ರಹಣೆಯಿಂದ ಇನ್ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ರಲ್ಲಿ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆಮಾಡಿ"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ಡೇಟಾ ಬಳಕೆ"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ಆಪ್ ಡೇಟಾ ಬಳಕೆ"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"ಮೊಬೈಲ್ ಡೇಟಾ ಮತ್ತು ವೈ-ಫೈ"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"ವಾಹಕ ಡೇಟಾ ಲೆಕ್ಕಾಚಾರವು ನಿಮ್ಮ ಸಾಧನಕ್ಕಿಂತ ಭಿನ್ನವಾಗಿರಬಹುದು."</string>
<string name="data_usage_app" msgid="4970478397515423303">"ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆ"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">%d ಮರೆಮಾಡಲಾದ ಐಟಂಗಳನ್ನು ತೋರಿಸಿ</item>
<item quantity="other">%d ಮರೆಮಾಡಲಾದ ಐಟಂಗಳನ್ನು ತೋರಿಸಿ</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ಕುಗ್ಗಿಸಿ"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"ನೆಟ್ವರ್ಕ್ ಮತ್ತು ಇಂಟರ್ನೆಟ್"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ಮೊಬೈಲ್"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ಡೇಟಾ ಬಳಕೆ"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ಬ್ಲೂಟೂತ್"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ಆ್ಯಪ್ & ಅಧಿಸೂಚನೆ"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ಅನುಮತಿಗಳು, ಡಿಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ನಲ್ಲಿರುವ ಅಪ್ಲಿಕೇಶನ್ಗಳಿಗೆ ಅಧಿಸೂಚನೆ ಪ್ರವೇಶ ಲಭ್ಯವಿಲ್ಲ."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"ಖಾತೆಗಳು"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"ಯಾವುದೇ ಖಾತೆಗಳನ್ನು ಸೇರಿಸಿಲ್ಲ"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ಡಿಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್ಗಳು"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ಭಾಷೆಗಳು, ಸಮಯ, ಬ್ಯಾಕ್ಅಪ್, ಅಪ್ಡೇಟ್ಗಳು"</string>
<string name="search_results_title" msgid="1796252422574886932">"ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
- <string name="search_menu" msgid="6283419262313758339">"ಸೆಟ್ಟಿಂಗ್ಗಳಲ್ಲಿ ಹುಡುಕಿ"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"ವೈಫೈ, ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ ಸಂಪರ್ಕ, ಇಂಟರ್ನೆಟ್, ವೈರ್ಲೆಸ್, ಡೇಟಾ, ವೈ ಫೈ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"ವೈಫೈ, ವೈ-ಫೈ, ಟಾಗಲ್, ನಿಯಂತ್ರಣ"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"ಪಠ್ಯ ಸಂದೇಶ, ಪಠ್ಯ ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ, ಸಂದೇಶಗಳು, ಪಠ್ಯ ಸಂದೇಶ ಮಾಡುವಿಕೆ, ಡಿಫಾಲ್ಟ್"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ಪಾವತಿಸಿ, ಟ್ಯಾಪ್ ಮಾಡಿ, ಪಾವತಿಗಳು"</string>
<string name="keywords_backup" msgid="470070289135403022">"ಬ್ಯಾಕಪ್, ಬ್ಯಾಕ್ ಅಪ್"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ಗೆಸ್ಚರ್"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ಮುಖ, ಅನ್ಲಾಕ್, ದೃಢೀಕರಣ, ಸೈನ್ ಇನ್"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl ಆವೃತ್ತಿ, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"ನೆಟ್ವರ್ಕ್, ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಸ್ಥಿತಿ, ಸೇವಾ ಸ್ಥಿತಿ, ಸಿಗ್ನಲ್ ಸಾಮರ್ಥ್ಯ, ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ವಿಧ, ರೋಮಿಂಗ್, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"ಕ್ರಮ ಸಂಖ್ಯೆ, ಹಾರ್ಡ್ವೇರ್ ಆವೃತ್ತಿ"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ಗಾಢವಾದ ಥೀಮ್"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ದೋಷ"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ಆಂಬಿಯೆಂಟ್ ಡಿಸ್ಪ್ಲೇ, ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಡಿಸ್ಪ್ಲೇ"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಅಧಿಸೂಚನೆ"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ಮುಖ"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ಫಿಂಗರ್ ಪ್ರಿಂಟ್"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ಮಂದ ಪರದೆ, ಟಚ್ಸ್ಕ್ರೀನ್, ಬ್ಯಾಟರಿ, ಸ್ಮಾರ್ಟ್ ಪ್ರಖರತೆ, ಡೈನಾಮಿಕ್ ಪ್ರಖರತೆ"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ನಿಮ್ಮ ಪಿನ್ ಅನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ, <xliff:g id="SERVICE">%1$s</xliff:g> ಅಂತಹ ಪ್ರವೇಶ ಸೇವೆಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ, <xliff:g id="SERVICE">%1$s</xliff:g> ಅಂತಹ ಪ್ರವೇಶ ಸೇವೆಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ನಿಮ್ಮ ಪಾಸ್ವರ್ಡ್ ಅನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ, <xliff:g id="SERVICE">%1$s</xliff:g> ರೀತಿಯ ಪ್ರವೇಶ ಸೇವೆಗಳು ಲಭ್ಯವಿರುವುದಿಲ್ಲ."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ಗಮನಿಸಿ: ರೀಬೂಟ್ ನಂತರ, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನೀವು ಅನ್ಲಾಕ್ ಮಾಡುವ ತನಕ ಈ ಆಪ್ ಪ್ರಾರಂಭಗೊಳ್ಳುವುದಿಲ್ಲ"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"ಗಮನಿಸಿ: ನೀವು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿದಲ್ಲಿ ಮತ್ತು ಪರದೆಯ ಲಾಕ್ ಹೊಂದಿದ್ದರೆ, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್ಲಾಕ್ ಮಾಡುವವರೆಗೂ ಈ ಆ್ಯಪ್ ಅನ್ನು ಪ್ರಾರಂಭಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI ಮಾಹಿತಿ"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI ಸಂಬಂಧಿತ ಮಾಹಿತಿ"</string>
<string name="slot_number" msgid="3762676044904653577">"(ಸ್ಲಾಟ್<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ವೈಯಕ್ತಿಕ"</string>
<string name="filter_work_apps" msgid="24519936790795574">"ಕೆಲಸ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ಅಪ್ಲಿಕೇಶನ್ಗಳು: ಎಲ್ಲ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ಆಪ್ಗಳು: ಆಫ್ ಮಾಡಿರುವವು"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ವರ್ಗಗಳು: ತುರ್ತು ಪ್ರಾಮುಖ್ಯತೆ"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ವರ್ಗಗಳು: ಕಡಿಮೆ ಪ್ರಾಮುಖ್ಯತೆ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ವರ್ಗಗಳು: ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"ಬಳಕೆ ಎಚ್ಚರಿಕೆಗಳು"</string>
<string name="show_all_apps" msgid="1512506948197818534">"ಸಾಧನದ ಸಂಪೂರ್ಣ ಬಳಕೆಯನ್ನು ತೋರಿಸಿ"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆಯನ್ನು ತೋರಿಸಿ"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ಅಧಿಕ ಬಳಕೆ"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> ಆಪ್ಗಳು ಅಸಹಜವಾಗಿ ವರ್ತಿಸುತ್ತಿವೆ</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ಆಪ್ಗಳು ಅಸಹಜವಾಗಿ ವರ್ತಿಸುತ್ತಿವೆ</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ಬಳಸಲಾಗಿದೆ - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ಮುಕ್ತವಾಗಿದೆ"</string>
<string name="display_summary" msgid="6737806235882127328">"ನಿಷ್ಕ್ರಿಯತೆಯ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ರ ಬಳಿಕ ನಿದ್ರಿಸು"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"ವಾಲ್ಪೇಪರ್, ಸ್ಲೀಪ್, ಫಾಂಟ್ ಗಾತ್ರ"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"ನಿಷ್ಕ್ರಿಯತೆಯ 10 ನಿಮಿಷಗಳ ನಂತರ ನಿದ್ರಿಸು"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ಯಲ್ಲಿ ಸರಾಸರಿ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ಮೆಮೊರಿ ಬಳಸಲಾಗಿದೆ"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> ಎಂಬುದಾಗಿ ಸೈನ್ ಇನ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"ಎಸ್ಎಂಎಸ್ಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"ಕ್ಯಾಮರಾಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ಸ್ಕ್ರೀನ್ಶಾಟ್ಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"ಬ್ಯಾಕ್ಅಪ್ಗಳನ್ನು ಆಫ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"ಈ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"ನಿಮಗೆ ಯಾವುದೇ ಪ್ರಶ್ನೆಗಳಿದ್ದರೆ, ನಿಮ್ಮ ಐಟಿ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ಇನ್ನಷ್ಟು ವಿವರಗಳು"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"ಕಟ್ಔಟ್ನೊಂದಿಗೆ ಪ್ರದರ್ಶನ ಅನುಕರಿಸಿ"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ಡಿಸ್ಪ್ಲೇ ಕಟ್ಔಟ್"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ಕಟ್ಔಟ್ ಪ್ರದರ್ಶನ, ನಾಚ್"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ಯಾವುದೂ ಅಲ್ಲ"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ಸಾಧನದ ಡೀಫಾಲ್ಟ್"</string>
<string name="special_access" msgid="3458780842491881155">"ವಿಶೇಷ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರವೇಶ"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್ಗಳು, ಅನಿರ್ಬಂಧಿತ ಡೇಟಾ ಬಳಸಬಹುದು</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ಹಲವು ಸಾಧನಗಳಿಗೆ ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
<string name="demo_mode" msgid="2798762752209330277">"ಸಿಸ್ಟಂ UI ಡೆಮೋ ಮೋಡ್"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"ರಾತ್ರಿ ಮೋಡ್"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"ರಾತ್ರಿ ಮೋಡ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"ಕತ್ತಲೆ ಮೋಡ್"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"ಕತ್ತಲೆ ಮೋಡ್ ಆರಂಭಿಸಿ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ಡೆವಲಪರ್ ಟೈಲ್ಸ್ನ ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"ವಿನ್ಸ್ಕೋಪ್ ಟ್ರೇಸ್"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ಸಂಪರ್ಕ ಹುಡುಕಿ"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ಕರೆದಾತರು ಮತ್ತು ಸಂಪರ್ಕಗಳನ್ನು ಗುರುತಿಸಲು ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಮೂಲಕ ಸಂಪರ್ಕ ಹುಡುಕಾಟಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ಫೋನ್ ಅನ್ನು ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"ಸಾಧನವನ್ನು ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್ಗಳು ಮತ್ತು ಇತರೆ ಮಾಹಿತಿಗಳನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಪರದೆಯ ಮೇಲೆ ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"ಸಮಯ, ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು, ನಿಮ್ಮ ಪರದೆಯನ್ನು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ಫೋನ್ ಪರಿಶೀಲಿಸಲು ಕೈಗೆತ್ತಿಕೊಳ್ಳಿ"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಎತ್ತಿರಿ"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ಸಾಧನ ಪರಿಶೀಲಿಸಲು ಕೈಗೆತ್ತಿಕೊಳ್ಳಿ"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್ಗಳು ಮತ್ತು ಇತರೆ ಮಾಹಿತಿಗಳನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಫೋನ್ ತೆಗೆದುಕೊಳ್ಳಿ."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್ಗಳು ಮತ್ತು ಇತರೆ ಮಾಹಿತಿಗಳನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ತೆಗೆದುಕೊಳ್ಳಿ."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ಸಮಯ, ಅಧಿಸೂಚನೆ ಐಕಾನ್ಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮ್ಮ ಸಾಧನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ಎಚ್ಚರಿಸುವ ಡಿಸ್ಪ್ಲೇ"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"ಸಮಯ, ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಎತ್ತಿಕೊಳ್ಳಿ."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"ಸಮಯ, ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಎತ್ತಿಕೊಳ್ಳಿ."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"ಸಮಯ, ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಎತ್ತಿಕೊಳ್ಳಿ."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"ವೇಕ್ ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಗೆಸ್ಚರ್"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ಅಧಿಸೂಚನೆಗಳಿಗಾಗಿ ಬೆರಳಚ್ಚು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ಬೆರಳಚ್ಚು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಫೋನ್ ಹಿಂಭಾಗದಲ್ಲಿನ ಬೆರಳಚ್ಚು ಸೆನ್ಸರ್ನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ಪ್ರಯತ್ನಗಳು</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ಪ್ರಯತ್ನಗಳು</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"ಈ ಸಾಧನದ ಡೇಟಾವನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"ಈ ಸಾಧನವನ್ನು ನಿಮ್ಮ ಸಂಸ್ಥೆ ನಿರ್ವಹಿಸುತ್ತಿದೆ."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"ಈ ಸಾಧನವನ್ನು <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ನಿರ್ವಹಿಸುತ್ತಿದೆ."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"ಸ್ವಯಂತುಂಬುವಿಕೆ ಸೇವೆ"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ಸ್ವಯಂ, ತುಂಬುವಿಕೆ, ಸ್ವಯಂತುಂಬುವಿಕೆ"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ನಿಮಗೆ ಈ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ವಿಶ್ವಾಸವಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ </b> <br/> <br/> ಯಾವ ಕ್ಷೇತ್ರಗಳನ್ನು ಸ್ವಯಂ-ಭರ್ತಿ ಮಾಡಬಹುದು ಎಂಬುದನ್ನು ನಿರ್ಧರಿಸಲು <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ನಿಮ್ಮ ಪರದೆಯಲ್ಲಿರುವ ಮಾಹಿತಿಯನ್ನು ಬಳಸಿಕೊಳ್ಳುತ್ತದೆ."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"ಸ್ವಯಂ ಭರ್ತಿ"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"ಲಾಗ್ ಮಾಡುವ ಹಂತ"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"ಪ್ರತಿ ಸೆಶನ್ಗೆ ಗರಿಷ್ಠ ವಿನಂತಿಗಳು"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"ಗರಿಷ್ಠ ಗೋಚರಿಸುವ ಡೇಟಾ ಸೆಟ್ಗಳು"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ಡಿಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳಿಗೆ ಮರುಹೊಂದಿಸಿ"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"ಸ್ವಯಂ ಭರ್ತಿ ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳನ್ನು ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
<string name="device_theme" msgid="4571803018917608588">"ಸಾಧನದ ಥೀಮ್"</string>
<string name="default_theme" msgid="7085644992078579076">"ಡಿಫಾಲ್ಟ್"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"ನೆಟ್ವರ್ಕ್ ಹೆಸರು"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ಟ್ರಿಗ್ಗರ್ ವಾಹಕ ಪೂರೈಕೆ"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಅನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಿ"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"ಫೋಕಸ್ ಆಗಿ ಇರಲು ಅಧಿಸೂಚನೆಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಿ"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"ಆಕರ್ಷಕವಾಗಿ ಮತ್ತು ಹೊಸದಾಗಿ ಏನಿದೆ?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ನಿಮ್ಮ ಹೊಸ ಫೋನ್ನ ಬಳಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ನಿಮ್ಮ ಹೊಸ ಟ್ಯಾಬ್ಲೆಟ್ನ ಬಳಕೆ ಪ್ರಾರಂಭಿಸಿ"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ನಿಮ್ಮ ಹೊಸ ಸಾಧನದ ಬಳಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"ಈ ಸಾಧನದಲ್ಲಿ ಈ ವೀಡಿಯೊ ಲಭ್ಯವಿಲ್ಲ"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ಫೋರ್ಸ್ ಫುಲ್ GNSS ಅಳತೆಗಳು"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ಯಾವುದೇ ಡ್ಯೂಟಿ ಸೈಕ್ಲಿಂಗ್ ಇಲ್ಲದೆ ಎಲ್ಲಾ GNSS ಕಾನ್ಸ್ಟಲೇಶನ್ಗಳು ಮತ್ತು ಆವರ್ತನೆಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಿ"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"ಯಾವಾಗಲೂ ಕ್ರ್ಯಾಶ್ ಸಂವಾದವನ್ನು ತೋರಿಸಿ"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"ಅಪ್ಲಿಕೇಶನ್ ಕ್ರ್ಯಾಶ್ ಆಗುವಾಗ ಪ್ರತಿ ಬಾರಿ ಸಂವಾದವನ್ನು ತೋರಿಸಿ"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE ಸಕ್ರಿಯಗೊಳಿಸಿದ ಆ್ಯಪ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ಯಾವುದೇ ANGLE ಸಕ್ರಿಯಗೊಳಿಸದ ಆ್ಯಪ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE ಸಕ್ರಿಯಗೊಳಿಸಿದ ಆ್ಯಪ್: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ಡೈರೆಕ್ಟರಿ ಪ್ರವೇಶ"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ಡೈರೆಕ್ಟರಿ ಪ್ರವೇಶ"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"ನೆಟ್ವರ್ಕ್ ವಿವರಗಳು"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"ನಿಮ್ಮ ಸಾಧನದ ಹೆಸರು ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿರುವ ಅಪ್ಲಿಕೇಶನ್ಗಳಲ್ಲಿ ಗೋಚರಿಸುತ್ತದೆ. ನೀವು ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಸಂಪರ್ಕಿಸಿದಾಗ ಅಥವಾ ವೈ-ಫೈ ಹಾಟ್ಸ್ಪಾಟ್ ಅನ್ನು ಹೊಂದಿಸಿದಾಗ ಇತರ ಜನರು ಸಹ ಅದನ್ನು ನೋಡಬಹುದು."</string>
<string name="devices_title" msgid="7701726109334110391">"ಸಾಧನಗಳು"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"ಎಲ್ಲಾ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"ಸಲಹೆಗಳು"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ಡೇಟಾ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ಡೇಟಾ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ನೆಟ್ವರ್ಕ್ ಆಯ್ಕೆಮಾಡಿ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+ <string name="network_connecting" msgid="76404590784733557">"ಸಂಪರ್ಕಿಸುತ್ತಿದೆ…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ಯಾವುದೇ ನೆಟ್ವರ್ಕ್ಗಳು ಕಂಡುಬಂದಿಲ್ಲ."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ನಿಷೇಧಿತ)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"ಯಾವುದೇ ಸಿಮ್ ಕಾರ್ಡ್ ಇಲ್ಲ"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"ಸುಧಾರಿತ ಕರೆ ಮಾಡುವಿಕೆ"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: GSM ಮಾತ್ರ"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: WCDMA ಮಾತ್ರ"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: CDMA ಮಾತ್ರ"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: EvDo ಮಾತ್ರ"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: ಜಾಗತಿಕ"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಮೋಡ್: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (ಶಿಫಾರಸು ಮಾಡಲಾಗಿದೆ)"</string>
+ <string name="network_global" msgid="959947774831178632">"ಜಾಗತಿಕ"</string>
+ <string name="label_available" msgid="1731547832803057893">"ಲಭ್ಯವಿರುವ ನೆಟ್ವರ್ಕ್ಗಳು"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"ಹುಡುಕಲಾಗುತ್ತಿದೆ..."</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> ನಲ್ಲಿ ನೋಂದಾಯಿಸಲಾಗುತ್ತಿದೆ…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"ನಿಮ್ಮ ಸಿಮ್ ಕಾರ್ಡ್ ಈ ನೆಟ್ವರ್ಕ್ಗೆ ಸಂಪರ್ಕವನ್ನು ಅನುಮತಿಸುವುದಿಲ್ಲ."</string>
+ <string name="connect_later" msgid="978991102125216741">"ಈಗ ಈ ನೆಟ್ವರ್ಕ್ಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
+ <string name="registration_done" msgid="4573820010512184521">"ನೆಟ್ವರ್ಕ್ನಲ್ಲಿ ನೋಂದಾಯಿಸಲಾಗಿದೆ."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"ನೆಟ್ವರ್ಕ್ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆಯ್ಕೆಮಾಡಿ"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"ಕ್ಯಾರಿಯರ್ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ಡೇಟಾ ಸೇವೆಯನ್ನು ಸೆಟಪ್ ಮಾಡಿ"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"ಮೊಬೈಲ್ ಡೇಟಾ"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"ಮೊಬೈಲ್ ನೆಟ್ವರ್ಕ್ ಬಳಸಿ ಡೇಟಾ ಪ್ರವೇಶಿಸಿ"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಪ್ರಕಾರ"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"ನೆಟ್ವರ್ಕ್ ಕಾರ್ಯಾಚರಣೆ ಮೋಡ್ ಬದಲಾಯಿಸಿ"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್ವರ್ಕ್ ಪ್ರಕಾರ"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"ಕ್ಯಾರಿಯರ್"</string>
+ <string name="call_category" msgid="8108654745239563833">"ಕರೆಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"ವಾಹಕ ವೀಡಿಯೊ ಕರೆ ಮಾಡುವಿಕೆ"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"ಸಿಸ್ಟಂ ಆಯ್ಕೆ"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA ರೋಮಿಂಗ್ ಮೋಡ್ ಬದಲಾಯಿಸಿ"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"ಸಿಸ್ಟಂ ಆಯ್ಕೆ"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"ನೆಟ್ವರ್ಕ್"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"ನೆಟ್ವರ್ಕ್"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA ಸಬ್ಸ್ಕ್ರಿಪ್ಶನ್"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/ಸಿಮ್ ಮತ್ತು NV ನಡುವೆ ಬದಲಾಯಿಸಿ"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"ಸಬ್ಸ್ಕ್ರಿಪ್ಶನ್"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ಸ್ವಯಂಚಾಲಿತ ನೋಂದಣಿ…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"ಡೇಟಾ ರೋಮಿಂಗ್ ಅನುಮತಿಸುವುದೇ?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"ಬೆಲೆ ನಿಗದಿಗಾಗಿ ನಿಮ್ಮ ನೆಟ್ವರ್ಕ್ ಪೂರೈಕೆದಾರರೊಂದಿಗೆ ಪರಿಶೀಲಿಸಿ."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ಆ್ಯಪ್ ಡೇಟಾ ಬಳಕೆ"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"ಅಮಾನ್ಯ ನೆಟ್ವರ್ಕ್ ಮೋಡ್ <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. ನಿರ್ಲಕ್ಷಿಸಿ."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಿದಾಗ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string>
+ <string name="see_more" msgid="5953815986207345223">"ಇನ್ನಷ್ಟು ನೋಡಿ"</string>
+ <string name="see_less" msgid="1250265310929558370">"ಕಡಿಮೆ ನೋಡಿ"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 9c063a1..8980e01 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"전송량 제한이 있는 Wi-Fi로 취급"</item>
<item msgid="2266114985518865625">"전송량 제한이 없는 Wi-Fi로 취급"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"기본(임의의 MAC 사용)"</item>
+ <item msgid="5398461510512959597">"신뢰할 수 있음"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"아니요"</item>
<item msgid="3863157480502955888">"예"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"항상 사용"</item>
<item msgid="6385301106124765323">"항상 사용 안함"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"사용 안함"</item>
+ <item msgid="2182686878828390312">"디버그"</item>
+ <item msgid="5286514712714822064">"상세"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"집 전용"</item>
+ <item msgid="5034813753274486448">"자동"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA로 기본 설정"</item>
+ <item msgid="807926878589867564">"GSM 전용"</item>
+ <item msgid="488474605709912156">"WCDMA 전용"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA 자동"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo 자동"</item>
+ <item msgid="370391313511477301">"CDMA(EvDo 없음)"</item>
+ <item msgid="4678789463133969294">"EvDo 전용"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA+LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"글로벌"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA 전용"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"글로벌"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 86b671d..1c25970 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"만들기"</string>
<string name="allow" msgid="3349662621170855910">"허용"</string>
<string name="deny" msgid="6947806159746484865">"거부"</string>
- <string name="dlg_close" msgid="7471087791340790015">"닫기"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"전환"</string>
<string name="device_info_default" msgid="7847265875578739287">"알 수 없음"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g>단계만 더 완료하면 개발자가 될 수 있습니다.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"이미 개발자입니다."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"먼저 개발자 옵션을 사용 설정하세요."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"무선 및 네트워크"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"연결"</string>
- <string name="header_category_device" msgid="4544026001618307754">"기기"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"개인"</string>
- <string name="header_category_access" msgid="7580499097416970962">"액세스"</string>
<string name="header_category_system" msgid="2816866961183068977">"시스템"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"데이터 연결 사용"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"데이터 연결 사용 안함"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"기기 블루투스 주소: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>을(를) 연결 해제하시겠습니까?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"브로드캐스팅"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"이름이 없는 블루투스 기기"</string>
<string name="progress_scanning" msgid="192587958424295789">"검색 중"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"근처에 블루투스 기기가 없습니다."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"앱에서 블루투스를 사용 설정하고 다른 기기에 내 휴대전화가 표시되도록 설정하려고 합니다. 나중에 블루투스 설정에서 변경할 수 있습니다."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"블루투스를 켜는 중"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"블루투스를 사용 중지하는 중"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"자동 연결"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"블루투스 연결 요청"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에 연결하려면 탭하세요."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'에 연결하시겠습니까?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"사용할 수 있는 통화 기기"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"현재 연결된 기기"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"저장된 기기"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"기기 추가"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"페어링을 위해 블루투스 켜기"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"연결 환경설정"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"이전에 연결된 기기"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"이전에 연결됨"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"블루투스가 사용 설정됨"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"전체 보기"</string>
<string name="date_and_time" msgid="9062980487860757694">"날짜 및 시간"</string>
<string name="choose_timezone" msgid="1362834506479536274">"시간대 선택"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"건너뛰기"</string>
<string name="next_label" msgid="4693520878012668114">"다음"</string>
<string name="language_picker_title" msgid="3596315202551687690">"언어"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"언어 환경설정"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"삭제"</string>
<string name="add_a_language" msgid="2330538812283783022">"언어 추가"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"설정"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"설정 바로가기"</string>
<string name="airplane_mode" msgid="8837269988154128601">"비행기 모드"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"더보기"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"무선 및 네트워크 설정"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, 블루투스, 비행기 모드, 모바일 네트워크 및 VPN 관리"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"모바일 데이터"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"개인정보 보호"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"관리자가 사용 중지함"</string>
<string name="security_status_title" msgid="5848766673665944640">"보안 상태"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"화면 잠금, 얼굴인식 잠금해제"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"화면 잠금, 지문"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"화면 잠금"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"얼굴 추가 완료"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"얼굴로 잠금 해제"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"얼굴로 인증"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"얼굴로 휴대전화를 잠금 해제하거나 구매를 승인하거나 앱에 로그인하세요."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"얼굴 사용"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"얼굴로 휴대전화를 잠금 해제하거나 구매를 승인하세요.\n\n참고: 이 기기는 얼굴로 잠금 해제할 수 없습니다. 자세한 내용은 조직의 관리자에게 문의하세요."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"얼굴로 휴대전화를 잠금 해제하거나 구매를 승인하거나 앱에 로그인하세요."</string>
- <string name="face_add_max" msgid="2342250989212694454">"지문을 <xliff:g id="COUNT">%d</xliff:g>개까지 추가할 수 있습니다."</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"얼굴을 동그라미 중앙에 맞춰주세요"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"나중에"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"얼굴을 <xliff:g id="COUNT">%d</xliff:g>개까지 추가할 수 있습니다."</string>
<string name="face_intro_error_max" msgid="160022811747660581">"이미 최대 개수의 얼굴을 추가했습니다."</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"얼굴을 추가할 수 없습니다."</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"등록이 완료되지 않았습니다."</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"확인"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"얼굴 파일 등록 제한 시간에 도달했습니다. 다시 시도하세요."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"얼굴이 등록되지 않았습니다."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"준비가 완료되었습니다. 감사합니다."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"완료"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"얼굴로 다음을 인증"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"기기 잠금 해제"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"앱 로그인 & 결제"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"눈을 떠 잠금 해제"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"얼굴 인증을 사용하는 경우 눈을 떠야 합니다."</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"얼굴 데이터 삭제"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"얼굴 데이터 향상"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"얼굴로 기기를 잠금 해제하고 앱에 액세스할 수 있습니다. "<annotation id="url">"자세히 알아보기"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"지문"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"지문 관리"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"지문을 사용할 항목"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi‑Fi 핫스팟 대역을 한 개 이상 선택하세요."</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP 설정"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"개인정보 보호"</string>
<string name="wifi_shared" msgid="844142443226926070">"다른 기기 사용자와 공유"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(변경 안함)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"선택하세요."</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"취소"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"네트워크를 삭제하시겠습니까?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"이 네트워크의 모든 비밀번호가 삭제됩니다."</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"저장된 네트워크"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">네트워크 %d개</item>
<item quantity="one">네트워크 1개</item>
@@ -999,7 +1006,7 @@
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"로밍 환경설정"</string>
<string-array name="wifi_calling_mode_choices">
<item msgid="2124257075906188844">"Wi-Fi를 기본으로 설정"</item>
- <item msgid="1335127656328817518">"모바일에 최적화됨"</item>
+ <item msgid="1335127656328817518">"모바일을 기본으로 설정"</item>
<item msgid="3132912693346866895">"Wi-Fi에서만"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
@@ -1014,7 +1021,7 @@
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
<item msgid="5782108782860004851">"Wi-Fi를 기본으로 설정"</item>
- <item msgid="5074515506087318555">"모바일에 최적화됨"</item>
+ <item msgid="5074515506087318555">"모바일을 기본으로 설정"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"밝기"</string>
<string name="brightness_summary" msgid="838917350127550703">"화면 밝기 조정"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"밝기 자동 조절"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"사용"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"사용 안함"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"원하는 밝기 수준이 매우 낮음"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"원하는 밝기 수준이 낮음"</string>
@@ -1122,11 +1128,11 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"주변의 밝기에 맞춰 밝기 수준을 최적화합니다. 이 기능이 사용 설정되어 있는 동안에도 밝기를 일시 조정할 수 있습니다."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"화면 밝기가 환경 및 활동에 맞게 자동으로 조정됩니다. 슬라이더를 수동으로 이동하여 밝기 자동 조절 기능이 사용자의 환경설정을 학습하도록 할 수 있습니다."</string>
<string name="night_display_title" msgid="2626451512200357686">"야간 조명"</string>
- <string name="night_display_text" msgid="1837277457033025056">"야간 조명을 사용하면 밤에 화면이 황색광으로 표시되어 희미한 빛에서도 편안하게 읽을 수 있으며 수면 방해 효과가 줄어듭니다."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"야간 조명을 사용하면 화면이 황색광으로 표시되어 희미한 빛에서도 편안하게 화면을 보고 읽을 수 있으며 수면 방해 효과가 줄어듭니다."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"예약"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"없음"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"맞춤 시간에 켜짐"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"일몰부터 일출까지 사용"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"일몰부터 일출까지 켜짐"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"시작 시간"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"종료 시간"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"상태"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN을 변경할 수 없습니다.\nPIN이 잘못된 것 같습니다."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN이 변경되었습니다."</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM 카드 잠금 상태를 변경할 수 없습니다.\nPIN이 잘못된 것 같습니다."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN을 사용 중지할 수 없습니다."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN을 사용 설정할 수 없습니다."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"확인"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"취소"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"여러 개의 SIM이 있음"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"이렇게 하려면 <xliff:g id="NAME_0">^1</xliff:g>을(를) 포맷해야 합니다. \n\n"<b>"포맷하면 현재 <xliff:g id="NAME_1">^1</xliff:g>에 저장되어 있는 모든 데이터가 삭제됩니다."</b>" 데이터가 손실되지 않도록 하려면 백업하는 것이 좋습니다."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"삭제 및 포맷"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> 포맷 중…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"포맷 중에 <xliff:g id="NAME">^1</xliff:g>을(를) 삭제하지 마세요."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"포맷 중에 <xliff:g id="NAME">^1</xliff:g>을(를) 삭제하지 마세요."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"새로운 저장소로 데이터 이동"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"사진, 파일, 일부 앱을 이 새로운 <xliff:g id="NAME">^1</xliff:g>(으)로 이동할 수 있습니다. \n\n이동에 소요되는 시간은 약 <xliff:g id="TIME">^2</xliff:g>이며 내부 저장소에 <xliff:g id="SIZE">^3</xliff:g>만큼의 공간이 확보됩니다. 이동 중에 일부 앱이 작동하지 않을 수 있습니다."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"지금 이동"</string>
@@ -1715,7 +1723,7 @@
<string name="data_size_label" msgid="6117971066063850416">"사용자 데이터"</string>
<string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB 저장소 데이터"</string>
<string name="external_data_size_label" product="default" msgid="626414192825329708">"SD 카드"</string>
- <string name="uninstall_text" msgid="3644892466144802466">"제거"</string>
+ <string name="uninstall_text" msgid="3644892466144802466">"설치 제거"</string>
<string name="uninstall_all_users_text" msgid="851857393177950340">"모든 사용자에 대해 제거"</string>
<string name="install_text" msgid="884360662922471113">"설치"</string>
<string name="disable_text" msgid="6544054052049395202">"사용 안함"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"설치됨"</string>
<string name="no_applications" msgid="7336588977497084921">"앱 없음."</string>
<string name="internal_storage" msgid="1584700623164275282">"내부 저장소"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"내부 저장소"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 저장소"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 카드 저장소"</string>
<string name="recompute_size" msgid="7722567982831691718">"크기 다시 계산 중..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"앱 데이터를 삭제하시겠습니까?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"앱의 전체 데이터가 영구적으로 삭제됩니다. 여기에는 모든 파일, 설정, 계정, 데이터베이스 등이 포함됩니다."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"앱이 설치된 앱 목록에 없습니다."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"앱 저장용량을 비우지 못했습니다."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"이 앱은 태블릿에서 다음에 액세스할 수 있습니다."</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"이 앱은 휴대전화의 다음 항목에 액세스할 수 있습니다."</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"이 앱은 내 태블릿에서 다음에 액세스할 수 있습니다.<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>(은)는 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>(와)과 동일한 프로세스에서 실행되기 때문에 성능을 향상시키고 메모리 사용량을 줄이기 위해서는 이러한 사용 권한 중 일부를 사용할 수 있습니다."</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"이 앱은 내 휴대전화에서 다음에 액세스할 수 있습니다. <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>(은)는 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>(와)과 동일한 프로세스에서 실행되기 때문에 성능을 향상시키고 메모리 사용량을 줄이기 위해서는 이러한 사용 권한 중 일부를 사용할 수 있습니다."</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"유료 앱일 수 있습니다."</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"프리미엄 SMS 보내기"</string>
<string name="computing_size" msgid="1599186977475211186">"계산 중..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"패키지 크기를 계산할 수 없습니다."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"설치된 타사 앱이 없습니다."</string>
<string name="version_text" msgid="9189073826278676425">"버전 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"이동"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"태블릿으로 이동"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"휴대전화로 이동"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB 저장소로 이동"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD 카드로 이동"</string>
- <string name="moving" msgid="6431016143218876491">"이동하는 중"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"또 다른 이전이 이미 진행 중입니다."</string>
<string name="insufficient_storage" msgid="481763122991093080">"저장공간이 충분하지 않습니다."</string>
<string name="does_not_exist" msgid="1501243985586067053">"앱이 없습니다."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"기기 관리자 앱을 외부 미디어에 설치할 수 없습니다."</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"강제로 종료하시겠습니까?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"강제로 앱을 종료하면 예기치 않은 오류가 발생할 수 있습니다."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"앱을 이동하지 못했습니다. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"기본 설치 위치"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"새 앱의 기본 설치 위치를 변경합니다."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"내장 앱을 사용중지하시겠습니까?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"앱 사용 중지"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"이 앱을 사용 중지하면 Android와 다른 앱이 제대로 작동하지 않을 수도 있습니다."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"데이터를 삭제하고 앱을 사용 중지하시겠습니까?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"이 앱을 사용 중지하면 Android와 다른 앱이 제대로 작동하지 않을 수도 있습니다. 또한 데이터가 삭제됩니다."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"알림을 사용 중지하시겠습니까?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"이 앱에서 알림을 사용하도록 설정하지 않으면 중요한 알리미와 업데이트를 놓칠 수 있습니다."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"스토어"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"앱 세부정보"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g>에서 다운로드한 앱"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"서비스 사용"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"색상 보정 사용"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"자막 사용"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"계속"</string>
<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="6371077608778830020">"보청기 추가"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"앱의 백그라운드 활동을 제한하면 앱이 정상적으로 작동하지 않을 수도 있습니다."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"배터리 최적화를 설정하지 않아 이 앱을 제한할 수 없습니다.\n\n앱을 제한하려면 먼저 배터리 최적화를 사용 설정하세요."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"충전 완료 후 화면 사용"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"화면 소비 전력"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"모바일 네트워크 검색"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"충전 완료 후 배터리 사용"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"충전 완료 후 화면이 켜진 시간"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"충전 완료 후 기기 사용"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"사용 세부정보"</string>
<string name="controls_subtitle" msgid="390468421138288702">"전원 사용 조절"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"포함된 패키지"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"앱에서 배터리가 많이 소모됨"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"기기 화면이 켜진 상태로 유지"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"백그라운드에서 기기를 작동시킴"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"너무 잦은 위치정보 요청"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"앱 <xliff:g id="NUMBER">%1$d</xliff:g>개에서 오류 발생"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"앱이 정상적으로 작동 중입니다."</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"휴대전화의 배터리 사용량이 평소와 같습니다."</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"태블릿의 배터리 사용량이 평소와 같습니다."</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d개 앱의 배터리 사용량 제한</item>
<item quantity="one">%1$d개 앱의 배터리 사용량 제한</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g>에 제한됨"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"이 앱은 백그라운드에서 배터리를 사용 중입니다. 제한된 앱이 제대로 작동하지 않을 수 있으며 알림이 지연될 수 있습니다."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"배터리 관리자 사용"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"앱에서 배터리를 많이 소모하면 감지"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"취소"</string>
<string name="tts_reset" msgid="2661752909256313270">"재설정"</string>
<string name="tts_play" msgid="2628469503798633884">"재생"</string>
- <string name="gadget_title" msgid="5519037532720577836">"전원 컨트롤"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi 설정 업데이트"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"블루투스 설정 업데이트"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"사용"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"꺼짐"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"켜는 중"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"끄는 중"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"블루투스"</string>
- <string name="gadget_location" msgid="2974757497945178165">"위치"</string>
- <string name="gadget_sync" msgid="858895763714222152">"동기화"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"밝기 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"자동"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"최고 밝기"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"중간 밝기"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"최저 밝기"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"자격증명 저장소"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"저장소에서 설치"</string>
@@ -2548,7 +2519,7 @@
<string name="sync_error" msgid="5060969083117872149">"동기화 오류"</string>
<string name="last_synced" msgid="4242919465367022234">"마지막 동기화 시간: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
<string name="sync_in_progress" msgid="5151314196536070569">"지금 동기화하는 중..."</string>
- <string name="settings_backup" msgid="2274732978260797031">"설정 백업"</string>
+ <string name="settings_backup" msgid="2274732978260797031">"백업 설정"</string>
<string name="settings_backup_summary" msgid="7916877705938054035">"내 설정 백업"</string>
<string name="sync_menu_sync_now" msgid="6154608350395805683">"지금 동기화"</string>
<string name="sync_menu_sync_cancel" msgid="8292379009626966949">"동기화 취소"</string>
@@ -2579,13 +2550,13 @@
<string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"잘못된 PIN"</string>
<string name="checking_decryption" msgid="8287458611802609493">"확인 중..."</string>
<string name="starting_android" msgid="4001324195902252681">"Android 시작하는 중..."</string>
- <string name="delete" msgid="4219243412325163003">"삭제"</string>
+ <string name="delete" msgid="4219243412325163003">"홈 화면에서 삭제"</string>
<string name="misc_files" msgid="6720680815969643497">"기타 파일"</string>
<string name="misc_files_selected_count" msgid="4647048020823912088">"<xliff:g id="TOTAL">%2$d</xliff:g>개 중 <xliff:g id="NUMBER">%1$d</xliff:g>개가 선택됨"</string>
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"모두 선택"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"데이터 사용량"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"앱 데이터 사용"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"모바일 데이터 및 Wi-Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"이동통신사 데이터 사용량 계산은 기기와 다를 수 있습니다."</string>
<string name="data_usage_app" msgid="4970478397515423303">"앱 사용"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"앱 정보"</string>
@@ -2831,10 +2802,10 @@
<string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"모든 앱과 데이터가 삭제됩니다."</string>
<string name="user_adding_new_user" msgid="1521674650874241407">"새 사용자 추가 중..."</string>
<string name="user_delete_user_description" msgid="3158592592118767056">"사용자 삭제"</string>
- <string name="user_delete_button" msgid="5131259553799403201">"삭제"</string>
- <string name="user_guest" msgid="8475274842845401871">"손님"</string>
- <string name="user_exit_guest_title" msgid="5613997155527410675">"손님 삭제"</string>
- <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"손님을 삭제하시겠습니까?"</string>
+ <string name="user_delete_button" msgid="5131259553799403201">"홈 화면에서 삭제"</string>
+ <string name="user_guest" msgid="8475274842845401871">"게스트"</string>
+ <string name="user_exit_guest_title" msgid="5613997155527410675">"게스트 삭제"</string>
+ <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"게스트를 삭제하시겠습니까?"</string>
<string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"이 세션에 있는 모든 앱과 데이터가 삭제됩니다."</string>
<string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"삭제"</string>
<string name="user_enable_calling" msgid="5128605672081602348">"통화 기능 사용"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">%d개의 숨겨진 항목 표시</item>
<item quantity="one">%d개의 숨겨진 항목 표시</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"접기"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"네트워크 및 인터넷"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"모바일"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"데이터 사용"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"블루투스"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"앱 및 알림"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"권한, 기본 앱"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"알림 액세스는 직장 프로필에 있는 앱에서 사용할 수 없습니다."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"계정"</string>
- <string name="account_dashboard_default_summary" msgid="3998347400161811075">"추가된 계정이 없습니다."</string>
+ <string name="account_dashboard_default_summary" msgid="3998347400161811075">"추가된 계정 없음"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"기본 앱"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"언어, 시간, 백업, 업데이트"</string>
<string name="search_results_title" msgid="1796252422574886932">"설정"</string>
- <string name="search_menu" msgid="6283419262313758339">"설정 검색"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, Wi-Fi, 네트워크 연결, 인터넷, 무선, 데이터, WiFi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"WiFi, Wi-Fi, 전환, 제어"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, 문자 메시지 보내기, 메시지, 메시지 보내기, 기본"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"결제, 탭, 결제"</string>
<string name="keywords_backup" msgid="470070289135403022">"백업, 백 업"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"동작"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"얼굴, 잠금 해제, 승인, 로그인"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"IMEI, MEID, MIN, PRL 버전, IMEI SV"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"네트워크, 모바일 네트워크 상태, 서비스 상태, 신호 강도, 모바일 네트워크 유형, 로밍, ICCID"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"일련번호, 하드웨어 버전"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"어두운 테마"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"버그"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"절전 모드 자동 해제, 잠금 화면 표시"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"잠금 화면 알림"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"얼굴"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"지문"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"화면 어둡게 하기, 터치스크린, 배터리, 스마트 밝기, 동적 밝기"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"기기를 시작하기 위해 PIN을 입력할 때에는 <xliff:g id="SERVICE">%1$s</xliff:g> 등의 접근성 서비스가 지원되지 않습니다."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"기기를 시작하기 위해 패턴을 입력할 때에는 <xliff:g id="SERVICE">%1$s</xliff:g> 등의 접근성 서비스가 지원되지 않습니다."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"기기를 시작하기 위해 비밀번호를 입력할 때에는 <xliff:g id="SERVICE">%1$s</xliff:g> 등의 접근성 서비스가 지원되지 않습니다."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"참고: 재부팅한 후 이 앱은 휴대전화를 잠금 해제해야 시작됩니다."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"참고: 화면 잠금이 설정되어 있다면 휴대전화를 다시 시작한 후 이 앱을 시작하려면 휴대전화를 잠금 해제해야 합니다."</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI 정보"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI 상대 정보"</string>
<string name="slot_number" msgid="3762676044904653577">"(슬롯 <xliff:g id="SLOT_NUM">%1$d</xliff:g>개)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"개인"</string>
<string name="filter_work_apps" msgid="24519936790795574">"직장"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"앱: 전체"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"앱: 사용 중지됨"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"사용 중지됨"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"카테고리: 중요도 긴급"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"카테고리: 중요도 낮음"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"카테고리: 사용 중지됨"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"배터리 사용량 알림"</string>
<string name="show_all_apps" msgid="1512506948197818534">"전체 기기 사용 정보 표시"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"앱 사용량 표시"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"사용량이 높은 항목"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other">앱 <xliff:g id="NUMBER">%2$d</xliff:g>개가 비정상적으로 작동하고 있음</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> 앱이 비정상적으로 작동하고 있음</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"내부 저장소: <xliff:g id="PERCENTAGE">%1$s</xliff:g> 사용 중 - <xliff:g id="FREE_SPACE">%2$s</xliff:g> 사용 가능"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 동안 사용하지 않으면 절전 모드로 전환됩니다."</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"배경화면, 절전 모드, 글꼴 크기"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10분 동안 사용하지 않으면 절전 모드로 전환됩니다."</string>
<string name="memory_summary" msgid="8080825904671961872">"평균 <xliff:g id="USED_MEMORY">%1$s</xliff:g>/<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> 저장용량 사용됨"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g>(으)로 로그인됨"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"문자 메시지를 사용할 수 없음"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"카메라를 사용할 수 없음"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"스크린샷을 사용할 수 없음"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"백업을 사용 중지할 수 없음"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"열 수 없는 앱"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"궁금한 점이 있으면 IT 관리자에게 문의하세요."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"세부정보 더보기"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"컷아웃이 있는 디스플레이 시뮬레이션"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"디스플레이 컷아웃"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"디스플레이 컷아웃, 노치"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"없음"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"기기 기본값"</string>
<string name="special_access" msgid="3458780842491881155">"특수 앱 액세스"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other">앱 <xliff:g id="COUNT">%d</xliff:g>개에서 무제한 데이터 사용 가능</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>에 연결됨"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"여러 기기에 연결됨"</string>
<string name="demo_mode" msgid="2798762752209330277">"시스템 UI 데모 모드"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"야간 모드"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"야간 모드 설정"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"어두운 모드"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"어두운 모드 설정"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"빠른 설정 개발자 타일"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope 추적"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"직장 프로필 설정"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"연락처 검색"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"조직에서 연락처를 검색하여 발신자 및 연락처를 확인할 수 있도록 허용합니다."</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"두 번 탭하여 휴대전화 확인"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"두 번 탭하여 태블릿 확인"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"두 번 탭하여 기기 확인"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"시간, 알림 아이콘 등의 정보를 확인하려면 화면을 두 번 탭하세요."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"시간, 알림, 기타 정보를 확인하려면 화면을 두 번 탭하세요."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"들어올려 휴대전화 확인"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"들어서 태블릿 확인"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"들어서 기기 확인"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"시간, 알림 아이콘 등의 정보를 확인하려면 휴대전화를 들어 올리세요."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"시간, 알림 아이콘 등의 정보를 확인하려면 태블릿을 들어 올리세요."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"시간, 알림 아이콘 등의 정보를 확인하려면 기기를 들어 올리세요."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"디스플레이 대기 모드 해제"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"시간, 알림, 기타 정보를 확인하려면 휴대전화를 들어 올리세요."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"시간, 알림, 기타 정보를 확인하려면 태블릿을 들어 올리세요."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"시간, 알림, 기타 정보를 확인하려면 기기를 들어 올리세요."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Wake lock 화면 동작"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"지문을 스와이프하여 알림 보기"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"지문 스와이프"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"알림을 확인하려면 휴대전화 뒷면의 지문 센서에서 아래로 스와이프합니다."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>회 시도</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>회 시도</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"기기 데이터를 백업하는 중"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"조직에서 관리하는 기기입니다."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>에서 관리하는 기기입니다."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"자동완성 서비스"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"자동, 완성, 자동완성"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>이 앱을 신뢰할 수 있는지 확인하세요.</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g>에서는 자동완성할 수 있는 항목을 결정하기 위해 화면의 내용을 사용합니다."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"자동 완성"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"로깅 수준"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"세션당 최대 요청 수"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"표시할 데이터세트 최대 개수"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"기본값으로 초기화"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"개발자 옵션 자동완성 기능이 초기화되었습니다."</string>
<string name="device_theme" msgid="4571803018917608588">"기기 테마"</string>
<string name="default_theme" msgid="7085644992078579076">"기본값"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"네트워크 이름"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"알림 일시중지 업데이트"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"방해받지 않도록 알림 일시중지"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"흥미로운 새 기능 살펴보기"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"새 휴대전화 둘러보기"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"새 태블릿 둘러보기"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"새 기기 둘러보기"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"이 기기에서 지원하지 않는 기능입니다."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"전체 GNSS 측정 강제 사용"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"사용률 없이 모든 GNSS 배열 및 빈도를 추적"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"비정상 종료 대화상자 항상 표시"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"앱이 비정상 종료될 때마다 대화상자 표시"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE 사용 앱 선택"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE을 사용하도록 설정된 애플리케이션 없음"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE 사용 애플리케이션: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"디렉토리 액세스"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"디렉토리 액세스"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g>(<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4168,7 +4147,7 @@
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"휴대전화 배터리 수명 향상"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
<string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"벨 울림 방지"</string>
- <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"전원 및 볼륨 크게 버튼 함께 누르기"</string>
+ <string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"전원 및 볼륨 업 버튼 함께 누르기"</string>
<string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"벨 울림 방지 단축키"</string>
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"진동"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"음소거"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"네트워크 세부정보"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"휴대전화에 설치된 앱에 기기 이름이 표시됩니다. 기기 이름은 블루투스 기기에 연결하거나 Wi-Fi 핫스팟을 설정할 때 다른 사용자에게 표시될 수도 있습니다."</string>
<string name="devices_title" msgid="7701726109334110391">"기기"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"모든 설정"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"추천"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS 데이터"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS 데이터"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"네트워크 선택"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"연결 끊김"</string>
+ <string name="network_connected" msgid="4943925032253989621">"연결됨"</string>
+ <string name="network_connecting" msgid="76404590784733557">"연결 중…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"연결할 수 없음"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"네트워크를 찾을 수 없습니다."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"네트워크를 찾지 못했습니다. 다시 시도해 주세요."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(금지됨)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM 카드 없음"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"고급 통화"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"기본 네트워크 모드: WCDMA 선호"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"기본 네트워크 모드: GSM 전용"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"기본 네트워크 모드: WCDMA 전용"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"기본 네트워크 모드: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"기본 네트워크 모드: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"기본 네트워크 모드: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"기본 네트워크 모드: CDMA 전용"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"기본 네트워크 모드: EvDo 전용"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"기본 네트워크 모드: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"기본 네트워크 모드: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"기본 네트워크 모드: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"기본 네트워크 모드: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"기본 네트워크 모드: 글로벌"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"기본 네트워크 모드: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"기본 네트워크 모드: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"기본 네트워크 모드: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"기본 네트워크 모드: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"기본 네트워크 모드: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"기본 네트워크 모드: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"기본 네트워크 모드: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"기본 네트워크 모드: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"기본 네트워크 모드: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"기본 네트워크 모드: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"기본 네트워크 모드: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"기본 네트워크 모드: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"기본 네트워크 모드: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE(권장)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G(권장)"</string>
+ <string name="network_global" msgid="959947774831178632">"글로벌"</string>
+ <string name="label_available" msgid="1731547832803057893">"사용 가능한 네트워크"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"검색 중…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g>에 등록 중..."</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM 카드에서 이 네트워크에 연결할 수 없습니다."</string>
+ <string name="connect_later" msgid="978991102125216741">"현재 네트워크에 연결할 수 없습니다. 나중에 다시 시도해 주세요."</string>
+ <string name="registration_done" msgid="4573820010512184521">"네트워크에 등록되었습니다."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"네트워크 자동 선택"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"이동통신사 설정"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"데이터 서비스 설정"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"모바일 데이터"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"모바일 네트워크를 사용하여 데이터 액세스"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"기본 네트워크 유형"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"네트워크 작동 모드 변경"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"기본 네트워크 유형"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"이동통신사"</string>
+ <string name="call_category" msgid="8108654745239563833">"통화"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"이동통신사 화상 통화"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"시스템 선택"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA 로밍 모드 변경"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"시스템 선택"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"네트워크"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"네트워크"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA 가입"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM 및 NV 간 변경"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"가입"</string>
+ <string name="register_automatically" msgid="518185886971595020">"자동 등록..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"데이터 로밍을 허용하시겠습니까?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"요금은 이동통신사에 문의하세요."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"앱 데이터 사용량"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"잘못된 네트워크 모드(<xliff:g id="NETWORKMODEID">%1$d</xliff:g>)입니다. 무시하세요."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g>에 연결된 경우 사용할 수 없음"</string>
+ <string name="see_more" msgid="5953815986207345223">"더보기"</string>
+ <string name="see_less" msgid="1250265310929558370">"간략히 보기"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index e73daaf..f7ef412 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Ченелет"</item>
<item msgid="2266114985518865625">"Ченелбейт"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Демейки (MAC дарегин кокустан тандоону колдонуу)"</item>
+ <item msgid="5398461510512959597">"Ишенимдүү"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Жок"</item>
<item msgid="3863157480502955888">"Ооба"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Ар дайым күйүк"</item>
<item msgid="6385301106124765323">"Ар дайым өчүк"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Өчүк"</item>
+ <item msgid="2182686878828390312">"Мүчүлүштүктөрдү оңдоо"</item>
+ <item msgid="5286514712714822064">"Оозеки кирүү"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Башкы бет гана"</item>
+ <item msgid="5034813753274486448">"Автоматтык"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA артыкчылыктуу"</item>
+ <item msgid="807926878589867564">"GSM гана"</item>
+ <item msgid="488474605709912156">"WCDMA гана"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA авто"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo авто"</item>
+ <item msgid="370391313511477301">"CDMA EvDo\'суз"</item>
+ <item msgid="4678789463133969294">"EvDo гана"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Жалпы"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA гана"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Жалпы"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 6ae3f85..bc2d9bd 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Түзүү"</string>
<string name="allow" msgid="3349662621170855910">"Уруксат"</string>
<string name="deny" msgid="6947806159746484865">"Тыюу салуу"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Жабуу"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Которуштуруу"</string>
<string name="device_info_default" msgid="7847265875578739287">"Белгисиз"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Сиздин иштеп чыгуучу болушуңузга <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> кадам калды.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Кереги жок, сиз өндүрүүчү болгонсуз."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Алгач иштеп чыгуучунун параметрлерин иштетиңиз"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Зымсыз тармактар"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Туташуулар"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Түзмөк"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Жеке"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Кирүү"</string>
<string name="header_category_system" msgid="2816866961183068977">"Тутум"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Мобилдик туташууну иштетүү"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Мобилдик туташууну өчүрүү"</string>
@@ -56,7 +50,7 @@
<string name="radio_info_ims_reg_status" msgid="7534612158445529715">"IMS каттоосу: <xliff:g id="STATUS">%1$s</xliff:g>\nLTE аркылуу аудио чалуу: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nWiFi аркылуу аудио чалуу: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nВидео чалуу: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT интерфейс: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
<string name="radioInfo_service_in" msgid="1697703164394784618">"Тейлөө аймагында"</string>
<string name="radioInfo_service_out" msgid="7999094221728929681">"Тейлөө аймагынын сыртында"</string>
- <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Шашылыш чалуулар гана"</string>
+ <string name="radioInfo_service_emergency" msgid="6274434235469661525">"Өзгөчө кырдаалда гана чалганга болот"</string>
<string name="radioInfo_service_off" msgid="7536423790014501173">"Радио өчүк"</string>
<string name="radioInfo_roaming_in" msgid="9045363884600341051">"Роуминг"</string>
<string name="radioInfo_roaming_not" msgid="4849214885629672819">"Роумингде эмес"</string>
@@ -120,7 +114,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Түзмөктүн Bluetooth дареги: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ажыратылсынбы?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Кеңири таратуу"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Аты жок Bluetooth-түзмөк"</string>
<string name="progress_scanning" msgid="192587958424295789">"Изделүүдө"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Bluetooth-тизмектер табылган жок."</string>
@@ -152,7 +145,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Колдонмо Bluetooth\'ду күйгүзүп, телефонуңузду башка түзмөктөргө көрсөткөнү жатат. Муну кийин Bluetooth жөндөөлөрүнөн өзгөртө аласыз."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth күйгүзүлүүдө…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth өчүрүлүүдө…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Авто-туташуу"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth туташтыруу өтүнүчү"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" менен туташуу үчүн таптап коюңуз."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" түзмөгүнө туташкыңыз келеби?"</string>
@@ -180,12 +172,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Жеткиликтүү чалуу түзмөктөрү"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Учурда туташып турган түзмөктөр"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Сакталган түзмөктөр"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Түзмөк кошуу"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth жупташтыруу үчүн күйгүзүлөт"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Туташуу параметрлери"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Мурунтан туташкан түзмөктөр"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Мурда туташкан"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth күйгүзүлдү"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Баарын көрүү"</string>
<string name="date_and_time" msgid="9062980487860757694">"Күн жана убакыт"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Саат алкагын тандаңыз"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -268,7 +260,6 @@
<string name="skip_label" msgid="47510779345218297">"Өткөрүп жиберүү"</string>
<string name="next_label" msgid="4693520878012668114">"Кийинки"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Тилдер"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Тил тандоо"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Алып салуу"</string>
<string name="add_a_language" msgid="2330538812283783022">"Тил кошуу"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -302,7 +293,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Жөндөөлөр"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Жөндөөлөр"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Учак режими"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Дагы"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Зымсыз тармактар"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, учак тартибин, мобилдик түйүндөрдү жана VPN\'дерди башкаруу"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Мобилдик Интернет"</string>
@@ -387,20 +377,37 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Купуялык"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Администратор өчүрүп койгон"</string>
<string name="security_status_title" msgid="5848766673665944640">"Коопсуздук абалы"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Экранды кулпулоо, жүзүнөн таануу"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Экранды кулпулоо, манжа изи"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Экран кулпусу"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Жүз кошулду"</string>
<string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Жүздүн аныктыгын текшерүүнү жөндөө үчүн басыңыз"</string>
<string name="security_settings_face_preference_title" msgid="7074548721778680481">"Жүздүн аныктыгын текшерүү"</string>
<string name="security_settings_face_enroll_introduction_cancel" msgid="4277182322482408514">"Баш тартуу"</string>
- <string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Жүзүңүз менен кулпуну ачуу"</string>
+ <string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Кулпуну жүзүңүз менен ачасыз"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Жүзүңүз менен аныктыгыңызды текшертиңиз"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же колдонмолорго кирүү үчүн жүзүңүздү көрсөтүңүз."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Жүзүңүздү көрсөтүңүз"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Телефонуңуздун кулпусун ачуу же сатып алууларды ырастоо үчүн жүзүңүздү пайдаланыңыз.\n\nЭскертүү: Жүзүңүздү бул түзмөктүн кулпусун ачууга колдоно албайсыз. Кеңири маалымат үчүн ишканаңыздын администраторуна кайрылыңыз."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Телефонуңуздун кулпусун ачып, сатып алууга уруксат берип же колдонмолорго кирүү үчүн жүзүңүздү көрсөтүңүз."</string>
- <string name="face_add_max" msgid="2342250989212694454">"<xliff:g id="COUNT">%d</xliff:g> чейин манжа изин кошсоңуз болот"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Жүзүңүздү тегеректин борборуна жайгаштырыңыз"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Азыр эмес"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"<xliff:g id="COUNT">%d</xliff:g> чейин жүз кошсоңуз болот"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Кошулган жүздөрдүн саны жогорку чегине жетти"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Дагы жүздөрдү кошуу мүмкүн эмес"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Жүз кошулган жок"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ЖАРАЙТ"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Жүздү каттоо боюнча убакыт чегине жетти. Кайра аракет кылыңыз."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Жүздү каттоо ишке ашкан жок."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Баары жөндөлдү. Сүрөтүңүз жакшы чыкты."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Бүттү"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Жүзүңүздү төмөнкүгө колдонуңуз:"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Түзмөктүн кулпусун ачуу"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Колдонмого кирүү жана төлөмдөр"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Кулпуну ачуу үчүн көздү ачуу"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Жүздүн аныктыгын текшерип жатканда көздөрүңүздү ачып турушуңуз керек"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Жүздү өчүрүү"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Жүзүңүздүн сүрөтүн жакшыртыңыз"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Түзмөгүңүздүн кулпусун жүзүңүздү көрсөтүп ачып, колдонмолорго киресиз. "<annotation id="url">"Кеңири маалымат"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Манжа изи"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Манжа издерин башкаруу"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Манжа издерин колдонуу"</string>
@@ -870,7 +877,7 @@
<string name="wifi_eap_ca_cert" msgid="3521574865488892851">"CA тастыктамасы"</string>
<string name="wifi_eap_domain" msgid="8471124344218082064">"Домен"</string>
<string name="wifi_eap_user_cert" msgid="1291089413368160789">"Колдонуучунун тастыктамасы"</string>
- <string name="wifi_eap_identity" msgid="4359453783379679103">"Аныктыгы"</string>
+ <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_show_password" msgid="6461249871236968884">"Сырсөздү көрсөтүү"</string>
@@ -883,6 +890,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 ГГц"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi‑Fi туташуу түйүнүн иштетүү үчүн кеминде бир жыштыкты тандаңыз:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP жөндөөлөрү"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Купуялык"</string>
<string name="wifi_shared" msgid="844142443226926070">"Түзмөктүн башка колдонуучулары менен бөлүшүлсүн"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(өзгөрбөгөн)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Тандаңыз"</string>
@@ -922,7 +930,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Жок"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Тармак унутулсунбу?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Бул тармак үчүн бардык сырсөздөр өчүрүлөт"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Сакталган тармактар"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d тармак</item>
<item quantity="one">1 тармак</item>
@@ -1101,8 +1108,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Жарыктыгы"</string>
<string name="brightness_summary" msgid="838917350127550703">"Экрандын жарыктыгын тууралоо"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Ыңгайлаштырылуучу жарык"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Күйүк"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Өчүк"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Өтө төмөн жарык деңгээли тандалды"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Төмөн жарык деңгээли тандалды"</string>
@@ -1198,6 +1204,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN\'ди алмаштыруу мүмкүн эмес.\nPIN туура эмес өңдөнөт."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM картанын PIN коду алмаштырылды"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM-картаны бөгөттөн чыгаруу мүмкүн эмес.\nPIN туура эмес өңдөнөт."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN код өчүрүлбөй жатат."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN код иштетилбей жатат."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Жарайт"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Жокко чыгаруу"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Бир нече SIM табылды"</string>
@@ -1371,7 +1379,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Ушуну менен <xliff:g id="NAME_0">^1</xliff:g> сактагычы форматталат. \n\n"<b>"Сактагыч форматталганда, <xliff:g id="NAME_1">^1</xliff:g> камтылган бардык дайындар жок болот. "</b>" Дайындарды жоготуп албаш үчүн, алардын камдык көчүрмөсүн сактап коюңуз."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Тазалоо жана форматтоо"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> форматталууда…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g> форматталып жатканда, аны чыгарбаңыз."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g> форматталып жатканда, аны өчүрбөңүз."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Дайындарды жаңы сактагычка жылдр"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Сүрөттөрүңүз, файлдарыңыз жана айрым колдонмолорду ушул жаңы <xliff:g id="NAME">^1</xliff:g> ичине жылдырсаңыз болот. \n\nЖылдыруу болжол менен <xliff:g id="TIME">^2</xliff:g> созулат жана ички эстутумдан <xliff:g id="SIZE">^3</xliff:g> орун бошотот. Бул нерсе аткарылып жатканда айрым колдонмолор иштебей калат."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Азыр жылдыруу"</string>
@@ -1753,9 +1761,6 @@
<string name="installed" msgid="3070865169422600098">"Орнотулду"</string>
<string name="no_applications" msgid="7336588977497084921">"Бир дагы колдонмо жок."</string>
<string name="internal_storage" msgid="1584700623164275282">"Ички эстутум"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ички сактагыч"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB сактагыч"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD карта сактгч"</string>
<string name="recompute_size" msgid="7722567982831691718">"Өлчөмү кайра эсептелүүдө…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Колдонмо берилиштери өчүрүлсүнбү?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Бул колдонмонун бардык маалыматтары биротоло жок болот. Алар менен кошо бардык файлдар, орнотуулар, эсептер, берилиштер корлору ж.б. жок болот."</string>
@@ -1764,24 +1769,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Бул колдонмо орнотулган колдонмолор тизмегинен табылган жок."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Колдонмонун сактагычы тазаланган жок."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Бул колдонмо планшетиңиздин кийинкилерине жетки алышы мүмкүн:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Бул колдонмо телефонуңуздун кийинкилерине жетки алышы мүмкүн:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Бул колдонмо сиздин планшетиңизде кийинкилерге жете алат: аткарууну жакшыртуу жана эстутумдун пайдалануусун кыскартуу максатында, бул уруксаттардын кээ бирлери <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> үчүн жеткиликтүү болот, анткени ал <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> менен бир процессте аткарылат:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Бул колдонмо сиздин телефонуңузда кийинкилерге жете алат. Аткарууну жакшыртуу жана эстутумдун пайдалануусун кыскартуу максатында, бул уруксаттардын кээ бирлери <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> үчүн жеткиликтүү болот, анткени ал <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> менен бир процессте аткарылат:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> жана <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Бул колдонмо кире алышы мүмкүн:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"SMS төлөм жөнөтүү"</string>
<string name="computing_size" msgid="1599186977475211186">"Эсептелүүдө…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Пакеттин өлчөмүн эсептей албай жатат."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Сизде үчүнчү тараптык колдонмолор орнотулган эмес."</string>
<string name="version_text" msgid="9189073826278676425">"<xliff:g id="VERSION_NUM">%1$s</xliff:g> версиясы"</string>
<string name="move_app" msgid="5042838441401731346">"Жылдыруу"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Планшетке жылдыруу"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Телефонго жылдыруу"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB сактагычка жылдыруу"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD картага жылдыруу"</string>
- <string name="moving" msgid="6431016143218876491">"Жылдырылууда"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Көчүү аракети аткарылып жатат."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Сактагычта орун жетишсиз."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Мындай колдонмо жок."</string>
@@ -1791,17 +1788,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Түзмөктү башкарган колдонмо сырткы сактагычка орнотулбайт"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Токтотулсунбу?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Колдонмону токтотсоңуз, ал туура эмес иштеп калышы мүмкүн."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Колдонмону жылдыруу мүмкүн эмес. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Орнотууга тандалган жер"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Жаңы колдонмолор үчүн орнотуу жайын алмаштырыңыз"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Камтылган колд. токтотулсунбу?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Колдонмону өчүрүү"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Эгер бул колдонмону өчүрсөңүз, Android жана башка колдонмолор талаптагыдай иштебей калышы мүмкүн."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Берилиштер жок кылынып, колдонмо өчүрүлсүнбү?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Эгер бул колдонмону өчүрсөңүз, Android жана башка колдонмолор талаптагыдай иштебей калышы мүмкүн. Дайындарыңыз да жок болот."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Билдирмелерди өчүрөсүзбү?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Эгер сиз бул колдонмо үчүн эскертмелерди өчүрсөңүз, сиз маанилүү эскертүүлөрдү жана жаңыртууларды өткөзүп жиберишиңиз мүмкүн."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Дүкөн"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Колдонмонун чоо-жайы"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Колдонмо <xliff:g id="APP_STORE">%1$s</xliff:g> аркылуу орнотулду"</string>
@@ -1994,6 +1987,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Кызматты колдонуу"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Түсүн тууралоону иштетүү"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Коштомо жазууларды иштетүү"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Улантуу"</string>
<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="6371077608778830020">"Угуу аппаратын кошуу"</string>
@@ -2137,8 +2131,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Колдонмонун фондогу аракеттери чектелсе, ал туура эмес иштеп калышы мүмкүн"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Бул колдонмодо батареянын үнөмдөлүшү жөндөлбөгөндүктөн, аны чектөөгө болбойт.\n\nКолдонмону чектөө үчүн, адегенде Батареяны үнөмдөө режимин күйгүзүңүз."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Толук кубатталгандан бери экран канча убакыт колдонулду"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Экран керектеген кубат"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Мобилдик тармак скандалууда"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Толук кубатталгандан бери батареянын колдонулушу"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Толук кубатталгандан бери экрандын күйүп турган убактысы"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Толук кубатталгандан бери түзмөктүн колдонулушу"</string>
@@ -2165,11 +2157,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Чоо-жайын колдонуу"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Кубат сарпталышын тууралоо"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Камтылган топтомдор"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Батареяңызды отургузган колдонмолор"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Түзмөк көшүү режимине өтпөйт"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Түзмөк фондо ойготулууда"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Жайгашкан жер көп суралууда"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> колдонмо кызыктай иштеп жатат"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Колдонмолор туура иштеп жатат"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Телефон фондо батареяны адаттагыдай колдонууда"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Планшет фондо батареяны адаттагыдай колдонууда"</string>
@@ -2233,6 +2220,7 @@
<item quantity="other">%1$d колдонмо батареяны чектелген режимде колдонуп жатат</item>
<item quantity="one">%1$d колдонмо батареяны чектелген режимде колдонуп жатат</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> чектелди"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Бул колдонмолор батареяны фондо колдонуп жатат. Чектелген колдонмолор талаптагыдай иштебей, эскертмелери кечигүү менен көрсөтүлүшү мүмкүн."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Battery Manager\'ди колдонуу"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Колдонмолордун батареяны тез сарптаганы аныкталсын"</string>
@@ -2410,23 +2398,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Жокко чыгаруу"</string>
<string name="tts_reset" msgid="2661752909256313270">"Баштапкы абалга келтирүү"</string>
<string name="tts_play" msgid="2628469503798633884">"Угуу"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Кубатты башкаруу"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi тууралоолорун жаңыртуу"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth жөндөөсү жаңыртылууда"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"жандырылган"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"өчүк"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"иштетүү"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"өчүрүүдө"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Жайгашкан жер"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Синхрондоо"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Жарыктыгы <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"авто"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"толук"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"жарымы"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"өчүк"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Каттоо маалыматы сакталган жер"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Сактагычтан орнотуу"</string>
@@ -2584,7 +2555,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ичинен <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Бардыгын тандоо"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Дайындардын өткөрүлүшү"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Колдонмолордун трафиги"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Мобилдик Интернет жана Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Оператор эсептеген дайындар түзмөгүңүздө эсептелген дайындардан айырмаланышы мүмкүн."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Колдонмонун пайдаланылышы"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"КОЛДОНМО МААЛЫМАТЫ"</string>
@@ -2961,7 +2932,6 @@
<item quantity="other">Жашырылган %d нерсе көрсөтүлсүн</item>
<item quantity="one">Жашырылган %d нерсе көрсөтүлсүн</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Жыйыштыруу"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Тармак жана Интернет"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилдик"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дайындардын колдонулушу"</string>
@@ -2973,12 +2943,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Колдонмолор/билдирмелер"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Уруксаттар, демейки колдонмолор"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Жумуш профилиндеги колдонмолордо билдирмелерди иштетүү мүмкүн эмес."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Аккаунттар"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Бир да аккаунт кошулган эмес"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Демейки колдонмолор"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Тилдер, убакыт, камдык көчүрмөлөр, жаңыртуулар"</string>
<string name="search_results_title" msgid="1796252422574886932">"Жөндөөлөр"</string>
- <string name="search_menu" msgid="6283419262313758339">"Жөндөөлөрдү издөө"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, тармак туташуусу, интернет, зымсыз, дайындар, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, өчүрүү/күйгүзүү, көзөмөлдөө"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, SMS жөнөтүү, билдирүүлөр, SMS/MMS, демейки"</string>
@@ -3023,6 +2993,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"төлөө, таптоо, төлөмдөр"</string>
<string name="keywords_backup" msgid="470070289135403022">"камдык көчүрмөнү сактоо, камдык көчүрмөнү сактоо"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"жаңсоо"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"жүз, кулпуну ачуу, аутентификация, кирүү"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl версиясы, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"тармак, мобилдик тармактын абалы, кызматтын абалы, сигналдын күчү, мобилдик тармактын түрү, роуминг, смарт-картанын идентификатору"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериялык номер, аппараттык камсыздоонун версиясы"</string>
@@ -3030,6 +3001,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"түнкү режим"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"мүчүлүштүк"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Экран автоматтык түрдө күйөт, экран кулпусу"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"кулпуланган экрандагы билдирме"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"жүз"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"манжа изи"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"күңүрт экран, сенсордук экран, батарея, акылдуу жарыктык, динамикалык жарыктык"</string>
@@ -3108,7 +3080,7 @@
<string name="zen_mode_automation_suggestion_summary" msgid="6223252025075862701">"\"Тынчымды алба\" режиминин эрежелерин коюу"</string>
<string name="zen_mode_use_automatic_rule" msgid="4509513632574025380">"Эреже колдонулсун"</string>
<string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Шашылыш эскертмелер гана"</string>
- <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ойготкучтар гана"</string>
+ <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ойготкуч гана"</string>
<string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Тымтырс"</string>
<string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
<string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Визуалдык эскертмелерди бөгөттөө"</string>
@@ -3461,7 +3433,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Бул түзмөктү иштетүү үчүн PIN киргизилгенде, <xliff:g id="SERVICE">%1$s</xliff:g> сыяктуу атайын мүмкүнчүлүктөр кызматтары иштебей калат."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Бул түзмөктү иштетүү үчүн үлгүңүз киргизилгенде, <xliff:g id="SERVICE">%1$s</xliff:g> сыяктуу атайын мүмкүнчүлүктөр кызматтары иштебей калат."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Бул түзмөктү иштетүү үчүн сырсөзүңүз киргизилгенде, <xliff:g id="SERVICE">%1$s</xliff:g> сыяктуу атайын мүмкүнчүлүктөр кызматтары иштебей калат."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Эскертүү: Өчүрүп-күйгүзгөндөн кийин, бул колдонмо телефондун кулпусу ачылмайынча иштебейт"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Эскертүү: Эгер телефонуңузду өчүрүп күйгүзгөндө экранды бөгөттөө жөндөлгөн болсо, телефонду бөгөттөн чыгармайынча бул колдонмо ачылбайт"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI маалыматы"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI байланыштуу маалымат"</string>
<string name="slot_number" msgid="3762676044904653577">"(Оюк<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3515,7 +3487,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Жумуш"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Колдонмолор: Баары"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Колдонмолор: Өчүрүлгөн"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Өчүрүлдү"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категориялар: Өтө маанилүү"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категориялар: Маанилүүлү эмес"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категориялар: Өчүрүлгөн"</string>
@@ -3576,7 +3548,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Батареянын сарпталышы"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Түзмөктүн колдонулушун толук көрсөтүү"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Колдонмонун иштетилиши"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Батарея кубаты көп колдонулат"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> колдонмо туура эмес иштеп жатат</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> колдонмо туура эмес иштеп жатат</item>
@@ -3665,7 +3636,7 @@
<string name="running_frequency" msgid="6622624669948277693">"Жыштык"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Эң көп керектелиши"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Колдонулган дайындар жок"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> колдонмосуна \"Тынчымды алба\" функциясын пайдаланууга уруксат берилсинби?"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> колдонмосуна \"Тынчымды алба\" режимине уруксат бересизби?"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Бул колдонмо \"Тынчымды алба\" режимин күйгүзүп/өчүрүп, тийиштүү жөндөөлөрдү өзгөртө алат."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Эскертмелерге уруксат берилгендиктен, күйүп турушу керек"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> колдонмосуна \"Тынчымды алба\" функциясын пайдалануу мүмкүнчүлүгү калыбына келтирилсинби?"</string>
@@ -3740,6 +3711,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Ички сактагыч: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ээленген – <xliff:g id="FREE_SPACE">%2$s</xliff:g> бош"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> мүнөт ишсиз тургандан кийин уйку режимине өтүү"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Тушкагаз, уйку режими, арип өлчөмү"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Түзмөк 10 мүнөт колдонулбагандан кийин көшүү режимине өтөт"</string>
<string name="memory_summary" msgid="8080825904671961872">"Болжол менен <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ичинен <xliff:g id="USED_MEMORY">%1$s</xliff:g> колдонулууда"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> аккаунту менен кирдиңиз"</string>
@@ -3755,7 +3728,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS жөнөтүүгө тыюу салынган"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Камераны колдонууга тыюу салынган"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Скриншот колдонууга тыюу салынган"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Камдык көчүрмөнү сактоо функциясы өчүрүлбөйт"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Бул колдонмо ачылбайт"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Суроолоруңуз болсо, IT администраторуңузга кайрылыңыз"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Көбүрөөк маалымат"</string>
@@ -3919,9 +3891,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Кесилген дисплейге окшоштуруу"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Дисплей кесиндиси"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"дисплейдин кесиндиси, кетик"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Жок"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Түзмөктүн демейки параметри"</string>
<string name="special_access" msgid="3458780842491881155">"Атайын мүмкүнчүлүк"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> колдонмо дайындарды чектөөсүз өткөрө алат</item>
@@ -3943,11 +3915,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> менен туташты"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Бир нече түзмөккө туташты"</string>
<string name="demo_mode" msgid="2798762752209330277">"Тутум интерфейсинин демо режими"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Түнкү режим"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Түнкү режимди коюу"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Караңгы режим"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Караңгы режимди коюу"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Иштеп чыгуучунун ыкчам жөндөөлөр такталары"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope көз салуусу"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Жумуш профилинин жөндөөлөрү"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Байланыштарды издөө"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Чалуучуларды жана байланыштарды аныктоо үчүн ишканаңыз байланыштарды издешине уруксат бериңиз"</string>
@@ -3988,13 +3959,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Убакытты жана билдирмелерди текшерүү үчүн эки жолу басуу"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Планшетти текшерүү үчүн эки жолу таптаңыз"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Түзмөктү текшерүү үчүн эки жолу таптаңыз"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Убакытты, билдирмелердин сүрөтчөлөрүн жана башка маалыматты көрүү үчүн экраныңызды эки жолу таптаңыз."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн экраныңызды эки жолу таптаңыз."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Билдирмелерди текшерүү үчүн телефонду көтөрүү"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Планшетти текшерүү үчүн көтөрүңүз"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Түзмөктү текшерүү үчүн көтөрүңүз"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Убакытты, билдирмелердин сүрөтчөлөрүн жана башка маалыматты көрүү үчүн телефонуңузду колуңузга алыңыз."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Убакытты, билдирмелердин сүрөтчөлөрүн жана башка маалыматты көрүү үчүн планшетиңизди колуңузга алыңыз."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Убакытты, билдирмелердин сүрөтчөлөрүн жана башка маалыматты көрүү үчүн түзмөгүңүздү колуңузга алыңыз."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Дисплейди ачуу"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн телефонуңузду колуңузга алыңыз."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн планшетиңизди колуңузга алыңыз."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн түзмөгүңүздү колуңузга алыңыз."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Кулпуланган экранды ачуу жаңсоосу"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Билдирмелерди манжа изинин сенсору менен көрүү"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Манжа изинин сканери"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Билдирмелериңизди текшерүү үчүн телефондун аркасындагы манжа изинин сенсорун ылдый сүртүп коюңуз"</string>
@@ -4012,7 +3987,7 @@
<string name="web_action_enable_title" msgid="4051513950976670853">"Ыкчам ачылуучу колдонмолор"</string>
<string name="web_action_enable_summary" msgid="3108127559723396382">"Түзмөктө орнотулган эмес болсо да, колдонмолордогу шилтемелерди ачасыз"</string>
<string name="web_action_section_title" msgid="7364647086538399136">"Ыкчам ачылуучу колдонмолор"</string>
- <string name="instant_apps_settings" msgid="8827777916518348213">"Ыкчам ачылуучу колдонмолордун параметрлери"</string>
+ <string name="instant_apps_settings" msgid="8827777916518348213">"Ыкчам ачылуучу колдонмолордун жөндөөлөрү"</string>
<string name="domain_url_section_title" msgid="7046835219056428883">"Орнотулган колдонмолор"</string>
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Учурда сактагычыңыз сактагычты көзөмөлдөгүч тарабынан башкарылууда"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> таандык аккаунттар"</string>
@@ -4074,7 +4049,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> аракет</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> аракет</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Бул түзмөктүн дайындарынын камдык көчүрмөсү сакталууда"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Бул түзмөк уюмуңуз тарабынан башкарылат."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Бул түзмөк <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> тарабынан башкарылат."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4115,6 +4089,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Автотолтуруу кызматы"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"авто, толтуруу, автотолтуруу"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Колдонмонун коопсуз экенин текшериңиз</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> экрандагы нерселерди талдап, автоматтык түрдө толтурула турган саптарды табат."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Автотолтуруу"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Кирүү деңгээли"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Бир сеанстагы сурамдардын жогорку чеги"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Көрүнүп турган дайындар топтомунун эң жогорку саны"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Демейки маанилерге кайтаруу"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Иштеп чыгуучунун параметрлерин автотолтуруу жөндөөсү кайра коюлду"</string>
<string name="device_theme" msgid="4571803018917608588">"Түзмөктүн темасы"</string>
<string name="default_theme" msgid="7085644992078579076">"Демейки"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Тармактын аталышы"</string>
@@ -4129,15 +4109,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Байланыш операторун өзгөртүү"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\"Тынчымды алба\" режимин жаңыртуу"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Алагды кылбоо үчүн билдирмелерди тындыруу"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Эмне жаңылык бар?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Жаңы телефонуңузду карап чыгыңыз"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Жаңы планшетиңизди карап чыгыңыз"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Жаңы түзмөгүңүзду карап чыгыңыз"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Бул функция бул түзмөктө иштебейт"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS көрсөткүчтөрүнө толук көз салууну иштетүү"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Иштөө цикли өчүрүлүп, бардык GNSS топторуна жана жыштыктарга көз салынат"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Ката диалогун ар дайым көрсөтүү"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Колдонмо бузулган сайын диалог көрүнөт"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE иштетилген колдонмону тандоо"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE иштетилген колдонмо жөндөлгөн жок"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE иштетилген колдонмо: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Каталогго мүмкүнчүлүк алуу"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"катталууга мүмкүнчүлүк алуу"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4166,9 +4145,9 @@
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"Түзмөктүн батареясынын кубатынын мөөнөтүн көбөйтүү"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"Телефондун батареясынын кубатынын мөөнөтүн көбөйтүү"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
- <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Шыңгыратууну өчүрүү"</string>
+ <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Шыңгырдын үнүн өчүрүү"</string>
<string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Кубат менен үнүн чоңойтуу баскычтарын чогуу басуу"</string>
- <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Шыңгыратууну өчүрүү баскычы"</string>
+ <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Шыңгырдын үнүн ыкчам өчүрүү"</string>
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Дирилдөө"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Үнсүз"</string>
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"Эч нерсе кылынбасын"</string>
@@ -4178,4 +4157,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Тармактын чоо-жайы"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Түзмөгүңүздүн аталышы телефонуңуздагы колдонмолорго көрүнүктүү. Bluetooth түзмөктөрүнө туташканыңызда же Wi‑Fi туташуу түйүнүн жөндөгөнүңүздө, аны башка адамдар да көрүшү мүмкүн."</string>
<string name="devices_title" msgid="7701726109334110391">"Түзмөктөр"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Бардык жөндөөлөр"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Сунуштар"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Жарандык радио кызматынын дайындары"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Жарандык радио кызматынын дайындары"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Тармакты тандоо"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Ажыратылды"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Туташты"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Туташууда…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Туташпай койду"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Эч тармак табылган жок."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Тармактар табылбай койду. Кайра аракет кылыңыз."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(тыюу салынган)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM-карта жок"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Өркүндөтүлгөн чалуу"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Тандалган тармак режими: WCDMA тандалган"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Тандалган тармак режими: GSM гана"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Тандалган тармак режими: WCDMA гана"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Тандалган тармак режими: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Тандалган тармак режими: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Тандалган тармак режими: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Тандалган тармак режими: CDMA гана"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Тандалган тармак режими: EvDo гана"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Тандалган тармак режими: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Тандалган тармак режими: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Тандалган тармак режими: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Тандалган тармак режими: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Тандалган тармак режими: Жалпы"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Тандалган тармак режими: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Тандалган тармак режими: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Тандалган тармак режими: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Тандалган тармак режими: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Тандалган тармак режими: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Тандалган тармак режими: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Тандалган тармак режими: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Тандалган тармак режими: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Тандалган тармак режими: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Тандалган тармак режими: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Тандалган тармак режими: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Тандалган тармак режими: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Тандалган тармак режими: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (сунушталат)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (сунушталат)"</string>
+ <string name="network_global" msgid="959947774831178632">"Жалпы"</string>
+ <string name="label_available" msgid="1731547832803057893">"Жеткиликтүү тармактар"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Издөөдө…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> тармагына катталууда…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Сиздин SIM-картаңыз менен бул тармакка туташууга болбойт."</string>
+ <string name="connect_later" msgid="978991102125216741">"Бул тармакка азыр кошулуу мүмкүн эмес. Кийинчерээк кайра аракет кылыңыз."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Тармакка катталды."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Тармак автоматтык түрдө тандалат"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Оператордун жөндөөлөрү"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Тарифтик планды жөндөө"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Мобилдик Интернет"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Интернетке мобилдик тармак аркылуу чыгуу"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Тандалган тармактын түрү"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Тармактын иштөө режимин өзгөртүңүз"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Тармактын түрү"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Байланыш оператору"</string>
+ <string name="call_category" msgid="8108654745239563833">"Чалуулар"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Видео чалуулар"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Тутум тандоо"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA роуминг режимин алмаштыруу"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Тутум тандоо"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Тармак"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Тармак"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA жазылуу"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM жана NV ортосунда которуштуруу"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"жазылуу"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Автоматтык катталуу…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Интернет-роумингди иштетесизби?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Бааларын байланыш операторуңуздан сурашыңыз керек."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Колдонмолордун трафиги"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Тармактын режими жараксыз: <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Баш тартыңыз."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна туташып турганда жеткиликсиз"</string>
+ <string name="see_more" msgid="5953815986207345223">"Дагы көрүү"</string>
+ <string name="see_less" msgid="1250265310929558370">"Азыраак көрүү"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 991e6a5..7102349 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"ໃຊ້ແບບວັດແທກປະລິມານ"</item>
<item msgid="2266114985518865625">"ໃຊ້ແບບບໍ່ວັດແທກປະລິມານ"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ຄ່າເລີ່ມຕົ້ນ (ໃຊ້ MAC ແບບສຸ່ມ)"</item>
+ <item msgid="5398461510512959597">"ເຊື່ອຖື"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"ບໍ່"</item>
<item msgid="3863157480502955888">"ແມ່ນ"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"ເປີດຕະຫຼອດ"</item>
<item msgid="6385301106124765323">"ປິດຕະຫຼອດ"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"ປິດ"</item>
+ <item msgid="2182686878828390312">"ດີບັກ"</item>
+ <item msgid="5286514712714822064">"ບັນທຶກລະອຽດ"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"ເຄືອຂ່າຍພາຍໃນເທົ່ານັ້ນ"</item>
+ <item msgid="5034813753274486448">"ອັດຕະໂນມັດ"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"ຕ້ອງການ GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"GSM ເທົ່ານັ້ນ"</item>
+ <item msgid="488474605709912156">"WCDMA ເທົ່ານັ້ນ"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA ອັດຕະໂນມັດ"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo ອັດຕະໂນມັດ"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"CDMA ເທົ່ານັ້ນ"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"ທົ່ວໂລກ"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA ເທົ່ານັ້ນ"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"ທົ່ວໂລກ"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 5401ed5..994519a 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"ສ້າງ"</string>
<string name="allow" msgid="3349662621170855910">"ອະນຸຍາດ"</string>
<string name="deny" msgid="6947806159746484865">"ປະຕິເສດ"</string>
- <string name="dlg_close" msgid="7471087791340790015">"ປິດ"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"ສັບປ່ຽນ"</string>
<string name="device_info_default" msgid="7847265875578739287">"ບໍ່ຮູ້ຈັກ"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">ປະຈຸບັນທ່ານຍັງຢູ່ຫ່າງ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ຂັ້ນຕອນຈາກການເປັນຜູ້ພັດທະນາ.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"ບໍ່ຈຳເປັນ, ທ່ານເປັນນັກພັດທະນາຢູ່ແລ້ວ."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ກະລຸນາເປີດໃຊ້ຕົວເລືອກນັກພັດທະນາກ່ອນ."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"ລະບົບໄຮ້ສາຍ & ເຄືອຂ່າຍ"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"ການເຊື່ອມຕໍ່"</string>
- <string name="header_category_device" msgid="4544026001618307754">"ອຸປະກອນ"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ສ່ວນໂຕ"</string>
- <string name="header_category_access" msgid="7580499097416970962">"ການເຂົ້າເຖິງ"</string>
<string name="header_category_system" msgid="2816866961183068977">"ລະບົບ"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ເປີດການເຊື່ອມຕໍ່ຂໍ້ມູນ"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ປິດການເຊື່ອມຕໍ່ຂໍ້ມູນ"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ທີ່ຢູ່ Bluetooth ຂອງອຸປະກອນ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ຕັດການເຊື່ອມຕໍ່ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ບໍ່?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"ການກະຈາຍສັນຍານ"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"ອຸປະກອນ Bluetooth ທີ່ບໍ່ມີຊື່"</string>
<string name="progress_scanning" msgid="192587958424295789">"ກຳລັງຊອກຫາ..."</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ບໍ່ມີອຸປະກອນ Bluetooth ຢູ່ໃນບໍລິເວນໃກ້ຄຽງ."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"ແອັບຕ້ອງການເປີດໃຊ້ Bluetooth ແລະ ເຮັດໃຫ້ໂທລະສັບຂອງທ່ານສາມາດຊອກເຫັນໄດ້ຈາກອຸປະກອນອື່ນ. ທ່ານສາມາດປ່ຽນໄດ້ໃນພາຍຫຼັງໃນການຕັ້ງຄ່າ Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ກຳລັງເປີດ Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ກຳລັງປິດ Bluetooth..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"ເຊື່ອມຕໍ່ອັດຕະໂນມັດ"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ການຮ້ອງຂໍການເຊື່ອມຕໍ່ Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"ແຕະເພື່ອເຊື່ອມຕໍ່ກັບ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"ທ່ານຕ້ອງການເຊື່ອມຕໍ່ຫາ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ບໍ່?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"ອຸປະກອນໂທທີ່ໃຊ້ໄດ້"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"ຕອນນີ້ເຊື່ອມຕໍ່ແລ້ວ"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"ອຸປະກອນທີ່ບັນທຶກໄວ້"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"ເພີ່ມອຸປະກອນ"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth ຈະເປີດການຈັບຄູ່"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"ການຕັ້ງຄ່າການເຊື່ອມຕໍ່"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"ອຸປະກອນທີ່ເຊື່ອມຕໍ່ກ່ອນໜ້າ"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ເຊື່ອມຕໍ່ກ່ອນໜ້ານີ້"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ເປີດ Bluetooth ແລ້ວ"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"ເບິ່ງທັງໝົດ"</string>
<string name="date_and_time" msgid="9062980487860757694">"ວັນທີ & ເວລາ"</string>
<string name="choose_timezone" msgid="1362834506479536274">"ເລືອກເຂດເວລາ"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"ຂ້າມ"</string>
<string name="next_label" msgid="4693520878012668114">"ຖັດໄປ"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ພາສາ"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ການຕັ້ງຄ່າພາສາ"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"ລຶບອອກ"</string>
<string name="add_a_language" msgid="2330538812283783022">"ເພີ່ມພາສາ"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"ການຕັ້ງຄ່າ"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"ທາງລັດການຕັ້ງຄ່າ"</string>
<string name="airplane_mode" msgid="8837269988154128601">"ໂໝດຢູ່ໃນຍົນ"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"ເພີ່ມເຕີມ"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"ລະບົບໄຮ້ສາຍ & ເຄືອຂ່າຍ"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"ຈັດການ Wi-Fi, Bluetooth, ຮູບແບບເທິງຍົນ, ເຄືອຂ່າຍມືຖື & VPNs"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"ອິນເຕີເນັດມືຖື"</string>
@@ -375,7 +365,7 @@
<string name="location_settings_title" msgid="1369675479310751735">"ສະຖານທີ່"</string>
<string name="location_settings_master_switch_title" msgid="3560242980335542411">"ໃຊ້ສະຖານທີ່"</string>
<string name="account_settings_title" msgid="626177544686329806">"ບັນຊີ"</string>
- <string name="security_settings_title" msgid="4918904614964215087">"ຄວາມປອດໄພ & ສະຖານທີ່"</string>
+ <string name="security_settings_title" msgid="4918904614964215087">"ຄວາມປອດໄພ ແລະ ສະຖານທີ່"</string>
<string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ການເຂົ້າລະຫັດ ແລະ ຂໍ້ມູນການເຂົ້າສູ່ລະບົບ"</string>
<string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ເຂົ້າລະຫັດໂທລະສັບແລ້ວ"</string>
<string name="decryption_settings_summary" product="default" msgid="5671817824042639849">"ໂທລະສັບບໍ່ໄດ້ຖືກເຂົ້າລະຫັດ"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"ຄວາມເປັນສ່ວນຕົວ"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ຖືກຜູ້ເບິ່ງແຍງລະບົບປິດໄວ້"</string>
<string name="security_status_title" msgid="5848766673665944640">"ສະຖານະຄວາມປອດໄພ"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"ລັອກໜ້າຈໍ, ການປົດລັອກດ້ວຍໃບໜ້າ"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"ການລັອກໜ້າຈໍ, ລາຍນິ້ວມື"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ການລັອກໜ້າຈໍ"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ເພີ່ມໜ້າແລ້ວ"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"ປົດລັອກດ້ວຍໃບໜ້າຂອງທ່ານ"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"ໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອພິສູດຢືນຢັນ"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບຫາແອັບຕ່າງໆ."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"ໃຊ້ທ່ານ"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ ຫຼື ອະນຸມັດການສັ່ງຊື້.\n\nໝາຍເຫດ: ທ່ານບໍ່ສາມາດໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອປົດລັອກອຸປະກອນນີ້ໄດ້. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບອົງກອນຂອງທ່ານ."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ, ອະນຸມັດການສັ່ງຊື້ ຫຼື ເຂົ້າສູ່ລະບົບຫາແອັບຕ່າງໆ"</string>
- <string name="face_add_max" msgid="2342250989212694454">"ທ່ານສາມາດເພີ່ມບໍ່ເກີນ <xliff:g id="COUNT">%d</xliff:g> ລາຍນີ້ວມື"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ໃຫ້ໜ້າຂອງທ່ານຢູ່ໃນວົງມົນ"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ເຮັດໃນພາຍຫຼັງ"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"ທ່ານສາມາດເພີ່ມບໍ່ເກີນ <xliff:g id="COUNT">%d</xliff:g> ໃບໜ້າ"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"ທ່ານເພີ່ມໃບໜ້າຮອດຈຳນວນສູງສຸດແລ້ວ"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"ບໍ່ສາມາດເພີ່ມໃບໜ້າໄດ້ອີກແລ້ວ"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"ການລົງທະບຽນບໍ່ສຳເລັດ"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ຕົກລົງ"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"ຮອດຂີດຈຳກັດເວລາການລົງທະບຽນໃບໜ້າແລ້ວ. ກະລຸນາລອງໃໝ່ອີກ."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ບໍ່ສາມາດໃຊ້ການລົງທະບຽນໃບໜ້າໄດ້."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"ທຸກຢ່າງພ້ອມໃຊ້ແລ້ວ."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"ແລ້ວໆ"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"ໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອ"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"ປົດລັອກອຸປະກອນຂອງທ່ານ"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ການເຂົ້າສູ່ລະບົບແອັບ ແລະ ການຈ່າຍເງິນ"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"ເປີດຕາເພື່ອປົດລັອກ"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"ເມື່ອໃຊ້ການພິສູດຢືນຢັນໃບໜ້າ, ທ່ານຕ້ອງມືນຕານຳ"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"ລຶບຂໍ້ມູນໃບໜ້າອອກ"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"ປັບປຸງຂໍ້ມູນໃບໜ້າຂອງທ່ານ"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"ໃບໜ້າຂອງທ່ານສາມາດໃຊ້ເພື່ອປົດລັອກອຸປະກອນ ແລະ ເຂົ້າເຖິງແອັບຕ່າງໆໄດ້. "<annotation id="url">"ສຶກສາເພີ່ມເຕີມ"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ລາຍນີ້ວມື"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ຈັດການລາຍນີ້ວມື"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ໃຊ້ລາຍນີ້ວມືສຳລັບ"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"ເລືອກແຖບຄວາມຖີ່ຢ່າງໜ້ອຍໜຶ່ງອັນສຳລັບ Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"ຕັ້ງຄ່າ IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"ຄວາມເປັນສ່ວນຕົວ"</string>
<string name="wifi_shared" msgid="844142443226926070">"ແບ່ງປັນກັບຜູ້ໃຊ້ອຸປະກອນອື່ນ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ບໍ່ມີການປ່ຽນແປງ)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"ກະລຸນາເລືອກ"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"ຍົກເລີກ"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"ລືມເຄືອຂ່າຍບໍ?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ລະຫັດຜ່ານທັງໝົດສຳລັບເຄືອຂ່າຍນີ້ຈະຖືກລຶບອອກ"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"ເຄືອຂ່າຍທີ່ບັນທຶກໄວ້"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d ເຄືອຂ່າຍ</item>
<item quantity="one">1 ເຄືອຂ່າຍ</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"ຄວາມສະຫວ່າງ"</string>
<string name="brightness_summary" msgid="838917350127550703">"ປັບແຕ່ງຄວາມແຈ້ງຂອງໜ້າຈໍ"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"ປັບຄວາມແຈ້ງອັດຕະໂນມັດ"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ເປີດ"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ປິດ"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"ຄວາມສະຫວ່າງທີ່ຕ້ອງການແມ່ນຕ່ຳຫຼາຍ"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"ຄວາມສະຫວ່າງທີ່ຕ້ອງການແມ່ນຕ່ຳ"</string>
@@ -1122,7 +1128,7 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"ປັບແຕ່ງຄວາມສະຫວ່າງຂອງແສງ. ເມື່ອເປີດໃຊ້ຄຸນສົມບັດນີ້, ທ່ານຈະຍັງຄົງສາມາດປັບແຕ່ງລະດັບຄວາມສະຫວ່າງຊົ່ວຄາວໄດ້ຢູ່."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"ຄວາມສະຫວ່າງໜ້າຈໍຂອງທ່ານຈະຖືກປັບໂດຍອັດຕະໂນມັດໂດຍອ້າງອີງຈາກສະພາບແວດລ້ອມ ແລະ ກິດຈະກຳທີ່ທ່ານເຮັດ. ທ່ານສາມາດຍ້າຍຕົວເລື່ອນດ້ວຍຕົນເອງເພື່ອຊ່ວຍໃຫ້ລະບົບຮຽນຮູ້ການຕັ້ງຄ່າຂອງທ່ານໄດ້."</string>
<string name="night_display_title" msgid="2626451512200357686">"ແສງກາງຄືນ"</string>
- <string name="night_display_text" msgid="1837277457033025056">"ຄຸນສົມບັດ ແສງກາງຄືນ ຈະໃສ່ສີໜ້າຈໍຂອງທ່ານເປັນສີແດງໃນເວລາກາງຄືນ. ນີ້ຈະເຮັດໃຫ້ສາມາດເບິ່ງໜ້າຈໍໄດ້ງ່າຍຂຶ້ນໃນສະພາບແສງໜ້ອຍ ແລະ ອາດຊ່ວຍໃຫ້ທ່ານນອນຫຼັບງ່າຍຂຶ້ນໄດ້ນຳ."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"ຄຸນສົມບັດ ແສງກາງຄືນ ຈະໃສ່ສີໜ້າຈໍຂອງທ່ານເປັນສີອົມເຫຼືອງໃນເວລາກາງຄືນ. ນີ້ຈະເຮັດໃຫ້ສາມາດເບິ່ງໜ້າຈໍໄດ້ງ່າຍຂຶ້ນໃນສະພາບແສງໜ້ອຍ ແລະ ອາດຊ່ວຍໃຫ້ທ່ານນອນຫຼັບງ່າຍຂຶ້ນໄດ້ນຳ."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"ຕັ້ງເວລາ"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"ບໍ່ໃຊ້"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ເປີດໃຊ້ໃນເວລາທີ່ກຳນົດເອງ"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"ບໍ່ສາມາດປ່ຽນລະຫັດ PIN ໄດ້.\nອາດເປັນເພາະລະຫັດ PIN ບໍ່ຖືກຕ້ອງ."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"ລະຫັດ PIN ຂອງ SIM ຖືກປ່ຽນສຳເລັດແລ້ວ"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"ບໍ່ສາມາດປ່ຽນສະຖານະການລັອກ SIM card ໄດ້.\nອາດເປັນຍ້ອນ PIN ບໍ່ຖືກຕ້ອງ."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"ບໍ່ສາມາດປິດການນຳໃຊ້ PIN ໄດ້."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"ບໍ່ສາມາດເປີດການນຳໃຊ້ PIN ໄດ້."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ຕົກລົງ"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"ຍົກເລີກ"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"ພົບຫຼາຍ SIM"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ອັນນີ້ຕ້ອງການໃຫ້ <xliff:g id="NAME_0">^1</xliff:g> ໄດ້ຮັບການຟໍແມັດ. \n\n"<b>"ການຟໍແມັດລຶບທຸກຂໍ້ມູນທີ່ປະຈຸບັນໄດ້ເກັບໄວ້ຢູ່ໃນ <xliff:g id="NAME_1">^1</xliff:g>."</b>" ເພື່ອຫຼີກເວັ້ນການເສຍຂໍ້ມູນ, ໃຫ້ພິຈາລະນາສຳຮອງມັນໄວ້."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ລຶບ & ຟໍແມັດ"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"ກຳລັງຟໍແມັດ <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"ຢ່າຖອດ <xliff:g id="NAME">^1</xliff:g> ອອກໃນຂະນະທີ່ກຳລັງຟໍແມັດ."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"ຢ່າຖອດ <xliff:g id="NAME">^1</xliff:g> ອອກໃນຂະນະທີ່ກຳລັງຈັດຮູບແບບ."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ຍ້າຍຂໍ້ມູນໄປບ່ອນຈັດເກັບໃໝ່"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"ທ່ານສາມາດຍ້າຍຮູບຖ່າຍ, ໄຟລ໌ ແລະບາງແອັບຫາ <xliff:g id="NAME">^1</xliff:g> ໃໝ່ນີ້. \n\nການຍ້າຍໃຊ້ເວລາປະມານ <xliff:g id="TIME">^2</xliff:g> ແລະຈະຂະຫຍາຍພື້ນທີວ່າງ <xliff:g id="SIZE">^3</xliff:g> ຢູ່ເທິງບ່ອນເກັບຂໍ້ມູນພາຍໃນເຄື່ອງ. ບາງແອັບຈະໃຊ້ບໍ່ໄດ້ໃນຂະນະທີ່ດຳເນີນການຢູ່."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ຍ້າຍດຽວນີ້"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ຕິດຕັ້ງແລ້ວ"</string>
<string name="no_applications" msgid="7336588977497084921">"ບໍ່ມີແອັບຯ."</string>
<string name="internal_storage" msgid="1584700623164275282">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນພາຍໃນ"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ບ່ອນເກັບຂໍ້ມູນພາຍໃນ"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"ບ່ອນເກັບຂໍ້ມູນ USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນ SD card"</string>
<string name="recompute_size" msgid="7722567982831691718">"ກຳລັງຄຳນວນຂະໜາດຄືນໃໝ່..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"ລຶບຂໍ້ມູນແອັບຯບໍ່?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"ຂໍ້ມູນທັງໝົດຂອງແອັບຯນີ້ຈະຖືກລຶບອອກຖາວອນ ເຊິ່ງຮວມເຖິງໄຟລ໌, ການຕັ້ງຄ່າ, ບັນຊີ, ຖານຂໍ້ມູນ ແລະອື່ນໆທັງໝົດນຳ."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ບໍ່ພົບແອັບຯດັ່ງກ່າວໃນລາຍຊື່ຂອງແອັບຯທີ່ມີການຕິດຕັ້ງແລ້ວ."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"ບໍ່ສາມາດລຶບພື້ນທີ່ຈັດເກັບຂໍ້ມູນໃຫ້ແອັບໄດ້."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ແອັບຯນີ້ສາມາດເຂົ້າເຖິງສິ່ງຕໍ່ໄປນີ້ໃນແທັບເລັດຂອງທ່ານໄດ້:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"ແອັບຯນີ້ສາມາດເຂົ້າເຖິງສິ່ງຕໍ່ໄປນີ້ໃນໂທລະສັບຂອງທ່ານໄດ້:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ແອັບຯນີ້ສາມາດເຂົ້າເຖິງສິ່ງຕໍ່ໄປນີ້ໃນແທັບເລັດຂອງທ່ານໄດ້. ເພື່ອປັບປຸງປະສິດທິພາບ ແລະຫຼຸດຜ່ອນການນຳໃຊ້ຄວາມຈຳຂອງລະບົບ, ການອະນຸຍາດບາງຢ່າງເຫຼົ່ານີ້ ຈະສາມາດໃຊ້ໄດ້ກັບ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ນຳ ເນື່ອງຈາກມັນໃຊ້ໂປຣເຊສດຽວກັນກັບ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ແອັບຯນີ້ສາມາດເຂົ້າເຖິງສິ່ງຕໍ່ໄປນີ້ໃນໂທລະສັບຂອງທ່ານໄດ້. ເພື່ອປັບປຸງປະສິດທິພາບ ແລະຫຼຸດຜ່ອນການນຳໃຊ້ຄວາມຈຳຂອງລະບົບ, ການອະນຸຍາດບາງຢ່າງເຫຼົ່ານີ້ ຈະສາມາດໃຊ້ໄດ້ກັບ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ນຳ ເນື່ອງຈາກມັນໃຊ້ໂປຣເຊສດຽວກັນກັບ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ແລະ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"ແອັບຯນີ້ອາດຮຽກເກັບເງິນທ່ານ:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ສົ່ງ Premium SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"ກຳລັງຄຳນວນ..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"ບໍ່ສາມາດຄຳນວນຂະໜາດແພັກເກດໄດ້."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"ທ່ານຍັງບໍ່ມີແອັບພລິເຄຊັນຈາກພາກສ່ວນທີສາມຕິດຕັ້ງເທື່ອ."</string>
<string name="version_text" msgid="9189073826278676425">"ເວີຊັນ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"ຍ້າຍ"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ຍ້າຍໄປແທັບເລັດ"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ຍ້າຍໄປໂທລະສັບ"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"ຍ້າຍໄປໃສ່ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"ຍ້າຍໄປ SD card"</string>
- <string name="moving" msgid="6431016143218876491">"ກຳລັງຍ້າຍ"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"ມີການໂອນຍ້າຍອື່ນກຳລັງດຳເນີນຢູ່."</string>
<string name="insufficient_storage" msgid="481763122991093080">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນບໍ່ພຽງພໍ."</string>
<string name="does_not_exist" msgid="1501243985586067053">"ບໍ່ມີແອັບຯ."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"ບໍ່ສາມາດຕິດຕັ້ງແອັບຜູ້ເບິ່ງແຍງລະບົບອຸປະກອນຢູ່ມີເດຍພາຍນອກໄດ້"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"ບັງຄັບປິດ?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"ຫານທ່ານບັງຄັບປິດແອັບໃດໜຶ່ງ, ມັນອາດເຮັດວຽກຜິດປົກກະຕິໄດ້."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ບໍ່ສາມາດຍ້າຍແອັບຯໄດ້. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"ບ່ອນຕິດຕັ້ງທີ່ຕ້ອງການ"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"ປ່ຽນບ່ອນຕິດງຕັ້ງທີ່ຕ້ອງການສຳລັບແອັບຯໃໝ່"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"ປິດການນຳໃຊ້ແອັບຯທີ່ມາກັບເຄື່ອງ?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"ປິດການນຳໃຊ້ແອັບ"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"ຫາກທ່ານປິດການນຳໃຊ້ແອັບນີ້, Android ແລະ ແອັບອື່ນອາດບໍ່ສາມາດເຮັດວຽກຕາມທີ່ຖືກອອກແບບມາໄດ້."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ລຶບຂໍ້ມູນ ແລະປິດການນຳໃຊ້ແອັບຯ?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ຖ້າທ່ານປິດການນຳໃຊ້ແອັບນີ້, Android ແລະ ແອັບອື່ນອາດບໍ່ເຮັດໜ້າທີ່ຕາມທີ່ກຳນົດໄວ້ໄດ້. ຂໍ້ມູນຂອງທ່ານກໍຈະຖືກລຶບອອກໄປນຳ."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ປິດການແຈ້ງເຕືອນ?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ຫາກທ່ານປິດການແຈ້ງເຕືອນສຳລັບແອັບຯນີ້ແລ້ວ ທ່ານອາດພາດການແຈ້ງເຕືອນ ແລະອັບເດດສຳຄັນໄດ້."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"ຮ້ານຄ້າ"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"ລາຍລະອຽດແອັບ"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"ແອັບທີ່ຕິດຕັ້ງຈາກ <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ໃຊ້ບໍລິການ"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ໃຊ້ການແກ້ໄຂສີ"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ໃຊ້ຄຳບັນຍາຍ"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"ສືບຕໍ່"</string>
<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="6371077608778830020">"ເພີ່ມການຊ່ວຍຟັງ"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ຫາກທ່ານຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງສຳລັບແອັບໃດໜຶ່ງ, ມັນຈະເຮັດວຽກຜິດປົກກະຕິ"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ເນື່ອງຈາກແອັບນີ້ຍັງບໍ່ໄດ້ປັບແຕ່ງໃຫ້ໃຊ້ແບັດເຕີຣີໄດ້ຢ່າງເໝາະສົມເທື່ອ, ທ່ານຈຶ່ງບໍ່ສາມາດຈຳກັດມັນໄດ້.\n\nເພື່ອຈຳກັດແອັບດັ່ງກ່າວ, ໃຫ້ເປີດການປັບແຕ່ງແບັດເຕີຣີໃຫ້ເໝາະສົມກ່ອນ."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"ການນຳໃຊ້ໜ້າຈໍຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"ການໃຊ້ພະລັງງານໄປກັບໜ້າຈໍ"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"ການສະແກນເຄືອຂ່າຍມືຖື"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"ການນຳໃຊ້ແບັດເຕີຣີຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ໄລຍະເວລາທີ່ໜ້າຈໍເປີດຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ການນຳໃຊ້ອຸປະກອນຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"ໃຊ້ລາຍລະອຽດ"</string>
<string name="controls_subtitle" msgid="390468421138288702">"ປັບແຕ່ງການໃຊ້ພະລັງງານ"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"ແພັກເກດທີ່ຮວມມານຳ"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ແອັບທີ່ໃຊ້ແບັດເຕີຣີ"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ເປີດໜ້າຈໍໄວ້"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ປຸກໂທລະສັບຂຶ້ນໃນພື້ນຫຼັງ"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ກຳລັງຮ້ອງຂໍສະຖານທີ່ເລື້ອຍໆ"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ແອັບເຮັດວຽກຜິດປົກກະຕິ"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"ແອັບຕ່າງໆກຳລັງເຮັດວຽກຕາມປົກກະຕິ"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ໂທລະສັບມີການໃຊ້ແບັດເຕີຣີໃນພື້ນຫຼັງໃນລະດັບປົກກະຕິ"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ແທັບເລັດມີການໃຊ້ແບັດເຕີຣີໃນພື້ນຫຼັງໃນລະດັບປົກກະຕິ"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">ກຳລັງຈຳກັດການໃຊ້ແບັດເຕີຣີສຳລັບ %1$d ແອັບ</item>
<item quantity="one">ກຳລັງຈຳກັດການໃຊ້ແບັດເຕີຣີສຳລັບ %1$d ແອັບ</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"ຈຳກັດເມື່ອ <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"ແອັບເຫຼົ່ານີ້ກຳລັງໃຊ້ແບັດເຕີຣີໃນພື້ນຫຼັງຢູ່. ແອັບທີ່ຖືກຈຳກັດໄວ້ອາດເຮັດວຽກບໍ່ປົກກະຕິ ແລະ ການແຈ້ງເຕືອນອາດຊັກຊ້າ."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"ໃຊ້ຕົວຈັດການແບັດເຕີຣີ"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"ກວດສອບເມື່ອແອັບໃຊ້ແບັດເຕີຣີຫຼາຍເກີນໄປ"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"ຍົກເລີກ"</string>
<string name="tts_reset" msgid="2661752909256313270">"ຣີເຊັດ"</string>
<string name="tts_play" msgid="2628469503798633884">"ຫຼິ້ນ"</string>
- <string name="gadget_title" msgid="5519037532720577836">"ການຄວບຄຸມພະລັງງານ"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"ກຳລັງອັບເດດການຕັ້ງຄ່າ Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ກຳລັງອັບເດດການຕັ້ງຄ່າ Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ເປີດ"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ປິດ"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ກຳລັງເປີດໃຊ້"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"ກຳລັງປິດ"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"ສະຖານທີ່"</string>
- <string name="gadget_sync" msgid="858895763714222152">"ຊິ້ງຂໍ້ມູນ"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"ຄວາມແຈ້ງ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ອັດຕະໂນມັດ"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"ເຕັມ"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"ເຄິ່ງນຶ່ງ"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"ປິດ"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ຕິດຕັ້ງຈາກພື້ນທີ່ຈັດເກັບຂໍ້ມູນ"</string>
@@ -2546,7 +2517,7 @@
<string name="sync_enabled" msgid="4551148952179416813">"ການຊິ້ງຂໍ້ມູນຖືກເປີດໃຊ້"</string>
<string name="sync_disabled" msgid="8511659877596511991">"ການຊິ້ງຂໍ້ມູນຖືກປິດຢູ່"</string>
<string name="sync_error" msgid="5060969083117872149">"ການຊິ້ງຂໍ້ມູນຜິດພາດ"</string>
- <string name="last_synced" msgid="4242919465367022234">"ຊິ້ງຂໍ້ມູນຄັ້ງຫຼ້າສຸດ <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+ <string name="last_synced" msgid="4242919465367022234">"ຊິ້ງຂໍ້ມູນຫຼ້າສຸດ <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
<string name="sync_in_progress" msgid="5151314196536070569">"ກຳລັງຊິ້ງຂໍ້ມູນ..."</string>
<string name="settings_backup" msgid="2274732978260797031">"ສຳຮອງຂໍ້ມູນການຕັ້ງຄ່າ"</string>
<string name="settings_backup_summary" msgid="7916877705938054035">"ສຳຮອງຂໍ້ມູນການຕັ້ງຄ່າຂອງຂ້ອຍ"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"ເລືອກທັງໝົດ"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ການນຳໃຊ້ຂໍ້ມູນ"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ການນຳໃຊ້ຂໍ້ມູນແອັບຯ"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"ອິນເຕີເນັດມືຖື ແລະ Wi-Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"ການນັບຈຳນວນຂໍ້ມູນທີ່ໃຊ້ຂອງຜູ່ໃຫ້ບໍລິການອາດແຕກຕ່າງຈາກທີ່ອຸປະກອນຂອງທ່ານນັບ"</string>
<string name="data_usage_app" msgid="4970478397515423303">"ການນຳໃຊ້ແອັບຯ"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ຂໍ້ມູນແອັບຯ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">ສະແດງ %d ລາຍການທີ່ເຊື່ອງໄວ້</item>
<item quantity="one">ສະແດງ %d ລາຍການທີ່ເຊື່ອງໄວ້</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ຫຍໍ້ເຂົ້າ"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"ເຄືອຂ່າຍ ແລະ ອິນເຕີເນັດ"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ມືຖື"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ການນຳໃຊ້ຂໍ້ມູນ"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ແອັບ ແລະ ການແຈ້ງເຕືອນ"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ສິດອະນຸຍາດ, ແອັບເລີ່ມຕົ້ນ"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"ບໍ່ສາມາດເຂົ້າເຖິງການແຈ້ງເຕືອນສຳລັບແອັບໃນໂປຣໄຟລ໌ບ່ອນເຮັດວຽກໄດ້."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"ບັນຊີ"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"ບໍ່ໄດ້ເພີ່ມບັນຊີ"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ແອັບເລີ່ມຕົ້ນ"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ພາສາ, ເວລາ, ຂໍ້ມູນສຳຮອງ, ອັບເດດ"</string>
<string name="search_results_title" msgid="1796252422574886932">"ການຕັ້ງຄ່າ"</string>
- <string name="search_menu" msgid="6283419262313758339">"ຊອກຫາການຕັ້ງຄ່າ"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, ການເຊື່ອມຕໍ່ເຄືອຂ່າຍ, ອິນເຕີເນັດ, ໄຮ້ສາຍ, ຂໍ້ມູນ, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, ເປີດ/ປິດ, ຄວບຄຸມ"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"ຂໍ້ຄວາມ, ຄ່າເລີ່ມຕົ້ນ"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pay, tap, payments"</string>
<string name="keywords_backup" msgid="470070289135403022">"ສຳຮອງຂໍ້ມູນ, ສຳຮອງ ຂໍ້ມູນ"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ທ່າທາງ"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ໃບໜ້າ, ປົດລັອກ, ການຢືນຢັນ, ເຂົ້າສູ່ລະບົບ"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, ເວີຊັນ prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"ເຄືອຂ່າຍ, ສະຖານະເຄືອຂ່າຍມືຖື, ສະຖານະບໍລິການ, ຄວາມແຮງສັນຍນານ, ປະເພດເຄືອຂ່າຍມືຖື, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"ໝາຍເລກຊີຣຽວ, ເວີຊັນຮາດແວ"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ສີສັນໜ້າຕາແບບມືດ"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ຂໍ້ຜິດພາດ"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ການສະແດງຜົນຕາມແສງສະພາບແວດລ້ອມ, ໜ້າຈໍລັອກ"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"ການແຈ້ງເຕືອນໃນໜ້າຈໍລັອກ"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ໃບໜ້າ"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ລາຍນີ້ວມື"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ຫຼຸດແສງໜ້າຈໍ, ໜ້າຈໍສຳຜັດ, ແບັດເຕີຣີ, ຄວາມສະຫວ່າງອັດສະລິຍະ, ຄວາມສະຫວ່າງແບບໄດນາມິກ"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"ເມື່ອທ່ານປ້ອນລະຫັດ PIN ຂອງທ່ານເພື່ອເລີ່ມອຸປະກອນນີ້, ບໍລິການຊ່ວຍການເຂົ້າເຖິງເຊັ່ນ <xliff:g id="SERVICE">%1$s</xliff:g> ຈະຍັງບໍ່ສາມາດນຳໃຊ້ໄດ້."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"ເມື່ອທ່ານປ້ອນຮູບແບບປົດລັອກຂອງທ່ານເພື່ອເລີ່ມອຸປະກອນນີ້, ບໍລິການຊ່ວຍການເຂົ້າເຖິງເຊັ່ນ <xliff:g id="SERVICE">%1$s</xliff:g> ຈະຍັງບໍ່ສາມາດນຳໃຊ້ໄດ້."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"ເມື່ອທ່ານປ້ອນລະຫັດຜ່ານຂອງທ່ານເພື່ອເລີ່ມອຸປະກອນນີ້, ບໍລິການຊ່ວຍການເຂົ້າເຖິງເຊັ່ນ <xliff:g id="SERVICE">%1$s</xliff:g> ຈະຍັງບໍ່ສາມາດນຳໃຊ້ໄດ້."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ໝາຍເຫດ: ຫຼັງຈາກເປີດຂຶ້ນມາໃໝ່ແລ້ວ, ແອັບນີ້ຈະບໍ່ສາມາດເລີ່ມໄດ້ຈົນກວ່າທ່ານຈະປົດລັອກໂທລະສັບຂອງທ່ານ"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"ໝາຍເຫດ: ຖ້າທ່ານປິດເປີດໂທລະສັບຂອງທ່ານຄືນໃໝ່ ແລະ ໄດ້ຕັ້ງການລັອກໜ້າຈໍໄວ້, ແອັບນີ້ບໍ່ສາມາດເລີ່ມຕົ້ນໄດ້ຈົນກວ່າວ່າທ່ານປົດລັອກໂທລະສັບຂອງທ່ານ"</string>
<string name="imei_information_title" msgid="8499085421609752290">"ຂໍ້ມູນ IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"ຂໍ້ມູນກ່ຽວຂ້ອງກັບ IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(ຊ່ອງ <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ສ່ວນໂຕ"</string>
<string name="filter_work_apps" msgid="24519936790795574">"ວຽກ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ແອັບ: ທັງໝົດ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ແອັບ: ປິດໄວ້ແລ້ວ"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ປິດໄວ້ແລ້ວ"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ໝວດໝູ່: ຄວາມສຳຄັນເລັ່ງດ່ວນ"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ໝວດໝູ່: ຄວາມສຳຄັນຕ່ຳ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ໝວດໝູ່: ປິດໄວ້ແລ້ວ"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"ການແຈ້ງເຕືອນການນຳໃຊ້"</string>
<string name="show_all_apps" msgid="1512506948197818534">"ສະແດງການນຳໃຊ້ແອັບແບບເຕັມ"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"ສະແດງການນຳໃຊ້ແອັບ"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ການນຳໃຊ້ສູງ"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ເຮັດວຽກຜິດປົກກະຕິ</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ເຮັດວຽກຜິດປົກກະຕິ</item>
@@ -3666,8 +3637,8 @@
<string name="running_frequency" msgid="6622624669948277693">"ຄວາມຖີ່"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"ການໃຊ້ສູງສຸດ"</string>
<string name="no_data_usage" msgid="9131454024293628063">"ບໍ່ມີຂໍ້ມູນທີ່ໃຊ້ແລ້ວ"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"ອະນຸຍາດການເຂົ້າເຖິງ ບໍ່ລົບກວນ ສຳລັບ <xliff:g id="APP">%1$s</xliff:g> ບໍ?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"ແອັບຈະສາມາດເປີດ/ປິດ ບໍ່ລົບກວນ ແລະເຮັດການປ່ຽນແປງຕໍ່ກັບການຕັ້ງຄ່າທີ່ກ່ຽວຂ້ອງ."</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"ອະນຸຍາດໃຫ້ເຂົ້າເຖິງໂໝດຫ້າມລົບກວນສຳລັບ <xliff:g id="APP">%1$s</xliff:g> ບໍ່?"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"ແອັບຈະສາມາດເປີດ/ປີດ ໂໝດຫ້າມລົບກວນ ແລະ ປ່ຽນແປງການຕັ້ງຄ່າທີ່ກ່ຽວຂ້ອງໄດ້."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"ຕ້ອງເປີດໄວ້ເນື່ອງຈາກການເຂົ້າເຖິງການແຈ້ງເຕືອນຖືກເປີດໃຊ້"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"ຖອດຖອນການເຂົ້າເຖິງຫ້າມລົບກວນສຳລັບ <xliff:g id="APP">%1$s</xliff:g> ບໍ?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ທຸກກົດລະບຽບຫ້າມລົບກວນທີ່ສ້າງຂຶ້ນໂດຍແອັບຯນີ້ຈະຖືກລຶບອອກ."</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"ບ່ອນຈັດເກັບຂໍ້ມູນພາຍໃນ: ໃຊ້ໄປແລ້ວ <xliff:g id="PERCENTAGE">%1$s</xliff:g> - ຫວ່າງ <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"ຫຼັງຈາກ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ທີ່ບໍ່ໄດ້ເຮັດຫຍັງ"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"ຮູບພື້ນຫຼັງ, ການປິດໜ້າຈໍ, ຂະໜາດຟອນ"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"ປິດໜ້າຈໍຫຼັງຈາກ 10 ນາທີຫາກບໍ່ໄດ້ເຮັດຫຍັງ"</string>
<string name="memory_summary" msgid="8080825904671961872">"ໂດຍສະເລ່ຍ ໃຊ້ຄວາມຈຳໄປແລ້ວ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ຈາກທັງໝົດ <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"ເຂົ້າສູ່ລະບົບເປັນ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"ບໍ່ອະນຸຍາດໃຫ້ໃຊ້ SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"ບໍ່ອະນຸຍາດໃຫ້ໃຊ້ກ້ອງຖ່າຍຮູບ"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ບໍ່ອະນຸຍາດຖ່າຍຮູບໜ້າຈໍ"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"ບໍ່ສາມາດປິດການສຳຮອງຂໍ້ມູນໄດ້"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"ບໍ່ສາມາດເປີດແອັບນີ້ໄດ້"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"ຫາກທ່ານມີຄຳຖາມ, ກະລຸນາຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບໄອທີຂອງທ່ານ"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ລາຍລະອຽດເພີ່ມເຕີມ"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"ຈຳລອງໜ້າຈໍດ້ວຍແຜ່ນປ້າຍ"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ຮອຍບາກຈໍສະແດງຜົນ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ສ່ວນຕັດການສະແດງຜົນ, ຮອຍບາກ"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ບໍ່ມີ"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ຄ່າເລີ່ມຕົ້ນອຸປະກອນ"</string>
<string name="special_access" msgid="3458780842491881155">"ສິດການເຂົ້າເຖິງແອັບພິເສດ"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ແອັບສາມາດໃຊ້ຂໍ້ມູນທີ່ບໍ່ຖືກຈຳກັດໄດ້</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"ເຊື່ອມຕໍ່ຫາ <xliff:g id="ID_1">%1$s</xliff:g> ແລ້ວ"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ເຊື່ອມຕໍ່ຫາຫຼາຍອຸປະກອນ"</string>
<string name="demo_mode" msgid="2798762752209330277">"ໂໝດເດໂມສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ລະບົບ"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"ໂໝດກາງຄືນ"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"ຕັ້ງໂໝດກາງຄືນ"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"ໂໝດມືດ"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"ຕັ້ງໂໝດມືດ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ຊິ້ນສ່ວນການຕັ້ງຄ່າດ່ວນສຳລັບນັກພັດທະນາຊອບແວ"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"ກາຮຄຕິດຕາມ Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"ການຕັ້ງຄ່າໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ຊອກຫາລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ອະນຸຍາດໃຫ້ລາຍຊື່ຜູ້ຕິດຕໍ່ຊອກຫາໂດຍອົງກອນຂອງທ່ານໄດ້ເພື່ອຢືນຢັນຜູ້ໂທ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຕ່າງໆ"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ແຕະສອງເທື່ອເພື່ອກວດສອບໂທລະສັບ"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ແຕະສອງເທືື່ອເພື່ອກວດສອບແທັບເລັດ"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"ແຕະສອງເທືື່ອເພື່ອກວດສອບອຸປະກອນ"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"ເພື່ອກວດສອບເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ແຕະສອງເທື່ອໃສ່ໜ້າຈໍຂອງທ່ານ."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"ເພື່ອກວດສອບເວລາ, ການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ແຕະສອງເທື່ອຢູ່ໜ້າຈໍຂອງທ່ານ."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ຍົກຂຶ້ນເພື່ອກວດສອບໂທລະສັບ"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ຍົກຂຶ້ນເພື່ອກວດສອບແທັບເລັດ"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ຍົກຂຶ້ນເພື່ອກວດສອບອຸປະກອນ"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ເພື່ອກວດສອບເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ຈັບໂທລະສັບຂອງທ່ານຂຶ້ນມາ."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ເພື່ອກວດສອບເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ຈັບແທັບເລັດຂອງທ່ານຂຶ້ນມາ."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ເພື່ອກວດສອບເວລາ, ໄອຄອນການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ຈັບອຸປະກອນຂອງທ່ານຂຶ້ນມາ."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ໜ້າຈໍປຸກ"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"ເພື່ອກວດສອບເວລາ, ການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ຍົກໂທລະສັບຂອງທ່ານຂຶ້ນ."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"ເພື່ອກວດສອບເວລາ, ການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ຍົກແທັບເລັດຂອງທ່ານຂຶ້ນ."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"ເພື່ອກວດສອບເວລາ, ການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ຍົກອຸປະກອນຂອງທ່ານຂຶ້ນ."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"ທ່າທາງປຸກໜ້າຈໍລັອກ"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ປັດລາຍນິ້ວມືສຳລັບການແຈ້ງເຕືອນ"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ປັດລາຍນິ້ວມື"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ເພື່ອກວດເບິ່ງການແຈ້ງເຕືອນຂອງທ່ານ, ໃຫ້ເລື່ອນລົງໃສ່ເຊັນເຊີນລາຍນິ້ວມືທີ່ຢູ່ຫຼັງໂທລະສັບຂອງທ່ານ"</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ຄວາມພະຍາຍາມ</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ຄວາມພະຍາຍາມ</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"ບໍ່ໄດ້ມີການສຳຮອງຂໍ້ມູນອຸປະກອນນີ້"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"ອຸປະກອນນີ້ແມ່ນຈັດການໂດຍອົງກອນຂອງທ່ານ."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"ອຸປະກອນນີ້ຖືກຈັດການໂດຍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"ບໍລິການຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ອັດຕະໂນມັດ, ຕື່ມຂໍ້ມູນ, ຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ໃຫ້ກວດສອບວ່າທ່ານເຊື່ອແອັບນີ້</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ຈະໃຊ້ສິ່ງທີ່ຢູ່ໃນໜ້າຈໍຂອງທ່ານເພື່ອກວດເບິ່ງວ່າຈະຕື່ມຂໍ້ມູນຫຍັງອັດຕະໂນມັດ."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"ຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"ລະດັບການບັນທຶກ"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"ຄຳຂໍສູງສຸດຕໍ່ເຊດຊັນ"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"ຊຸດຂໍ້ມູນທີ່ສະແດງສູງສຸດ"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ຣີເຊັດເປັນຄ່າເລີ່ມຕົ້ນ"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"ຣີເຊັດຕົວເລືອກການຕື່ມຂໍ້ມູນນັກພັດທະນາໂດຍອັດຕະໂນມັດແລ້ວ"</string>
<string name="device_theme" msgid="4571803018917608588">"ຮູບແບບສີສັນອຸປະກອນ"</string>
<string name="default_theme" msgid="7085644992078579076">"ຄ່າເລີ່ມຕົ້ນ"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"ຊື່ເຄືອຂ່າຍ"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"ອັບເດດໂໝດຫ້າມລົບກວນ"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"ຢຸດການແຈ້ງເຕືອນຊົ່ວຄາວເພື່ອໃຫ້ມີສະມາທິ"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"ມີຫຍັງໃໝ່ ແລະ ໜ້າຕື່ນເຕັ້ນ?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ລອງເບິ່ງໂທລະສັບໃໝ່ຂອງທ່ານ"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ລອງເບິ່ງແທັບເລັດໃໝ່ຂອງທ່ານ"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ລອງເບິ່ງອຸປະກອນໃໝ່ຂອງທ່ານ"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"ຄຸນສົມບັດນີ້ບໍ່ສາມາດໃຊ້ໄດ້ໃນອຸປະກອນນີ້ໄດ້"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ບັງຄັບການກວດສອບ GNSS ເຕັມຮູບແບບ"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ຕິດຕາມກຸ່ມ ແລະ ຄວາມຖີ່ GNSS ທັງໝົດໂດຍບໍ່ມີຮອບຕາມພັນທະ"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"ສະແດງກ່ອງຂໍ້ຄວາມການເຮັດວຽກລົ້ມເຫລວທຸກເທື່ອ"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"ສະແດງກ່ອງຂໍ້ຄວາມທຸກເທື່ອທີ່ແອັບເຮັດວຽກລົ້ມເຫລວ"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ເລືອກແອັບທີ່ໃຊ້ ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ບໍ່ໄດ້ກຳນົດເອັບທີ່ເປີດໃຊ້ ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ແອັບທີ່ເປີດໃຊ້ ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ການເຂົ້າເຖິງໄດເຣັກທໍຣີ"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ການເຂົ້າເຖິງໄດເຣັກທໍຣີ"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"ລາຍລະອຽດເຄືອຂ່າຍ"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"ຊື່ອຸປະກອນຂອງທ່ານຈະສາມາດເບິ່ງເຫັນໄດ້ໂດຍແອັບຢູ່ໂທລະສັບຂອງທ່ານ. ນອກຈາກນັ້ນ, ຄົນອື່ນອາດຈະເຫັນມັນໄດ້ເມື່ອທ່ານເຊື່ອມຕໍ່ຫາອຸປະກອນ Bluetooth ຫຼື ຕັ້ງ Wi-Fi ຮັອດສະປອດ."</string>
<string name="devices_title" msgid="7701726109334110391">"ອຸປະກອນ"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"ການຕັ້ງຄ່າທັງໝົດ"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"ຄຳແນະນຳ"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"ຂໍ້ມູນ CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"ຂໍ້ມູນ CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ເລືອກເຄືອຂ່າຍ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
+ <string name="network_connecting" msgid="76404590784733557">"ກຳລັງເຊື່ອມຕໍ່…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"ບໍ່ສາມາດເຊື່ອມຕໍ່ໄດ້"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ບໍ່ພົບເຄືອຂ່າຍ."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ບໍ່ພົບເຄືອຂ່າຍ. ກະລຸນາລອງໃໝ່ອີກເທື່ອໜຶ່ງ."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ຕ້ອງຫ້າມ)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"ບໍ່ມີຊິມກາດ"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"ການໂທຂັ້ນສູງ"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: ຕ້ອງການ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: GSM ເທົ່ານັ້ນ"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: WCDMA ເທົ່ານັ້ນ"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: CDMA ເທົ່ານັ້ນ"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: EvDo ເທົ່ານັ້ນ"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: ທົ່ວໂລກ"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (ແນະນຳ)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (ແນະນຳ)"</string>
+ <string name="network_global" msgid="959947774831178632">"ທົ່ວໂລກ"</string>
+ <string name="label_available" msgid="1731547832803057893">"ເຄືອຂ່າຍທີ່ສາມາດໃຊ້ໄດ້"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"ກຳລັງຊອກຫາ..."</string>
+ <string name="register_on_network" msgid="766516026652295941">"ກຳລັງລົງທະບຽນໃນ <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM ກາດຂອງທ່ານບໍ່ອະນຸຍາດໃຫ້ເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍນີ້."</string>
+ <string name="connect_later" msgid="978991102125216741">"ບໍ່ສາມາດເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍນີ້ໄດ້ໃນຂະນະນີ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
+ <string name="registration_done" msgid="4573820010512184521">"ລົງທະບຽນໃນເຄືອຂ່າຍແລ້ວ."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"ເລືອກເຄືອຂ່າຍອັດຕະໂນມັດ"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"ການຕັ້ງຄ່າຜູ້ໃຫ້ບໍລິການ"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ຕັ້ງຄ່າການບໍລິການຂໍ້ມູນ"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"ອິນເຕີເນັດມືຖື"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"ເຂົ້າເຖິງອິນເຕີເນັດຜ່ານເຄືອຂ່າຍມືຖື"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"ປະເພດເຄືອຂ່າຍທີ່ຕ້ອງການ"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"ປ່ຽນໂໝດປະຕິບັດການຂອງເຄືອຂ່າຍ"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"ປະເພດເຄືອຂ່າຍທີ່ຕ້ອງການ"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"ຜູ້ໃຫ້ບໍລິການ"</string>
+ <string name="call_category" msgid="8108654745239563833">"ກຳລັງໂທ"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"ການໂທວິດີໂອຂອງຜູ້ໃຫ້ບໍລິການ"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"ການເລືອກລະບົບ"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"ປ່ຽນໂໝດໂຣມມິງ CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"ການເລືອກລະບົບ"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"ເຄືອຂ່າຍ"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"ເຄືອຂ່າຍ"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"ການສະໝັກໃຊ້ CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"ປ່ຽນລະຫວ່າງ RUIM/SIM ແລະ NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"ການສະໝັກໃຊ້"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ການລົງທະບຽນອັດຕະໂນມັດ..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"ອະນຸຍາດໃຫ້ໂຣມມິງຂໍ້ມູນບໍ?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"ກະລຸນາກວດສອບລາຄາກັບຜູ້ໃຫ້ບໍລິການເຄືອຂ່າຍຂອງທ່ານ."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ການໃຊ້ຂໍ້ມູນແອັບ"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"ໂໝດເຄືອຂ່າຍ <xliff:g id="NETWORKMODEID">%1$d</xliff:g> ບໍ່ຖືກຕ້ອງ. ບໍ່ສົນໃຈ."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"ບໍ່ສາມາດໃຊ້ໄດ້ເມື່ອເຊື່ອມຕໍ່ກັບ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"ເບິ່ງເພີ່ມເຕີມ"</string>
+ <string name="see_less" msgid="1250265310929558370">"ເບິ່ງໜ້ອຍລົງ"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 9a50007..f7284be 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -286,7 +286,7 @@
<item msgid="1474039653814954902">"pridėti balso pašto pranešimą"</item>
<item msgid="7222837656938871633">"naudoti SIP"</item>
<item msgid="6108267038969274380">"apdoroti siunčiamąjį skambutį"</item>
- <item msgid="4823402479973873358">"kontrolinis kodas"</item>
+ <item msgid="4823402479973873358">"piršto antspaudas"</item>
<item msgid="5895843015407713543">"kūno jutikliai"</item>
<item msgid="1436446526955010826">"skaityti transliacijas mobiliuoju"</item>
<item msgid="884172201575690484">"imituoti vietovę"</item>
@@ -353,7 +353,7 @@
<item msgid="4542463358215230845">"Pridėti balso pašto pranešimą"</item>
<item msgid="864565065016166003">"Naudoti SIP"</item>
<item msgid="1958009349883195116">"Apdoroti siunčiamąjį skambutį"</item>
- <item msgid="8526563410140613458">"Kontrolinis kodas"</item>
+ <item msgid="8526563410140613458">"Piršto antspaudas"</item>
<item msgid="7864822459293570891">"Kūno jutikliai"</item>
<item msgid="6798698496904810960">"Skaityti transliacijas mobiliuoju"</item>
<item msgid="5242052845700875820">"Imituoti vietovę"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Laikyti matuojamu"</item>
<item msgid="2266114985518865625">"Laikyti nematuojamu"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Numatytasis (naudoti atsitiktine tvarka parinktą MAC)"</item>
+ <item msgid="5398461510512959597">"Patikimas"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ne"</item>
<item msgid="3863157480502955888">"Taip"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Visada įjungtas"</item>
<item msgid="6385301106124765323">"Visada išjungtas"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Išjungta"</item>
+ <item msgid="2182686878828390312">"Derinti"</item>
+ <item msgid="5286514712714822064">"Daugiažodis"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Tik pagrindinis"</item>
+ <item msgid="5034813753274486448">"Automatinis"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Pageidaujamas GSM / WCDMA"</item>
+ <item msgid="807926878589867564">"Tik GSM"</item>
+ <item msgid="488474605709912156">"Tik WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM / WCDMA automatinis"</item>
+ <item msgid="5072198667819683600">"CDMA / „EvDo“ automatinis"</item>
+ <item msgid="370391313511477301">"CDMA be „EvDo“"</item>
+ <item msgid="4678789463133969294">"Tik „EvDo“"</item>
+ <item msgid="3960210542349075517">"CDMA / „EvDo“ / GSM / WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA ir LTE / „EvDo“"</item>
+ <item msgid="8008611169788556519">"GSM / WCDMA / LTE"</item>
+ <item msgid="4486851520863433847">"Visuotinis"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"Tik TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA / WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE / TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA / GSM"</item>
+ <item msgid="131738018826229696">"LTE / TDSCDMA / GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA / GSM / WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE / TDSCDMA / WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE / TDSCDMA / GSM / WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA / CDMA / EVDO / GSM / WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE / TDSCDMA / CDMA / EVDO / GSM / WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM / SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Visuotinis"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f65ed92..e8998d1 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Kurti"</string>
<string name="allow" msgid="3349662621170855910">"Leisti"</string>
<string name="deny" msgid="6947806159746484865">"Atmesti"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Uždaryti"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Perjungti"</string>
<string name="device_info_default" msgid="7847265875578739287">"Nežinomas"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Liko atlikti <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> veiksmą ir būsite kūrėjas.</item>
@@ -34,10 +32,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Nereikia, jūs jau esate kūrėjas."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Pirmiausia įgalinkite kūrėjo parinktis."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Belaidis ryšys ir tinklai"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Ryšiai"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Įrenginys"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Asmeninės parinktys"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Prieiga"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Įgalinti duomenų ryšį"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Išjungti duomenų ryšį"</string>
@@ -123,7 +117,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Įrenginio „Bluetooth“ adresas: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Atjungti „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Transliavimas"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"„Bluetooth“ įrenginys be pavadinimo"</string>
<string name="progress_scanning" msgid="192587958424295789">"Ieškoma"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nerasta netol. esanč. „Bluetooth“ įreng."</string>
@@ -155,7 +148,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Programa nori įjungti „Bluetooth“ ir nustatyti, kad telefoną galėtų aptikti kiti įrenginiai. Tai vėliau galėsite pakeisti „Bluetooth“ nustatymuose."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Įjungiamas „Bluetooth“…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"„Bluetooth“ išjungiamas…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatiškai prisijungti"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"„Bluetooth“ ryšio užklausa"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Palieskite, kad prisijungtumėte prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ar norite prisijungti prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
@@ -183,12 +175,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Pasiekiami skambinimo įrenginiai"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Šiuo metu prisijungta"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Išsaugoti įrenginiai"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Pridėti įrenginį"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bus įjungtas „Bluetooth“, kad būtų galima susieti"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Ryšio nuostatos"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Anksčiau prijungti įrenginiai"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Anksčiau susieti"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"„Bluetooth“ įjungtas"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Žr. viską"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data ir laikas"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Pasirinkite laiko juostą"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -271,7 +263,6 @@
<string name="skip_label" msgid="47510779345218297">"Praleisti"</string>
<string name="next_label" msgid="4693520878012668114">"Kitas"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Kalbos"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Kalbos nuostatos"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Pašalinti"</string>
<string name="add_a_language" msgid="2330538812283783022">"Pridėti kalbą"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -307,7 +298,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Nustatymai"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Spartusis nustatymų klavišas"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Lėktuvo režimas"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Daugiau"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Belaidis ryšys ir tinklai"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Tvarkyti „Wi-Fi“, „Bluetooth“, lėktuvo režimą, mobiliojo ryšio tinklus ir VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobiliojo ryšio duomenys"</string>
@@ -368,7 +358,7 @@
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Įgalinti valdiklius"</string>
<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="429230431748285997">"Rodyti maitinimo mygtuko parinktį, kuri išjungia „Smart Lock“, atrakinimą naudojant kontrolinį kodą ir užrakinimo ekrano pranešimus"</string>
+ <string name="lockdown_settings_summary" msgid="429230431748285997">"Rodyti maitinimo mygtuko parinktį, kuri išjungia „Smart Lock“, atrakinimą naudojant piršto antspaudą ir užrakinimo ekrano pranešimus"</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Nėra"</string>
<string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g> / <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
<string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"Pvz., Tomo „Android“."</string>
@@ -392,7 +382,8 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privatumas"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Išjungė administratorius"</string>
<string name="security_status_title" msgid="5848766673665944640">"Saugos būsena"</string>
- <string name="security_dashboard_summary" msgid="6757421634477554939">"Ekrano užraktas, kontrolinis kodas"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Ekrano užraktas, atrakinimas pagal veidą"</string>
+ <string name="security_dashboard_summary" msgid="6757421634477554939">"Ekrano užraktas, piršto antspaudas"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekrano užraktas"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Veidas pridėtas"</string>
<string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"Palieskite, kad nust. veido autentifik."</string>
@@ -401,15 +392,31 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Atrakinimas naudojant veidą"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Autentifikavimas naudojant veidą"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Naudokite veidą, norėdami atrakinti telefoną, įgalioti pirkimo veiksmus arba prisijungti prie programų."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Naudokite savo veidą"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Atrakinkite telefoną ir patvirtinkite pirkimo operacijas veidu.\n\nPastaba: negalite atrakinti šio įrenginio veidu. Norėdami gauti daugiau informacijos, susisiekite su organizacijos administratoriumi."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Naudokite veidą, norėdami atrakinti telefoną, įgalioti pirkimo veiksmus arba prisijungti prie programų"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Galite pridėti daugiausia tiek kontrolinių kodų: <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Veidas turi būti apskritimo centre"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Atlikti vėliau"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Galite pridėti daugiausia tiek veidų: <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Pridėjote maksimalų skaičių veidų"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Negalima pridėti daugiau veidų"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registracija neužbaigta"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"GERAI"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Pasiektas veido registracijos laiko apribojimas. Bandykite dar kartą."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Nepavyko užregistruoti veido."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Viskas nustatyta. Atrodo gerai."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Atlikta"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Veido naudojimas"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Atrakinti įrenginį"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Prisij. prie progr. ir mokėj."</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Atrakinti, jei akys atmerktos"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Naudojant veido autentifikavimą, akys turi būti atmerktos"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Pašal. veido duom."</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Patobulinti veido duomenis"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Veidas gali būti naudojamas norint atrakinti įrenginį ir pasiekti programas. "<annotation id="url">"Sužinokite daugiau"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Kontr. kodo jutiklis"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Kontrolin. kodų tvark."</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Kontrolinių kodų naud."</string>
- <string name="fingerprint_add_title" msgid="1926752654454033904">"Pridėti kontrolinį kodą"</string>
+ <string name="fingerprint_add_title" msgid="1926752654454033904">"Pridėti piršto antspaudą"</string>
<string name="fingerprint_enable_keyguard_toggle_title" msgid="5078060939636911795">"ekrano užraktas"</string>
<plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="624961700033979880">
<item quantity="one">Nustatytas <xliff:g id="COUNT_1">%1$d</xliff:g> piršto atspaudas</item>
@@ -419,16 +426,16 @@
</plurals>
<string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
<string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Atrakinimas piršto atspaudu"</string>
- <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Kontrolinio kodo naudojimas"</string>
- <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tiesiog palieskite kontrolinio kodo jutiklį, kad galėtumėte atrakinti telefoną, įgalioti pirkimo operacijas arba prisijungti prie programų. Naudojant visus pridėtus kontrolinius kodus bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate.\n\nPastaba: kontrolinis kodas gali būti ne toks saugus kaip sudėtingas atrakinimo piešinys ar PIN kodas."</string>
+ <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Piršto antspaudo naudojimas"</string>
+ <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Tiesiog palieskite piršto antspaudo jutiklį, kad galėtumėte atrakinti telefoną, įgalioti pirkimo operacijas arba prisijungti prie programų. Naudojant visus pridėtus kontrolinius kodus bus galima atlikti šiuos veiksmus, todėl atidžiai rinkitės, kieno kontrolinius kodus pridedate.\n\nPastaba: piršto antspaudas gali būti ne toks saugus kaip sudėtingas atrakinimo piešinys ar PIN kodas."</string>
<string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="1550756694054944874">"Atrakinkite telefoną ir patvirtinkite pirkimo operacijas piršto atspaudu.\n\nPastaba: negalite atrakinti šio įrenginio piršto atspaudu. Norėdami gauti daugiau informacijos, susisiekite su organizacijos administratoriumi."</string>
<string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="6817326798834882531">"Atrakinkite telefoną ir patvirtinkite pirkimo operacijas piršto atspaudu.\n\nPastaba: piršto atspaudas gali būti ne toks saugus kaip patikimas atrakinimo piešinys ar PIN kodas."</string>
<string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Atšaukti"</string>
<string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Tęsti"</string>
<string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Praleisti"</string>
<string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="1961957425135180242">"Kitas"</string>
- <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Praleisti kontrolinį kodą?"</string>
- <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Kontrolinio kodo sąranka užtrunka tik minutę ar dvi. Jei praleisite šį veiksmą, vėliau kontrolinį kodą galėsite pridėti nustatymuose."</string>
+ <string name="setup_fingerprint_enroll_skip_title" msgid="362050541117362034">"Praleisti piršto antspaudą?"</string>
+ <string name="setup_fingerprint_enroll_skip_after_adding_lock_text" msgid="958990414356204763">"Piršto antspaudo sąranka užtrunka tik minutę ar dvi. Jei praleisite šį veiksmą, vėliau piršto antspaudą galėsite pridėti nustatymuose."</string>
<string name="lock_screen_intro_skip_title" msgid="4988210105913705679">"Praleisti ekrano užraktą?"</string>
<string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="1581834104051243425">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti planšetiniu kompiuteriu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
<string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="4629503416877189572">"Įrenginio apsaugos funkcijos nebus įjungtos. Negalėsite užtikrinti, kad kiti asmenys negalėtų pasinaudoti įrenginiu, jei jis bus pavogtas ar nustatytas iš naujo arba jį pamesite."</string>
@@ -440,7 +447,7 @@
<string name="go_back_button_label" msgid="4745265266186209467">"Grįžti"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="3051496861358227199">"Palieskite jutiklį"</string>
<string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="8793966374365960368">"Jis yra telefono užpakalinėje dalyje. Naudokite smilių."</string>
- <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Įrenginio ir kontrolinio kodo jutiklio vietos iliustracija"</string>
+ <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Įrenginio ir piršto antspaudo jutiklio vietos iliustracija"</string>
<string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Pavadinimas"</string>
<string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"Gerai"</string>
<string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Ištrinti"</string>
@@ -449,7 +456,7 @@
<string name="security_settings_fingerprint_enroll_repeat_title" msgid="2819679722403209778">"Patraukite ir vėl prilieskite"</string>
<string name="security_settings_fingerprint_enroll_repeat_message" msgid="6158989350522518586">"Vis patraukite pirštą, kad pridėtumėte skirtingas piršto atspaudo dalis"</string>
<string name="security_settings_fingerprint_enroll_finish_title" msgid="7567276170287972230">"Piršto atspaudas pridėtas"</string>
- <string name="security_settings_fingerprint_enroll_finish_message" msgid="8970048776120548976">"Kai rodoma ši piktograma, tapatybei nustatyti ar pirkimo operacijai patvirtinti naudokite kontrolinį kodą"</string>
+ <string name="security_settings_fingerprint_enroll_finish_message" msgid="8970048776120548976">"Kai rodoma ši piktograma, tapatybei nustatyti ar pirkimo operacijai patvirtinti naudokite piršto antspaudą"</string>
<string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"Atlikti vėliau"</string>
<string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Praleisti pirštų atspaudų nustatymą?"</string>
<string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Pasirinkote naudoti piršto atspaudą kaip vieną iš telefono atrakinimo būdų. Jei praleisite dabar, turėsite nustatyti funkciją vėliau. Nustatymas apytiksliai užtruks tik minutę."</string>
@@ -458,23 +465,23 @@
<string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Oi, tai ne jutiklis"</string>
<string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="2989019978041986175">"Smiliumi palieskite jutiklį tel. užp. dalyje."</string>
<string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Registracija neužbaigta"</string>
- <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Pasiektas kontrolinio kodo registracijos laiko apribojimas. Bandykite dar kartą."</string>
- <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Nepavyko užregistruoti kontrolinio kodo. Bandykite dar kartą arba atlikite tai kitu pirštu."</string>
+ <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Pasiektas piršto antspaudo registracijos laiko apribojimas. Bandykite dar kartą."</string>
+ <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Nepavyko užregistruoti piršto antspaudo. Bandykite dar kartą arba atlikite tai kitu pirštu."</string>
<string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Pridėti kitą"</string>
<string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Kitas"</string>
- <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Naudodami kontrolinį kodą galite atrakinti telefoną, be to, galite įgalioti pirkimo veiksmus ir programų prieigą. "<annotation id="url">"Sužinokite daugiau"</annotation></string>
- <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Ekrano užrakto parinktis išjungta. Jei norite sužinoti daugiau, susisiekite su savo organizacijos administratoriumi. "<annotation id="admin_details">"Daugiau išsamios informacijos"</annotation>\n\n"Vis tiek galite naudoti savo kontrolinį kodą ir įgalioti pirkinius bei prieigą prie programų. "<annotation id="url">"Sužinokite daugiau"</annotation></string>
+ <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Naudodami piršto antspaudą galite atrakinti telefoną, be to, galite įgalioti pirkimo veiksmus ir programų prieigą. "<annotation id="url">"Sužinokite daugiau"</annotation></string>
+ <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Ekrano užrakto parinktis išjungta. Jei norite sužinoti daugiau, susisiekite su savo organizacijos administratoriumi. "<annotation id="admin_details">"Daugiau išsamios informacijos"</annotation>\n\n"Vis tiek galite naudoti savo piršto antspaudą ir įgalioti pirkinius bei prieigą prie programų. "<annotation id="url">"Sužinokite daugiau"</annotation></string>
<string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Patraukite pirštą, tada vėl palieskite jutiklį"</string>
<string name="fingerprint_add_max" msgid="1020927549936895822">"Galite pridėti iki <xliff:g id="COUNT">%d</xliff:g> kontrol. kod."</string>
<string name="fingerprint_intro_error_max" msgid="6864066984678078441">"Pridėjote maksimalų skaičių kontrolinių kodų"</string>
<string name="fingerprint_intro_error_unknown" msgid="1905692132326523040">"Negalima pridėti daugiau kontrolinių kodų"</string>
<string name="fingerprint_last_delete_title" msgid="6410310101247028988">"Pašalinti visus kontrolinius kodus?"</string>
<string name="fingerprint_delete_title" msgid="1368196182612202898">"Pašalinti „<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>“"</string>
- <string name="fingerprint_delete_message" msgid="8597787803567398131">"Ar norite ištrinti šį kontrolinį kodą?"</string>
+ <string name="fingerprint_delete_message" msgid="8597787803567398131">"Ar norite ištrinti šį piršto antspaudą?"</string>
<string name="fingerprint_last_delete_message" msgid="7852321001254275878">"Negalėsite naudoti kontrolinių kodų norėdami atrakinti telefoną, įgalioti pirkimo procesus ar prisijungti prie programų"</string>
<string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"Negalėsite naudoti kontrolinių kodų norėdami atrakinti darbo profilį, įgalioti pirkimo operacijas ar prisijungti prie darbo programų"</string>
<string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"Taip, pašalinti"</string>
- <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Naudokite kontrolinį kodą, kad galėtumėte tęsti."</string>
+ <string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"Naudokite piršto antspaudą, kad galėtumėte tęsti."</string>
<string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifruotė"</string>
<string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifruoti planšetinį kompiuterį"</string>
<string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifruoti telefoną"</string>
@@ -546,11 +553,11 @@
<string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Aukštas saugos lygis"</string>
<string name="unlock_set_do_later_title" msgid="4894767558414979243">"Ne dabar"</string>
<string name="current_screen_lock" msgid="4104091715420072219">"Esamas ekrano užraktas"</string>
- <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Kontrolinis kodas + atrakinimo piešinys"</string>
- <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Kontrolinis kodas + PIN kodas"</string>
- <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Kontrolinis kodas + slaptažodis"</string>
- <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Tęsti be kontrolinio kodo"</string>
- <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Telefoną galite atrakinti kontroliniu kodu. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
+ <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Piršto antspaudas + atrakinimo piešinys"</string>
+ <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Piršto antspaudas + PIN kodas"</string>
+ <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Piršto antspaudas + slaptažodis"</string>
+ <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Tęsti be piršto antspaudo"</string>
+ <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Telefoną galite atrakinti piršto antspaudu. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
<string name="face_unlock_set_unlock_pattern" msgid="8792301636367000123">"Veido autentifikavimas ir atrakinimo piešinys"</string>
<string name="face_unlock_set_unlock_pin" msgid="1196620299595657479">"Veido autentifikavimas ir PIN kodas"</string>
<string name="face_unlock_set_unlock_password" msgid="223117276773907474">"Veido autentifikavimas ir slaptažodis"</string>
@@ -562,7 +569,7 @@
<string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Piešinys"</string>
<string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN kodas"</string>
<string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Slaptažodis"</string>
- <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"Kai nustatysite ekrano užraktą, taip pat galėsite nustatyti kontrolinį kodą skiltyje „Nustatymai > Sauga“."</string>
+ <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"Kai nustatysite ekrano užraktą, taip pat galėsite nustatyti piršto antspaudą skiltyje „Nustatymai > Sauga“."</string>
<string name="unlock_disable_lock_title" msgid="1427036227416979120">"Išjungti ekrano užraktą"</string>
<string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"Pašalinti įrenginio apsaugą?"</string>
<string name="unlock_disable_frp_warning_title_profile" msgid="5507136301904313583">"Pašalinti profilio apsaugą?"</string>
@@ -914,6 +921,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Pasirinkite bent vieną „Wi‑Fi“ viešosios interneto prieigos taško dažnio juostą:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP nustatymai"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privatumas"</string>
<string name="wifi_shared" msgid="844142443226926070">"Bendrinti su kitais įrenginio naudotojais"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nepakeista)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Pasirinkite"</string>
@@ -953,7 +961,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Atšaukti"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Pamiršti tinklą?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Visi šio tinklo slaptažodžiai turi būti ištrinti"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Išsaugoti tinklai"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d tinklas</item>
<item quantity="few">%d tinklai</item>
@@ -1134,8 +1141,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Šviesumas"</string>
<string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano šviesumą"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Prisitaikantis šviesumas"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Įjungta"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Išjungta"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Pageidaujamas šviesumas yra labai mažas"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Pageidaujamas šviesumas yra mažas"</string>
@@ -1154,7 +1160,7 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimizuokite šviesumo lygį pagal esamą šviesą. Kai ši funkcija įjungta, vis tiek galite laikinai koreguoti šviesumą."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"Ekrano šviesumas automatiškai prisitaikys prie jūsų aplinkos ir veiklos. Galite šliaužiklį perkelti patys, kad prisitaikantis šviesumas įsimintų jūsų nuostatas."</string>
<string name="night_display_title" msgid="2626451512200357686">"Nakties šviesa"</string>
- <string name="night_display_text" msgid="1837277457033025056">"Nustačius „Nakties šviesą“, naktį rodomas gintaro spalvos atspalvio ekranas. Taip bus patogiau žiūrėti į ekraną prietemoje ir galbūt lengviau užmigsite."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"Nustačius Nakties šviesą, naktį rodomas gintaro spalvos atspalvio ekranas. Taip bus patogiau žiūrėti į ekraną prietemoje ir galbūt lengviau užmigsite."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Tvarkaraštis"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Nėra"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Įjungiama pasirinktu laiku"</string>
@@ -1231,6 +1237,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Nepavyksta pakeisti PIN kodo.\nTikriausiai netinkamas PIN kodas."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM kortelės PIN kodas sėkmingai pakeistas"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Neįmanoma pakeisti SIM kortelės užrakto būsenos.\nTikriausiai netinkamas PIN kodas."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Nepavyksta išjungti PIN kodo."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Nepavyksta įjungti PIN kodo."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Gerai"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Atšaukti"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Rastos kelios SIM"</string>
@@ -1406,7 +1414,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Reikia suformatuoti: <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"Suformatavus ištrinami visi duomenys, šiuo metu saugomi: <xliff:g id="NAME_1">^1</xliff:g>."</b>" Kad neprarastumėte duomenų, turėtumėte sukurti atsarginę kopiją."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ištrinti ir formatuoti"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatuojama <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Neatjunkite saugyklos (<xliff:g id="NAME">^1</xliff:g>), kol formatuojama."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Neatjunkite saugyklos (<xliff:g id="NAME">^1</xliff:g>), kol ji formatuojama."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Perkelti duom. į naują atmintį"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Galite perkelti nuotraukas, failus ir kai kurias programas į šią naują saugyklą (<xliff:g id="NAME">^1</xliff:g>). \n\nPerkėlimas užtruks maždaug <xliff:g id="TIME">^2</xliff:g> ir bus atlaisvinta <xliff:g id="SIZE">^3</xliff:g> vidinės saugyklos vietos. Atliekant šį veiksmą kai kurios programos neveiks."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Perkelti dabar"</string>
@@ -1790,9 +1798,6 @@
<string name="installed" msgid="3070865169422600098">"Įdiegta"</string>
<string name="no_applications" msgid="7336588977497084921">"Nėra programų"</string>
<string name="internal_storage" msgid="1584700623164275282">"Vidinė atmint."</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"vidinė atmintis"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB atmintinė"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD kort. atm."</string>
<string name="recompute_size" msgid="7722567982831691718">"Iš naujo apskaičiuojamas dydis..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Ištrinti programos duomenis?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Visi šios programos duomenys bus visam laikui ištrinti. Tai taikoma visiems failams, nustatymams, paskyroms, duomenims ir kt."</string>
@@ -1801,24 +1806,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Programa nerasta įdiegtų programų sąraše."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Nepavyko išvalyti programos saugyklos."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ši programa planšetiniame kompiuteryje gali pasiekti:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ši programa telefone gali pasiekti:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ši programa gali pasiekti nurodytus elementus planšetiniame kompiuteryje. Siekiant padidinti našumą ir sumažinti atminties naudojimą, kai kurie iš šių leidimų pasiekiami „<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>“, nes ji veikia ta pačia eiga kaip „<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>“:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ši programa gali pasiekti nurodytus elementus telefone. Siekiant padidinti našumą ir sumažinti atminties naudojimą, kai kurie iš šių leidimų pasiekiami „<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>“, nes ji veikia ta pačia eiga kaip „<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>“:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ir <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Naudodami šią programą galite būti apmokestinti:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Siųsti brangesnį SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Apskaičiuojama..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Nepavyko apskaičiuoti paketo dydžio."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Neturite įdiegtų trečiosios šalies programų."</string>
<string name="version_text" msgid="9189073826278676425">"<xliff:g id="VERSION_NUM">%1$s</xliff:g> versija"</string>
<string name="move_app" msgid="5042838441401731346">"Perkelti"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Perkelti į planšetinį kompiuterį"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Perkelti į telefoną"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Perkelti į USB atmintinę"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Perkelti į SD kortelę"</string>
- <string name="moving" msgid="6431016143218876491">"Perkėlimas"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Jau vykdomas kitas perkėlimas."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nėra pakankamai vietos atmintinėje."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Programos nėra."</string>
@@ -1828,17 +1825,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Įrenginio administravimo programos negalima įdiegti išorinėje laikmenoje"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Priverstinai sustabdyti?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Jei priverstinai sustabdysite programą, ji gali neveikti tinkamai."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Nepavyko perkelti programos. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Pageidaujama diegimo vieta"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Pakeisti pageidaujamą naujų programų diegimo vietą"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Neleisti integruotos programos?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Išjungti programą"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Jei išjungsite šią programą, „Android“ ir kitos programos gali neveikti, kaip numatyta."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ištrinti duomenis ir neleisti programos?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Jei išjungsite šią programą, „Android“ ir kitos programos gali neveikti, kaip numatyta. Be to, bus ištrinti duomenys."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Išjungti pranešimus?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jei išjungsite šios programos pranešimus, galite praleisti svarbius įspėjimus ir naujinius."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Parduotuvė"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Išsami programos informacija"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Programa įdiegta iš „<xliff:g id="APP_STORE">%1$s</xliff:g>“"</string>
@@ -2031,6 +2024,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Naudoti paslaugą"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Naudoti spalvų taisymą"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Naudoti subtitrus"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Tęsti"</string>
<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="6371077608778830020">"Pridėkite klausos aparatą"</string>
@@ -2190,8 +2184,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jei apribosite programos veiklą fone, ji gali netinkamai veikti"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Negalite apriboti progr., nes ji nenust. optimiz. akum. naud.\n\nJei norite apr. progr., pirmiausia įj. akum. naud. optimiz."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Ekrano naudojimas po paskutinio visiško įkrovimo"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrano suvartojama energija"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobiliojo ryšio tinklo nuskaitymas"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Akumuliatoriaus naudojimas nuo paskutinio visiško įkrovimo"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Kiek laiko ekranas buvo įjungtas po visiško įkrovimo"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Įrenginio naudojimas po visiško įkrovimo"</string>
@@ -2218,11 +2210,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Išsami naudojimo informacija"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Reguliuoti maitinimo naudojimą"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Įtraukti paketai"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Programos, eikvojančios akumuliatoriaus energiją"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Neleidžiama įjungti įrenginio miego būsenos"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Įrenginys pažadinamas fone"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Dažnai siunčiamos vietos užklausos"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Netinkamai veikiančių programų: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Programos veikia įprastai"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefono fone veikiančios programos naudoja įprastą akumuliatoriaus energijos kiekį"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Planšetinio kompiuterio fone veikiančios programos naudoja įprastą akumuliatoriaus energijos kiekį"</string>
@@ -2298,6 +2285,7 @@
<item quantity="many">Ribojamas %1$d programos akumuliatoriaus energijos vartojimas</item>
<item quantity="other">Ribojamas %1$d programų akumuliatoriaus energijos vartojimas</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Apribota <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Šios programos akumuliatoriaus energiją naudojo fone. Apribotos programos gali neveikti tinkamai, o pranešimai gali vėluoti."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Akumuliatoriaus tvarkytuvės naudojimas"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Aptikti, kai programos eikvoja akumuliatoriaus energiją"</string>
@@ -2477,23 +2465,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Atšaukti"</string>
<string name="tts_reset" msgid="2661752909256313270">"Nustatyti iš naujo"</string>
<string name="tts_play" msgid="2628469503798633884">"Paleisti"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Maitinimo valdymas"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Atnaujinamas „Wi-Fi“ nustatymas"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atnaujinamas „Bluetooth“ nustatymas"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"įjungta"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"išjungta"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"įjungiama"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"išjungiama"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Vietovė"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinchronizavimas"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Šviesumas <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatinis"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"visiškas"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"pusinis"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"išjungta"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Prisijungimo duomenų saugykla"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Įdiegti iš saugyklos"</string>
@@ -2651,7 +2622,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Pasirinkti viską"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Duomenų naudojimas"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Programos duomenų naud."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mob. r. duom. ir „Wi‑Fi“"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operatoriaus duomenų apskaita gali skirtis nuo jūsų įrenginio apskaitos."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Programos naudojimas"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"PROGRAMOS INFORMACIJA"</string>
@@ -3038,7 +3009,6 @@
<item quantity="many">Rodyti %d paslėpto elemento</item>
<item quantity="other">Rodyti %d paslėptų elementų</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Sutraukti"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Tinklas ir internetas"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilusis"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"duomenų naudojimas"</string>
@@ -3050,12 +3020,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programos ir pranešimai"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Leidimai, numatytosios programos"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Prieiga prie pranešimų negalima darbo profilio programoms."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Paskyros"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nepridėta jokių paskyrų"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Numatytosios programos"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Kalbos, laikas, atsarginė kopija, naujiniai"</string>
<string name="search_results_title" msgid="1796252422574886932">"Nustatymai"</string>
- <string name="search_menu" msgid="6283419262313758339">"Ieškoti nustatymų"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, tinklo ryšys, internetas, belaidis ryšys, duomenys, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, perjungimas, valdymas"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"teksto pranešimas, žinutės siuntimas, pranešimai, susirašinėjimas, numatytasis"</string>
@@ -3100,6 +3070,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"mokėti, paliesti, mokėjimai"</string>
<string name="keywords_backup" msgid="470070289135403022">"atsarginė kopija, kurti atsarginę kopiją"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gestas"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"veidas, atrakinti, autentifikavimas, prisijungti"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"IMEI, MEID, MIN, PRL versija, IMEI SV"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"tinklas, mobiliojo ryšio tinklo būsena, paslaugos būsena, signalo stiprumas, mobiliojo ryšio tinklo tipas, tarptinklinis ryšys, ICCID"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serijos numeris, aparatinės įrangos versija"</string>
@@ -3107,8 +3078,9 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"Tamsi tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"riktas"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Aplinkos ekranas, užrakinimo ekranas"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"užrakinimo ekrano pranešimas"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"veidas"</string>
- <string name="keywords_fingerprint_settings" msgid="239222512315619538">"kontrolinis kodas"</string>
+ <string name="keywords_fingerprint_settings" msgid="239222512315619538">"piršto antspaudas"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"pritemdyti ekraną, jutiklinis ekranas, akumuliatorius, išmanusis šviesumas, dinaminis šviesumas"</string>
<string name="keywords_auto_rotate" msgid="5620879898668211494">"pasukti, apversti, pasukimas, stačia, gulsčia, orientacija, vertikali, horizontali"</string>
<string name="keywords_system_update_settings" msgid="7752189778843741773">"atnaujinti, android"</string>
@@ -3542,9 +3514,9 @@
<string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiant būtų prašoma įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?"</string>
<string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiant būtų prašoma nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?"</string>
<string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiat būtų prašoma įvesti slaptažodį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti įvesti slaptažodį norint paleisti jūsų įrenginį?"</string>
- <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Be to, kad atrakinant įrenginį prašoma kontrolinio kodo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?"</string>
- <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Be to, kad atrakinant įrenginį prašoma kontrolinio kodo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?"</string>
- <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Be kontrolinio kodo, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti slaptažodį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti slaptažodžio paleidžiant įrenginį?"</string>
+ <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Be to, kad atrakinant įrenginį prašoma piršto antspaudo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?"</string>
+ <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Be to, kad atrakinant įrenginį prašoma piršto antspaudo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?"</string>
+ <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Be piršto antspaudo, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti slaptažodį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti slaptažodžio paleidžiant įrenginį?"</string>
<string name="encryption_interstitial_message_pin_for_face" msgid="2017438765366716760">"Be veido, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti PIN kodą prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti PIN kodo paleidžiant įrenginį?"</string>
<string name="encryption_interstitial_message_pattern_for_face" msgid="3551827507967661552">"Be veido, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami nubrėžti atrakinimo piešinį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti atrakinimo piešinio paleidžiant įrenginį?"</string>
<string name="encryption_interstitial_message_password_for_face" msgid="3452793542112093614">"Be veido, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti slaptažodį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti slaptažodžio paleidžiant įrenginį?"</string>
@@ -3558,7 +3530,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Kai įvesite PIN kodą, norėdami paleisti įrenginį, pritaikymo neįgaliesiems paslaugos, pvz., „<xliff:g id="SERVICE">%1$s</xliff:g>“, dar nebus pasiekiamos."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Kai nupiešite atrakinimo piešinį, norėdami paleisti įrenginį, pritaikymo neįgaliesiems paslaugos, pvz., „<xliff:g id="SERVICE">%1$s</xliff:g>“, dar nebus pasiekiamos."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Kai įvesite slaptažodį, norėdami paleisti įrenginį, pritaikymo neįgaliesiems paslaugos, pvz., „<xliff:g id="SERVICE">%1$s</xliff:g>“, dar nebus pasiekiamos."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Pastaba: paleidus iš naujo nebus galima paleisti programos, kol neatrakinsite telefono"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Pastaba: jei esate nustatę ekrano užraktą ir iš naujo paleisite telefoną, nebus galima atidaryti programos, kol neatrakinsite telefono"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI informacija"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI susijusi informacija"</string>
<string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g> lizdas)"</string>
@@ -3616,11 +3588,11 @@
<string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Nėra užklausų dėl leidimų"</string>
<string name="filter_all_apps" msgid="1988403195820688644">"Visos programos"</string>
<string name="filter_enabled_apps" msgid="5395727306799456250">"Įdiegtos programos"</string>
- <string name="filter_instant_apps" msgid="574277769963965565">"Akimirksniu įkeliamos programėlės"</string>
+ <string name="filter_instant_apps" msgid="574277769963965565">"Akimirksniu įkeliamos programos"</string>
<string name="filter_personal_apps" msgid="3277727374174355971">"Asmeninės"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Darbas"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Programos: visos"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Programos: išjungtos"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Išjungta"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorijos: skubi svarba"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorijos: maža svarba"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorijos: išjungtos"</string>
@@ -3683,7 +3655,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Naudojimo įspėjimai"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Rodyti visą įrenginio naudojimo info."</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Rodyti progr. naud. inform."</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Intensyvus naudojimas"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> programa veikia neįprastai</item>
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> programos veikia neįprastai</item>
@@ -3855,6 +3826,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Vidinė saugykla: panaudota: <xliff:g id="PERCENTAGE">%1$s</xliff:g>, laisva: <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Įjungti miego būseną, jei <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neatliekama jokių veiksmų"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Ekrano fonas, miego būsena, šrifto dydis"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Įjungti miego būseną, jei 10 minučių neatliekama jokių veiksmų"</string>
<string name="memory_summary" msgid="8080825904671961872">"Vid. naudojama atminties: <xliff:g id="USED_MEMORY">%1$s</xliff:g> iš <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Prisijungta kaip <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3870,7 +3843,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS pranešimai neleidžiami"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Fotoaparatas neleidžiamas"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Ekrano kopija neleidžiama"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Nepavyko išjungti atsarginių kopijų funkcijos"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Nepavyko atidaryti šios programos"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Jei kyla klausimų, susisiekite su IT administratoriumi"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Daugiau išsamios informacijos"</string>
@@ -4002,7 +3974,7 @@
<string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Reikalauti atrakinimo piešinio norint paleisti įrenginį. Kai įrenginys išjungtas, juo nepriimami skambučiai, pranešimai, informaciniai pranešimai ar įspėjimai."</string>
<string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Reikalauti PIN kodo norint paleisti įrenginį. Kai įrenginys išjungtas, juo nepriimami skambučiai, pranešimai, informaciniai pranešimai ar įspėjimai."</string>
<string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Reikalauti slaptažodžio norint paleisti įrenginį. Kai įrenginys išjungtas, juo nepriimami skambučiai, pranešimai, informaciniai pranešimai ar įspėjimai."</string>
- <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Pridėkite kitą kontrolinį kodą"</string>
+ <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Pridėkite kitą piršto antspaudą"</string>
<string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Atrakinkite naudodami kitą pirštą"</string>
<string name="battery_saver_on_summary" msgid="7722791295871319534">"Įjungta"</string>
<string name="battery_saver_off_scheduled_summary" msgid="3953785517002197881">"Bus įjungta pasiekus <xliff:g id="BATTERY_PERCENTAGE">%1$s</xliff:g>"</string>
@@ -4044,9 +4016,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Imituoti ekraną su išpjova"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nėra"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Numatytasis įrenginio nustatymas"</string>
<string name="special_access" msgid="3458780842491881155">"Spec. prieiga prie prog."</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> programa gali naudoti neribotus duomenis</item>
@@ -4070,11 +4042,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Prisijungta prie „<xliff:g id="ID_1">%1$s</xliff:g>“"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Prisijungta prie kelių įrenginių"</string>
<string name="demo_mode" msgid="2798762752209330277">"Sistemos NS demonstracinis režimas"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Naktinis režimas"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Nustatyti naktinį režimą"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Tamsus režimas"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Nustatyti tamsų režimą"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Sparčiųjų nustatymų kūrėjo išklotinės elementai"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"„Winscope“ pėdsakas"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Darbo profilio nustatymai"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktų paieška"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Leiskite nustatyti skambintojus ir kontaktus atliekant organizacijos kontaktų paiešką"</string>
@@ -4121,18 +4092,22 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefono tikrinimas dukart palietus"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Planšetinio kompiuterio tikrinimas dukart palietus"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Įrenginio tikrinimas dukart palietus"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Dukart palieskite ekraną, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, dukart palieskite ekraną."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefono tikrinimas pakėlus"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Planšetinio kompiuterio tikrinimas pakėlus"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Įrenginio tikrinimas pakėlus"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Paimkite telefoną, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Paimkite planšetinį kompiuterį, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Paimkite įrenginį, jei norite sužinoti laiką ir peržiūrėti pranešimus, piktogramas bei kitą informaciją."</string>
- <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Perbraukimas kontrolinio kodo jutikliu norint peržiūrėti pranešimus"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Pažadinti ekraną"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, paimkite telefoną."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, paimkite planšetinį kompiuterį."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, paimkite įrenginį."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Pažadinimo užrakto ekrano gestas"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
+ <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Perbraukimas piršto antspaudo jutikliu norint peržiūrėti pranešimus"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Perbr. kontr. k. jutikliu"</string>
- <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Jei norite patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu telefono užpakalinėje dalyje."</string>
- <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Jei norite greitai patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu planšetinio kompiuterio užpakalinėje dalyje."</string>
- <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Jei norite patikrinti pranešimus, perbraukite žemyn kontrolinio kodo jutikliu įrenginio užpakalinėje dalyje."</string>
+ <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Jei norite patikrinti pranešimus, perbraukite žemyn piršto antspaudo jutikliu telefono užpakalinėje dalyje."</string>
+ <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Jei norite greitai patikrinti pranešimus, perbraukite žemyn piršto antspaudo jutikliu planšetinio kompiuterio užpakalinėje dalyje."</string>
+ <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Jei norite patikrinti pranešimus, perbraukite žemyn piršto antspaudo jutikliu įrenginio užpakalinėje dalyje."</string>
<string name="fingerprint_swipe_for_notifications_suggestion_title" msgid="1677291167470357802">"Greitai peržiūrėkite pranešimus"</string>
<string name="gesture_setting_on" msgid="3455094265233870280">"Įjungta"</string>
<string name="gesture_setting_off" msgid="5230169535435881894">"Išjungta"</string>
@@ -4142,10 +4117,10 @@
<string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Nepasiekiamas įrenginiuose, kuriuose taik. operat. pasirink. ribojimas"</string>
<string name="oem_lock_info_message" msgid="9218313722236417510">"Norėdami įgalinti įrenginio apsaugos funkciją, paleiskite įrenginį iš naujo."</string>
<string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"Iš viso pasiekiama: <xliff:g id="SIZE">%1$s</xliff:g>\n\nPaskutinį kartą vykdyta <xliff:g id="DATE">%2$s</xliff:g>"</string>
- <string name="web_action_enable_title" msgid="4051513950976670853">"Akimirksniu įkeliamos programėlės"</string>
+ <string name="web_action_enable_title" msgid="4051513950976670853">"Akimirksniu įkeliamos programos"</string>
<string name="web_action_enable_summary" msgid="3108127559723396382">"Atidaryti nuorodas programose, net jei jos neįdiegtos"</string>
- <string name="web_action_section_title" msgid="7364647086538399136">"Akimirksniu įkeliamos programėlės"</string>
- <string name="instant_apps_settings" msgid="8827777916518348213">"„Android“ akimirksniu įkeliamų programėlių nuostatos"</string>
+ <string name="web_action_section_title" msgid="7364647086538399136">"Akimirksniu įkeliamos programos"</string>
+ <string name="instant_apps_settings" msgid="8827777916518348213">"„Android“ akimirksniu įkeliamų programų nuostatos"</string>
<string name="domain_url_section_title" msgid="7046835219056428883">"Įdiegtos programos"</string>
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Saugyklą dabar tvarko saugyklos valdytojas"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> paskyros"</string>
@@ -4215,7 +4190,6 @@
<item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> bandymo</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> bandymų</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Sukurta šio įrenginio duomenų atsarginė kopija"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Šį įrenginį tvarko jūsų organizacija."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Šį įrenginį tvarko „<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>“."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4262,6 +4236,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Automatinio pildymo paslauga"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatinis, pildymas, automatinis pildymas"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Įsitikinkite, kad pasitikite šia programa</b> <br/> <br/> <xliff:g id=app_name example=„Google“ automatinis pildymas>%1$s</xliff:g> naudodamas informaciją ekrane nustato, ką gali užpildyti automatiškai."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automatinis pildymas"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Registr. į žurnalą lygis"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Didžiausias užklausų skaičius per sesiją"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maks. matomų duomenų rinkinių"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Nustatyti numatytąsias vertes iš naujo"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Automatinio pildymo kūrėjo parinktys nustatytos iš naujo"</string>
<string name="device_theme" msgid="4571803018917608588">"Įrenginio tema"</string>
<string name="default_theme" msgid="7085644992078579076">"Numatytoji"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Tinklo pavadinimas"</string>
@@ -4276,15 +4256,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktyviklio operatoriaus aprūpinimas"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Atnaujinti netrukdymo režimą"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pristabdyti pranešimus, kad neblaškytų dėmesio"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Kas nauja ir verta dėmesio?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Peržiūrėkite naujo telefono apžvalgą"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Peržiūrėkite naujo planšetinio kompiuterio apžvalgą"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Peržiūrėkite naujo įrenginio apžvalgą"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ši funkcija nepasiekiama šiame įrenginyje"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Priversti vykdyti visus GNSS matavimus"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Stebėti visas GNSS konferencijas ir visus dažnius netaikant darbo ciklų"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Visada rodyti strigčių dialogo langą"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Rodyti dialogo langą kiekvieną kartą, kai programa užstringa"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Pasirinkti programą, kurioje įgalinta ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nėra jokių programų, kuriose būtų įgalinta ANGLE, rinkinių"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Programa, kurioje įgalinta ANGLE: „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string>
<string name="directory_access" msgid="4722237210725864244">"Galimybė pasiekti katalogą"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"galimybė pasiekti katalogą"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> („<xliff:g id="DIRECTORY">%2$s</xliff:g>“)"</string>
@@ -4325,4 +4304,87 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Išsami tinklo informacija"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Įrenginio pavadinimas matomas jūsų telefone esančioms programoms. Kai prisijungiate prie „Bluetooth“ įrenginių arba nustatote „Wi-Fi“ viešosios interneto prieigos tašką, jį taip pat gali matyti kiti žmonės."</string>
<string name="devices_title" msgid="7701726109334110391">"Įrenginiai"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Visi nustatymai"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Pasiūlymai"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS duomenys"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS duomenys"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Pasirinkti tinklą"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Atsijungta"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Prisijungta"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Prisijungiama…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nepavyko prisijungti"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nerasta jokių tinklų."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nepavyko rasti tinklų. Bandykite dar kartą."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(uždrausta)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Nėra SIM kortelės"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Išplėstinės skambinimo parinktys"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Pageidaujamas tinklo režimas: pageidautina WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Pageidaujamas tinklo režimas: tik GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Pageidaujamas tinklo režimas: tik WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Pageidaujamas tinklo režimas: CDMA / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Pageidaujamas tinklo režimas: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Pageidaujamas tinklo režimas: CDMA / „EvDo“"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Pageidaujamas tinklo režimas: tik CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Pageidaujamas tinklo režimas: tik „EvDo“"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Pageidaujamas tinklo režimas: CDMA / „EvDo“ / GSM / WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Pageidaujamas tinklo režimas: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Pageidaujamas tinklo režimas: GSM / WCDMA / LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Pageidaujamas tinklo režimas: CDMA ir LTE / EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Pageidaujamas tinklo režimas: pasaulinis"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Pageidaujamas tinklo režimas: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Pageidautinas tinklo režimas: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Pageidaujamas tinklo režimas: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Pageidaujamas tinklo režimas: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Pageidaujamas tinklo režimas: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Pageidaujamas tinklo režimas: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Pageidaujamas tinklo režimas: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Pageidaujamas tinklo režimas: LTE / GSM / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Pageidaujamas tinklo režimas: TDSCDMA / GSM / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Pageidaujamas tinklo režimas: LTE / TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Pageidaujamas tinklo režimas: LTE / TDSCDMA / GSM / WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Pageidaujamas tinklo režimas: TDSCDMA / CDMA / „EvDo“ / GSM / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Pageidaujamas tinklo režimas: LTE / TDSCDMA / CDMA / „EvDo“ / GSM / WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (rekomenduojama)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (rekomenduojama)"</string>
+ <string name="network_global" msgid="959947774831178632">"Visuotinis"</string>
+ <string name="label_available" msgid="1731547832803057893">"Galimi tinklai"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Ieškoma…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registruojama tinkle „<xliff:g id="NETWORK">%s</xliff:g>“…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM kortelė neleidžia užmegzti ryšio su šiuo tinklu."</string>
+ <string name="connect_later" msgid="978991102125216741">"Dabar prie šio tinklo prisijungti nepavyksta. Vėliau bandykite dar kartą."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registruota tinkle."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automatiškai pasirinkti tinklą"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operatoriaus nustatymai"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Nustatyti duomenų paslaugą"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobilieji duomenys"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Prieiga prie duomenų naudojant mobiliojo ryšio tinklą"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Pageidaujamas tinklo tipas"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Pakeisti tinklo veikimo režimą"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Pageidaujamas tinklo tipas"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operatorius"</string>
+ <string name="call_category" msgid="8108654745239563833">"Skambinama"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operatoriaus vaizdo skambučiai"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Sistemos pasirinkimas"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Pakeisti tarptinklinio CDMA ryšio režimą"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Sistemos pasirinkimas"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Tinklas"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Tinklas"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA prenumerata"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Keisti RUIM / SIM ir NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"prenumerata"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatinė registracija…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Leisti tarptinklinį duomenų ryšį?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Daugiau kainodaros informacijos galite gauti susisiekę su tinklo paslaugų teikėju."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Programos duomenų naudojimas"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Netinkamas tinklo režimas (<xliff:g id="NETWORKMODEID">%1$d</xliff:g>). Nepaisyti."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Nepasiekiama, kai prisijungta prie „<xliff:g id="CARRIER">%1$s</xliff:g>“"</string>
+ <string name="see_more" msgid="5953815986207345223">"Žr. daugiau"</string>
+ <string name="see_less" msgid="1250265310929558370">"Žr. mažiau"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> įrenginys prijungtas</item>
+ <item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> įrenginiai prijungti</item>
+ <item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> įrenginio prijungta</item>
+ <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> įrenginių prijungta</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nėra jokių prijungtų įrenginių"</string>
</resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index b9c5fe0..12f76be 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Maksas"</item>
<item msgid="2266114985518865625">"Bezmaksas"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Noklusējuma (izmantot nejaušā secībā atlasītu MAC adresi)"</item>
+ <item msgid="5398461510512959597">"Uzticams"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nē"</item>
<item msgid="3863157480502955888">"Jā"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Vienmēr ieslēgts"</item>
<item msgid="6385301106124765323">"Vienmēr izslēgts"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Izslēgts"</item>
+ <item msgid="2182686878828390312">"Atkļūdošana"</item>
+ <item msgid="5286514712714822064">"Izvērsta informācija"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Tikai mājās"</item>
+ <item msgid="5034813753274486448">"Automātiski"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Ieteicamais režīms: GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Tikai GSM"</item>
+ <item msgid="488474605709912156">"Tikai WCDMA"</item>
+ <item msgid="1912421096218750039">"Automātiskais režīms: GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Automātiskais režīms: CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA bez EvDo"</item>
+ <item msgid="4678789463133969294">"Tikai EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA un LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Vispārējie"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Tikai TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Vispārējie"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index ca39b71..e6f0feb 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Izveidot"</string>
<string name="allow" msgid="3349662621170855910">"Atļaut"</string>
<string name="deny" msgid="6947806159746484865">"Aizliegt"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Aizvērt"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Pārslēgt"</string>
<string name="device_info_default" msgid="7847265875578739287">"Nezināms"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="zero">Lai jūs kļūtu par izstrādātāju, atlikušas <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> darbības.</item>
@@ -33,10 +31,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Nav nepieciešams, ja jau esat izstrādātājs."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Lūdzu, vispirms iespējojiet izstrādātājiem paredzētās opcijas."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Bezvadu sakari un tīkli"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Savienojumi"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Ierīce"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personiski"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Piekļuve"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistēma"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Iespējot datu savienojumu"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Atspējot datu savienojumu"</string>
@@ -122,7 +116,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Ierīces Bluetooth adrese: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vai atvienot <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Apraidīšana"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Nenosaukta Bluetooth ierīce"</string>
<string name="progress_scanning" msgid="192587958424295789">"Notiek meklēšana"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Tuvumā nav atrastas Bluetooth ierīces."</string>
@@ -154,7 +147,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Tālrunī instalētā lietotnē tiek mēģināts ieslēgt Bluetooth savienojumu un padarīt tālruni redzamu citām ierīcēm. Vēlāk varēsiet to mainīt Bluetooth iestatījumos."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Tiek ieslēgta tehnoloģija Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Notiek Bluetooth savienojuma izslēgšana…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automātiski izveidot savienojumu"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth savienojuma pieprasījums"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Pieskarieties, lai izveidotu savienojumu ar ierīci “<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vai vēlaties izveidot savienojumu ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
@@ -182,12 +174,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Pieejamās zvanīšanas ierīces"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Pašlaik pievienotās"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Saglabātās ierīces"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Ierīces pievienošana"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Tiks ieslēgts Bluetooth un izveidots savienojums pārī."</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Savienojuma preferences"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Ierīces, ar kurām savienojums tika izveidots iepriekš"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Ierīces, ar kurām savienojums tika izveidots iepriekš"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth savienojums ir ieslēgts"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Skatīt visas"</string>
<string name="date_and_time" msgid="9062980487860757694">"Datums un laiks"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Laika joslas izvēle"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -270,7 +262,6 @@
<string name="skip_label" msgid="47510779345218297">"Izlaist"</string>
<string name="next_label" msgid="4693520878012668114">"Tālāk"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Valodas"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Valodas preferences"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Noņemt"</string>
<string name="add_a_language" msgid="2330538812283783022">"Pievienot valodu"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -305,7 +296,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Iestatījumi"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Saīsne Iestatījumi"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Lidojuma režīms"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Vairāk"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezvadu sakari un tīkli"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, Bluetooth, lidojuma režīma, mobilo tīklu un VPN pārvaldība"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobilie dati"</string>
@@ -390,6 +380,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Konfidencialitāte"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Atspējoja administrators"</string>
<string name="security_status_title" msgid="5848766673665944640">"Drošības statuss"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Ekrāna bloķēšana, autorizācija pēc sejas"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Ekrāna bloķēšana, pirksta nospiedums"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekrāna bloķēšana"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Seja pievienota"</string>
@@ -399,11 +390,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Atbloķēšana, izmantojot seju"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Autentificēšana, izmantojot seju"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Varat izmantot seju, lai atbloķētu tālruni, apstiprinātu pirkumus un pierakstītos lietotnēs."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Varat izmantot savu seju"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Izmantojiet sejas atpazīšanu, lai atbloķētu savu tālruni vai apstiprinātu pirkumus.\n\nPiezīme. Sejas atpazīšanu nevar izmantot šīs ierīces atbloķēšanai. Lai iegūtu plašāku informāciju, sazinieties ar savas organizācijas administratoru."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Varat izmantot seju, lai atbloķētu tālruni, apstiprinātu pirkumus un pierakstītos lietotnēs"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Varat pievienot ne vairāk kā <xliff:g id="COUNT">%d</xliff:g> pirkstu nospiedumus."</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrējiet seju aplī"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Vēlāk"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Varat pievienot ne vairāk kā <xliff:g id="COUNT">%d</xliff:g> sejas."</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Jūs esat pievienojis maksimālo seju skaitu."</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Nevar pievienot vairāk seju"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Reģistrēšana netika pabeigta."</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"LABI"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Ir sasniegts sejas reģistrēšanas laika ierobežojums. Mēģiniet vēlreiz."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Neizdevās reģistrēt seju."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Viss gatavs!"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Gatavs"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Sejas izmantošana"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Ierīces atbloķēšana"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Pierakst. lietotnēs, maksājumi"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Lai atbloķētu, atveriet acis"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Izmantojot autentificēšanu pēc sejas, acīm jābūt atvērtām"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Noņemt sejas datus"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Uzlabot sejas atpazīšanu"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Sejas atpazīšanu var izmantot, lai atbloķētu ierīci un piekļūtu lietotnēm. "<annotation id="url">"Uzziniet vairāk"</annotation>"."</string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Pirkstu nospiedumi"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Nospiedumu pārvaldība"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Nospieduma lietošana"</string>
@@ -899,6 +906,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Izvēlieties vismaz vienu joslu Wi‑Fi tīklājam:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP iestatījumi"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Konfidencialitāte"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Lūdzu, atlasiet"</string>
@@ -938,7 +946,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Atcelt"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Vai neiegaumēt tīklu?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Visas šī tīkla paroles tiks dzēstas."</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Saglabātie tīkli"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="zero">%d tīkli</item>
<item quantity="one">%d tīkls</item>
@@ -1118,8 +1125,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Spilgtums"</string>
<string name="brightness_summary" msgid="838917350127550703">"Noregulēt ekrāna spilgtumu"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Adaptīvs spilgtums"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Ieslēgt"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Izslēgts"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Vēlamais spilgtuma iestatījums: ļoti mazs"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Vēlamais spilgtuma iestatījums: mazs"</string>
@@ -1215,6 +1221,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Nevar mainīt PIN kodu.\nIespējams, ka PIN kods nav pareizs."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN ir veiksmīgi nomainīts"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Nevar mainīt SIM kartes bloķēšanas stāvokli.\nIespējams, ka ievadījāt nepareizu PIN kodu."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Nevar atspējot PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Nevar iespējot PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Labi"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Atcelt"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Atrastas vairākas SIM kartes"</string>
@@ -1389,7 +1397,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> ir jāformatē.\n\n"<b>"Formatējot ierīci <xliff:g id="NAME_1">^1</xliff:g>, tiks izdzēsti visi tajā pašlaik glabātie dati."</b>" Lai nezaudētu datus, dublējiet tos."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Dzēst un formatēt"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Notiek <xliff:g id="NAME">^1</xliff:g> formatēšana…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Formatēšanas laikā neizņemiet: <xliff:g id="NAME">^1</xliff:g>."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Formatēšanas laikā neizņemiet: <xliff:g id="NAME">^1</xliff:g>."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Pārvietojiet uz jauno krātuvi"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Varat pārvietot fotoattēlus, failus un dažas lietotnes uz šo jauno krātuvi (<xliff:g id="NAME">^1</xliff:g>).\n\nPārvietošana ilgs apmēram <xliff:g id="TIME">^2</xliff:g>, un tādējādi iekšējā atmiņā tiks atbrīvota <xliff:g id="SIZE">^3</xliff:g> liela vieta. Pārvietošanas laikā dažas lietotnes nedarbosies."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Pārvietot tūlīt"</string>
@@ -1772,9 +1780,6 @@
<string name="installed" msgid="3070865169422600098">"Instalēta"</string>
<string name="no_applications" msgid="7336588977497084921">"Nav lietotņu"</string>
<string name="internal_storage" msgid="1584700623164275282">"Iekšējā krātuve"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"iekšējā atmiņa"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB krātuve"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD kartes kr."</string>
<string name="recompute_size" msgid="7722567982831691718">"Notiek izmēra pārrēķināšana..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Vai dzēst lietotnes datus?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Tiks neatgriezeniski dzēsti visi šīs lietotnes dati, tostarp visi faili, iestatījumi, konti, datu bāzes un citi vienumi."</string>
@@ -1783,24 +1788,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Šī lietotne netika atrasta instalēto lietotņu sarakstā."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Neizdevās notīrīt krātuvi lietotnei."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Šai lietotnei jūsu planšetdatorā ir šādas piekļuves tiesības:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Šai lietotnei tālrunī ir tiesības piekļūt šādam saturam:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Šī lietotne planšetdatorā var piekļūt tālāk minētajai informācijai. Lai uzlabotu darbību un samazinātu atmiņas lietojumu, dažas atļaujas ir pieejamas lietotnei <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, jo tā tiek darbināta tajā pašā procesā, kurā tiek darbinātas lietotnes <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>."</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Šī lietotne tālrunī var piekļūt tālāk minētajai informācijai. Lai uzlabotu darbību un samazinātu atmiņas lietojumu, dažas atļaujas ir pieejamas lietotnei <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, jo tā tiek darbināta tajā pašā procesā, kurā tiek darbinātas lietotnes <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>."</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> un <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Šī lietotne var iekasēt no jums naudu:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Nosūtīt īpašo īsziņu"</string>
<string name="computing_size" msgid="1599186977475211186">"Notiek aprēķināšana..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Nevar aprēķināt pakotnes izmēru."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Nav instalēta neviena trešās puses lietotne."</string>
<string name="version_text" msgid="9189073826278676425">"versija <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Pārvietot"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Pārvietot uz planšetdatoru"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Pārvietot uz tālruni"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Pārvietot uz USB krātuvi"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Pārvietot uz SD karti"</string>
- <string name="moving" msgid="6431016143218876491">"Notiek pārvietošana"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Jau norisinās cita migrēšanas darbība."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Atmiņā nepietiek vietas."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Lietotne nepastāv."</string>
@@ -1810,17 +1807,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Ierīces administratora lietotni nevar instalēt ārējā datu nesējā."</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Vai veikt piespiedu apturēšanu?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Piespiedu kārtā apturot lietotnes darbību, var rasties šīs lietotnes darbības traucējumi."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Nevarēja pārvietot lietotni. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Vēlamā instalēšanas vieta"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Mainīt jaunu lietotņu vēlamo instalēšanas vietu"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Vai atspējot iebūvēto lietotni?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Atspējot lietotni"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ja atspējosiet šo lietotni, Android un citas lietotnes, iespējams, vairs nedarbosies, kā paredzēts."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vai dzēst datus un atspējot lietotni?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ja atspējosiet šo lietotni, Android un citas lietotnes, iespējams, vairs nedarbosies, kā paredzēts. Tiks izdzēsti arī jūsu dati."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vai izslēgt paziņojumus?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Izslēdzot paziņojumus šajā lietotnē, varat palaist garām svarīgus brīdinājumus un atjauninājumus."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Veikals"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Lietotnes informācija"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Lietotne instalēta, izmantojot <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2013,6 +2006,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Izmantot pakalpojumu"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Izmantot krāsu korekciju"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Izmantot parakstus"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Turpināt"</string>
<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="6371077608778830020">"Pievienot dzirdes aparātu"</string>
@@ -2164,8 +2158,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ierobežojot lietotnes darbību fonā, var rasties šīs lietotnes darbības traucējumi."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Lietotnei nav iestatīta akumulatora optimizācija, tāpēc to nevar ierobežot.\n\nVispirms iestatiet akumulatora optimizāciju."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Ekrāna lietojums kopš pilnas uzlādes"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrāna lietojuma patēriņš"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobilo tīklu meklēšana"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Akumulatora lietojums kopš pilnas uzlādes"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Cik ilgi ekrāns ir ieslēgts kopš pilnas uzlādes"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Ierīces lietojums kopš pilnas uzlādes"</string>
@@ -2192,11 +2184,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Izmantot detaļas"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Noregulēt strāvas patēriņu"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Iekļautās pakotnes"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Lietotņu darbības dēļ var tikt izlādēts akumulators"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Ierīce arvien tiek aktivizēta"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ierīce tiek aktivizēta fonā"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Bieži tiek pieprasīti atrašanās vietas dati"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> lietotnēm ir neatbilstoša darbība"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Lietotnes darbojas normāli"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Tālrunis patērē normālu akumulatora enerģijas apjomu fonā"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Planšetdators patērē normālu akumulatora enerģijas apjomu fonā"</string>
@@ -2266,6 +2253,7 @@
<item quantity="one">Akumulatora lietojums tiek ierobežots %1$d lietotnei</item>
<item quantity="other">Akumulatora lietojums tiek ierobežots %1$d lietotnēm</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Ierobežota <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Šīs lietotnes fonā patērēja akumulatora enerģiju. Lietotnes ar ierobežotu darbību var darboties neatbilstoši, un paziņojumi var tikt parādīti aizkavēti."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Izmantot akumulatora pārvaldnieku"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Nosaka lietotnes, kas patērē daudz akumulatora enerģijas"</string>
@@ -2424,7 +2412,7 @@
<string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Saglabāts kešatmiņā"</string>
<string name="voice_input_output_settings" msgid="1336135218350444783">"Balss ievade un izvade"</string>
<string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balss ievades un izvades iestatījumi"</string>
- <string name="voice_search_settings_title" msgid="2775469246913196536">"Balss meklēšana"</string>
+ <string name="voice_search_settings_title" msgid="2775469246913196536">"Meklēšana ar balsi"</string>
<string name="keyboard_settings_title" msgid="5080115226780201234">"Android tastatūra"</string>
<string name="voice_input_settings" msgid="1099937800539324567">"Balss ievades iestatījumi"</string>
<string name="voice_input_settings_title" msgid="2676028028084981891">"Balss ievade"</string>
@@ -2444,23 +2432,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Atcelt"</string>
<string name="tts_reset" msgid="2661752909256313270">"Atiestatīt"</string>
<string name="tts_play" msgid="2628469503798633884">"Atskaņot"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Barošanas vadība"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi iestatījumu atjaunināšana"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth iestatījumu atjaunināšana"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ieslēgts"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"izslēgts"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"notiek ieslēgšana"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"notiek izslēgšana"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Atrašanās vieta"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinhronizācija"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Spilgtums <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automātisks"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"maksimālais"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"puse"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"izslēgts"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Akreditācijas datu krātuve"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalēšana no atmiņas"</string>
@@ -2618,7 +2589,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Atlasīt visu"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Datu lietojums"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Lietotnes datu lietojums"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobilie dati un Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Lietotnes lietojums"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMĀCIJA PAR LIETOTNI"</string>
@@ -3000,7 +2971,6 @@
<item quantity="one">Rādīt %d slēptu vienumu</item>
<item quantity="other">Rādīt %d slēptus vienumus</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Sakļaut"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Tīkls un internets"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilais tīkls"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datu lietojums"</string>
@@ -3012,12 +2982,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Lietotnes un paziņojumi"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Atļaujas, noklusējuma lietotnes"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Piekļuve paziņojumiem nav pieejama darba profila lietotnēm."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Konti"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Neviens konts nav pievienots"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Noklusējuma lietotnes"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Valodas, laiks, dublēšana, atjauninājumi"</string>
<string name="search_results_title" msgid="1796252422574886932">"Iestatījumi"</string>
- <string name="search_menu" msgid="6283419262313758339">"Meklēt iestatījumus"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, tīkla savienojums, internets, bezvadu, dati, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"Wifi, Wi-Fi, pārslēgt, pārvaldība"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"īsziņa, īsziņas sūtīšana, ziņojumi, ziņojumapmaiņa, noklusējuma"</string>
@@ -3062,6 +3032,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"maksāt, pieskarties, maksājumi"</string>
<string name="keywords_backup" msgid="470070289135403022">"dublēšana, dublēt"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"žests"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"sejas, autorizācija, atbloķēšana, pierakstīšanās"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl versija, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"tīkls, mobilā tīkla statuss, pakalpojuma statuss, signāla stiprums, mobilā tīkla veids, viesabonēšana, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"sērijas numurs, aparatūras versija"</string>
@@ -3069,6 +3040,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tumšs motīvs"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"kļūda"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Gaidstāves ekrāns, bloķēšanas ekrāna attēlojums"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"bloķēšanas ekrāna paziņojums"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"seja"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"pirksta nospiedums"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"aptumšots ekrāns, skārienekrāns, akumulators, viedais spilgtums, dinamiskais spilgtums"</string>
@@ -3510,7 +3482,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Kad ievadīsiet PIN kodu, lai sāknētu šo ierīci, pieejamības pakalpojumi, piemēram, <xliff:g id="SERVICE">%1$s</xliff:g>, vēl nebūs pieejami."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Kad ievadīsiet kombināciju, lai sāknētu šo ierīci, pieejamības pakalpojumi, piemēram, <xliff:g id="SERVICE">%1$s</xliff:g>, vēl nebūs pieejami."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Kad ievadīsiet paroli, lai sāknētu šo ierīci, pieejamības pakalpojumi, piemēram, <xliff:g id="SERVICE">%1$s</xliff:g>, vēl nebūs pieejami."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Piezīme. Šo lietotni pēc atkārtotas palaišanas nevarēs startēt, kamēr netiks atbloķēts tālrunis."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Piezīme. Ja restartēsiet tālruni un iestatīsiet ekrāna bloķēšanu, šo lietotni varēs startēt tikai pēc tālruņa atbloķēšanas."</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI informācija"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Ar IMEI saistīta informācija"</string>
<string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. slots)"</string>
@@ -3568,7 +3540,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Privātās"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Darba"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Lietotnes: visas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Lietotnes: izslēgts"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Izslēgti"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorijas: steidzams"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorijas: nav svarīgs"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorijas: izslēgts"</string>
@@ -3630,7 +3602,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Brīdinājumi par lietojumu"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Rādīt pilnu ierīces lietojumu"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Rādīt lietotnes izmantojumu"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Augsts lietojuma līmenis"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="zero"><xliff:g id="NUMBER">%2$d</xliff:g> lietotnēs ir neparastas darbības</item>
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> lietotnē ir neparastas darbības</item>
@@ -3798,6 +3769,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Iekšējā krātuve: <xliff:g id="PERCENTAGE">%1$s</xliff:g> izmantota, <xliff:g id="FREE_SPACE">%2$s</xliff:g> brīva"</string>
<string name="display_summary" msgid="6737806235882127328">"Pāriešana miega režīmā, ja <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nav aktivitātes"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Fona tapete, miega režīms, fonta lielums"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Miega režīms pēc 10 minūšu neaktivitātes"</string>
<string name="memory_summary" msgid="8080825904671961872">"Izmantotais atmiņas apjoms: vidēji <xliff:g id="USED_MEMORY">%1$s</xliff:g> no <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Pierakstījies kā: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3813,7 +3786,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Nav atļauts sūtīt īsziņas"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Nav atļauts izmantot kameru"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Nav atļauts veikt ekrānuzņēmumus"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Nevar izslēgt dublēšanu"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Nevar atvērt šo lietotni"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Ja jums radās jautājumi, sazinieties ar savu IT administratoru."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Plašāka informācija"</string>
@@ -3982,9 +3954,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Imitēt ekrānu ar izgriezumu"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Ekrāna izgriezums"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekrāna izgriezums"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nav"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Ierīces noklusējuma iestatījums"</string>
<string name="special_access" msgid="3458780842491881155">"Īpaša piekļuve lietotnēm"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="zero"><xliff:g id="COUNT">%d</xliff:g> lietotnēs var izmantot neierobežotu datu apjomu</item>
@@ -4007,11 +3979,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Izveidots savienojums ar ierīci <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Izveidots savienojums ar vairākām ierīcēm"</string>
<string name="demo_mode" msgid="2798762752209330277">"Sistēmas lietotāja saskarnes demonstrācijas režīms"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Nakts režīms"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Iestatīt nakts režīmu"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Tumšais režīms"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Iestatīt tumšo režīmu"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Izstrādātāja ātro iestatījumu elementi"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope izsekošana"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> — <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Darba profila iestatījumi"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktpersonu meklēšana"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Atļaut identificēt zvanītājus un kontaktpersonas, kad organizācijā tiek meklētas kontaktpersonas"</string>
@@ -4055,13 +4026,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dubultskāriens, lai skatītu tālruņa paziņojumus"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dubultskāriens, lai skatītu planšetdatora paziņojumus"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dubultskāriens, lai skatītu ierīces paziņojumus"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Lai skatītu laiku, paziņojumu ikonas un citu informāciju, divreiz ātri pieskarieties ekrānam."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Lai skatītu laiku, paziņojumus un citu informāciju, divreiz pieskarieties ekrānam."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tālruņa pārbaude paceļot"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Planšetdatora pacelšana, lai skatītu paziņojumus"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ierīces pacelšana, lai skatītu paziņojumus"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Lai skatītu laiku, paziņojumu ikonas un citu informāciju, paņemiet tālruni."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Lai skatītu laiku, paziņojumu ikonas un citu informāciju, paņemiet planšetdatoru."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Lai skatītu laiku, paziņojumu ikonas un citu informāciju, paņemiet ierīci."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Displeja aktivizēšana"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Lai skatītu laiku, paziņojumus un citu informāciju, paņemiet tālruni."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Lai skatītu laiku, paziņojumus un citu informāciju, paņemiet planšetdatoru."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Lai skatītu laiku, paziņojumus un citu informāciju, paņemiet ierīci."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Ekrāna žests aktivizēšanas gadījumam"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Ziņu skatīšana ar pirksta nospiedumu"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Nospiedumu skeneris"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru tālruņa aizmugurē."</string>
@@ -4145,7 +4120,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> mēģinājums</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> mēģinājumi</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Šīs ierīces dati tiek dublēti."</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Šo ierīci pārvalda jūsu organizācija."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Šo ierīci pārvalda <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4189,6 +4163,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Automātiskā aizpilde"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automātiskā aizpilde"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Pārliecinieties, ka šī lietotne ir uzticama</b> <br/> <br/> <xliff:g id=app_name example=Google automātiskā aizpilde>%1$s</xliff:g> izmanto ekrānā redzamo, lai noteiktu, kādu informāciju aizpildīt automātiski."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automātiskā aizpilde"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Pieteikšanās līmenis"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maksimālais pieprasījumu skaits katrā sesijā"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maksimālais redzamo datu kopu skaits"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Atiestatīt uz noklusējuma vērtībām"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Izstrādātājiem paredzēto opciju automātiskā aizpilde ir atiestatīta."</string>
<string name="device_theme" msgid="4571803018917608588">"Ierīces motīvs"</string>
<string name="default_theme" msgid="7085644992078579076">"Noklusējums"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Tīkla nosaukums"</string>
@@ -4203,15 +4183,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizēt operatora nodrošināšanu"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Atjaunināt iestatījumu “Netraucēt”"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pārtraukt paziņojumus, lai ilglaicīgi koncentrētos"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Kādi ir jaunumi?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Apskatiet savu jauno tālruni"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Apskatiet savu jauno planšetdatoru"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Apskatiet savu jauno ierīci"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Šī funkcija šajā ierīcē nav pieejama."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Veikt pilnus GNSS mērījumus"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Izsekot visas GNSS konstelācijas un frekvences bez darba cikliem"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Vienmēr rādīt avārijas dialoglodziņu"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Rādīt dialoglodziņu katru reizi, kad lietotne avarē"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Atlasiet lietotni, kam ANGLE ir iespējots"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nav iestatīta neviena lietojumprogramma, kam ANGLE ir iespējots"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Lietojumprogramma, kam ANGLE ir iespējots: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Direktoriju piekļuve"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"direktoriju piekļuve"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4252,4 +4231,86 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Dati par tīklu"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Jūsu ierīces nosaukums ir redzams tālrunī instalētajām lietotnēm. Ja izveidosiet savienojumu ar Bluetooth ierīcēm vai iestatīsiet Wi-Fi tīklāju, tas būs redzams arī citām personām."</string>
<string name="devices_title" msgid="7701726109334110391">"Ierīces"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Visi iestatījumi"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Ieteikumi"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS dati"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS dati"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Izvēlēties tīklu"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Nav savienojuma"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Izveidots savienojums"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Notiek savienojuma izveide…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nevarēja izveidot savienojumu"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Netika atrasts neviens tīkls."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Neizdevās atrast tīklus. Mēģiniet vēlreiz."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(aizliegts)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Nav SIM kartes"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Paplašinātas zvanu iespējas"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Ieteicamais tīkla režīms: WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Ieteicamais tīkla režīms: tikai GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Ieteicamais tīkla režīms: tikai WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Ieteicamais tīkla režīms: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Ieteicamais tīkla režīms: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Ieteicamais tīkla režīms: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Ieteicamais tīkla režīms: tikai CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Ieteicamais tīkla režīms: tikai EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Ieteicamais tīkla režīms: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Ieteicamais tīkla režīms: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Ieteicamais tīkla režīms: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Ieteicamais tīkla režīms: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Ieteicamais tīkla režīms: vispārējs"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Ieteicamais tīkla režīms: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Ieteicamais tīkla režīms: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Ieteicamais tīkla režīms: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Ieteicamais tīkla režīms: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Ieteicamais tīkla režīms: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Ieteicamais tīkla režīms: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Ieteicamais tīkla režīms: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Ieteicamais tīkla režīms: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Ieteicamais tīkla režīms: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Ieteicamais tīkla režīms: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Ieteicamais tīkla režīms: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Ieteicamais tīkla režīms: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Ieteicamais tīkla režīms: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (ieteicams)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (ieteicams)"</string>
+ <string name="network_global" msgid="959947774831178632">"Vispārējie"</string>
+ <string name="label_available" msgid="1731547832803057893">"Pieejamie tīkli"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Notiek meklēšana…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Notiek reģistrēšana tīklā <xliff:g id="NETWORK">%s</xliff:g>..."</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM karte neļauj izveidot savienojumu ar šo tīklu."</string>
+ <string name="connect_later" msgid="978991102125216741">"Pašlaik nevar izveidot savienojumu ar šo tīklu. Vēlāk mēģiniet vēlreiz."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Reģistrēts tīklā."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automātiski atlasīt tīklu"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Mobilo sakaru operatora iestatījumi"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Datu pakalpojuma iestatīšana"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobilie dati"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Piekļuve datiem, izmantojot mobilo tīklu"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Ieteicamais tīkla veids"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Mainiet tīkla darbības režīmu"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Ieteicamais tīkla veids"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Mobilo sakaru operators"</string>
+ <string name="call_category" msgid="8108654745239563833">"Zvanīšana"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Mobilo sakaru operatora videozvani"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Sistēmas atlasīšana"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Mainīt CDMA viesabonēšanas režīmu"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Sistēmas atlasīšana"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Tīkls"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Tīkls"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA abonements"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Mainīt uz RUIM/SIM vai NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"abonēšana"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automātiska reģistrācija..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Vai atļaut datu viesabonēšanu?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Sazinieties ar savu tīkla pakalpojumu sniedzēju, lai uzzinātu par tarifiem."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Lietotnes datu lietojums"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Nederīgs tīkla režīms: <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorēt."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Nav pieejams, ja izveidots savienojums ar operatoru <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Skatīt vairāk"</string>
+ <string name="see_less" msgid="1250265310929558370">"Skatīt mazāk"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ <item quantity="other">Pievienotas <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ierīces</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nav pievienota neviena ierīce"</string>
</resources>
diff --git a/res/values-mcc262-mnc02-ky/strings.xml b/res/values-mcc262-mnc02-ky/strings.xml
index 12d5d6b..f033c88 100644
--- a/res/values-mcc262-mnc02-ky/strings.xml
+++ b/res/values-mcc262-mnc02-ky/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n" Өзгөчө кырдаалда Wi-Fi чалуу кызматынан чала албайсыз. Өзгөчө кырдаалда чалууга аракет кылганыңызда түзмөгүңүз автоматтык түрдө мобилдик тармакты пайдаланат. Өзгөчө кырдаалда чалууларды мобилдик тармак кармаган аймактарда гана аткара аласыз."</string>
+ <string name="wifi_calling_off_explanation_2" msgid="741028819102506783">\n\n" Өзгөчө кырдаалда Wi-Fi аркылуу чала албайсыз. Өзгөчө кырдаалда чалууга аракет кылганыңызда түзмөгүңүз автоматтык түрдө мобилдик тармакты пайдаланат. Өзгөчө кырдаалда мобилдик тармак кармаган аймактарда гана чала аласыз."</string>
</resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 9688caf..49dc9aa 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Сметај како ограничена мрежа"</item>
<item msgid="2266114985518865625">"Сметај како неограничена мрежа"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Стандардно (користи рандомизирана MAC-адреса)"</item>
+ <item msgid="5398461510512959597">"Доверливо"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Не"</item>
<item msgid="3863157480502955888">"Да"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Секогаш вклучен"</item>
<item msgid="6385301106124765323">"Секогаш исклучен"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Исклучено"</item>
+ <item msgid="2182686878828390312">"Отстранување грешка"</item>
+ <item msgid="5286514712714822064">"Опширно"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Само домашен"</item>
+ <item msgid="5034813753274486448">"Автоматски"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Претпочитан е GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Само GSM"</item>
+ <item msgid="488474605709912156">"Само WCDMA"</item>
+ <item msgid="1912421096218750039">"Автоматски GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Автоматски CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA без EvDo"</item>
+ <item msgid="4678789463133969294">"Само EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Глобален"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Само TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Глобален"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 08d27b0..d267832 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Создај"</string>
<string name="allow" msgid="3349662621170855910">"Дозволи"</string>
<string name="deny" msgid="6947806159746484865">"Одбиј"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Затвори"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Префрли"</string>
<string name="device_info_default" msgid="7847265875578739287">"Непознато"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Сега сте на <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> чекор поблиску да станете програмер.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Нема потреба, веќе сте развивач"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Прво овозможете ги опциите за програмери."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Безжичен и мрежи"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Поврзувања"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Уред"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Лични"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Пристап"</string>
<string name="header_category_system" msgid="2816866961183068977">"Систем"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Овозможи ја врската со податоците"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Оневозможи ја врската со податоците"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Адреса на Bluetooth на уредот: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Исклучи <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Емитување"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Неименуван уред со Bluetooth"</string>
<string name="progress_scanning" msgid="192587958424295789">"Пребарување"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Нема уреди со Bluetooth во близина."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Дадена апликација сака да се вклучи Bluetooth и телефонот да се направи видлив за други уреди. Ова може да го промените подоцна во поставките за Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Вклучување Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth се исклучува..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматско поврзување"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Барање за поврзување со Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Допрeте за да се поврзе со „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Дали сакате да се поврзете со „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Достапни уреди за повикување"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Моментално поврзани"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Зачувани уреди"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Додавање уред"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth ќе се вклучи за спарување"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Поставки за врски"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Претходно поврзани уреди"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Претходно поврзани"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth е вклучен"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Прикажи ги сите"</string>
<string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Избери временска зона"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Прескокни"</string>
<string name="next_label" msgid="4693520878012668114">"Следно"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Јазици"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Поставки за јазик"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Отстрани"</string>
<string name="add_a_language" msgid="2330538812283783022">"Додај јазик"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Поставки"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Кратенка за поставки"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Режим на работа во авион"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Повеќе"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Безжичен и мрежи"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Управувај со Wi-Fi, Bluetooth, режим за работа во авион, мобилни мрежи и виртуелни приватни мрежи"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Мобилен интернет"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Приватност"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Оневозможено од администраторот"</string>
<string name="security_status_title" msgid="5848766673665944640">"Безбедносен статус"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Заклучување екран, отклучување со лик"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Заклучување екран, отпечаток"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Заклучување екран"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Додадено е лице"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Отклучување со лице"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Користење на лицето за проверка"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Користете го лицето за отклучување на телефонот, за одобрување купувања или за најавување на апликации."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Користете"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Користете го вашето лице за да го отклучите телефонот или да ги одобрите купувањата.\n\nЗабелешка: не може да го користите лицето за да го отклучите уредов. За повеќе информации, контактирајте со администраторот на вашата организација."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Користете го лицето за отклучување на телефонот, за одобрување купувања или за најавување на апликации"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Може да додадете до <xliff:g id="COUNT">%d</xliff:g> отпечатоци"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Центрирајте го лицето во кругот"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Направи подоцна"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Може да додадете до <xliff:g id="COUNT">%d</xliff:g> лица"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Додадовте максимален број лица"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Не може да додадете повеќе лица"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Запишувањето не е завршено"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Во ред"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Се достигна временското ограничување на запишувањето со лице. Обидете се повторно."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Не успеа запишувањето со лице."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Готово. Изгледа добро."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Готово"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Користи го лицето за"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Отклучување уред"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Најавување на аплик. и плаќања"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Отворени очи за отклучување"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Кога користите проверка на лице, очите мора да ви бидат отворени"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Отстр. под. за лице"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Подобрете податоци за лицето"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Вашето лице може да се користи за отклучување на уредот и пристап до апликациите. "<annotation id="url">"Дознајте повеќе"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Отпечаток"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Управување отпечатоци"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Користи отпечатоци за"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Изберете барем еден појас за Wi‑Fi точка на пристап:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Поставки на IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Приватност"</string>
<string name="wifi_shared" msgid="844142443226926070">"Сподели со други корисници на уредот"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(непроменети)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Изберете"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Откажи"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Дали да се заборави мрежата?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Ќе се избришат сите лозинки за мрежава"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Зачувани мрежи"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d мрежа</item>
<item quantity="other">%d мрежи</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Осветленост"</string>
<string name="brightness_summary" msgid="838917350127550703">"Приспособи ја осветленоста на екранот"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Приспособлива осветленост"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Вклучено"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Исклучена"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Претпочитаната осветленост е многу мала"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Претпочитаната осветленост е мала"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Не може да го промените PIN-от.\nМожно е PIN-от да е погрешен."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN на SIM картичката е успешно променет"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Не може да се промени состојбата на заклучување на SIM картичката.\nМожно е PIN-от да е погрешен."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Не може да се оневозможи PIN-от."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Не може да се овозможи PIN-от."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Во ред"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Откажи"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Пронајдени се повеќе SIM-картички"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Ова бара <xliff:g id="NAME_0">^1</xliff:g> да се форматира. \n\n"<b>"Форматирањето ги брише сите податоци што моментално се меморирани на <xliff:g id="NAME_1">^1</xliff:g>."</b>" За да избегнете губење на податоците, размислете да направите резервна копија од нив."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Избриши и форматирај"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Се форматира <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Не отстранувајте <xliff:g id="NAME">^1</xliff:g> додека се форматира."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Не отстранувајте <xliff:g id="NAME">^1</xliff:g> додека се форматира."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Премести подат. во нова меморија"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Може да ги преместувате фотографиите, датотеките и некои апликации на новата <xliff:g id="NAME">^1</xliff:g>. \n\nПреместувањето трае околу <xliff:g id="TIME">^2</xliff:g> и ќе ослободи <xliff:g id="SIZE">^3</xliff:g> од внатрешната меморија. Некои од апликациите нема да работат додека ова е во тек."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Премести сега"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Инсталирано"</string>
<string name="no_applications" msgid="7336588977497084921">"Нема апликации."</string>
<string name="internal_storage" msgid="1584700623164275282">"Внатрешен капацитет"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"внатрешен капацитет"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB меморија"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"СД мемо картич."</string>
<string name="recompute_size" msgid="7722567982831691718">"Повторно пресметување големина..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Избриши податоци за апликацијата?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Сите податоци на оваа апликација ќе бидат трајно избришани. Ова ги опфаќа сите датотеки, поставки, сметки, бази на податоци, итн."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Апликацијата не е пронајдена во списокот на инсталирани апликации."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Не можеше да се исчисти меморијата за апликацијата."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Оваа апликација може да пристапи до следното на вашиот таблет:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Оваа апликација може да пристапи до следното на вашиот телефон:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Апликацијата може да пристапи кон следното на вашиот таблет. Со цел да се подобри изведбата и да се намали употребата на меморија, некои од овие дозволи се достапни за <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> зашто работи во истиот процес како и <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Оваа апликација може да пристапи до следново на вашиот телефон. Со цел да се подобри ефикасноста и да се намали употребата на меморијата, некои од овие дозволи се достапни за <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> зашто таа се извршува во истиот процес како <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> и <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Оваа апликација може да ви наплати:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Испрати премиум SMS порака"</string>
<string name="computing_size" msgid="1599186977475211186">"Пресметување..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Не можеше да се пресмета големината на пакетот."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Немате инсталирано апликации од трета страна"</string>
<string name="version_text" msgid="9189073826278676425">"верзија <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Премести"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Премести во таблет"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Премести во телефон"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Премести во USB меморија"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Премести на СД картичка"</string>
- <string name="moving" msgid="6431016143218876491">"Се преместува"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Друга миграција е веќе во тек."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Нема доволно меморија."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Апликацијата не постои."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Администраторот на уредот не може да се инсталира на надворешни уреди за аудиовизуелни содржини"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Исклучи присилно?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ако присилно запрете апликација, таа може да не се однесува правилно."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Не може да се премести апликацијата <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Претпочиана локација на инсталирање"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Променете ја претпочитаната локација на инсталирање за нови апликации."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Оневозможи вградена апликација?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Оневозможете ја апликацијата"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ако ја оневозможите оваа апликација, Android и другите апликации можеби веќе нема да функционираат како што треба."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Избриши ги податоците и оневозможи ја апликацијата?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ако ја оневозможите оваа апликација, Android и другите апликации можеби веќе нема да функционираат како што треба. Освен тоа, ќе се избришат и вашите податоци."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Исклучи известувања?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ако ги исклучите известувањата за оваа апликација, може да пропуштите важни предупредувања и ажурирања."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Продавница"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Детали за апликацијата"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Апликација инсталирана од <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Користи ја услугата"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Користи корекција на боите"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Користи титли"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Продолжи"</string>
<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="6371077608778830020">"Додајте слушно помагало"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Апликацијата може да се однесува необично ако ја ограничите нејзината активност во заднина"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Апликацијава не е оптимизирана и не може да се ограничи.\n\nЗа да ја ограничите, прво вклучете оптимизација на батеријата."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Употреба на екранот по целосно полнење"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Потрошувачка на екранот"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилна мрежа"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Употреба на батеријата по целосното полнење"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Време на активен екран по целосно полнење"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Употреба на уредот по целосно полнење"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Користи детали"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Приспособи употреба на струја"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Вклучени пакети"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Апликации што ја трошат батеријата"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Го држи уредот активен"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Го активира уредот во заднина"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Често бара локација"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> апликации се однесуваат необично"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Апликациите работат нормално"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Телефонот троши вообичаено количество батерија во заднина"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Таблетот троши вообичаено количество батерија во заднина"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">Ограничување на користењето батерија за %1$d апликација</item>
<item quantity="other">Ограничување на користењето батерија за %1$d апликации</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Ограничено <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Овие апликации ја користеле батеријата во заднина. Ограничените апликации може да не работат правилно и известувањата може да бидат одложени."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Користење управник со батерија"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Откријте кога апликациите ја трошат батеријата"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Откажи"</string>
<string name="tts_reset" msgid="2661752909256313270">"Ресетирај"</string>
<string name="tts_play" msgid="2628469503798633884">"Пушти"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Контрола на напојување"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Се ажурира Wi-Fi подесување"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ажурирање подесување за Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"вклучено"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"исклучено"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"се вклучува"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"се исклучува"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Локација"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Синхронизирај"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Осветленост <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"автоматски"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"целосна"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"половина"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"исклучено"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Меморирање акредитиви"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Инсталирај од меморија"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Избери сè"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Потрошен интернет"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Сообраќај по аплик."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Мобилен интернет и Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Пресметувањето податоци на операторот може да се разликува од вашиот уред."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Користење апликација"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ИНФОРМАЦИИ ЗА АПЛИКАЦИЈА"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">Прикажи %d сокриена ставка</item>
<item quantity="other">Прикажи %d сокриени ставки</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Собери"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Мрежа и интернет"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"потрошен сообраќај"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апликации и известувања"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дозволи, стандардни апликации"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Пристапот до известувањата не е достапен за апликации во работниот профил."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Сметки"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Нема додадени сметки"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Стандардни апликации"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Јазици, време, бекап и ажурирања"</string>
<string name="search_results_title" msgid="1796252422574886932">"Поставки"</string>
- <string name="search_menu" msgid="6283419262313758339">"Пребарувај низ поставките"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"WiFi, Wi-Fi, мрежна врска, интернет, безжичен, податоци, Wi Fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, префрли, контрола"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"текстуална порака, испраќање текстуални пораки, пораки, испраќање пораки, стандарден"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"плати, допри, плаќања"</string>
<string name="keywords_backup" msgid="470070289135403022">"бекап, прави бекап"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"движење"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"лице, отклучи, проверка, најави се"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, верзија на prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"мрежа, состојба на мобилна мрежа, состојба на услуга, јачина на сигнал, тип на мобилна мрежа, роаминг, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"сериски број, верзија на хардвер"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"темна тема"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"грешка"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Амбиентален екран, Екран за заклучување на екранот"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"известување на заклучен екран"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"лице"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"отпечаток"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"затемнет екран, екран на допир, батерија, паметна осветленост, динамична осветленост"</string>
@@ -3309,7 +3281,7 @@
<string name="notification_content_block_summary" msgid="7746185794438882389">"Никогаш не прикажувај известувања во сенка или на периферни уреди"</string>
<string name="notification_badge_title" msgid="6370122441168519809">"Дозволи точка за известување"</string>
<string name="notification_channel_badge_title" msgid="2240827899882847087">"Прикажи точка за известување"</string>
- <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отфрли го Не вознемирувај"</string>
+ <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Отфрли го „Не вознемирувај“"</string>
<string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"Остави ги известувањава да продолжат да прекинуваат кога опцијата „Не вознемирувај“ е вклучена"</string>
<string name="app_notification_visibility_override_title" msgid="7821124557634786985">"На заклучен екран"</string>
<string name="app_notification_row_banned" msgid="5983655258784814773">"Блокирана"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Кога ќе го внесете PIN-кодот за да го вклучите уредот, услугите за пристапност како <xliff:g id="SERVICE">%1$s</xliff:g> сè уште нема да бидат достапни."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Кога ќе ја внесете шемата за да го вклучите уредот, услугите за пристапност како <xliff:g id="SERVICE">%1$s</xliff:g> сè уште нема да бидат достапни."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Кога ќе ја внесете лозинката за да го вклучите уредот, услугите за пристапност како <xliff:g id="SERVICE">%1$s</xliff:g> сè уште нема да бидат достапни."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Забелешка: по рестартирање, апликацијава не може да се вклучи додека не го отклучите телефонот"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Забелешка: ако го рестартирате телефонот, а имате поставено заклучување на екранот, апликацијава нема да може да се стартува додека не го отклучите телефонот"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Информации за IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Информации во врска со IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Отвор<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Лични"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Службени"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Апликации: сите"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Апликации: исклучени"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Исклучени"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категории: итна важност"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категории: мала важност"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категории: исклучени"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Предупредувања за батеријата"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Употреба на целосно полн уред"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Прикажи употреба на апликација"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Голема искористеност"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> апликација се однесува невообичаено</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> апликации се однесуваат невообичаено</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Внатрешен капацитет: искористено <xliff:g id="PERCENTAGE">%1$s</xliff:g> - слободно <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Стави во режим на мирување по <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Тапет, режим во мирување, големина на фонт"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Стави на режим во мирување по 10 минути неактивност"</string>
<string name="memory_summary" msgid="8080825904671961872">"Искористени се просечно <xliff:g id="USED_MEMORY">%1$s</xliff:g> од <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> меморија"</string>
<string name="users_summary" msgid="1674864467098487328">"Најавени сте како <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-порака не е дозволена"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Камерата не е дозволена"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Слика од екранот не е дозволена"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Бекапите не може да се исклучат"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Апликацијава не може да се отвори"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Ако имате прашања, контактирајте со администраторот за информатичка технологија"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Повеќе детали"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Симулирање екран со пресекување"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Исечок на екранот"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"исечок на екранот, сензор за носење"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Нема"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Стандардно за уредот"</string>
<string name="special_access" msgid="3458780842491881155">"Посебни пристапи"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> апликација може да користи неограничен интернет</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Поврзан со <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Поврзан со повеќе уреди"</string>
<string name="demo_mode" msgid="2798762752209330277">"Демо-режим на кориснички интерфејс на систем"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Ноќен режим"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Поставете ноќен режим"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Темен режим"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Поставете „Темен режим“"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочки на програмерот за брзи поставки"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Трага од Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Поставки на работен профил"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пребарување контакти"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дозволете при пребарувањата контакти на вашата организација да се препознаваат повикувачи и контакти"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Допрете двапати за да го проверите телефонот"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Допрете двапати за да го проверите таблетот"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Допрете двапати за да го проверите уредот"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"За да ги проверите времето, иконите за известување и другите информации, допрете двапати на екранот."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"За да ги проверите времето, известувањата и другите информации, допрете двапати на екранот."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Подигнете за проверка"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Подигнете за да го проверите таблетот"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Подигнете за да го проверите уредот"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"За да ги проверите времето, иконите за известување и другите информации, земете го телефонот."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"За да ги проверите времето, иконите за известување и другите информации, земете го таблетот."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"За да ги проверите времето, иконите за известување и другите информации, земете го уредот."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Екран за будење"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"За да ги проверите времето, известувањата и другите информации, земете го телефонот."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"За да ги проверите времето, известувањата и другите информации, земете го таблетот."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"За да ги проверите времето, известувањата и другите информации, земете го уредот."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Движење на екранот за заклучување на будењето"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Повлечи отпечаток за известувања"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Повлечете отпечаток"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"За да ги проверите известувањата, повлечете надолу на сензорот за отпечатоци на задната страна на телефонот."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> обид</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> обиди</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Се прави бекап на податоците на уредот"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Вашата организација управува со уредов."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"<xliff:g id="ORGANIZATION_NAME">%s</xliff:g> управува со уредов."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Автоматско пополнување"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"автоматско, пополнување, автоматско пополнување"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Проверете дали е ова апликација на која ѝ верувате</b> <br/> <br/> <xliff:g id=app_name example=„Автоматско пополнување на Google“>%1$s</xliff:g> го користи она што е на екранот за да утврди што може автоматски да се пополни."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Автоматско пополнување"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Ниво на најавување"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Максимум барања по сесија"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Максимум видливи збирови на податоци"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Ресетирај на стандардните вредности"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Опциите за програмери за автоматско пополнување се ресетирани"</string>
<string name="device_theme" msgid="4571803018917608588">"Тема на уредот"</string>
<string name="default_theme" msgid="7085644992078579076">"Стандардно"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Име на мрежата"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активирајте обезбедување оператор"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Ажурирање на режимот „Не вознемирувај“"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Паузирајте ги известувањата за да останете фокусирани"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Што има ново и интересно?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Запознајте се со новиот телефон"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Запознајте се со новиот таблет"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Запознајте се со новиот уред"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Функцијава не е достапна на овој уред"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Присилување целосни мерења со GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Следете ги сите констелации и фреквенции со GNSS без работен циклус"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Секогаш прикажувај дијалог на пад"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Прикажи дијалог при секој пад на апликација"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Избери апликација овозможена за ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Нема поставена апликација овозможена за ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Апликација овозможена за ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Пристап до адресарот"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"пристап до адресарот"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Детали за мрежа"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Името на уредот е видливо за апликациите на телефонот. Може да го видат и други луѓе кога ќе се поврзете со уреди со Bluetooth или кога ќе поставите Wi-Fi точка на пристап."</string>
<string name="devices_title" msgid="7701726109334110391">"Уреди"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Сите поставки"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Предлози"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-податоци"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-податоци"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Изберете мрежа"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Исклучена"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Поврзана"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Се поврзува…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Не може да се поврзе"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Не се најдени мрежи."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Не најдовме мрежи. Обидете се повторно."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(забранета)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Нема SIM-картичка"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Напредно повикување"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Претпочитан режим на мрежа: претпочитан е WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Претпочитан режим на мрежа: само GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Претпочитан режим на мрежа: само WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Претпочитан режим на мрежа: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Претпочитан режим на мрежа: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Претпочитан режим на мрежа: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Претпочитан режим на мрежа: само CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Претпочитан режим на мрежа: само EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Претпочитан режим на мрежа: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Претпочитан режим на мрежа: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Претпочитан режим на мрежа: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Претпочитан режим на мрежа: CDMA + LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Претпочитан режим на мрежа: глобален"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Претпочитан режим на мрежа: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Претпочитан режим на мрежа: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Претпочитан режим на мрежа: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Претпочитан режим на мрежа: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Претпочитан режим на мрежа: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Претпочитан режим на мрежа: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Претпочитан режим на мрежа: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Претпочитан режим на мрежа: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Претпочитан режим на мрежа: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Претпочитан режим на мрежа: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Претпочитан режим на мрежа: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Претпочитан режим на мрежа: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Претпочитан режим на мрежа: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (препорачано)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (препорачано)"</string>
+ <string name="network_global" msgid="959947774831178632">"Глобален"</string>
+ <string name="label_available" msgid="1731547832803057893">"Достапни мрежи"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Се пребарува…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Се регистрира на <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Вашата SIM-картичка не дозволува поврзување на мрежава."</string>
+ <string name="connect_later" msgid="978991102125216741">"Не може да се поврземе со мрежава во моментов. Обидете се повторно подоцна."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Регистрирано на мрежа."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Автоматски избирај мрежа"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Поставки за операторот"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Услуга за мобилен интернет"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Мобилен интернет"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Пристап на интернет преку мобилната мрежа"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Претпочитан тип мрежа"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Променете го режимот на работа на мрежата"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Претпочитан тип мрежа"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Оператор"</string>
+ <string name="call_category" msgid="8108654745239563833">"Повикување"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Видеоповици преку оператор"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Избирање систем"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Променете го режимот на роаминг на CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Избирање систем"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Мрежа"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Мрежа"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Претплата на CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Менувајте помеѓу RUIM/SIM и NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"претплата"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Автоматска регистрација…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Да се дозволи интернет-роаминг?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"За цени, проверете кај вашиот мрежен оператор."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Сообраќај на апликациите"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Неважечки режим на мрежа <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Игнорирајте."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Недостапно кога сте поврзани на <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Видете повеќе"</string>
+ <string name="see_less" msgid="1250265310929558370">"Види помалку"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 60959b6..83ecf46 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"മീറ്റർ-മാപകമായി കണക്കാക്കുക"</item>
<item msgid="2266114985518865625">"മീറ്റർ മാപകമല്ലാത്തതായി കണക്കാക്കുക"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ഡിഫോൾട്ട് (ക്രമരഹിതമാക്കിയ MAC ഉപയോഗിക്കുക)"</item>
+ <item msgid="5398461510512959597">"വിശ്വസ്തൻ"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"ഇല്ല"</item>
<item msgid="3863157480502955888">"ഉവ്വ്"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"എപ്പോഴും ഓണാക്കുക"</item>
<item msgid="6385301106124765323">"എപ്പോഴും ഓഫാക്കുക"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"ഓഫ്"</item>
+ <item msgid="2182686878828390312">"ഡീബഗ് ചെയ്യുക"</item>
+ <item msgid="5286514712714822064">"വെർബോസ്"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"ഹോം മാത്രം"</item>
+ <item msgid="5034813753274486448">"സ്വമേധയാ"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"മുൻഗണന നൽകുന്നത് GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"GSM മാത്രം"</item>
+ <item msgid="488474605709912156">"WCDMA മാത്രം"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA സ്വമേധയാ"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo സ്വമേധയാ"</item>
+ <item msgid="370391313511477301">"EvDo ഇല്ലാത്ത CDMA"</item>
+ <item msgid="4678789463133969294">"EvDo മാത്രം"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"ആഗോളം"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA മാത്രം"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/സിം"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"ആഗോളം"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index caec200..c558c09 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"സൃഷ്ടിക്കുക"</string>
<string name="allow" msgid="3349662621170855910">"അനുവദിക്കുക"</string>
<string name="deny" msgid="6947806159746484865">"നിരസിക്കുക"</string>
- <string name="dlg_close" msgid="7471087791340790015">"അടയ്ക്കുക"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"സ്വിച്ച്"</string>
<string name="device_info_default" msgid="7847265875578739287">"അജ്ഞാതം"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">ഒരു ഡവലപ്പറാകുന്നതിൽ നിന്നും നിങ്ങൾ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ചുവട് മാത്രം അകലെയാണ്.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"ആവശ്യമില്ല, നിങ്ങൾ ഇതിനകം ഒരു ഡവലപ്പറാണ്."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ആദ്യം ഡെവലപ്പർ ഓപ്ഷനുകൾ പ്രവർത്തനക്ഷമമാക്കുക."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"വയർലെസും നെറ്റ്വർക്കുകളും"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"കണക്ഷനുകൾ"</string>
- <string name="header_category_device" msgid="4544026001618307754">"ഉപകരണം"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"വ്യക്തിഗതം"</string>
- <string name="header_category_access" msgid="7580499097416970962">"ആക്സസ്സ്"</string>
<string name="header_category_system" msgid="2816866961183068977">"സിസ്റ്റം"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ഡാറ്റാ കണക്ഷൻ പ്രവർത്തനക്ഷമമാക്കുക"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ഡാറ്റ കണക്ഷൻ പ്രവർത്തനരഹിതമാക്കുക"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ഉപകരണത്തിന്റെ Bluetooth വിലാസം: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> വിച്ഛേദിക്കണോ?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"പ്രക്ഷേപണം ചെയ്യുന്നു"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"പേരുനൽകാത്ത ബ്ലൂടൂത്ത് ഉപകരണം"</string>
<string name="progress_scanning" msgid="192587958424295789">"തിരയുന്നു"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"സമീപത്ത് ബ്ലൂടൂത്ത് ഉപകരണങ്ങളൊന്നും കണ്ടെത്തിയില്ല."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Bluetooth ഓണാക്കാനും നിങ്ങളുടെ ഫോൺ മറ്റ് ഉപകരണങ്ങൾക്ക് ദൃശ്യമാക്കാനും ഒരു ആപ്പ് താൽപ്പര്യപ്പെടുന്നു. നിങ്ങൾക്കിത് പിന്നീട് Bluetooth ക്രമീകരണത്തിൽ മാറ്റാനാകും."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ബ്ലൂടൂത്ത് ഓണാക്കുന്നു..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ബ്ലൂടൂത്ത് ഓഫ് ചെയ്യുന്നു..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"സ്വയമേവ കണക്റ്റുചെയ്യുക"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ബ്ലൂടൂത്ത് കണക്ഷൻ അഭ്യർത്ഥന"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" എന്ന ഉപകരണത്തിലേക്ക് കണക്റ്റുചെയ്യാൻ ടാപ്പുചെയ്യുക."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" എന്നതിൽ കണക്റ്റുചെയ്യണോ?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"ലഭ്യമായ കോൾ ഉപകരണങ്ങൾ"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"നിലവിൽ കണക്റ്റ് ചെയ്തു"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"സംരക്ഷിച്ച ഉപകരണങ്ങൾ"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"ഉപകരണം ചേർക്കുക"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"ജോടിയാക്കുന്നതിന് Bluetooth ഓണാക്കപ്പെടും"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"കണക്ഷൻ മുൻഗണനകൾ"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"മുമ്പ് കണക്റ്റ് ചെയ്തിട്ടുള്ള ഉപകരണങ്ങൾ"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"മുമ്പേ കണക്റ്റ് ചെയ്തവ"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth ഓണാക്കി"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"എല്ലാം കാണുക"</string>
<string name="date_and_time" msgid="9062980487860757694">"തീയതിയും സമയവും"</string>
<string name="choose_timezone" msgid="1362834506479536274">"സമയ മേഖല തിരഞ്ഞെടുക്കുക"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"ഒഴിവാക്കുക"</string>
<string name="next_label" msgid="4693520878012668114">"അടുത്തത്"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ഭാഷകൾ"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ഭാഷാ മുൻഗണനകൾ"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"നീക്കംചെയ്യുക"</string>
<string name="add_a_language" msgid="2330538812283783022">"ഒരു ഭാഷ ചേർക്കുക"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"ക്രമീകരണം"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"ക്രമീകരണങ്ങളിലേയ്ക്ക്"</string>
<string name="airplane_mode" msgid="8837269988154128601">"ഫ്ലൈറ്റ് മോഡ്"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"കൂടുതൽ"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"വയർലസ്സും നെറ്റ്വർക്കും"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"വൈഫൈ, ബ്ലൂടൂത്ത്, ഫ്ലൈറ്റ് മോഡ്, മൊബൈൽ നെറ്റ്വർക്കുകൾ, VPN-കൾ എന്നിവ നിയന്ത്രിക്കുക"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"മൊബൈൽ ഡാറ്റ"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"സ്വകാര്യത"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"അഡ്മിൻ പ്രവർത്തനരഹിതമാക്കി"</string>
<string name="security_status_title" msgid="5848766673665944640">"സുരക്ഷാ നില"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"സ്ക്രീൻ ലോക്ക്, മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"സ്ക്രീൻ ലോക്കും ഫിംഗർപ്രിന്റും"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"സ്ക്രീൻ ലോക്ക്"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"മുഖം ചേർത്തു"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"നിങ്ങളുടെ മുഖം ഉപയോഗിച്ച് അൺലോക്ക് ചെയ്യൂ"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"പരിശോധിച്ചുറപ്പിക്കലിനായി നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുക"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾ അംഗീകരിക്കാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുക."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"നിങ്ങളെ ഉപയോഗിക്കുക"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ഫോൺ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലുകൾക്ക് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫെയ്സ് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക: ഈ ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ ഫെയ്സ് ഉപയോഗിക്കാനാവില്ല. കൂടുതൽ വിവരങ്ങൾക്ക് ഓർഗനൈസേഷന്റെ അഡ്മിനെ ബന്ധപ്പെടുക."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ഫോൺ അൺലോക്ക് ചെയ്യാനോ വാങ്ങലുകൾ അംഗീകരിക്കാനോ ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യാനോ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുക"</string>
- <string name="face_add_max" msgid="2342250989212694454">"നിങ്ങൾക്ക് <xliff:g id="COUNT">%d</xliff:g> ഫിംഗർപ്രിൻറുകൾ വരെ ചേർക്കാനാവും"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"നിങ്ങളുടെ ഫെയ്സ് വൃത്തത്തിനുള്ളിൽ കേന്ദ്രീകരിക്കുക"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ഇത് പിന്നീട് ചെയ്യുക"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"നിങ്ങൾക്ക് <xliff:g id="COUNT">%d</xliff:g> വരെ ഫെയ്സുകൾ ചേർക്കാനാവും"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"നിങ്ങൾ പരമാവധി മുഖങ്ങൾ ചേർത്തിരിക്കുന്നു"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"കൂടുതൽ മുഖങ്ങൾ ചേർക്കാനാവില്ല"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"എൻറോൾമെന്റ് പൂർത്തിയായിട്ടില്ല"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ശരി"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"ഫെയ്സ് എൻറോൾമെന്റിന്റെ സമയ പരിധി കഴിഞ്ഞു. വീണ്ടും ശ്രമിക്കുക."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ഫെയ്സ് എൻറോൾമെന്റ് പ്രവർത്തിച്ചില്ല."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"എല്ലാം തയ്യാറായി. നന്നായിരിക്കുന്നു."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"പൂർത്തിയായി"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"മുഖം ഇതിനുപയോഗിക്കൂ"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"ഉപകരണം അൺലോക്ക് ചെയ്യൂ"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"സൈൻ ഇൻ ചെയ്യലും പണമടയ്ക്കലും"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"അൺലോക്ക് ചെയ്യാൻ കണ്ണുകൾ തുറന്നിരിക്കണം"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"മുഖം പരിശോധിച്ചുറപ്പിക്കുമ്പോൾ, കണ്ണുകൾ തുറന്നിരിക്കണം"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"മുഖ ഡാറ്റ നീക്കം ചെയ്യുക"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"മുഖ ഡാറ്റ മെച്ചപ്പെടുത്തുക"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"ഉപകരണം അൺലോക്ക് ചെയ്യാനും ആപ്പുകൾ ആക്സസ് ചെയ്യാനും നിങ്ങളുടെ മുഖം ഉപയോഗിക്കാനാവും. "<annotation id="url">"കൂടുതലറിയുക"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"വിരലടയാളം"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"വിരലടയാളങ്ങൾ നിയന്ത്രിക്കുക"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ഇതിനായി വിരലടയാളം ഉപയോഗിക്കുക"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"വൈഫൈ ഹോട്ട്സ്പോട്ടിനായി കുറഞ്ഞത് ഒരു ബാൻഡ് എങ്കിലും തിരഞ്ഞെടുക്കുക:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ക്രമീകരണം"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"സ്വകാര്യത"</string>
<string name="wifi_shared" msgid="844142443226926070">"മറ്റ് ഉപകരണ ഉപയോക്താക്കളുമായി പങ്കിടുക"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(മാറ്റം വരുത്തിയിട്ടില്ല)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"തിരഞ്ഞെടുക്കുക"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"റദ്ദാക്കുക"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"നെറ്റ്വർക്ക് മറന്നോ?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ഈ നെറ്റ്വർക്കിന് വേണ്ടിയുള്ള എല്ലാ പാസ്വേഡുകളും ഇല്ലാതാക്കും"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"സംരക്ഷിച്ച നെറ്റ്വർക്ക്"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d നെറ്റ്വർക്കുകൾ</item>
<item quantity="one">1 നെറ്റ്വർക്ക്</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"തെളിച്ചം"</string>
<string name="brightness_summary" msgid="838917350127550703">"സ്ക്രീനിന്റെ തെളിച്ചം ക്രമീകരിക്കുക"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"അനുയോജ്യമായ തെളിച്ചം"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ഓണാക്കുക"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ഓഫ്"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"തിരഞ്ഞെടുത്ത തെളിച്ചം വളരെ കുറവാണ്"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"തിരഞ്ഞെടുത്ത തെളിച്ചം കുറവാണ്"</string>
@@ -1123,10 +1129,10 @@
<string name="auto_brightness_description" msgid="7310335517128283729">"നിങ്ങളുടെ പരിതസ്ഥിതിയ്ക്കും പ്രവർത്തനങ്ങൾക്കുമനുസരിച്ച് സ്ക്രീൻ തെളിച്ചം സ്വമേധയാ ക്രമീകരിക്കപ്പെടും. മുൻഗണനകൾ മനസ്സിലാക്കാൻ അനുയോജ്യമായ തെളിച്ചത്തിനെ സഹായിക്കുന്നതിന് നിങ്ങൾക്ക് സ്ലൈഡർ നേരിട്ട് നീക്കാം."</string>
<string name="night_display_title" msgid="2626451512200357686">"നൈറ്റ് ലൈറ്റ്"</string>
<string name="night_display_text" msgid="1837277457033025056">"\'നൈറ്റ് ലൈറ്റ്\' നിങ്ങളുടെ സ്ക്രീനിന് ചെറിയ ആംബർ നിറം നൽകുന്നു. മങ്ങിയ വെളിച്ചത്തിൽ സ്ക്രീനിൽ നോക്കുന്നതും വായിക്കുന്നതും ഈ ഡിസ്പ്ലേ എളുപ്പമാക്കുന്നു, പെട്ടെന്ന് ഉറങ്ങാനും ഇത് നിങ്ങളെ സഹായിച്ചേക്കാം."</string>
- <string name="night_display_auto_mode_title" msgid="6574111412154833409">"സമയക്രമം"</string>
+ <string name="night_display_auto_mode_title" msgid="6574111412154833409">"ഷെഡ്യൂള്"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"ഒന്നുമില്ല"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ഇഷ്ടാനുസൃത സമയത്ത് ഓണാക്കുന്നു"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"സൂര്യോദയം മുതൽ അസ്തമയം വരെ ഓണാക്കുന്നു"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"സൂര്യാസ്തമയം മുതൽ ഉദയം വരെ ഓണാക്കുന്നു"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"ആരംഭിക്കുന്ന സമയം"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"അവസാനിക്കുന്ന സമയം"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"നില"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"പിൻ മാറ്റാനായില്ല.\nപിൻ തെറ്റായിരിക്കാൻ സാധ്യതയുണ്ട്."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"സിമ്മിന്റെ പിൻ മാറ്റി"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"സിം കാർഡ് ലോക്ക് നില മാറ്റാനായില്ല.\nപിൻ തെറ്റായിരിക്കാൻ സാധ്യതയുണ്ട്."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"പിൻ പ്രവർത്തനരഹിതമാക്കാനാവില്ല."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"പിൻ പ്രവർത്തനക്ഷമമാക്കാനാവില്ല."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ശരി"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"റദ്ദാക്കുക"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"ഒന്നിലധികം സിം-കൾ കണ്ടെത്തി"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ഇതിന് <xliff:g id="NAME_0">^1</xliff:g> എന്നത് ഫോർമാറ്റുചെയ്യേണ്ടതുണ്ട്. \n\n"<b>"ഫോർമാറ്റിംഗ് <xliff:g id="NAME_1">^1</xliff:g> എന്നതിൽ നിലവിൽ സംഭരിച്ചിരിക്കുന്ന എല്ലാ വിവരവും മായ്ക്കുന്നു."</b>" വിവരം നഷ്ടപ്പെടുന്നത് ഒഴിവാക്കാൻ, അത് ബാക്കപ്പുചെയ്യുന്നത് പരിഗണിക്കുക."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"മായ്ക്കുക, ഫോർമാറ്റുചെയ്യുക"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ഫോർമാറ്റുചെയ്യുന്നു…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"അത് ഫോർമാറ്റ് ചെയ്യുമ്പോൾ <xliff:g id="NAME">^1</xliff:g> നീക്കംചെയ്യരുത്."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"അത് ഫോർമാറ്റ് ചെയ്യുമ്പോൾ <xliff:g id="NAME">^1</xliff:g> നീക്കം ചെയ്യരുത്."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"പുതിയ സംഭരണത്തിലേക്ക് വിവരം നീക്കുക"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"നിങ്ങൾക്ക് ഈ പുതിയ <xliff:g id="NAME">^1</xliff:g> എന്നതിലേക്ക് ഫോട്ടോകളും ഫയലുകളും ചില ആപ്സും നീക്കാനാകും. \n\nനീക്കുന്നതിന് ഏതാണ്ട് <xliff:g id="TIME">^2</xliff:g> എടുക്കും, ആന്തരിക സംഭരണത്തിൽ <xliff:g id="SIZE">^3</xliff:g> സ്വതന്ത്രമാകും. നീക്കിക്കൊണ്ടിരിക്കുന്ന സമയത്ത് ചില ആപ്സ് പ്രവർത്തിക്കില്ല."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ഇപ്പോൾ നീക്കുക"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ഇന്സ്റ്റാളുചെയ്തു"</string>
<string name="no_applications" msgid="7336588977497084921">"ആപ്സൊന്നുമില്ല."</string>
<string name="internal_storage" msgid="1584700623164275282">"ആന്തരിക സ്റ്റോറേജ്"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ആന്തരിക സ്റ്റോറേജ്"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB സ്റ്റോറേജ്"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD കാർഡ് സ്റ്റോറേജ്"</string>
<string name="recompute_size" msgid="7722567982831691718">"വലുപ്പം വീണ്ടും കണക്കാക്കുന്നു..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"അപ്ലിക്കേഷൻ ഡാറ്റ ഇല്ലാതാക്കണോ?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"ഈ അപ്ലിക്കേഷന്റെ എല്ലാ ഡാറ്റയും ശാശ്വതമായി ഇല്ലാതാക്കും. ഫയലുകൾ, ക്രമീകരണങ്ങൾ, അക്കൗണ്ടുകൾ, ഡാറ്റാബേസുകൾ തുടങ്ങിയവയെല്ലാം ഇതിൽ ഉൾപ്പെടും."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ഇൻസ്റ്റാളുചെയ്ത അപ്ലിക്കേഷനുകളുടെ ലിസ്റ്റിൽ അപ്ലിക്കേഷൻ കണ്ടെത്തിയില്ല."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"ആപ്പുകൾക്കായി സ്റ്റോറേജ് മായ്ക്കാനായില്ല."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"നിങ്ങളുടെ ടാബ്ലെറ്റിൽ ഇനിപ്പറയുന്നവ ഈ അപ്ലിക്കേഷന് ആക്സസ്സുചെയ്യാനാകും:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"നിങ്ങളുടെ ഫോണിൽ ഇനിപ്പറയുന്നവ ഈ അപ്ലിക്കേഷന് ആക്സസ്സുചെയ്യാനാകും:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ഈ അപ്ലിക്കേഷന് നിങ്ങളുടെ ടാബ്ലെറ്റിൽ ഇനിപ്പറയുന്നവ ആക്സസ്സുചെയ്യാനാകും. പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിനും മെമ്മറി ഉപയോഗം കുറയ്ക്കുന്നതിനും ഈ അനുമതികളിൽ ചിലത് <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> എന്നതിന് ലഭ്യമാണ്, കാരണം ഇത് <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> എന്നതിന്റെ സമാന പ്രോസസ്സിൽ പ്രവർത്തിക്കുന്നു:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ഈ അപ്ലിക്കേഷന് നിങ്ങളുടെ ഫോണിൽ ഇനിപ്പറയുന്നവ ആക്സസ്സുചെയ്യാനാകും. പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിനും മെമ്മറി ഉപയോഗം കുറയ്ക്കുന്നതിനും ഈ അനുമതികളിൽ ചിലത് <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> എന്നതിന് ലഭ്യമാണ്, കാരണം ഇത് <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> എന്നതിന്റെ സമാന പ്രോസസ്സിൽ പ്രവർത്തിക്കുന്നു:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g> എന്നിവ"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"ഈ അപ്ലിക്കേഷൻ നിങ്ങളുടെ പണമീടാക്കാം:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"പ്രീമിയം SMS അയയ്ക്കുക"</string>
<string name="computing_size" msgid="1599186977475211186">"കണക്കാക്കുന്നു..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"പാക്കേജ് വലുപ്പം കണക്കാക്കാനായില്ല."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"നിങ്ങൾക്ക് ഇൻസ്റ്റാളുചെയ്ത മൂന്നാം കക്ഷി അപ്ലിക്കേഷനുകളൊന്നുമില്ല."</string>
<string name="version_text" msgid="9189073826278676425">"പതിപ്പ് <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"നീക്കുക"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ടാബ്ലെറ്റിലേക്ക് നീക്കുക"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ഫോണിലേക്ക് നീക്കുക"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB സംഭരണത്തിലേക്ക് നീക്കുക"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD കാർഡിലേക്ക് നീക്കുക"</string>
- <string name="moving" msgid="6431016143218876491">"നീക്കുന്നു"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"മറ്റൊരു മൈഗ്രേഷൻ ഇതിനകം തന്നെ പുരോഗതിയിലാണ്."</string>
<string name="insufficient_storage" msgid="481763122991093080">"ആവശ്യമായ സംഭരണ ഇടമില്ല."</string>
<string name="does_not_exist" msgid="1501243985586067053">"അപ്ലിക്കേഷൻ നിലവിലില്ല."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"ഉപകരണ അഡ്മിൻ ആപ്പ് എക്സ്റ്റേണൽ മീഡിയയിൽ ഇൻസ്റ്റാൾ ചെയ്യാനാവില്ല"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"നിർബന്ധിതമായി നിർത്തണോ?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"നിങ്ങൾ ഒരു അപ്ലിക്കേഷൻ നിർബന്ധിതമായി നിർത്തിയാൽ, അത് ശരിയായി പ്രവർത്തിക്കാനിടയില്ല."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"അപ്ലിക്കേഷൻ നീക്കാനായില്ല. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"തിരഞ്ഞെടുത്ത ഇൻസ്റ്റാൾ ലൊക്കേഷൻ"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"പുതിയ അപ്ലിക്കേഷനുകൾക്കായി തിരഞ്ഞെടുത്ത ഇൻസ്റ്റാളേഷൻ ലൊക്കേഷൻ മാറ്റുക"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"ബിൽറ്റ്ഇൻ ആപ്പ് നിഷ്ക്രിയമാക്കണോ?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"ആപ്പ് പ്രവർത്തനരഹിതമാക്കുക"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"നിങ്ങൾ ഈ ആപ്പ് പ്രവർത്തനരഹിതമാക്കുന്നുവെങ്കിൽ, Android-ഉം മറ്റ് ആപ്സും തുടർന്നങ്ങോട്ട് ഉദ്ദേശിച്ചത് പോലെ പ്രവർത്തിച്ചേക്കില്ല."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ഡാറ്റ ഇല്ലാതാക്കി അപ്ലിക്കേഷൻ പ്രവർത്തനരഹിതമാക്കണോ?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"നിങ്ങൾ ഈ ആപ്പ് പ്രവർത്തനരഹിതമാക്കുന്നുവെങ്കിൽ, Android-ഉം മറ്റ് ആപ്സും തുടർന്നങ്ങോട്ട് ഉദ്ദേശിച്ചത് പോലെ പ്രവർത്തിച്ചേക്കില്ല. നിങ്ങളുടെ ഡാറ്റ ഇല്ലാതാക്കപ്പെടുകയും ചെയ്യും."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"അറിയിപ്പുകൾ ഓഫാക്കണോ?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ഈ അപ്ലിക്കേഷനായി അറിയിപ്പുകൾ ഓഫുചെയ്യുമ്പോൾ, പ്രധാന അലേർട്ടുകളും അപ്ഡേറ്റുകളും നിങ്ങളുടെ ശ്രദ്ധയിൽപ്പെടാതെ പോകാം."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"സ്റ്റോർ"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"ആപ്പ് വിശദാംശങ്ങൾ"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> എന്നതിൽ നിന്ന് ആപ്പ് ഇൻസ്റ്റാൾ ചെയ്തു"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"സേവനം ഉപയോഗിക്കുക"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"നിറം ക്രമീകരിക്കൽ ഉപയോഗിക്കുക"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"അടിക്കുറിപ്പുകൾ ഉപയോഗിക്കുക"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"തുടരുക"</string>
<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="6371077608778830020">"ശ്രവണ സഹായി ചേർക്കുക"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"നിങ്ങൾ ഒരു ആപ്പിനായി പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തുകയാണെങ്കിൽ, അത് ശരിയായി പ്രവർത്തിക്കാനിടയില്ല."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ബാറ്ററി ഓപ്റ്റിമൈസ് ചെയ്യാൻ ഈ ആപ്പ് സജ്ജീകരിക്കാത്തതിനാൽ, നിങ്ങൾക്ക് ഇത് നിയന്ത്രിക്കാനാവില്ല.\n\nആപ്പ് നിയന്ത്രിക്കാൻ, ആദ്യം ബാറ്ററി ഓപ്റ്റിമൈസേഷൻ ഓണാക്കുക."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"പൂർണ്ണമായി ചാർജ്ജുചെയ്തത് മുതലുള്ള സ്ക്രീൻ ഉപയോഗം"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"സ്ക്രീൻ ഉപഭോഗം"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"മൊബൈൽ നെറ്റ്വർക്ക് സ്കാൻ ചെയ്യൽ"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"പൂർണ്ണമായി ചാർജ് ചെയ്ത ശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"പൂർണ്ണമായി ചാർജ് ചെയ്തത് മുതൽ സ്ക്രീൻ ഓണായിരുന്ന സമയം"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"പൂർണ്ണമായി ചാർജ്ജുചെയ്തത് മുതലുള്ള ഉപകരണ ഉപയോഗം"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"വിശദാംശം ഉപയോഗിക്കൂ"</string>
<string name="controls_subtitle" msgid="390468421138288702">"പവർ ഉപയോഗം ക്രമീകരിക്കുക"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"ഉൾപ്പെടുത്തിയ പാക്കേജുകൾ"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ആപ്പുകൾ ബാറ്ററി ഉപയോഗിച്ചുതീർക്കുന്നു"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ഉപകരണം സജീവമാക്കി നിലനിർത്തുന്നു"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"പശ്ചാത്തലത്തിൽ ഉപകരണം സജീവമാക്കുന്നു"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ലൊക്കേഷൻ കൂടെക്കൂടെ അഭ്യർത്ഥിക്കുന്നു"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ആപ്പുകൾ അസ്വാഭാവികമായി പ്രവർത്തിക്കുന്നു"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"ആപ്പുകൾ സാധാരണ രീതിയിൽ റൺ ചെയ്യുന്നു"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ഫോണിന് സാധാരണ പശ്ചാത്തല ബാറ്ററി ഉപയോഗമുണ്ട്"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ടാബ്ലെറ്റിന് സാധാരണ പശ്ചാത്തല ബാറ്ററി ഉപയോഗമുണ്ട്"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d ആപ്പുകൾക്കായി ബാറ്ററി ഉപഭോഗം നിയന്ത്രിക്കുന്നു</item>
<item quantity="one">%1$d ആപ്പിനായി ബാറ്ററി ഉപഭോഗം നിയന്ത്രിക്കുന്നു</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> നിയന്ത്രിതം"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"ഈ ആപ്പുകൾ പശ്ചാത്തലത്തിൽ ബാറ്ററി ഉപയോഗിച്ച് കൊണ്ടിരിക്കുന്നു. നിയന്ത്രിത ആപ്പുകൾ ശരിയായ രീതിയിൽ പ്രവർത്തിക്കാതിരിക്കുകയും അറിയിപ്പുകൾ വൈകുകയും ചെയ്തേക്കാം."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"ബാറ്ററി മാനേജർ ഉപയോഗിക്കുക"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"ആപ്പുകൾ ബാറ്ററി ഉപയോഗിച്ചുതീർക്കുമ്പോൾ കണ്ടെത്തുക"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"റദ്ദാക്കുക"</string>
<string name="tts_reset" msgid="2661752909256313270">"പുനഃസജ്ജമാക്കുക"</string>
<string name="tts_play" msgid="2628469503798633884">"പ്ലേ ചെയ്യുക"</string>
- <string name="gadget_title" msgid="5519037532720577836">"പവർ നിയന്ത്രണം"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"വൈഫൈ ക്രമീകരണം അപ്ഡേറ്റുചെയ്യുന്നു"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ബ്ലൂടൂത്ത് ക്രമീകരണം അപ്ഡേറ്റുചെയ്യുന്നു"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ഓണാണ്"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ഓഫ്"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ഓൺചെയ്യുന്നു"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"ഓഫുചെയ്യുന്നു"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"വൈഫൈ"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ബ്ലൂടൂത്ത്"</string>
- <string name="gadget_location" msgid="2974757497945178165">"ലൊക്കേഷൻ"</string>
- <string name="gadget_sync" msgid="858895763714222152">"സമന്വയിപ്പിക്കുക"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"തെളിച്ചം <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"യാന്ത്രികം"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"പൂർണ്ണതെളിച്ചം"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"പകുതിതെളിച്ചം"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"വളരെക്കുറച്ച് തെളിച്ചം"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ക്രെഡൻഷ്യൽ സ്റ്റോറേജ്"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"സംഭരണത്തിൽ നിന്ന് ഇൻസ്റ്റാളുചെയ്യുക"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>-ൽ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"എല്ലാം തിരഞ്ഞെടുക്കുക"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ഡാറ്റ ഉപയോഗം"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ആപ്പ് ഡാറ്റ ഉപയോഗം"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"മൊബൈൽ ഡാറ്റയും വൈഫൈയും"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"കാരിയർ ഡാറ്റ കണക്കാക്കുന്നത് ഉപകരണത്തിൽ നിന്നും വ്യത്യാസപ്പെട്ടിരിക്കാം."</string>
<string name="data_usage_app" msgid="4970478397515423303">"അപ്ലിക്കേഷൻ ഉപയോഗം"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ആപ്പ് വിവരം"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">മറച്ച %d ഇനങ്ങൾ കാണിക്കുക</item>
<item quantity="one">മറച്ച %d ഇനം കാണിക്കുക</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ചുരുക്കുക"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"നെറ്റ്വർക്കും ഇന്റർനെറ്റും"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"മൊബൈല്"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ഡാറ്റ ഉപയോഗം"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ആപ്സും അറിയിപ്പുകളും"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"അനുമതികൾ, ഡിഫോൾട്ട് ആപ്പുകൾ"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"ഔദ്യോഗിക പ്രൊഫൈലിലെ ആപ്പുകൾക്ക് അറിയിപ്പിലേക്കുള്ള ആക്സസ് ലഭ്യമല്ല."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"അക്കൗണ്ടുകൾ"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"അക്കൗണ്ടുകളൊന്നും ചേർത്തില്ല"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ഡിഫോൾട്ട് ആപ്സ്"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ഭാഷകൾ, സമയം, ബാക്കപ്പ്, അപ്ഡേറ്റുകൾ"</string>
<string name="search_results_title" msgid="1796252422574886932">"ക്രമീകരണം"</string>
- <string name="search_menu" msgid="6283419262313758339">"തിരയൽ ക്രമീകരണം"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"വൈഫൈ, വൈ-ഫൈ, നെറ്റ്വർക്ക് കണക്ഷൻ, ഇന്റർനെറ്റ്, വയർലെസ്സ്, ഡാറ്റ, വൈ ഫൈ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"വൈഫൈ, വൈ-ഫൈ, ടോഗിൾ, നിയന്ത്രണം"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"അക്ഷര സന്ദേശം, ടെക്സ്റ്റിംഗ്, സന്ദേശങ്ങൾ, സന്ദേശമയയ്ക്കൽ, ഡിഫോൾട്ട്"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"പണമടയ്ക്കുക. ടാപ്പുചെയ്യുക, പേയ്മെന്റുകൾ"</string>
<string name="keywords_backup" msgid="470070289135403022">"ബാക്കപ്പ് ചെയ്യൂ"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"വിരൽചലനം"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ഫേസ്, അൺലോക്ക് ചെയ്യുക, പരിശോധിച്ചുറപ്പിക്കുക, സൈൻ ഇൻ ചെയ്യുക"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl പതിപ്പ്, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"നെറ്റ്വർക്ക്, മൊബൈൽ നെറ്റ്വർക്ക് നില, സേവന നില, സിഗ്നൽ ശക്തി, മൊബൈൽ നെറ്റ്വർക്ക് നില, റോമിംഗ്, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"സീരിയൽ നമ്പർ, ഹാർഡ്വെയർ പതിപ്പ്"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ഇരുണ്ട തീം"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ബഗ്"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"പാതിമയക്ക ഡിസ്പ്ലേ, ലോക്ക് സ്ക്രീൻ ഡിസ്പ്ലേ"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"ലോക്ക് സ്ക്രീൻ അറിയിപ്പ്"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"മുഖം"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ഫിംഗർപ്രിന്റ്"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"സ്ക്രീൻ മങ്ങിക്കൽ, ടച്ച്സ്ക്രീൻ, ബാറ്ററി, സ്മാർട്ട് തെളിച്ചം, ചലനാത്മക തെളിച്ചം"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"ഈ ഉപകരണം ആരംഭിക്കാൻ PIN നൽകുന്ന സമയത്ത്, <xliff:g id="SERVICE">%1$s</xliff:g> പോലുള്ള ഉപയോഗസഹായി സേവനങ്ങൾ ലഭ്യമാകില്ല."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"ഈ ഉപകരണം ആരംഭിക്കാൻ പാറ്റേൺ നൽകുന്ന സമയത്ത്, <xliff:g id="SERVICE">%1$s</xliff:g> പോലുള്ള ഉപയോഗസഹായി സേവനങ്ങൾ ലഭ്യമാകില്ല."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"ഈ ഉപകരണം ആരംഭിക്കാൻ പാസ്വേഡ് നൽകുന്ന സമയത്ത്, <xliff:g id="SERVICE">%1$s</xliff:g> പോലുള്ള ഉപയോഗസഹായി സേവനങ്ങൾ ലഭ്യമാകില്ല."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ശ്രദ്ധിക്കുക: റീബൂട്ടിന് ശേഷം, ഫോൺ അൺലോക്കുചെയ്യുന്നത് വരെ ഈ ആപ്പ് ആരംഭിക്കാൻ കഴിയില്ല"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"ശ്രദ്ധിക്കുക: നിങ്ങളുടെ ഫോൺ റീസ്റ്റാർട്ട് ചെയ്ത്, സ്ക്രീൻ ലോക്ക് സജ്ജീകരിച്ചിട്ടുണ്ടെങ്കിൽ നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യുന്നതുവരെ ഈ ആപ്പ് ആരംഭിക്കാനാവില്ല"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI വിവരങ്ങൾ"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI അനുബന്ധ വിവരങ്ങൾ"</string>
<string name="slot_number" msgid="3762676044904653577">"(സ്ലോട്ട്<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"വ്യക്തിഗതം"</string>
<string name="filter_work_apps" msgid="24519936790795574">"ഔദ്യോഗികം"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ആപ്പുകൾ: എല്ലാം"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ആപ്പുകൾ: ഓഫാക്കി"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ഓഫാക്കി"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"വിഭാഗങ്ങൾ: അടിയന്തര പ്രാധാന്യം"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"വിഭാഗങ്ങൾ: പ്രാധാന്യം കുറഞ്ഞത്"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"വിഭാഗങ്ങൾ: ഓഫാക്കി"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"ബാറ്ററി ഉപഭോഗ മുന്നറിയിപ്പ്"</string>
<string name="show_all_apps" msgid="1512506948197818534">"ഉപകരണത്തിന്റെ മുഴുവൻ ഉപയോഗം കാണിക്കുക"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"ആപ്പ് ഉപയോഗം കാണിക്കുക"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ഉയർന്ന ഉപയോഗം"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ആപ്പുകൾ അസ്വാഭാവികമായി പ്രവർത്തിക്കുന്നു</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> അസ്വാഭാവികമായി പ്രവർത്തിക്കുന്നു</item>
@@ -3667,7 +3638,7 @@
<string name="memory_maximum_usage" msgid="6513785462055278341">"പരമാവധി ഉപയോഗം"</string>
<string name="no_data_usage" msgid="9131454024293628063">"ഡാറ്റയൊന്നും ഉപയോഗിച്ചില്ല"</string>
<string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"\'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് <xliff:g id="APP">%1$s</xliff:g>-ന് ആക്സസ് അനുവദിക്കണോ?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"\'ശല്യപ്പെടുത്തരുത്\' ഓണാക്കാനും/ഓഫാക്കാനും ബന്ധപ്പെട്ട ക്രമീകരണത്തിലേക്ക് മാറ്റങ്ങൾ വരുത്താനും ആപ്പിന് കഴിയും."</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"\'ശല്യപ്പെടുത്തരുത്\' ഓൺ/ഓഫ് ആക്കാനും ബന്ധപ്പെട്ട ക്രമീകരണത്തിലേക്ക് മാറ്റങ്ങൾ വരുത്താനും ആപ്പിന് കഴിയും."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"അറിയിപ്പ് ആക്സസ്സ് ഓണായിരിക്കുന്നതിനാൽ ഇതും ഓണായി തുടരണം"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"\'ശല്യപ്പെടുത്തരുത്\' എന്നതിലേക്ക് <xliff:g id="APP">%1$s</xliff:g> ആപ്പിനുള്ള ആക്സസ് പിൻവലിക്കണോ?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ഈ ആപ്പ് സൃഷ്ടിച്ചിട്ടുള്ള എല്ലാ \'ശല്യപ്പെടുത്തരുത്\' നിയമങ്ങളും നീക്കംചെയ്യപ്പെടും."</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"ഉള്ളിലെ മെമ്മറി: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ഉപയോഗിച്ചു - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ശേഷിക്കുന്നു"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> നിഷ്ക്രിയമാണെങ്കിൽ സ്ലീപ്പിലാക്കുക"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"വാൾപേപ്പർ, സ്ലീപ്പ്, ഫോണ്ട് വലുപ്പം"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 മിനിറ്റ് നിഷ്ക്രിയമാണെങ്കിൽ സ്ലീപ്പിലാക്കുക"</string>
<string name="memory_summary" msgid="8080825904671961872">"ശരാശരി <xliff:g id="USED_MEMORY">%1$s</xliff:g> / <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> മെമ്മറി ഉപയോഗിച്ചു"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> എന്നയാളായി സൈൻ ഇൻ ചെയ്തു"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS അനുവദനീയമല്ല"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"ക്യാമറ അനുവദനീയമല്ല"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"സ്ക്രീൻഷോട്ട് അനുവദനീയമല്ല"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"ബാക്കപ്പുകൾ ഓഫാക്കാനാവില്ല"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"ഈ ആപ്പ് തുറക്കാനാവില്ല"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"നിങ്ങൾക്ക് ചോദ്യങ്ങളുണ്ടെങ്കിൽ, ഐടി അഡ്മിനെ ബന്ധപ്പെടുക"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"കൂടുതൽ വിശദാംശങ്ങൾ"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"കട്ടൗട്ട് ഉപയോഗിച്ച് ഒരു ഡിസ്പ്ലേ പ്രവർത്തിപ്പിക്കുക"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ഡിസ്പ്ലേ കട്ട്ഔട്ട്"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ഡിസ്പ്ലേ കട്ടൗട്ട്, നോച്ച്"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ഒന്നുമില്ല"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ഉപകരണത്തിൽ ഡിഫോൾട്ടായുള്ളത്"</string>
<string name="special_access" msgid="3458780842491881155">"പ്രത്യേക ആപ്പ് ആക്സസ്സ്"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ആപ്പുകൾക്ക് നിയന്ത്രണമില്ലാതെ ഡാറ്റ ഉപയോഗിക്കാം</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> എന്നതിൽ കണക്റ്റുചെയ്തു"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ഒന്നിലധികം ഉപകരണങ്ങളിൽ കണക്റ്റുചെയ്തു"</string>
<string name="demo_mode" msgid="2798762752209330277">"സിസ്റ്റം UI ഡെമോ മോഡ്"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"നൈറ്റ് മോഡ്"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"നൈറ്റ് മോഡ് സജ്ജീകരിക്കുക"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"ഡാർക്ക് മോഡ്"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"ഡാർക്ക് മോഡ് സജ്ജീകരിക്കുക"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ദ്രുത ക്രമീകരണ ഡെവലപ്പർ ടൈലുകൾ"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"വിൻസ്കോപ്പ് അടയാളം"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"ഔദ്യോഗിക പ്രൊഫൈൽ ക്രമീകരണം"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"കോൺടാക്റ്റ് തിരയൽ"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"വിളിക്കുന്നവരെയും കോൺടാക്റ്റുകളെയും തിരിച്ചറിയുന്നതിന് കോൺടാക്റ്റുകൾ തിരയാൻ നിങ്ങളുടെ സ്ഥാപനത്തെ അനുവദിക്കുക"</string>
@@ -3986,17 +3957,21 @@
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"ആപ്പുകൾ മാറാൻ, ഹോം ബട്ടണിൽ സ്വൈപ്പ് ചെയ്യുക. എല്ലാ ആപ്പുകളും കാണാൻ വീണ്ടും സ്വൈപ്പ് ചെയ്യുക. ഏത് സ്ക്രീനിൽ നിന്നും പ്രവർത്തിക്കുന്നു. നിങ്ങളുടെ സ്ക്രീനിന്റെ താഴെ വലത് ഭാഗത്ത് തുടർന്നങ്ങോട്ട് അവലോകന ബട്ടൺ ഉണ്ടാവുകയില്ല."</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"പുതിയ ഹോം ബട്ടൺ പരീക്ഷിക്കുക"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"ആപ്പുകൾ മാറാൻ പുതിയ വിരൽചലനം ഓണാക്കുക"</string>
- <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ഫോൺ പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
+ <string name="ambient_display_title" product="default" msgid="5144814600610448504">"ഫോൺ പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പ് ചെയ്യുക"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ടാബ്ലെറ്റ് പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"ഉപകരണം പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, സ്ക്രീനിൽ രണ്ടുതവണ ടാപ്പുചെയ്യുക."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ സ്ക്രീനിൽ രണ്ട് തവണ ടാപ്പ് ചെയ്യുക."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"പരിശോധിക്കാൻ ഫോണുയർത്തുക"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"പരിശോധിക്കുന്നതിന് ടാബ്ലെറ്റ് എടുത്തുയർത്തുക"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"പരിശോധിക്കുന്നതിന് ഉപകരണം എടുത്തുയർത്തുക"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, ഫോൺ കയ്യിലെടുക്കുക."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, ടാബ്ലെറ്റ് കയ്യിലെടുക്കുക."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"സമയം, അറിയിപ്പ് ഐക്കണുകൾ, മറ്റ് വിവരങ്ങൾ എന്നിവ നോക്കുന്നതിന്, ഫോൺ കയ്യിലെടുക്കുക."</string>
- <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"അറിയിപ്പുകൾക്ക് വിരലടയാളം സ്വൈപ്പുചെയ്യുക"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ഡിസ്പ്ലേ സജീവമാക്കുക"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ ഫോൺ കയ്യിലെടുക്കുക."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ ടാബ്ലെറ്റ് കയ്യിലെടുക്കുക."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ ഉപകരണം കയ്യിലെടുക്കുക."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"വേക്ക് ലോക്ക് സ്ക്രീൻ കാണിക്കാനുള്ള വിരൽചലനം"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
+ <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"അറിയിപ്പുകൾക്ക് വിരലടയാളം സ്വൈപ്പ് ചെയ്യുക"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ഫിംഗർപ്രിന്റ് സ്വൈപ്പ്"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ ഫോണിന്റെ പിൻവശത്തുള്ള വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"നിങ്ങളുടെ അറിയിപ്പുകൾ പരിശോധിക്കാൻ, ടാബ്ലെറ്റിന്റെ പിൻവശത്തുള്ള വിരലടയാള സെൻസറിൽ താഴേക്ക് സ്വൈപ്പുചെയ്യുക."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ശ്രമങ്ങൾ</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ശ്രമം</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"ഈ ഉപകരണത്തിലെ ഡാറ്റ ബാക്കപ്പ് ചെയ്യുന്നു"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"ഈ ഉപകരണം മാനേജുചെയ്യുന്നത് നിങ്ങളുടെ സ്ഥാപനമാണ്."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"ഈ ഉപകരണം നിയന്ത്രിക്കുന്നത് <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ആണ്."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"സ്വയം പൂരിപ്പിക്കൽ സേവനം"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"സ്വയമേവ, പൂരിപ്പിക്കൽ, സ്വയമേവ പൂരിപ്പിക്കൽ"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ഈ ആപ്പിനെ നിങ്ങൾ വിശ്വസിക്കുന്നുണ്ടെന്ന് ഉറപ്പുവരുത്തുക</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> സ്വയമേവ പൂരിപ്പിക്കേണ്ടത് എന്താണെന്ന് നിർണ്ണയിക്കുന്നതിന് നിങ്ങളുടെ സ്ക്രീനിൽ ഉള്ളത് ഉപയോഗിക്കുന്നു."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"സ്വമേധയാ പൂരിപ്പിക്കൽ"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"ലോഗിംഗ് ലെവൽ"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"ഓരോ സെഷനിലെയും പരമാവധി അഭ്യർത്ഥനകൾ"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"കാണാനാവുന്ന പരമാവധി ഡാറ്റാസെറ്റുകൾ"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ഡിഫോൾട്ട് മൂല്യങ്ങളിലേക്ക് പുനഃക്രമീകരിക്കുക"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"സ്വമേധയാ പൂരിപ്പിക്കുന്ന ഡെവലപ്പർ ഓപ്ഷനുകൾ പുനഃക്രമീകരിച്ചു"</string>
<string name="device_theme" msgid="4571803018917608588">"ഉപകരണത്തിന്റെ തീം"</string>
<string name="default_theme" msgid="7085644992078579076">"ഡിഫോൾട്ട്"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"നെറ്റ്വർക്കിന്റെ പേര്"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"കാരിയർ പ്രൊവിഷനിംഗ് തുടങ്ങുക"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\'ശല്യപ്പെടുത്തരുത്\' അപ്ഡേറ്റ് ചെയ്യുക"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"ഫോക്കസ് ചെയ്ത നിലയിൽ തുടരാൻ, അറിയിപ്പുകൾ താൽക്കാലികമായി നിർത്തുക"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"പുതിയതും ആവേശമുണർത്തുന്നതുമായ കാര്യങ്ങൾ എന്തൊക്കെയാണ്?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"നിങ്ങളുടെ പുതിയ ഫോണിനെ അറിയുക"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"നിങ്ങളുടെ പുതിയ ടാബ്ലെറ്റിനെ അറിയുക"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"നിങ്ങളുടെ പുതിയ ഉപകരണത്തെ അറിയുക"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"ഈ ഫീച്ചർ ഈ ഉപകരണത്തിൽ ലഭ്യമല്ല"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"പൂർണ്ണ GNSS അളവുകൾ നടപ്പിലാക്കുക"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"നോ ഡ്യൂട്ടി സൈക്ലിംഗ് ഉപയോഗിച്ച് മുഴുവൻ GNSS കോൺസ്റ്റലേഷനുകളും ആവൃത്തികളും ട്രാക്ക് ചെയ്യൂ"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"എപ്പോഴും ക്രാഷ് ഡയലോഗ് കാണിക്കുക"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"ആപ്പ് ക്രാഷാകുമ്പോഴെല്ലാം ഡയലോഗ് കാണിക്കുക"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE പ്രവർത്തനക്ഷമമാക്കിയ ആപ്പ് തിരഞ്ഞെടുക്കുക"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE പ്രവർത്തനക്ഷമമാക്കിയ ആപ്പൊന്നും സജ്ജീകരിച്ചിട്ടില്ല"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE പ്രവർത്തനക്ഷമമാക്കിയ ആപ്പ്: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ഡയറക്റ്ററി ആക്സസ്"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ഡയറക്റ്ററി ആക്സസ്"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"നെറ്റ്വർക്ക് വിശദാംശങ്ങൾ"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"നിങ്ങളുടെ ഫോണിലെ അപ്ലിക്കേഷനുകൾക്ക് നിങ്ങളുടെ ഉപകരണത്തിന്റെ പേര് ദൃശ്യമാണ്. വൈഫൈ ഹോട്ട്സ്പോട്ട് സജ്ജീകരിക്കുമ്പോഴോ Bluetooth ഉപകരണങ്ങളുമായി കണക്റ്റ് ചെയ്യുമ്പോഴോ, ഇത് മറ്റ് ആളുകൾക്കും കാണാനായേക്കും."</string>
<string name="devices_title" msgid="7701726109334110391">"ഉപകരണങ്ങൾ"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"എല്ലാ ക്രമീകരണവും"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"നിർദ്ദേശങ്ങൾ"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ഡാറ്റ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ഡാറ്റ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"നെറ്റ്വര്ക്ക് തിരഞ്ഞെടുക്കുക"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"വിച്ഛേദിച്ചു"</string>
+ <string name="network_connected" msgid="4943925032253989621">"കണക്റ്റ് ചെയ്തു"</string>
+ <string name="network_connecting" msgid="76404590784733557">"കണക്റ്റ് ചെയ്യുന്നു…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"കണക്റ്റ് ചെയ്യാനായില്ല"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"നെറ്റ്വർക്കുകളൊന്നും കണ്ടെത്തിയില്ല."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"നെറ്റ്വർക്കുകൾ കണ്ടെത്താനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(നിരോധിക്കപ്പെട്ടത്)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"സിം കാർഡില്ല"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"വിപുലമായ കോളിംഗ്"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: WCDMA-യ്ക്ക് മുൻഗണന"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: GSM മാത്രം"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: WCDMA മാത്രം"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: CDMA മാത്രം"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: EvDo മാത്രം"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: ആഗോളം"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് മോഡ്: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (ശുപാർശചെയ്തത്)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (ശുപാർശചെയ്തത്)"</string>
+ <string name="network_global" msgid="959947774831178632">"ആഗോളം"</string>
+ <string name="label_available" msgid="1731547832803057893">"ലഭ്യമായ നെറ്റ്വർക്കുകൾ"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"തിരയുന്നു..."</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> എന്നതിൽ രജിസ്റ്റർ ചെയ്യുന്നു…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"നിങ്ങളുടെ സിം കാർഡ്, ഈ നെറ്റ്വർക്കിലേക്ക് കണക്ഷൻ അനുവദിക്കുന്നില്ല."</string>
+ <string name="connect_later" msgid="978991102125216741">"ഈ നെറ്റ്വർക്കിലേക്ക് ഇപ്പോൾ കണക്റ്റ് ചെയ്യാനാവുന്നില്ല. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
+ <string name="registration_done" msgid="4573820010512184521">"നെറ്റ്വർക്കിൽ രജിസ്റ്റർ ചെയ്തു."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"സ്വമേധയാ നെറ്റ്വർക്ക് തിരഞ്ഞെടുക്കുക"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"കാരിയർ ക്രമീകരണം"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ഡാറ്റാ സേവനം സജ്ജീകരിക്കുക"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"മൊബൈൽ ഡാറ്റ"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"മൊബൈൽ നെറ്റ്വർക്ക് ഉപയോഗിച്ച് ഡാറ്റ ആക്സസ് ചെയ്യുക"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് തരം"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"നെറ്റ്വർക്ക് പ്രവർത്തിക്കുന്ന മോഡ് മാറ്റുക"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"മുൻഗണന നൽകുന്ന നെറ്റ്വർക്ക് തരം"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"കാരിയര്"</string>
+ <string name="call_category" msgid="8108654745239563833">"കോൾചെയ്യുന്നു"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"കാരിയർ വീഡിയോ കോളിംഗ്"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"സിസ്റ്റം സെലക്ട്"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA റോമിംഗ് മോഡ് മാറ്റുക"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"സിസ്റ്റം സെലക്ട്"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"നെറ്റ്വർക്ക്"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"നെറ്റ്വർക്ക്"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA സബ്സ്ക്രിപ്ഷൻ"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/സിം, NV എന്നിവ പരസ്പരം മാറ്റുക"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"സബ്സ്ക്രിപ്ഷൻ"</string>
+ <string name="register_automatically" msgid="518185886971595020">"സ്വമേധയായുള്ള രജിസ്ട്രേഷൻ…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"ഡാറ്റാ റോമിംഗ് അനുവദിക്കണോ?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"നിരക്കിനായി, നെറ്റ്വർക്ക് ദാതാവിനെ ബന്ധപ്പെടുക."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ആപ്പിന്റെ ഡാറ്റ ഉപയോഗം"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"നെറ്റ്വര്ക്ക് മോഡ് <xliff:g id="NETWORKMODEID">%1$d</xliff:g> അസാധുവാണ്. അവഗണിക്കുക."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> എന്നതിലേക്ക് കണക്റ്റ് ചെയ്തിരിക്കുമ്പോൾ ലഭ്യമല്ല"</string>
+ <string name="see_more" msgid="5953815986207345223">"കൂടുതൽ കാണുക"</string>
+ <string name="see_less" msgid="1250265310929558370">"കുറച്ച് കാണുക"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index fbfe81c..0953820 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -266,8 +266,8 @@
<item msgid="4547883971364273343">"аудио фокус"</item>
<item msgid="2603878814882344450">"үндсэн дууны хэмжээ"</item>
<item msgid="7136963238377062018">"хоолойн дууны хэмжээ"</item>
- <item msgid="4270236897655923007">"хонхны дууны хэмжээ"</item>
- <item msgid="6325739889222559394">"медиа дууны хэмжээ"</item>
+ <item msgid="4270236897655923007">"хонхны дууны түвшин"</item>
+ <item msgid="6325739889222559394">"медиа дууны түвшин"</item>
<item msgid="5762123934816216821">"сэрүүлгийн дууны түвшин"</item>
<item msgid="785049718065337473">"мэдэгдлийн дууны хэмжээ"</item>
<item msgid="6700305533746877052">"блютүүтийн хэмжээ"</item>
@@ -333,8 +333,8 @@
<item msgid="3265262911688671938">"Аудио фокус"</item>
<item msgid="2098976479485046797">"Үндсэн дууны хэмжээ"</item>
<item msgid="5660213838861789350">"Хоолойн дууны хэмжээ"</item>
- <item msgid="7983336752371254444">"Хонхны дууны хэмжээ"</item>
- <item msgid="7878027809189330917">"Медиа дууны хэмжээ"</item>
+ <item msgid="7983336752371254444">"Хонхны дууны түвшин"</item>
+ <item msgid="7878027809189330917">"Медиа дууны түвшин"</item>
<item msgid="7260546305036218513">"Сэрүүлгийн дууны түвшин"</item>
<item msgid="9103719301075748925">"Мэдэгдлийн дууны хэмжээ"</item>
<item msgid="7025966722295861512">"Блютүүтийн хэмжээ"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Хязгаартайгаар тохируулах"</item>
<item msgid="2266114985518865625">"Хязгааргүйгээр тохируулах"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Өгөгдмөл (үүсгэсэн MAC ашиглах)"</item>
+ <item msgid="5398461510512959597">"Итгэмжлэгдсэн"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Үгүй"</item>
<item msgid="3863157480502955888">"Тийм"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Байнга асаалттай"</item>
<item msgid="6385301106124765323">"Байнга унтраалттай"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Идэвхгүй"</item>
+ <item msgid="2182686878828390312">"Дебаг хийх"</item>
+ <item msgid="5286514712714822064">"Verbose"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Зөвхөн гэр"</item>
+ <item msgid="5034813753274486448">"Автомат"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA нь давуу эрхтэй"</item>
+ <item msgid="807926878589867564">"Зөвхөн GSM"</item>
+ <item msgid="488474605709912156">"Зөвхөн WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA автомат"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo автомат"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"Зөвхөн EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Глобал"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"Зөвхөн TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Глобал"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 4cfd97a..97d78b5 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Үүсгэх"</string>
<string name="allow" msgid="3349662621170855910">"Зөвшөөрөх"</string>
<string name="deny" msgid="6947806159746484865">"Татгалзах"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Хаах"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Шилжих"</string>
<string name="device_info_default" msgid="7847265875578739287">"Тодорхойгүй"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Танд одоо хөгжүүлэгч болоход <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> алхам дутуу байна.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Шаардлагагүй, та аль хэдийн хөгжүүлэгч болсон."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Эхлээд хөгжүүлэгчийн сонголтыг идэвхжүүлнэ үү."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Утасгүй & сүлжээ"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Холболтууд"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Төхөөрөмж"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Хувийн"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Хандалт"</string>
<string name="header_category_system" msgid="2816866961183068977">"Систем"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Дата холболтыг идэвхжүүлэх"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Дата холболтыг идэвхгүй болгох"</string>
@@ -45,7 +39,7 @@
<string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presence-г бэлтгэсэн"</string>
<string name="radio_info_radio_power" msgid="7187666084867419643">"Мобайл радио цахилгаан"</string>
<string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"SIM хаягийн лавлахыг харах"</string>
- <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Тогтвортой залгах дугаарыг харах"</string>
+ <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Тогтсон залгах дугааруудыг харах"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Үйлчилгээний Залгах Дугаарыг харах"</string>
<string name="radioInfo_menu_getIMS" msgid="185171476413967831">"IMS үйлчилгээний төлөв"</string>
<string name="radio_info_ims_reg_status_title" msgid="16971785902696970">"IMS төлөв"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Төхөөрөмжийн Bluetooth хаяг: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-г салгах уу?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Цацалт"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Нэргүй блютүүт төхөөрөмж"</string>
<string name="progress_scanning" msgid="192587958424295789">"Хайж байна..."</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Ойролцоо блютүүт төхөөрөмж олдсонгүй."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Апп Bluetooth-г асааж, таны утсыг бусад төхөөрөмжид харуулах хүсэлтэй байна. Та үүнийг дараа нь Bluetooth-н тохиргоонд өөрчлөх боломжтой."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Блютүүтийг асааж байна…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Блютүүтийг унтрааж байна…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Авто-холболт"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth холболтын хүсэлт"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" руу холбохын тулд дарна уу."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Та \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"-д холбогдохыг хүсч байна уу?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Боломжтой дуудлагын төхөөрөмж"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Одоогоор холбогдсон"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Хадгалсан төхөөрөмж"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Төхөөрөмж нэмэх"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth холбогдохын тулд асна"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Холболтын тохируулга"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Өмнө нь холбогдсон төхөөрөмж"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Өмнө нь холбогдсон"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth-г асаасан"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Бүгдийг харах"</string>
<string name="date_and_time" msgid="9062980487860757694">"Огноо & цаг"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Цагийн бүсийг сонгоно уу"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Алгасах"</string>
<string name="next_label" msgid="4693520878012668114">"Дараагийн"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Хэл"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Хэлний тохиргоо"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Арилгах"</string>
<string name="add_a_language" msgid="2330538812283783022">"Хэл нэмэх"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Тохиргоо"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Тохиргооны товчилбор"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Нислэгийн горим"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Цааш"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Утасгүй & сүлжээ"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, блютүүт , нислэгийн горим, мобайл сүлжээнүүд, & VPNs-г удирдах"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Мобайл дата"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Нууцлал"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Админ цуцалсан"</string>
<string name="security_status_title" msgid="5848766673665944640">"Аюулгүй байдлын төлөв"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Дэлгэцийн түгжээ, царайгаар тайлах"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Дэлгэцийн түгжээ, хурууны хээ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Дэлгэцийн түгжээ"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Царай нэмсэн"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Таны царайгаар түгжээ тайлах"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Баталгаажуулахын тулд царайгаа ашиглах"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Утасныхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэхдээ царайгаа ашиглана уу."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Таныг ашиглах"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Утасныхаа түгжээг тайлах эсвэл худалдан авалтыг зөвшөөрөхийн тулд царайгаа ашиглана уу.\n\nСанамж: Та энэ төхөөрөмжийн түгжээг тайлахын тулд царайгаа ашиглах боломжгүй. Дэлгэрэнгүй мэдээлэл авахын тулд байгууллагынхаа админтай холбогдоно уу."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Утасныхаа түгжээг тайлах, худалдан авалт хийх эсвэл аппад нэвтрэхдээ царайгаа ашиглана уу"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Та <xliff:g id="COUNT">%d</xliff:g> хүртэлх хурууны хээ нэмж болно"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Царайгаа дугуй хүрээнд голлуулна уу"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Дараа бүртгүүлэх"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Та <xliff:g id="COUNT">%d</xliff:g> хүртэлх царай нэмж болно"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Таны зөвшөөрөгдсөн царайны тоо гүйцсэн байна"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Илүү царай нэмж чадахгүй байна"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Царайг бүртгүүлж чадсангүй"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ОК"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Царай бүртгүүлэх хугацаа дууслаа. Дахин оролдоно уу."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Царайг бүртгүүлж чадсангүй."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Царайг амжилттай бүртгүүллээ."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Болсон"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Дараахыг хийхийн тулд царайгаа ашиглах"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Төхөөрөмжийнхөө түгжээг тайлах"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Аппад нэвтрэх & төлбөр"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Түгжээг тайлахын тулд нүдээ нээх"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Царайны нотолгоог ашиглах үед таны нүд нээлттэй байх ёстой"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Царайны өгөгдлийг хасах"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Царайны өгөгдлийг сайжруулах"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Та царайгаа төхөөрөмжийн түгжээ тайлах болон аппад нэвтрэхэд ашиглах боломжтой. "<annotation id="url">"Нэмэлт мэдээлэл авах"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Хурууны хээ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Хурууны хээ удирдах"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Хурууны хээг дараах зорилгоор ашиглах"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 Гц"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi-Fi сүлжээний цэгт хамгийн багадаа нэг зурвасыг сонгоно уу:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP тохиргоо"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Нууцлал"</string>
<string name="wifi_shared" msgid="844142443226926070">"Төхөөрөмжийн бусад хэрэглэгчтэй хуваалцах"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(өөрчлөгдөөгүй)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Сонгоно уу"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Цуцлах"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Сүлжээг мартах уу?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Энэ сүлжээний бүх нууц үгийг устгах болно"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Хадгалсан сүлжээ"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d сүлжээ</item>
<item quantity="one">1 сүлжээ</item>
@@ -998,8 +1005,8 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Роуминг тохиргоо"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"Wi-Fi илүү эрхэмлэдэг"</item>
- <item msgid="1335127656328817518">"Давуу эрхтэй мобайл"</item>
+ <item msgid="2124257075906188844">"Wi-Fi давуу эрхтэй"</item>
+ <item msgid="1335127656328817518">"Мобайл давуу эрхтэй"</item>
<item msgid="3132912693346866895">"Зөвхөн Wi-Fi"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
@@ -1013,8 +1020,8 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"Wi-Fi-г эрхэмлэдэг"</item>
- <item msgid="5074515506087318555">"Давуу эрхтэй мобайл"</item>
+ <item msgid="5782108782860004851">"Wi-Fi давуу эрхтэй"</item>
+ <item msgid="5074515506087318555">"Мобайл давуу эрхтэй"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Тодролт"</string>
<string name="brightness_summary" msgid="838917350127550703">"Дэлгэцийн тодролыг тохируулах"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Зохицогч гэрэлтүүлэг"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Асаасан"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Идэвхгүй"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Сонгож буй гэрэлтүүлэг маш бага байна"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Сонгок буй гэрэлтүүлэг бага байна"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN-г өөрчилж чадахгүй.\nБуруу PIN бололтой."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN амжилттай өөрчлөгдсөн"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM картын түгжигдсэн байдлыг өөрчлөх боломжгүй.\nБуруу PIN байж магадгүй."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"ПИН-г идэвхгүй болгож чадсангүй."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"ПИН-г идэвхжүүлж чадсангүй."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Цуцлах"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Олон SIM байна"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Энэ нь <xliff:g id="NAME_0">^1</xliff:g>-ыг хэлбэршүүлэх шаардлага тавьдаг. \n\n"<b>"Хэлбэршүүлэлт нь <xliff:g id="NAME_1">^1</xliff:g> дээрх бүх өгөгдөлийг устгах болно. "</b>" Өгөгдлөө алдахаас сэргийлэх үүднээс нөөцөлнө үү."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Устгах & хэлбэршүүлэх"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>-ыг хэлбэршүүлж байна..."</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g>-г форматалж байх үед бүү салгана уу."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g>-г форматалж байх үед нэрийг бүү устгана уу."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Шинэ санах ойд өгөгдлийг зөөх"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Та өөрийн зураг, файл болон апп-ийг шинэ <xliff:g id="NAME">^1</xliff:g> руу зөөх боломжтой. \n\n Зөөвөрлөхөд ойролцоогоор <xliff:g id="TIME">^2</xliff:g>-н хугацаа шаардлагатай бөгөөд дотоод санах ойд <xliff:g id="SIZE">^3</xliff:g> хэмжээний зай үүсгэнэ. Зөөвөрлөх явцад зарим апп ажиллахгүй."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Одоо зөөх"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Суулгасан"</string>
<string name="no_applications" msgid="7336588977497084921">"Апп байхгүй."</string>
<string name="internal_storage" msgid="1584700623164275282">"Дотоод сан"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"дотоод санах ой"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB сан"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD картын сан"</string>
<string name="recompute_size" msgid="7722567982831691718">"Хэмжээг дахин тооцоолж байна…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Апп өгөгдлийг устгах уу?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Энэ апп-н бүх өгөгдөл бүрмөсөн устах болно. Үүнд бүх файлууд, тохиргоонууд, акаунтууд, өгөгдлүүд гэх мэт орно."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Суулгасан апп-уудын жагсаалтад тус апп байхгүй байна."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Аппын санг устгаж чадсангүй."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Энэ апп таны таблет дээрх дараах зүйлсэд хандалт хийж чадна:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Энэ апп таны утсан дээрх дараах зүйлсэд хандалт хийж чадна:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Энэ апп таны таблет дээрх дараах зүйлсэд хандалт хийж чадна. Ажиллагааг сайжруулж санах ойн ашиглалтыг багасгахын тулд эдгээр зөвшөөрлийн заримыг нь <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>-тай ижил процессоор ажилладаг учир <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>-д өгсөн:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Энэ апп таны утсан дээрх дараах зүйлсэд хандалт хийж чадна. Ажиллагааг сайжруулж санах ойн ашиглалтыг багасгахын тулд эдгээр зөвшөөрлийн заримыг нь <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>-тай ижил процессоор ажилладаг учир <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>-д өгсөн:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> болон <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Энэ апп-с танд төлбөр тавиж магадгүй:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Урамшууллын SMS илгээх"</string>
<string name="computing_size" msgid="1599186977475211186">"Тооцоолж байна…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Багцын хэмжээг тооцоолж чадсангүй."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Та гуравдагч талын ямар нэгэн апп-г суулгаагүй байна."</string>
<string name="version_text" msgid="9189073826278676425">"хувилбар <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Зөөх"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Таблет руу зөөх"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Утас руу зөөх"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB сан руу зөөх"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD карт руу зөөх"</string>
- <string name="moving" msgid="6431016143218876491">"Зөөж байна"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Өөр шилжүүлэлтийг аль хэдийн боловсруулж байна."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Хангалттай хадгалалтын сан байхгүй."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Апп байхгүй байна."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Төхөөрөмжийн админы аппыг гадаад медиад суулгах боломжгүй"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Хүчээр зогсоох"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Хэрэв апп-г хүчээр зогсоовол буруу ажиллаж магадгүй."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Апп-г зөөж чадсангүй. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Суулгах давуу байршил"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Шинэ апп-уудыг суулгах тохиромжтой байршлыг өөрчлөх."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Суурилагдсан аппыг идэвхгүйжүүлэх үү?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Aпп-ийг идэвхгүй болгох"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Та энэ аппыг идэвхгүй болгосон тохиолдолд Андройд болон бусад аппын хэвийн ажиллагаа тасалдаж болзошгүй."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Өгөгдлийг устгаж аппыг идэвхгүйжүүлэх үү?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Хэрэв та энэ аппыг идэвхгүй болговол бусад аппын хэвийн ажиллагаа тасалдаж болзошгүй. Таны өгөгдөл мөн устах болно."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Мэдэгдлийг унтраах уу?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Хэрэв та энэ апп-н мэдэгдлийг унтраавал чухал сануулгууд болон шинэчлэлтүүдийг алгасаж магадгүй."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Дэлгүүр"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Апп-н дэлгэрэнгүй мэдээлэл"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g>-с суулгасан апп"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Үйлчилгээг ашиглах"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Өнгө тохируулагчийг ашиглах"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Тайлбар ашиглах"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Үргэлжлүүлэх"</string>
<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="6371077608778830020">"Сонсголын төхөөрөмж нэмэх"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Та арын үйл ажиллагааг аппад хязгаарласан тохиолдолд апп буруу ажиллаж болзошгүй"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Энэ аппыг батарейг оновчлохоор тохируулаагүй тул та үүнийг хязгаарлах боломжгүй.\n\nАппыг хязгаарлахын тулд эхлээд батарейны оновчлолыг асаана уу."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Бүрэн цэнэглэснээс хойшхи дэлгэц ашиглалт"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Дэлгэцийн хэрэглээ"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Мобайл сүлжээний скан"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Бүрэн цэнэглэснээс хойших батарей ашиглалт"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Бүрэн цэнэглэснээс хойших дэлгэцийг асаалттай байлгасан хугацаа"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Бүрэн цэнэглэснээс хойших төхөөрөмжийн ашиглалт"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Ашиглалтын мэдээлэл"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Цэнэг ашиглалтыг тохируулах"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Агуулагдсан багцууд"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Батерей дуусгаж буй апп"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Төхөөрөмжийг идэвхтэй байлгаж байна"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Төхөөрөмжийг цаана сэрээж байна"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Байршлыг тогтмол хүсэж байна"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> апп буруу ажиллаж байна"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Апп хэвийн ажиллаж байна"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Утас батарейг цаана энгийн байдлаар ашигладаг"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Таблет батарейг цаана энгийн байдлаар ашигладаг"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d аппын батерей ашиглалтыг хязгаарлаж байна</item>
<item quantity="one">%1$d аппын батерей ашиглалтыг хязгаарлаж байна</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Хязгаарласан <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Эдгээр апп батарейг дэвсгэрт ашигласаар байна. Хязгаарласан аппууд зохих ёсоор ажиллахгүй байж болзошгүй бөгөөд мэдэгдэл хоцорч болзошгүй."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Батерейны менежерийг ашиглах"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Аппууд батерейг хурдан дуусгах үед илрүүлэх"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Цуцлах"</string>
<string name="tts_reset" msgid="2661752909256313270">"Шинэчлэх"</string>
<string name="tts_play" msgid="2628469503798633884">"Тоглуулах"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Тэжээлийн Удирдлага"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi тохиргоог шинэчилж байна"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth тохиргоог шинэчилж байна"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"идэвхтэй"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"идэвхгүй"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"асааж байна"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"унтрааж байна"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Байршил"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Синк"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Гэрэлтүүлэг <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"автомат"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"дүүрэн"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"хагас"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"идэвхгүй"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Жуухын сан"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Хадгалах сангаас суулгах"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>-с <xliff:g id="NUMBER">%1$s</xliff:g> нь"</string>
<string name="select_all" msgid="1562774643280376715">"Бүгдийг сонгох"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Дата ашиглалт"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Апп дата ашиглалт"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Мобайл дата & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Операторын дата хэмжилт таны төхөөрөмжийнхөөс өөр байж болно."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Апп-н ашиглалт"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"AПП МЭДЭЭЛЭЛ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Нуусан %d зүйлийг харуулах</item>
<item quantity="one">Нуусан %d зүйлийг харуулах</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Буулгах"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Сүлжээ & интернэт"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобайл"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"дата ашиглалт"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Апп; мэдэгдэл"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Зөвшөөрөл, өгөгдмөл апп"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Мэдэгдлийн хандалт ажлын профайлын аппад боломжгүй байна."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Бүртгэл"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Бүртгэл нэмээгүй байна"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Өгөгдмөл апп"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Хэл, цаг, нөөцлөх, шинэчлэлт"</string>
<string name="search_results_title" msgid="1796252422574886932">"Тохиргоо"</string>
- <string name="search_menu" msgid="6283419262313758339">"Тохиргоог хайх"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, сүлжээний холболт, интернэт, утасгүй сүлжээ, дата, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, унтраах/асаах, хяналт"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"текст мессеж, текст мессеж бичих, мессеж, мессеж бичих, өгөгдмөл"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"төлөх, товших, төлбөр"</string>
<string name="keywords_backup" msgid="470070289135403022">"нөөцлөлт, нөөцлөх"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"зангаа"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"царай, түгжээг тайлах, нотлох, нэвтрэх"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl хувилбар, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"сүлжээ, мобайл сүлжээний төлөв, үйлчилгээний төлөв, дохионы хүч, мобайл сүлжээний төрөл, роуминг, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"серийн дугаар, техник хангамжийн хувилбар"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"бараан загвар"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"алдаа"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Орчинтой тохирсон дэлгэц, Түгжигдсэн дэлгэцийн дэлгэц"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"түгжигдсэн дэлгэцийн мэдэгдэл"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"царай"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"хурууны хээ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"бүдэг дэлгэц, мэдрэмтгий дэлгэц, батарей, ухаалаг гэрэлтүүлэг, динамик гэрэлтүүлэг"</string>
@@ -3062,10 +3034,10 @@
<string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Хонхыг чичиргээтэй болгож тохируулсан"</string>
<string name="sound_settings_summary_silent" msgid="5074529767435584948">"Хонхыг чимээгүй болгож тохируулсан"</string>
<string name="sound_settings_example_summary" msgid="2404914514266523165">"Хонх дуугаргах түвшин 80%-д"</string>
- <string name="media_volume_option_title" msgid="2811531786073003825">"Медиа дууны хэмжээ"</string>
+ <string name="media_volume_option_title" msgid="2811531786073003825">"Медиа дууны түвшин"</string>
<string name="call_volume_option_title" msgid="1265865226974255384">"Дуудлагын дууны түвшин"</string>
<string name="alarm_volume_option_title" msgid="8219324421222242421">"Сэрүүлгийн дууны түвшин"</string>
- <string name="ring_volume_option_title" msgid="6767101703671248309">"Хонхны дууны хэмжээ"</string>
+ <string name="ring_volume_option_title" msgid="6767101703671248309">"Хонхны дууны түвшин"</string>
<string name="notification_volume_option_title" msgid="6064656124416882130">"Мэдэгдлийн дууны хэмжээ"</string>
<string name="ringtone_title" msgid="5379026328015343686">"Утасны хонхны ая"</string>
<string name="notification_ringtone_title" msgid="4468722874617061231">"Мэдэгдлийн өгөгдмөл ая"</string>
@@ -3460,7 +3432,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Та энэ төхөөрөмжийг эхлүүлэхдээ PIN оруулах үед <xliff:g id="SERVICE">%1$s</xliff:g> мэтийн хандалтын үйлчилгээнүүд хараахан ашиглах боломжгүй байна."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Та энэ төхөөрөмжийг эхлүүлэхдээ хээ оруулах үед <xliff:g id="SERVICE">%1$s</xliff:g> мэтийн хандалтын үйлчилгээнүүд хараахан ашиглах боломжгүй байна."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Та энэ төхөөрөмжийг эхлүүлэхдээ нууц үг оруулах үед <xliff:g id="SERVICE">%1$s</xliff:g> мэтийн хандалтын үйлчилгээнүүд хараахан ашиглах боломжгүй байна."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Санамж: Дахин асаасны дараа энэ апп нь таныг утасны түгжээгээ тайлах хүртэл эхлэх боломжгүй"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Санамж: Хэрэв та утсаа дахин эхлүүлэх болон дэлгэцийн түгжээ тохируулбал энэ апп таныг утасныхаа түгжээг тайлах хүртэл эхлэх боломжгүй"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI мэдээлэл"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI хамаарах мэдээлэл"</string>
<string name="slot_number" msgid="3762676044904653577">"(Слот<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3514,7 +3486,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Хувийн"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Ажил"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Апп: Бүх"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Апп: Унтраасан"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Унтраасан"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категори: Яаралтай ач холбогдолтой"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категори: Бага ач холбогдолтой"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категори: Унтраасан"</string>
@@ -3575,7 +3547,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Хэрэглээний сануулга"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Төхөөрөмжийн бүрэн ашиглалтыг харуулах"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Апп ашиглалтыг харуулах"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Өндөр хэрэглээ"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> апп хэвийн бус ажиллаж байна</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> хэвийн бус ажиллаж байна</item>
@@ -3739,6 +3710,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Дотоод сан: <xliff:g id="PERCENTAGE">%1$s</xliff:g>-г ашигласан - <xliff:g id="FREE_SPACE">%2$s</xliff:g> сул"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> идэвхгүй байсны дараа унтах"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Ханын зураг, идэвхгүй, фонтын хэмжээ"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 минут идэвхгүй байсны дараа унтах"</string>
<string name="memory_summary" msgid="8080825904671961872">"Ойролцоогоор <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>-н <xliff:g id="USED_MEMORY">%1$s</xliff:g> санах ойг ашигласан"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g>-р нэвтэрсэн"</string>
@@ -3754,7 +3727,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS илгээх боломжгүй"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Камер ашиглах боломжгүй"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Дэлгэцийн зураг дарах боломжгүй"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Нөөцлөлтийг унтраах боломжгүй байна"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Энэ аппыг нээх боломжгүй"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Хэрэв танд асуух зүйл байгаа бол IT админтайгаа холбогдоно уу"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Илүү дэлгэрэнгүй"</string>
@@ -3918,9 +3890,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Дэлгэцийн хэсгийг тасдаж хуулах"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Дэлгэцийг таслах"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"дэлгэцийн хайчилбар, хэрчлээс"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Байхгүй"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Төхөөрөмжийн өгөгдмөл"</string>
<string name="special_access" msgid="3458780842491881155">"Тусгай аппын хандалт"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other">Хязгааргүй датаг <xliff:g id="COUNT">%d</xliff:g> апп ашиглах боломжтой</item>
@@ -3942,11 +3914,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>-д холбогдсон"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Олон төхөөрөмжтэй холбогдсон"</string>
<string name="demo_mode" msgid="2798762752209330277">"Системийн UI демо горим"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Шөнийн горим"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Шөнийн горимыг тохируулах"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Харанхуй горим"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Харанхуй горимыг тохируулах"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Хурдан тохиргоо хөгжүүлэгчийн хавтан"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Ажлын профайлын тохиргоо"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Харилцагч хайх"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дуудлага хийгч болон харилцагчийг тогтоохын тулд танай байгууллагыг харилцагчийн хайлт хийхийг зөвшөөрдөг"</string>
@@ -3987,13 +3958,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Утсаа шалгахын тулд хоёр товшино уу"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Таблетаа шалгахын тулд хоёр товшино уу"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Төхөөрөмжийг шалгахын тулд хоёр товшино уу"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Цаг, мэдэгдлийн дүрс тэмдэг болон бусад мэдээллийг шалгахын тулд дэлгэцээ хоёр удаа товшино уу."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Цаг, мэдэгдэл болон бусад мэдээллийг шалгахын тулд дэлгэцээ хоёр товшино уу."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Утсаа шалгахын тулд өргөнө үү"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Таблетаа шалгахын тулд өргөнө үү"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Төхөөрөмжийг шалгахын тулд өргөнө үү"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Цаг, мэдэгдлийн дүрс тэмдэг болон бусад мэдээллийг шалгахын тулд утсаа авна уу."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Цаг, мэдэгдлийн дүрс тэмдэг болон бусад мэдээллийг шалгахын тулд таблетаа авна уу."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Цаг, мэдэгдлийн дүрс тэмдэг болон бусад мэдээллийг шалгахын тулд төхөөрөмжөө aвна уу."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Сэрээх дэлгэц"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Цаг, мэдэгдэл болон бусад мэдээллийг шалгахын тулд утсаа авна уу."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Цаг, мэдэгдэл болон бусад мэдээллийг шалгахын тулд таблетаа авна уу."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Цаг, мэдэгдэл болон бусад мэдээллийг шалгахын тулд төхөөрөмжөө авна уу."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Сэрүүн байлгах дэлгэцийн зангаа"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Мэдэгдэл харах бол хурууны хээгээ шударна уу"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Хурууны хээгээр шудрах"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Мэдэгдлээ шалгахын тулд утасныхаа арын хурууны хээ мэдрэгчийг доош шударна уу."</string>
@@ -4073,7 +4048,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> оролдлого</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> оролдлого</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Энэ төхөөрөмжийн өгөгдлийг нөөцөлж байна"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Энэ төхөөрөмжийг таны байгууллага удирдаж байна."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Энэ төхөөрөмжийг <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> удирддаг"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4114,6 +4088,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Автоматаар бөглөх үйлчилгээ"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"авто, бөглөх, автоматаар бөглөх"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Энэ апп-д итгэдэг эсэхээ шалгана уу</b> <br/> <br/> <xliff:g id=app_name example=Google автоматаар бөглөх>%1$s</xliff:g> таны дэлгэцэд автоматаар бөглөх зүйлийг илрүүлэхийн тулд ашигладаг."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Автоматаар бөглөх хэсэг"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Нэвтрэх түвшин"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Харилцан үйлдэл тус бүрд зөвшөөрөгдөх хүсэлтийн дээд хязгаар"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Харагдах өгөгдлийн багцийн дээд хэмжээ"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Өгөгдмөл утга руу шинэчлэх"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Хөгжүүлэгчийн тохиргоог автоматаар бөглөх хэсгийг шинэчилсэн"</string>
<string name="device_theme" msgid="4571803018917608588">"Төхөөрөмжийн загвар"</string>
<string name="default_theme" msgid="7085644992078579076">"Өгөгдмөл"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Сүлжээний нэр"</string>
@@ -4128,15 +4108,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Оператор компанийн хангалтыг асаах"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Бүү саад бол горимыг шинэчлэх"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Төвлөрсөн хэвэрэ байхын тулд мэдэгдлийг түр зогсоох"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Шинэ соргог зүйл юу байна?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Шинэ утастай танилцах"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Шинэ таблеттай танилцах"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Шинэ төхөөрөмжтэй танилцах"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Энэ онцлог энэ төхөөрөмжид боломжгүй"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Бүтэн GNSS хэмжилтийг хүчлэх"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Бүх GNSS орд болон давтамжийг давтамжийн түвшингүйгээр шинжлэх"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Гэмтлийн харилцах цонхыг тогтмол харуулах"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Харилцах цонхыг апп гэмтэх бүрд харуулах"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ӨНЦӨГ идэвхжүүлсэн аппыг сонгох"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ӨНЦӨГ идэвхжүүлээгүй аппыг тохируулаагүй"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ӨНЦӨГ идэвхжүүлсэн апп: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Лавлахын хандалт"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"лавлалтын хандалт"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4177,4 +4156,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Сүлжээний мэдээлэл"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Таны төхөөрөмжийн нэр таны утасны аппуудад харагдана. Та Bluetooth төхөөрөмжүүдэд холбогдох эсвэл Wi-Fi сүлжээний цэгийг тохируулах үед энэ нь бусад хүмүүст харагдаж болзошгүй."</string>
<string name="devices_title" msgid="7701726109334110391">"Төхөөрөмжүүд"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Бүх тохиргоо"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Зөвлөмж"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Дата"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Дата"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Сүлжээ сонгох"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Салсан"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Холбогдсон"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Холбогдож байна…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Холбогдож чадсангүй"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Сүлжээ олдсонгүй."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Сүлжээ олдсонгүй. Дахин оролдоно уу."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(хориглосон)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM карт алга"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Дэвшилтэт дуудлага"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Давуу эрхтэй сүлжээний горим: WCDMA давуу эрхтэй"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Давуу эрхтэй сүлжээний горим: зөвхөн GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Давуу эрхтэй сүлжээний горим: зөвхөн WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Давуу эрхтэй сүлжээний горим: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Давуу эрхтэй сүлжээний горим: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Давуу эрхтэй сүлжээний горим: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Давуу эрхтэй сүлжээний горим: зөвхөн CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Давуу эрхтэй сүлжээний горим: зөвхөн EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Давуу эрхтэй сүлжээний горим: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Давуу эрхтэй сүлжээний горим: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Давуу эрхтэй сүлжээний горим: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Давуу эрхтэй сүлжээний горим: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Давуу эрхтэй сүлжээний горим: Глобал"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Давуу эрхтэй сүлжээний горим: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Давуу эрхтэй сүлжээний горим: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Давуу эрхтэй сүлжээний горим: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Давуу эрхтэй сүлжээний горим: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Давуу эрхтэй сүлжээний горим: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Давуу эрхтэй сүлжээний горим: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Давуу эрхтэй сүлжээний горим: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Давуу эрхтэй сүлжээний горим: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Давуу эрхтэй сүлжээний горим: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Давуу эрхтэй сүлжээний горим: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Давуу эрхтэй сүлжээний горим: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Давуу эрхтэй сүлжээний горим: CDMA/EvDo/GSM/WCDMAj"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Давуу эрхтэй сүлжээний горим: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (санал болгосон)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (санал болгосон)"</string>
+ <string name="network_global" msgid="959947774831178632">"Глобал"</string>
+ <string name="label_available" msgid="1731547832803057893">"Боломжтой сүлжээнүүд"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Хайж байна…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g>-д бүртгэж байна…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Таны SIM карт энэ сүлжээнд холбогдохыг зөвшөөрөхгүй байна."</string>
+ <string name="connect_later" msgid="978991102125216741">"Энэ сүлжээнд одоо холбогдох боломжгүй байна. Дараа дахин оролдоно уу."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Сүлжээнд бүртгэсэн."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Сүлжээг автоматаар сонгох"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Оператор компанийн тохиргоо"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Дата үйлчилгээг тохируулах"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Мобайл дата"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Мобайл сүлжээг ашиглан датад холбогдох"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Давуу эрхтэй сүлжээний төрөл"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Сүлжээний ажиллах горимыг өөрчлөх"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Давуу эрхтэй сүлжээний төрөл"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Оператор компани"</string>
+ <string name="call_category" msgid="8108654745239563833">"Дуудлага"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Оператор компанийн видео дуудлага"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Систем сонгох"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA роуминг горимыг өөрчлөх"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Систем сонгох"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Сүлжээ"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Сүлжээ"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA захиалга"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM болон NV-н хооронд өөрчлөх"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"захиалга"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Автомат бүртгэл…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Дата роумингийг зөвшөөрөх үү?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Үнийг нь сүлжээний үйлчилгээ үзүүлэгчээсээ тодруулна уу."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Аппын дата ашиглалт"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Буруу сүлжээний горим <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Үл хэрэгсэнэ үү."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g>-д холбогдсон үед боломжгүй"</string>
+ <string name="see_more" msgid="5953815986207345223">"Дэлгэрэнгүй үзэх"</string>
+ <string name="see_less" msgid="1250265310929558370">"Цөөнийг харах"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index f70d119..94756e5 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -168,7 +168,7 @@
<item msgid="8926455723452645935">"AKA\'"</item>
</string-array>
<string-array name="wifi_phase2_entries">
- <item msgid="1818786254010764570">"काहीही नाही"</item>
+ <item msgid="1818786254010764570">"नको"</item>
<item msgid="6189918678874123056">"PAP"</item>
<item msgid="1524112260493662517">"MSCHAP"</item>
<item msgid="5923246669412752932">"MSCHAPV2"</item>
@@ -195,7 +195,7 @@
<item msgid="8084938354605535381">"IPv4/IPv6"</item>
</string-array>
<string-array name="bearer_entries">
- <item msgid="1697455674244601285">"निर्दिष्ट केले नाही"</item>
+ <item msgid="1697455674244601285">"नमूद केले नाही"</item>
<item msgid="1317061551798123908">"LTE"</item>
<item msgid="5005435684511894770">"HSPAP"</item>
<item msgid="7700603056475539235">"HSPA"</item>
@@ -411,9 +411,9 @@
</string-array>
<string-array name="vpn_types_long">
<item msgid="2732002039459078847">"PPTP VPN"</item>
- <item msgid="3799752201662127867">"पूर्व-सामायिक की सह L2TP/IPSec VPN"</item>
+ <item msgid="3799752201662127867">"पूर्व-शेअर की सह L2TP/IPSec VPN"</item>
<item msgid="4725504331295252103">"प्रमाणपत्रांसह L2TP/IPSec VPN"</item>
- <item msgid="7526551163264034377">"पूर्व-सामायिक की आणि Xauth प्रमाणीकरणासह IPSec VPN"</item>
+ <item msgid="7526551163264034377">"पूर्व-शेअर की आणि Xauth प्रमाणीकरणासह IPSec VPN"</item>
<item msgid="8064740940687465039">"प्रमाणपत्रे आणि Xauth प्रमाणीकरणासह IPSec VPN"</item>
<item msgid="4946199982372391490">"प्रमाणपत्रे आणि संकरित प्रमाणीकरणासह IPSec VPN"</item>
</string-array>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"मीटरने मोजले जात असल्याचे धरा"</item>
<item msgid="2266114985518865625">"मीटरने मोजले जात नसल्याचे धरा"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"डीफॉल्ट (रँडमाइझ केलेले MAC वापरा)"</item>
+ <item msgid="5398461510512959597">"विश्वासू"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"नाही"</item>
<item msgid="3863157480502955888">"होय"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"नेहमी चालू"</item>
<item msgid="6385301106124765323">"नेहमी बंद"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"बंद"</item>
+ <item msgid="2182686878828390312">"डीबग करा"</item>
+ <item msgid="5286514712714822064">"शब्दबंबाळ"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"केवळ होम"</item>
+ <item msgid="5034813753274486448">"आपोआप"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA प्राधान्यकृत"</item>
+ <item msgid="807926878589867564">"केवळ GSM"</item>
+ <item msgid="488474605709912156">"केवळ WCDMA"</item>
+ <item msgid="1912421096218750039">"आपोआप GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"आपोआप CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"केवळ EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"जागतिक"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"केवळ TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/सिम"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"जागतिक"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1d523e0..3e422a1 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"तयार करा"</string>
<string name="allow" msgid="3349662621170855910">"अनुमती द्या"</string>
<string name="deny" msgid="6947806159746484865">"नकार द्या"</string>
- <string name="dlg_close" msgid="7471087791340790015">"बंद करा"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"स्विच"</string>
<string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">तुम्ही आता विकासक बनण्यापासून <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण दूर आहात.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"आवश्यकता नाही, तुम्ही आधीपासून एक विकासक आहात."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"कृपया सर्वात आधी डेव्हलपर पर्याय सुरू करा."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"वायरलेस आणि नेटवर्क"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"कनेक्शन"</string>
- <string name="header_category_device" msgid="4544026001618307754">"डिव्हाइस"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"वैयक्तिक"</string>
- <string name="header_category_access" msgid="7580499097416970962">"प्रवेश"</string>
<string name="header_category_system" msgid="2816866961183068977">"सिस्टम"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"डेटा कनेक्शन सुरू करा"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"डेटा कनेक्शन अक्षम करा"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"डीव्हाइसचा ब्लूटूथ अॅड्रेस: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> डिस्कनेक्ट करायचे?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"नाव नसलेले ब्लूटूथ डिव्हाइस"</string>
<string name="progress_scanning" msgid="192587958424295789">"शोधत आहे"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"जवळपास ब्लूटूथ डिव्हाइस आढळली नाहीत."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"अॅप ब्लूटूथ चालू करु इच्छित आहे आणि तुमचा फोन इतर डीव्हाइससाठी दृश्यमान करू इच्छित आहे. तुम्ही ब्लूटूथ सेटिंग्जमध्ये नंतर हे बदलू शकता."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ब्लूटूथ चालू करत आहे…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लूटूथ बंद करत आहे…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्वयं-कनेक्ट"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ब्लूटूथ कनेक्शन विनंती"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" शी कनेक्ट करण्यासाठी टॅप करा."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"तुम्ही \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" शी कनेक्ट करू इच्छिता?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"उपलब्ध कॉल डिव्हाइस"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"सध्या कनेक्ट केले आहे"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"सेव्ह केलेली डिव्हाइस"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"डिव्हाइस जोडा"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"पेअर करण्यासाठी ब्लूटूथ सुरू होईल"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"कनेक्शन प्राधान्ये"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"याआधी कनेक्ट केलेली डिव्हाइस"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"याआधी कनेक्ट केलेले"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ब्लूटूथ सुरू केले"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"सर्व पाहा"</string>
<string name="date_and_time" msgid="9062980487860757694">"तारीख आणि वेळ"</string>
<string name="choose_timezone" msgid="1362834506479536274">"टाइम झोन निवडा"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"वगळा"</string>
<string name="next_label" msgid="4693520878012668114">"पुढील"</string>
<string name="language_picker_title" msgid="3596315202551687690">"भाषा"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"भाषा प्राधान्ये"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"काढा"</string>
<string name="add_a_language" msgid="2330538812283783022">"एक भाषा जोडा"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"सेटिंग्ज"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"सेटिंग्ज शॉर्टकट"</string>
<string name="airplane_mode" msgid="8837269988154128601">"विमान मोड"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"अधिक"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"वायरलेस आणि नेटवर्क"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, विमान मोड, मोबाईल नेटवर्क आणि VPN व्यवस्थापित करा"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"मोबाइल डेटा"</string>
@@ -317,7 +307,7 @@
<string name="roaming_reenable_message" msgid="9141007271031717369">"तुम्ही डेटा रोमिंग बंद करून तुमचे होम नेटवर्क सोडल्यामुळे तुम्ही डेटा कनेक्टिव्हिटी गमावली आहे."</string>
<string name="roaming_turn_it_on_button" msgid="4387601818162120589">"हे चालू करा"</string>
<string name="roaming_warning" msgid="4275443317524544705">"आपल्याला बर्याच प्रमाणात शुल्क लागू शकते."</string>
- <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"जेव्हा तुम्ही डेटा रोमिंगला अनुमती देता, तेव्हा आपल्याला महत्त्वाचे रोमिंग शुल्क आकारले जाऊ शकते!\n\nही सेटिंग या टॅब्लेटवरील सर्व वापरकर्ते प्रभावित करते."</string>
+ <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"जेव्हा तुम्ही डेटा रोमिंगला अनुमती देता, तेव्हा तुम्हाला महत्त्वाचे रोमिंग शुल्क आकारले जाऊ शकते!\n\nही सेटिंग या टॅब्लेटवरील सर्व वापरकर्ते प्रभावित करते."</string>
<string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"जेव्हा तुम्ही डेटा रोमिंगला अनुमती देता, तेव्हा आपल्याकडून महत्त्वाचे रोमिंग शुल्क आकारले जाऊ शकते!\n\nही सेटिंग या फोनवरील सर्व वापरकर्ते प्रभावित करते."</string>
<string name="roaming_reenable_title" msgid="6068100976707316772">"डेटा रोमिंगला अनुमती द्यायची?"</string>
<string name="networks" msgid="6333316876545927039">"ऑपरेटर निवड"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"गोपनीयता"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"प्रशासकाने अक्षम केलेले"</string>
<string name="security_status_title" msgid="5848766673665944640">"सुरक्षितता स्थिती"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"स्क्रीन लॉक, फेस अनलॉक"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"स्क्रीन लॉक, फिंगरप्रिंट"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"स्क्रीन लॉक"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"चेहरा जोडला आहे"</string>
@@ -396,12 +387,28 @@
<string name="security_settings_face_enroll_introduction_cancel" msgid="4277182322482408514">"रद्द करा"</string>
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"तुमच्या चेहऱ्यासह अनलॉक करा"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"ऑथेंटिकेट करण्यासाठी तुमचा चेहरा वापरा"</string>
- <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्यासाठी किंवा अॅप्समध्ये साइन इन करण्यासाठी तुमचा चेहरा वापरा."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"तुमचा चेहरा वापरा"</string>
- <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी अधिकृत करण्यासाठी किंवा अॅप्सवर साइन इन करण्यासाठी तुमचा चेहरा वापरा"</string>
- <string name="face_add_max" msgid="2342250989212694454">"तुम्ही <xliff:g id="COUNT">%d</xliff:g> पर्यंत फिंगरप्रिंट जोडू शकता"</string>
+ <string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी मान्यता देण्यासाठी किंवा अॅप्समध्ये साइन इन करण्यासाठी तुमचा चेहरा वापरा."</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचा चेहरा वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुमचा चेहरा वापरू शकत नाही. अधिक माहितीसाठी, तुमच्या संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
+ <string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"तुमचा फोन अनलॉक करण्यासाठी, खरेदी परवानगी देण्यासाठी किंवा अॅप्सवर साइन इन करण्यासाठी तुमचा चेहरा वापरा"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"तुमचा चेहरा वर्तुळाच्या मध्यभागी ठेवा"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"हे नंतर करा"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"तुम्ही <xliff:g id="COUNT">%d</xliff:g> पर्यंत चेहरे जोडू शकता"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"तुम्ही चेहरे जोडण्याची कमाल संख्या गाठली आहे"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"अधिक चेहरे जोडता येणार नाहीत"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"नोंदणी पूर्ण झाली नाही"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ओके"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"चेहरा नोंदणी वेळ मर्यादा गाठली. पुन्हा प्रयत्न करा."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"चेहरा नोंदणी करू शकलो नाही."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"चेहरा नोंदणी पूर्ण झाली."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"पूर्ण झाले"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"तुमचा चेहेरा वापरून"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"तुमचे डिव्हाइस अनलॉक करा"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"अॅप साइन इन आणि पेमेंट"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"अनलॉक करण्यासाठी डोळे उघडा"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"चेहरा ऑथेंटिकेशन वापरताना, तुमचे डोळे उघडे असणे आवश्यक आहे"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"फेस डेटा काढून टाका"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"तुमच्या फेस डेटात सुधारणा करा"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"डिव्हाइस अनलॉक करण्यासाठी आणि अॅप्स करण्यासाठी तुम्ही तुमचा चेहेरा वापरू शकता. "<annotation id="url">"अधिक जाणून घ्या"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"फिंगरप्रिंट"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"फिंगरप्रिंट व्यवस्थापित करा"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"फिंगरप्रिंट यासाठी वापरा"</string>
@@ -446,7 +453,7 @@
<string name="security_settings_fingerprint_enroll_finish_message" msgid="8970048776120548976">"तुम्हाला हा आयकन दिसल्यावर, ओळख पडताळणीसाठी किंवा खरेदी मंजूर करण्यासाठी तुमचे फिंगरप्रिंट वापरा"</string>
<string name="security_settings_fingerprint_enroll_enrolling_skip" msgid="3710211704052369752">"हे नंतर करा"</string>
<string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"फिंगरप्रिंट सेटअप वगळायचे?"</string>
- <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तुम्ही तुमचा फोन अनलॉक करण्याची एक पद्धत म्हणून तुम्ही तुमचे फिंगरप्रिंट वापरणे निवडले. आता तुम्ही वगळल्यास, आपल्याला हे नंतर सेट करण्याची आवश्यकता असेल. सेटअपला केवळ एक मिनिट लागेल."</string>
+ <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"तुम्ही तुमचा फोन अनलॉक करण्याची एक पद्धत म्हणून तुम्ही तुमचे फिंगरप्रिंट वापरणे निवडले. आता तुम्ही वगळल्यास, तुम्हाला हे नंतर सेट करण्याची आवश्यकता असेल. सेटअपला केवळ एक मिनिट लागेल."</string>
<string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"स्क्रीन लॉक सेट करा"</string>
<string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"पूर्ण झाले"</string>
<string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"अरेरे, तो सेन्सर नाही"</string>
@@ -480,7 +487,7 @@
<string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"तुमची बॅटरी चार्ज करा आणि पुन्हा प्रयत्न करा."</string>
<string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"तुमचा चार्जर प्लग इन करा आणि पुन्हा प्रयत्न करा."</string>
<string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"कोणताही लॉक स्क्रीन पिन किंवा पासवर्ड नाही"</string>
- <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"तुम्ही एनक्रिप्शन सुरु करण्यापूर्वी आपल्याला एक लॉक स्क्रीन पिन किंवा पासवर्ड सेट करण्याची आवश्यकता आहे."</string>
+ <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"तुम्ही एनक्रिप्शन सुरु करण्यापूर्वी तुम्हाला एक लॉक स्क्रीन पिन किंवा पासवर्ड सेट करण्याची आवश्यकता आहे."</string>
<string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"एंक्रिप्ट करायचे?"</string>
<string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि तुम्ही त्यात व्यत्यय आणल्यास, तुमचा डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान टॅबलेट कित्येक वेळा रीस्टार्ट होईल."</string>
<string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"एंक्रिप्शन कार्य परत न करता येणारे आहे आणि तुम्ही त्यात व्यत्यय आणल्यास, तुमचा डेटा गमावेल. एंक्रिप्शनला एखादा तास किंवा जास्त वेळ लागतो, यादरम्यान फोन कित्येक वेळा रीस्टार्ट होईल."</string>
@@ -494,11 +501,11 @@
<string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"चेतावणी: अनलॉक करण्याच्या आणखी <xliff:g id="COUNT">^1</xliff:g> अयशस्वी प्रयत्नांनंतर तुमचे डिव्हाइस पुसले जाईल."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"तुमचा पासवर्ड टाइप करा"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एंक्रिप्शन अयशस्वी"</string>
- <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n तुमचा टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
- <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nतुमचा फोन वापरणे पुन्हा सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा तुम्ही तुमचा फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+ <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"कूटबद्धीकरणात व्यत्यय आला आणि हे पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या टॅबलेटवरील डेटा यापुढे प्रवेशयोग्य राहणार नाही. \n\n तुमचा टॅबलेट वापरून पुन्हा सुरु करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+ <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"कूटबद्धीकरणात व्यत्यय आला आणि पूर्ण होऊ शकत नाही. परिणामस्वरूप, आपल्या फोनवरील डेटा यापुढे प्रवेशयोग्य नाही.\n\nतुमचा फोन वापरणे पुन्हा सुरु करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करण्याची आवश्यकता आहे. रीसेट केल्यानंतर जेव्हा तुम्ही तुमचा फोन सेट करता, तेव्हा आपल्याकडे आपल्या Google खात्यावर बॅकअप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
<string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"विकूटन अयशस्वी"</string>
- <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"तुम्ही एंटर केलेला पासवर्ड चुकीचा आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा टॅबलेट वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
- <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"तुम्ही एंटर केलेला पासवर्ड बरोबर आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा फोन वापरणे पुनः सुरु करण्यासाठी, आपल्याला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा फोन सेट करता, तेव्हा आपल्याला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"तुम्ही एंटर केलेला पासवर्ड चुकीचा आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा टॅबलेट वापरणे पुनः सुरु करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा टॅबलेट सेट करता, तेव्हा तुम्हाला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
+ <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"तुम्ही एंटर केलेला पासवर्ड बरोबर आहे, परंतु दुर्दैवाने तुमचा डेटा दूषित आहे. \n\nतुमचा फोन वापरणे पुनः सुरु करण्यासाठी, तुम्हाला फॅक्टरी रीसेट करणे आवश्यक आहे. रीसेट केल्यानंतर तुम्ही तुमचा फोन सेट करता, तेव्हा तुम्हाला आपल्या Google खात्यावर बॅक अप घेतलेला कोणताही डेटा रीस्टोअर करण्याची संधी असेल."</string>
<string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"इनपुट पद्धत स्विच करा"</string>
<string name="suggested_lock_settings_title" msgid="8498743819223200961">"तुमचा फोन सुरक्षित ठेवा"</string>
<string name="suggested_lock_settings_summary" product="tablet" msgid="2296800316150748710">"टॅबलेटचे संरक्षण करण्यासाठी स्क्रीन लॉक सेट करा"</string>
@@ -692,8 +699,8 @@
<string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"पिन मध्ये अक्षरे किंवा प्रतीके आहेत"</string>
<string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"सामान्यतः 0000 किंवा 1234"</string>
<string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"16 अंक असणे आवश्यक आहे"</string>
- <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"आपल्याला इतर डिव्हाइसवर देखील हा पिन टाईप करण्याची आवश्यकता असू शकते."</string>
- <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"आपल्याला इतर डिव्हाइसवर देखील ही पासकी टाईप करण्याची आवश्यकता असू शकते."</string>
+ <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"तुम्हाला इतर डिव्हाइसवर देखील हा पिन टाईप करण्याची आवश्यकता असू शकते."</string>
+ <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"तुम्हाला इतर डिव्हाइसवर देखील ही पासकी टाईप करण्याची आवश्यकता असू शकते."</string>
<string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"यासह जोडण्यासाठी:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>हे ही पासकी दर्शवत असल्याचे सुनिश्चित करा:<br><b><xliff:g id="PASSKEY">%2$s</xliff:g></b>"</string>
<string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"यावरून:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>हे डिव्हाइस जोडायचे?"</string>
<string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"यासह जोडण्यासाठी:<xliff:g id="BOLD1_0"><br><b></xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1"></b><br><br></xliff:g>यावर टाइप करा:<xliff:g id="BOLD2_1"><br><b></xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2"></b></xliff:g>, नंतर Return किंवा Enter दाबा."</string>
@@ -709,7 +716,7 @@
<string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"कीबोर्ड"</string>
<string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"संपर्क आणि कॉल इतिहास"</string>
<string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"या डिव्हाइसशी जोडायचे?"</string>
- <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"फोन बुक सामायिक करायचे?"</string>
+ <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"फोन बुक शेअर करायचे?"</string>
<string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> आपल्या संपर्कांवर आणि कॉल इतिहासावर प्रवेश करू इच्छित आहे."</string>
<string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ब्लूटूथ सह जोडू इच्छिते. कनेक्ट केले असताना, त्यास आपल्या संपर्कांवर आणि कॉल इतिहासावर अॅक्सेस असेल."</string>
<string name="bluetooth_preference_found_media_devices" msgid="1617401232446299411">"उपलब्ध डिव्हाइस"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"५.० GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"वाय-फाय हॉटस्पॉटसाठी किमान एक बँड निवडा:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP सेटिंग्ज"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"गोपनीयता"</string>
<string name="wifi_shared" msgid="844142443226926070">"इतर डिव्हाइस वापरकर्त्यांसह शेअर करा"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(न बदललेले)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"कृपया निवडा"</string>
@@ -891,9 +899,9 @@
<string name="wifi_use_system_certs" msgid="5270879895056893783">"सिस्टम प्रमाणपत्रे वापरा"</string>
<string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"प्रदान करू नका"</string>
<string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"प्रमाणित करू नका"</string>
- <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कोणतेही प्रमाणपत्र निर्दिष्ट केले नाही. तुमचे कनेक्शन खाजगी होणार नाही."</string>
+ <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"कोणतेही प्रमाणपत्र नमूद केले नाही. तुमचे कनेक्शन खाजगी होणार नाही."</string>
<string name="wifi_ssid_too_long" msgid="3474753269579895244">"नेटवर्कचे नाव फार लांबलचक आहे."</string>
- <string name="wifi_no_domain_warning" msgid="5223011964091727376">"एक डोमेन निर्दिष्ट करणे आवश्यक आहे."</string>
+ <string name="wifi_no_domain_warning" msgid="5223011964091727376">"एक डोमेन नमूद करणे आवश्यक आहे."</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPS उपलब्ध"</string>
<string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्ध)"</string>
<string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"तुमचा नेटवर्क पासवर्ड एंटर करा"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"रद्द करा"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"हे नेटवर्क नको?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"या नेटवर्कसाठी सर्व पासवर्ड हटवले जातील"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"सेव्ह केलेली नेटवर्क"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d नेटवर्क</item>
<item quantity="other">%d नेटवर्क</item>
@@ -1072,8 +1079,8 @@
<string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"फोन डॉक केला नाही"</string>
<string name="dock_audio_summary_unknown" msgid="4465059868974255693">"संलग्न डॉकसाठी सेटिंग्ज"</string>
<string name="dock_not_found_title" msgid="3290961741828952424">"डॉक आढळले नाही"</string>
- <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ऑडिओ डॉक करणे सेट करण्यापूर्वी आपल्याला टॅबलेट डॉक करण्याची आवश्यकता आहे."</string>
- <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ऑडिओ डॉक करणे सेट करण्यापूर्वी आपल्याला फोन डॉक करण्याची आवश्यकता आहे."</string>
+ <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"ऑडिओ डॉक करणे सेट करण्यापूर्वी तुम्हाला टॅबलेट डॉक करण्याची आवश्यकता आहे."</string>
+ <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"ऑडिओ डॉक करणे सेट करण्यापूर्वी तुम्हाला फोन डॉक करण्याची आवश्यकता आहे."</string>
<string name="dock_sounds_enable_title" msgid="885839627097024110">"ध्वनी घाला डॉक"</string>
<string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"डॉकमध्ये टॅबलेट घालताना किंवा त्यातून काढताना ध्वनी प्ले करा"</string>
<string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"डॉकवरून फोन घालताना किंवा काढताना ध्वनी प्ले करा"</string>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"चकाकी"</string>
<string name="brightness_summary" msgid="838917350127550703">"स्क्रीनची चकाकी समायोजित करा"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"अॅडॅप्टिव्ह चकाकी"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"सुरू"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"बंद"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"प्राधान्य दिलेली उज्ज्वलता खूप कमी आहे"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"प्राधान्य दिलेली उज्ज्वलता कमी आहे"</string>
@@ -1122,13 +1128,13 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"उपलब्ध प्रकाशासाठी उज्ज्वलता स्तर अनुकूल करा. हे वैशिष्ट्य चालू असताना, तुम्ही तरीही उज्ज्वलता तात्पुरती समायोजित करू शकता."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"तुमच्या स्क्रीनची चमक तुमच्या वातावरण आणि अॅक्टिव्हिटीशी आपोआप समायोजित होईल. अनुकूलित चमकेला तुमची प्राधान्ये जाणून घेण्यात मदत करण्यासाठी तुम्ही स्लाइडर व्यक्तिचलितपणे हलवू शकता."</string>
<string name="night_display_title" msgid="2626451512200357686">"रात्रीचा प्रकाश"</string>
- <string name="night_display_text" msgid="1837277457033025056">"रात्रीचा प्रकाश तुमच्या स्क्रीनला पिवळसर तपकिरी रंगछटा देतो. यामुळे मंद प्रकाशात तुमचा स्क्रीन पाहणे किंवा वाचणे सोपे होते आणि तुम्हाला झोप येण्यात मदत होऊ शकते."</string>
- <string name="night_display_auto_mode_title" msgid="6574111412154833409">"शेड्यूल"</string>
+ <string name="night_display_text" msgid="1837277457033025056">"रात्रीचा प्रकाश तुमच्या स्क्रीनला पिवळसर तपकिरी छटा देतो. यामुळे मंद प्रकाशात तुमची स्क्रीन पाहणे किंवा वाचणे सोपे होते आणि तुम्हाला झोप येण्यात मदत होऊ शकते."</string>
+ <string name="night_display_auto_mode_title" msgid="6574111412154833409">"शेड्युल"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"काहीही नाही"</string>
- <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"कस्टम वेळी चालू होते"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"सूर्योदय ते सूर्यास्तादरम्यान चालू होते"</string>
+ <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ठराविक वेळी चालू होतो"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"सूर्यास्त-सूर्योदय चालू राहतो"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"प्रारंभ वेळ"</string>
- <string name="night_display_end_time_title" msgid="8286061578083519350">"समाप्ती वेळ"</string>
+ <string name="night_display_end_time_title" msgid="8286061578083519350">"संपण्याची वेळ"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"स्थिती"</string>
<string name="night_display_temperature_title" msgid="1435292789272017136">"तीव्रता"</string>
<string name="night_display_summary_off" msgid="1792750041697946539">"बंद / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"पिन बदलू शकत नाही.\nकदाचित अयोग्य पिन."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"सिम पिन यशस्वीरित्या बदलला"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"सिम कार्ड लॉक स्थिती बदलू शकत नाही.\nकदाचित अयोग्य पिन."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"पिन बंद करू शकत नाही."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"पिन सुरू करू शकत नाही."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ठीक"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"रद्द करा"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"एकाधिक सिम आढळली"</string>
@@ -1277,7 +1285,7 @@
<string name="memory_music_usage" msgid="1363785144783011606">"ऑडिओ (संगीत, रिंगटोन, पॉडकास्ट इ.)"</string>
<string name="memory_media_misc_usage" msgid="6094866738586451683">"इतर फायली"</string>
<string name="memory_media_cache_usage" msgid="6704293333141177910">"कॅश केलेला डेटा"</string>
- <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"सामायिक केलेले संचयन अनमाउंट करा"</string>
+ <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"शेअर केलेले संचयन अनमाउंट करा"</string>
<string name="sd_eject" product="default" msgid="6915293408836853020">"SD कार्ड अनमाउंट करा"</string>
<string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"अंतर्गत USB स्टोरेज अनमाउंट करा"</string>
<string name="sd_eject_summary" product="default" msgid="3300599435073550246">"SD कार्ड अनमाउंट करा जेणेकरून तुम्ही ते सुरक्षितपणे काढू शकता"</string>
@@ -1323,9 +1331,9 @@
<string name="storage_title_usb" msgid="679612779321689418">"USB कॉंप्युटर कनेक्शन"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"म्हणून कनेक्ट करा"</string>
<string name="usb_mtp_title" msgid="3399663424394065964">"मीडिया डिव्हाइस (MTP)"</string>
- <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows वरील मीडिया फायली वापरून किंवा Mac वरील Android फाईल स्थानांतरण वापरून आपल्याला मीडिया फायली स्थानांतरण करू देते (www.android.com/filetransfer पहा)"</string>
+ <string name="usb_mtp_summary" msgid="4617321473211391236">"Windows वरील मीडिया फायली वापरून किंवा Mac वरील Android फाईल स्थानांतरण वापरून तुम्हाला मीडिया फायली स्थानांतरण करू देते (www.android.com/filetransfer पहा)"</string>
<string name="usb_ptp_title" msgid="3852760810622389620">"कॅमेरा (PTP)"</string>
- <string name="usb_ptp_summary" msgid="7406889433172511530">"आपल्याला कॅमेरा सॉफ्टवेअर वापरून फोटो स्थानांतर आणि MTP वर समर्थित नसलेल्या संगणकावर कोणत्याही फायली स्थानांतर करू देते"</string>
+ <string name="usb_ptp_summary" msgid="7406889433172511530">"तुम्हाला कॅमेरा सॉफ्टवेअर वापरून फोटो स्थानांतर आणि MTP वर समर्थित नसलेल्या संगणकावर कोणत्याही फायली स्थानांतर करू देते"</string>
<string name="usb_midi_title" msgid="3069990264258413994">"MIDI"</string>
<string name="usb_midi_summary" msgid="539169474810956358">"MIDI सक्षम असलेल्या अनुप्रयोगांना आपल्या संगणकावर MIDI सॉफ्टवेअरसह USB वर कार्य करू द्या."</string>
<string name="storage_other_users" msgid="808708845102611856">"इतर वापरकर्ते"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"यास <xliff:g id="NAME_0">^1</xliff:g> फॉर्मेट करणे आवश्यक आहे. \n\n"<b>"फॉर्मेट केल्यामुळे <xliff:g id="NAME_1">^1</xliff:g> वर सध्या स्टोअर केलेला सर्व डेटा मिटविला जातो."</b>" डेटा गमावला जाणे टाळण्यासाठी, त्याचा बॅकअप घेण्याचा विचार करा."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"मिटवा आणि फॉर्मेट करा"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> फॉर्मेट करत आहे…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"फॉरमॅट होत असताना <xliff:g id="NAME">^1</xliff:g> काढू टाकू नका."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"फॉरमॅट होत असताना <xliff:g id="NAME">^1</xliff:g> काढू टाकू नका."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"डेटा नवीन संचयनावर हलवा"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"या नवीन <xliff:g id="NAME">^1</xliff:g> वर तुम्ही तुमचे फोटो, फायली आणि काही अॅप्स हलवू शकता. \n\nहलविण्यास सुमारे <xliff:g id="TIME">^2</xliff:g> लागेल आणि अंतर्गत संचयनावर <xliff:g id="SIZE">^3</xliff:g> मोकळे करेल. काही अॅप्स सुरु असताना कार्य करणार नाहीत."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"आता हलवा"</string>
@@ -1486,8 +1494,8 @@
<string name="reset_esim_error_msg" msgid="8434956817922668388">"एका एररमुळे eSIM रीसेट करता येणार नाहीत."</string>
<string name="master_clear_title" msgid="3531267871084279512">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
<string name="master_clear_short_title" msgid="8652450915870274285">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
- <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"हे आपल्या टॅब्लेटच्या "<b>"अंतर्गत संचयना"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
- <string name="master_clear_desc" product="default" msgid="4800386183314202571">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेले अॅप्स"</li></string>
+ <string name="master_clear_desc" product="tablet" msgid="9146059417023157222">"हे आपल्या टॅब्लेटच्या "<b>"अंतर्गत संचयना"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अॅप्स"</li></string>
+ <string name="master_clear_desc" product="default" msgid="4800386183314202571">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अॅप्स"</li></string>
<string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"तुम्ही खालील खात्यांवर सध्या साइन इन केले आहे:\n"</string>
<string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"या डिव्हाइसवर इतर वापरकर्ते उपस्थित आहेत.\n"</string>
<string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"संगीत"</li>\n<li>"फोटो"</li>\n<li>"अन्य वापरकर्ता डेटा"</li></string>
@@ -1504,7 +1512,7 @@
<string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"टॅबलेटवरील सर्व eSIM मिटवा. यामुळे तुमचा मोबाइल सेवा प्लॅन रद्द होणार नाही."</string>
<string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"टॅबलेट रीसेट करा"</string>
<string name="master_clear_button_text" product="default" msgid="7550632653343157971">"फोन रीसेट करा"</string>
- <string name="master_clear_final_desc" msgid="7318683914280403086">"तुमची सर्व वैयक्तिक माहिती आणि डाउनलोड केलेले अॅप्स मिटवायचे? तुम्ही ही क्रिया पूर्ववत करू शकत नाही!"</string>
+ <string name="master_clear_final_desc" msgid="7318683914280403086">"तुमची सर्व वैयक्तिक माहिती आणि डाउनलोड केलेली अॅप्स मिटवायचे? तुम्ही ही क्रिया पूर्ववत करू शकत नाही!"</string>
<string name="master_clear_final_button_text" msgid="5390908019019242910">"प्रत्येकगोष्ट मिटवा"</string>
<string name="master_clear_failed" msgid="2503230016394586353">"सिस्टम साफ करा सेवा उपलब्ध नसल्यामुळे कोणतेही रीसेट केले नाही."</string>
<string name="master_clear_confirm_title" msgid="7572642091599403668">"रीसेट करायचे?"</string>
@@ -1755,9 +1763,6 @@
<string name="installed" msgid="3070865169422600098">"इंस्टॉल केले"</string>
<string name="no_applications" msgid="7336588977497084921">"अॅप्स नाहीत."</string>
<string name="internal_storage" msgid="1584700623164275282">"अंतर्गत स्टोरेज"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"अंतर्गत स्टोरेज"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB स्टोरेज"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD कार्ड संचयन"</string>
<string name="recompute_size" msgid="7722567982831691718">"आकाराचे पुनर्संगणन करत आहे…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"अॅप डेटा हटवायचा?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"या अॅप चा सर्व डेटा कायमचा हटवला जाईल. यात सर्व फायली, सेटिंग्ज, खाती, डेटाबेस इ. समाविष्ट होते."</string>
@@ -1766,24 +1771,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"इंस्टॉल अॅप्सच्या सूचीमध्ये अॅप आढळला नाही."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"अॅपसाठी स्टोरेज साफ करता आले नाही."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"हा अॅप आपल्या टॅब्लेटवरील खालीलवर प्रवेश करू शकतो:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"हा अॅप आपल्या फोनवरील खालीलवर प्रवेश करू शकतो:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"हा अॅप आपल्या टॅब्लेटवरील खाली ठिकाणी प्रवेश करू शकतो. कार्यप्रदर्शन सुधारण्यासाठी आणि मेमरी वापर कमी करण्यासाठी, यापैकी काही परवानग्या <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> वर उपलब्ध आहेत कारण ते <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> प्रमाणेच समान प्रक्रियेमध्ये चालते:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"हा अॅप आपल्या फोनवरील खालील ठिकाणी प्रवेश करू शकतो. कार्यप्रदर्शन सुधारण्यासाठी आणि मेमरी वापर कमी करण्यासाठी, यापैकी काही परवानग्या <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> वर उपलब्ध आहेत कारण त्या <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> प्रमाणे समान प्रक्रियेमध्ये चालतात:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> आणि <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"या अॅपचे आपल्याकडून पैसे आकारले जाऊ शकतात."</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"प्रिमियम SMS पाठवा"</string>
<string name="computing_size" msgid="1599186977475211186">"संगणन…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"पॅकेजच्या आकाराची गणना करणे शक्य नाही"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"तुम्ही कोणतेही तृतीय-पक्ष अॅप्स इंस्टॉल केले नाहीत."</string>
<string name="version_text" msgid="9189073826278676425">"आवृत्ती <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"हलवा"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"टॅब्लेटवर हलवा"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"फोन वर हलवा"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB संचयनावर हलवा"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD कार्डवर हलवा"</string>
- <string name="moving" msgid="6431016143218876491">"हलवत आहे"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"दुसरे स्थलांतर आधीपासून प्रगतीपथावर आहे."</string>
<string name="insufficient_storage" msgid="481763122991093080">"पुरेसे संचयन स्थान नाही."</string>
<string name="does_not_exist" msgid="1501243985586067053">"अॅप अस्तित्वात नाही."</string>
@@ -1793,17 +1790,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"डिव्हाइस प्रशासक अॅप बाह्य मीडियावर इंस्टॉल केले जाऊ शकत नाही"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"सक्तीने थांबवायचे?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"तुम्ही अॅप थांबविण्याची सक्ती केल्यास, ते गैरवर्तन करू शकते."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"अॅप हलवू शकलो नाही. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"प्राधान्यकृत स्थापना स्थान"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"नवीन अॅप्स साठी प्राधान्यीकृत स्थापना स्थान बदला"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"अंगभूत अॅप अक्षम करायचा?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"अॅप अक्षम करा"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"तुम्ही हा अॅप अक्षम केल्यास, Android आणि अन्य अॅप्सना ज्या हेतूने कार्य करायचे आहे कदाचित त्यानुसार ते यापुढे कार्य करू शकणार नाहीत."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा हटवायचा आणि अॅप अक्षम करायचा?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"तुम्ही हा अॅप अक्षम केल्यास, Android आणि अन्य अॅप्सना ज्या हेतूने कार्य करायचे आहे कदाचित त्यानुसार ते यापुढे कार्य करू शकणार नाहीत. तुमचा डेटा हटवला देखील जाईल."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"सूचना बंद करायच्या?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"तुम्ही या अॅपसाठी सूचना बंद केल्यास, तुम्ही महत्वाच्या सूचना आणि अपडेट गमावू शकता."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"स्टोअर"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"अॅप तपशील"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"अॅप <xliff:g id="APP_STORE">%1$s</xliff:g> मधून इंस्टॉल केला"</string>
@@ -1996,6 +1989,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"सेवा वापरा"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"रंग सुधारणा वापरा"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"कॅप्शन वापरा"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"सुरू ठेवा"</string>
<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="6371077608778830020">"श्रवण यंत्र जोडा"</string>
@@ -2139,8 +2133,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"तुम्ही एखाद्या अॅपसाठी बॅकग्राउंड अॅक्टिव्हिटी मर्यादित ठेवल्यास, ते व्यवस्थित न चालण्याची शक्यता आहे"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"हे अॅप बॅटरी ऑप्टिमाइझ करण्यासाठी सेट केलेले नसल्याने, तुम्ही ते प्रतिबंधित करू शकत नाही.\n\nअॅप प्रतिबंधित करण्यासाठी, प्रथम बॅटरी ऑप्टिमायझेशन सुरू करा"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"पूर्ण चार्ज झाल्यानंतर स्क्रीन वापर"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रीन उपयोग"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कॅनिंग"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"पूर्ण चार्ज केल्यापासून बॅटरी वापर"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"पूर्ण चार्जपासून स्क्रीन चालू असण्याच्या वेळाचे प्रमाण"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"शेवटच्या पूर्ण चार्जपासून डिव्हाइस वापर"</string>
@@ -2167,11 +2159,6 @@
<string name="details_subtitle" msgid="32593908269911734">"तपशील वापरा"</string>
<string name="controls_subtitle" msgid="390468421138288702">"पॉवर वापर समायोजित करा"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"समाविष्ट पॅकेज"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"अॅप्स बॅटरी संपवत आहेत"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"डिव्हाइस अॅक्टिव्हेट ठेवते"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"डिव्हाइसला बॅकग्राउंडमध्ये सक्रिय ठेवते"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"स्थानाशी संबंधित माहिती वारंवार मागत आहे"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> अॅप्स विचित्र प्रकारे काम करत आहेत"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"अॅप्स नेहमीप्रमाणे चालत आहेत"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"फोनमध्ये विशिष्ट बॅकग्राउंड बॅटरी वापर आहे"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"टॅबलेटमध्ये विशिष्ट बॅकग्राउंड बॅटरी वापर आहे"</string>
@@ -2235,6 +2222,7 @@
<item quantity="one">%1$d अॅप्ससाठी बॅटरीचा वापर मर्यादित करत आहे</item>
<item quantity="other">%1$d अॅप्ससाठी बॅटरीचा वापर मर्यादित करत आहे</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> दिवसांपूर्वी प्रतिबंधित केलेले"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"ही अॅप्स बॅकग्राउंडवर बॅटरी वापरत आहेत. प्रतिबंधित अॅप्स व्यवस्थित काम करू शकणार नाहीत आणि सूचना येण्यास उशीर होऊ शकतो."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"बॅटरी व्यवस्थापक वापरा"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"अॅप्सची बॅटरी केव्हा संंपते ते ओळखा"</string>
@@ -2412,23 +2400,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"रद्द करा"</string>
<string name="tts_reset" msgid="2661752909256313270">"रीसेट करा"</string>
<string name="tts_play" msgid="2628469503798633884">"प्ले करा"</string>
- <string name="gadget_title" msgid="5519037532720577836">"पॉवर नियंत्रण"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाय-फाय सेटिंग अपडेट करत आहे"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटूथ सेटिंग्ज अपडेट करत आहे"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"वर"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"बंद"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"चालू करत आहे"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद करत आहे"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"वाय-फाय"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लूटूथ"</string>
- <string name="gadget_location" msgid="2974757497945178165">"स्थान"</string>
- <string name="gadget_sync" msgid="858895763714222152">"सिंक करा"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"चकाकी <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"स्वयंचलित"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"पूर्ण"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"अर्धी"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"बंद"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"क्रेडेन्शियल स्टोरेज"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"स्टोरेजवरून इंस्टॉल करा"</string>
@@ -2586,7 +2557,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> पैकी <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"सर्व निवडा"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"डेटा वापर"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"अॅप डेटा वापर"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"मोबाइल डेटा आणि वाय-फाय"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"वाहक डेटा गणना आपल्या डिव्हाइसपेक्षा भिन्न असू शकते."</string>
<string name="data_usage_app" msgid="4970478397515423303">"अॅप वापर"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"अॅप माहिती"</string>
@@ -2682,7 +2653,7 @@
<string name="vpn_mppe" msgid="6639001940500288972">"PPP एंक्रिप्शन (MPPE)"</string>
<string name="vpn_l2tp_secret" msgid="529359749677142076">"L2TP गुपीत"</string>
<string name="vpn_ipsec_identifier" msgid="4098175859460006296">"IPSec ओळखकर्ता"</string>
- <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec पूर्व-सामायिक की"</string>
+ <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec पूर्व-शेअर की"</string>
<string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec वापरकर्ता प्रमाणपत्र"</string>
<string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA प्रमाणपत्र"</string>
<string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"IPSec सर्व्हर प्रमाणपत्र"</string>
@@ -2698,7 +2669,7 @@
<string name="vpn_no_server_cert" msgid="2167487440231913330">"(सर्व्हरवरुन प्राप्त झालेले)"</string>
<string name="vpn_always_on_invalid_reason_type" msgid="7574518311224455825">"हा VPN प्रकार सर्व वेळी कनेक्ट केलेला राहू शकत नाही"</string>
<string name="vpn_always_on_invalid_reason_server" msgid="477304620899799383">"नेहमी-चालू VPN केवळ अंकीय सर्व्हर पत्त्यांना समर्थित करतात"</string>
- <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"नेहमी-चालू VPN साठी DNS सर्व्हर निर्दिष्ट करणे आवश्यक आहे"</string>
+ <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"नेहमी-चालू VPN साठी DNS सर्व्हर नमूद करणे आवश्यक आहे"</string>
<string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"नेहमी-चालू VPN साठी DNS सर्व्हर पत्ते अंकीय असणे आवश्यक आहे"</string>
<string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"एंटर केलेली माहिती नेहमी-चालू VPN ला समर्थित करत नाही"</string>
<string name="vpn_cancel" msgid="1979937976123659332">"रद्द करा"</string>
@@ -2791,7 +2762,7 @@
<string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"वापरकर्ता किंवा प्रोफाइल जोडा"</string>
<string name="user_add_user_menu" msgid="1675956975014862382">"वापरकर्ता जोडा"</string>
<string name="user_summary_restricted_profile" msgid="6354966213806839107">"प्रतिबंधित प्रोफाईल"</string>
- <string name="user_need_lock_message" msgid="5879715064416886811">"तुम्ही एक प्रतिबंधित प्रोफाईल तयार करु शकण्यापूर्वी आपल्याला तुमचे अॅप्स आणि वैयक्तिक डेटा संरक्षित करण्यासाठी एक स्क्रीन लॉक सेट करण्याची आवश्यकता राहील."</string>
+ <string name="user_need_lock_message" msgid="5879715064416886811">"तुम्ही एक प्रतिबंधित प्रोफाईल तयार करु शकण्यापूर्वी तुम्हाला तुमचे अॅप्स आणि वैयक्तिक डेटा संरक्षित करण्यासाठी एक स्क्रीन लॉक सेट करण्याची आवश्यकता राहील."</string>
<string name="user_set_lock_button" msgid="8311219392856626841">"लॉक सेट करा"</string>
<string name="user_summary_not_set_up" msgid="8778205026866794909">"सेट केलेले नाही"</string>
<string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"सेट केलेले नाही - प्रतिबंधित प्रोफाईल"</string>
@@ -2842,7 +2813,7 @@
<string name="user_enable_calling_sms" msgid="9172507088023097063">"फोन कॉल आणि SMS चालू करा"</string>
<string name="user_remove_user" msgid="6490483480937295389">"वापरकर्ता काढा"</string>
<string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"फोन कॉल चालू करायचे?"</string>
- <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"या वापरकर्त्याशी कॉल इतिहास सामायिक केला जाईल."</string>
+ <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"या वापरकर्त्याशी कॉल इतिहास शेअर केला जाईल."</string>
<string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"फोन कॉल आणि SMS चालू करायचे?"</string>
<string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"या वापरकर्त्याशी कॉल आणि SMS इतिहास शेअर केला जाईल."</string>
<string name="emergency_info_title" msgid="208607506217060337">"आणीबाणी माहिती"</string>
@@ -2860,13 +2831,13 @@
<string name="nfc_payment_favor_default" msgid="5743781166099608372">"नेहमी"</string>
<string name="nfc_payment_favor_open" msgid="1923314062109977944">"दुसरा पेमेंट अॅप खुला असतो तेव्हा त्यास वगळून"</string>
<string name="nfc_payment_pay_with" msgid="7524904024378144072">"टॅप आणि पे टर्मिनलवर, यासह पे करा:"</string>
- <string name="nfc_how_it_works_title" msgid="1984068457698797207">"टर्मिनलवर देय द्या"</string>
+ <string name="nfc_how_it_works_title" msgid="1984068457698797207">"टर्मिनलवर पेमेंट करा"</string>
<string name="nfc_how_it_works_content" msgid="4749007806393224934">"पेमेंट अॅप सेट करा. त्यानंतर संपर्करहित आयकन असलेल्या कोणत्याही टर्मिनलवर आपल्या फोनची मागील बाजू धरा."</string>
<string name="nfc_how_it_works_got_it" msgid="259653300203217402">"समजले"</string>
<string name="nfc_more_title" msgid="815910943655133280">"आणखी..."</string>
<string name="nfc_payment_set_default_label" msgid="7315817259485674542">"तुमचे प्राधान्य म्हणून सेट करायचे?"</string>
- <string name="nfc_payment_set_default" msgid="8532426406310833489">"तुम्ही टॅप करता आणि देय देता तेव्हा नेहमी <xliff:g id="APP">%1$s</xliff:g> वापरायचे?"</string>
- <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"तुम्ही टॅप करता आणि देय देता तेव्हा <xliff:g id="APP_1">%2$s</xliff:g> ऐवजी नेहमी <xliff:g id="APP_0">%1$s</xliff:g> वापरायचे?"</string>
+ <string name="nfc_payment_set_default" msgid="8532426406310833489">"तुम्ही टॅप करता आणि पेमेंट देता तेव्हा नेहमी <xliff:g id="APP">%1$s</xliff:g> वापरायचे?"</string>
+ <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"तुम्ही टॅप करता आणि पेमेंट देता तेव्हा <xliff:g id="APP_1">%2$s</xliff:g> ऐवजी नेहमी <xliff:g id="APP_0">%1$s</xliff:g> वापरायचे?"</string>
<string name="restriction_settings_title" msgid="4233515503765879736">"निर्बंध"</string>
<string name="restriction_menu_reset" msgid="2067644523489568173">"प्रतिबंध काढून टाका"</string>
<string name="restriction_menu_change_pin" msgid="740081584044302775">"पिन बदला"</string>
@@ -2963,7 +2934,6 @@
<item quantity="one">%d लपविलेला आयटम दर्शवा</item>
<item quantity="other">%d लपविलेले आयटम दर्शवा</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"कोलॅप्स"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"नेटवर्क आणि इंटरनेट"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटा वापर"</string>
@@ -2975,12 +2945,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ब्लूटूथ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अॅप्स आणि सूचना"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"परवानग्या, डीफॉल्ट अॅप्स"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"कार्य प्रोफाइलमधील अॅप्ससाठी सूचनेचा अॅक्सेस उपलब्ध नाही."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"खाती"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"कोणतीही खाती जोडली नाहीत"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"डीफॉल्ट अॅप्स"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"भाषा, वेळ, बॅक अप, अपडेट"</string>
<string name="search_results_title" msgid="1796252422574886932">"सेटिंग्ज"</string>
- <string name="search_menu" msgid="6283419262313758339">"सेटिंग्ज शोधा"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"वायफाय, वाय-फाय, नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वाय फाय"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"वायफाय, वाय-फाय, टॉगल, कंट्रोल"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"एसएमएस, मजकूर पाठवणे, मेसेज, मेसेजिंग, डीफॉल्ट"</string>
@@ -3022,9 +2992,10 @@
<string name="keywords_profile_challenge" msgid="789611397846512845">"कार्य आव्हान, कार्य, प्रोफाईल"</string>
<string name="keywords_unification" msgid="1922900767659821025">"कार्य प्रोफाईल, व्यवस्थापित केलेले प्रोफाईल, एकीकरण, एकीकरण करणे, कार्य, प्रोफाईल"</string>
<string name="keywords_gesture" msgid="3526905012224714078">"जेश्चर"</string>
- <string name="keywords_payment_settings" msgid="5220104934130446416">"देय द्या, टॅप करा, पेमेंट"</string>
+ <string name="keywords_payment_settings" msgid="5220104934130446416">"पेमेंट करा, टॅप करा, पेमेंट"</string>
<string name="keywords_backup" msgid="470070289135403022">"बॅकअप, बॅक अप"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"जेश्चर"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"चेहरा, अनलॉक, प्रमाणीकरण, साइन इन"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl आवृत्ती, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"नेटवर्क, मोबाइल नेटवर्क स्थिती, सेवा स्थिती, सिग्नल तीव्रता, मोबाइल नेटवर्क प्रकार, रोमिंग, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"सीरीअल नंबर, हार्डवेअर आवृत्ती"</string>
@@ -3032,6 +3003,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"गडद थीम"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"बग"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"अँबियन्ट डिस्प्ले, लॉक स्क्रीन डिस्प्ले"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"लॉक स्क्रीन सूचना"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"चेहरा"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"फिंगरप्रिंट"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"मंद स्क्रीन, टचस्क्रीन, बॅटरी, स्मार्ट ब्राइटनेस, डायनॅमिक ब्राइटनेस"</string>
@@ -3274,7 +3246,7 @@
<string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"अस्पष्टता कमी करा (शिफारस केलेले)"</string>
<string name="display_vr_pref_off" msgid="2190091757123260989">"फ्लिकर कमी करा"</string>
<string name="picture_in_picture_title" msgid="5824849294270017113">"चित्रा-मध्ये-चित्र"</string>
- <string name="picture_in_picture_empty_text" msgid="685224245260197779">"कोणतेही इंस्टॉल केलेले अॅप्स चित्रा मध्ये चित्रचे समर्थन करत नाहीत"</string>
+ <string name="picture_in_picture_empty_text" msgid="685224245260197779">"कोणतेही इंस्टॉल केलेली अॅप्स चित्रा मध्ये चित्रचे समर्थन करत नाहीत"</string>
<string name="picture_in_picture_keywords" msgid="8361318686701764690">"चि. म. चि. चित्रामध्ये"</string>
<string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"चित्रा मध्ये चित्र"</string>
<string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"चित्रामध्ये चित्राची अनुमती द्या"</string>
@@ -3408,7 +3380,7 @@
<string name="zen_mode_when_never" msgid="8809494351918405602">"कधीही नाही"</string>
<string name="zen_mode_when_every_night" msgid="3122486110091921009">"प्रत्येक रात्री"</string>
<string name="zen_mode_when_weeknights" msgid="8354070633893273783">"आठवड्याच्या रात्री"</string>
- <string name="zen_mode_start_time" msgid="8102602297273744441">"प्रारंभ वेळ"</string>
+ <string name="zen_mode_start_time" msgid="8102602297273744441">"सुरू होण्याची वेळ"</string>
<string name="zen_mode_end_time" msgid="8774327885892705505">"समाप्ती वेळ"</string>
<string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> पुढील दिवशी"</string>
<string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"अनिश्चितपणे केवळ अलार्म वर बदला"</string>
@@ -3463,15 +3435,15 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"या डिव्हाइसचा प्रारंभ करण्यासाठी तुम्ही तुमचा पिन एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्धता असणार नाही."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"हे डिव्हाइस सुरू करण्यासाठी तुम्ही तुमचा पॅटर्न एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"या डिव्हाइसचा प्रारंभ करण्यासाठी तुम्ही तुमचा पासवर्ड एंटर करता, तेव्हा <xliff:g id="SERVICE">%1$s</xliff:g> सारख्या सेवांची प्रवेशयोग्यता उपलब्ध असणार नाही."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"टीप: रीबूट केल्यानंतर, तुम्ही तुमचा फोन अनलॉक करे पर्यंत हे अॅप सुरू होऊ शकत नाही"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"टीप: तुम्ही तुमचा फोन रीस्टार्ट केल्यास आणि स्क्रीन लॉक सेट केले असल्यास, तुम्ही तुमचा फोन अनलॉक करेपर्यंत हे अॅप सुरू होऊ शकत नाही"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI माहिती"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI सापेक्ष माहिती"</string>
<string name="slot_number" msgid="3762676044904653577">"(स्लॉट<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
<string name="launch_by_default" msgid="1840761193189009248">"डीफॉल्टनुसार उघडा"</string>
- <string name="app_launch_domain_links_title" msgid="1160925981363706090">"उघडणारे दुवे"</string>
- <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"समर्थित दुवे उघडा"</string>
+ <string name="app_launch_domain_links_title" msgid="1160925981363706090">"उघडणारे लिंक"</string>
+ <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"समर्थित लिंक उघडा"</string>
<string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"न विचारता उघडा"</string>
- <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"समर्थित दुवे"</string>
+ <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"समर्थित लिंक"</string>
<string name="app_launch_other_defaults_title" msgid="2516812499807835178">"इतर डीफॉल्ट"</string>
<string name="storage_summary_format" msgid="5419902362347539755">"<xliff:g id="STORAGE_TYPE">%2$s</xliff:g> मध्ये <xliff:g id="SIZE">%1$s</xliff:g> वापरले"</string>
<string name="storage_type_internal" msgid="6042049833565674948">"अंतर्गत स्टोरेज"</string>
@@ -3512,12 +3484,12 @@
<string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"कोणत्याही परवानग्यांना मंजूरी दिली नाही"</string>
<string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"कोणत्याही परवानग्यांची विनंती केली नाही"</string>
<string name="filter_all_apps" msgid="1988403195820688644">"सर्व अॅप्स"</string>
- <string name="filter_enabled_apps" msgid="5395727306799456250">"इंस्टॉल केलेले अॅप्स"</string>
+ <string name="filter_enabled_apps" msgid="5395727306799456250">"इंस्टॉल केलेली अॅप्स"</string>
<string name="filter_instant_apps" msgid="574277769963965565">"इन्स्टंट अॅप्स"</string>
<string name="filter_personal_apps" msgid="3277727374174355971">"वैयक्तिक"</string>
<string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"अॅप्स: सर्व"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"अॅप्स: बंद केलेली"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"बंद केले आहे"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"वर्गवाऱ्या: तातडीचे महत्त्व"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"वर्गवाऱ्या: कमी महत्त्व"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"वर्गवाऱ्या: बंद केलेल्या"</string>
@@ -3529,14 +3501,14 @@
<string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> वापरणारी अॅप्स"</string>
<string name="tap_to_wake" msgid="7211944147196888807">"सक्रिय करण्यासाठी टॅप करा"</string>
<string name="tap_to_wake_summary" msgid="4341387904987585616">"डिव्हाइस अॅक्टिव्हेट करण्यासाठी स्क्रीनवर कुठेही दोनदा टॅप करा"</string>
- <string name="domain_urls_title" msgid="3132983644568821250">"उघडणारे दुवे"</string>
- <string name="domain_urls_summary_none" msgid="2639588015479657864">"समर्थित दुवे उघडू नका"</string>
+ <string name="domain_urls_title" msgid="3132983644568821250">"उघडणारे लिंक"</string>
+ <string name="domain_urls_summary_none" msgid="2639588015479657864">"समर्थित लिंक उघडू नका"</string>
<string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> उघडा"</string>
<string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g>आणि अन्य URL उघडा"</string>
- <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"कोणतेही अॅप समर्थित दुवे उघडू शकत नाहीत"</string>
+ <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"कोणतेही अॅप समर्थित लिंक उघडू शकत नाहीत"</string>
<plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
- <item quantity="one">समर्थित दुवे उघडणारे <xliff:g id="COUNT">%d</xliff:g> अॅप</item>
- <item quantity="other">समर्थित दुवे उघडणारी <xliff:g id="COUNT">%d</xliff:g> अॅप्स</item>
+ <item quantity="one">समर्थित लिंक उघडणारे <xliff:g id="COUNT">%d</xliff:g> अॅप</item>
+ <item quantity="other">समर्थित लिंक उघडणारी <xliff:g id="COUNT">%d</xliff:g> अॅप्स</item>
</plurals>
<string name="app_link_open_always" msgid="2474058700623948148">"हा अॅप उघडा"</string>
<string name="app_link_open_ask" msgid="7800878430190575991">"प्रत्येक वेळी विचारा"</string>
@@ -3578,7 +3550,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"वापरासंबंधी सूचना"</string>
<string name="show_all_apps" msgid="1512506948197818534">"पूर्ण डिव्हाइस वापर दाखवा"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"अॅपचा वापर दाखवा"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"जास्त वापर"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> अॅप अस्वाभाविकपणे काम करत आहे</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> अॅप्स अस्वाभाविकपणे काम करत आहेत</item>
@@ -3602,7 +3573,7 @@
<string name="additional_permissions" msgid="6463784193877056080">"अतिरिक्त परवानग्या"</string>
<string name="additional_permissions_more" msgid="3538612272673191451">"<xliff:g id="COUNT">%1$d</xliff:g> अधिक"</string>
<string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"बग रीपोर्ट शेअर करायचा?"</string>
- <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अॅप्स आणि डेटा सामायिक केले जाऊ शकतात."</string>
+ <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"आपल्या IT प्रशासकाने या डिव्हाइसच्या समस्येचे निवारण करण्यात मदत करण्यासाठी दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात."</string>
<string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"तुमच्या IT प्रशासकाने या डिव्हाइस च्या समस्येचे निवारण करण्यात मदत करण्यासाठी एका दोष अहवालाची विनंती केली. अॅप्स आणि डेटा शेअर केले जाऊ शकतात आणि तुमचे डिव्हाइस तात्पुरते धीमे होऊ शकते."</string>
<string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"हा बग रीपोर्ट आपल्या IT प्रशासकासह शेअर केला जात आहे. अधिक तपशीलांसाठी त्यांच्याशी संपर्क साधा."</string>
<string name="share_remote_bugreport_action" msgid="532226159318779397">"शेअर करा"</string>
@@ -3645,7 +3616,7 @@
<string name="assist_access_screenshot_summary" msgid="6761636689013259901">"स्क्रीनच्या प्रतिमेमध्ये प्रवेश करण्यासाठी साहाय्यक अॅपला अनुमती द्या"</string>
<string name="assist_flash_title" msgid="506661221230034891">"स्क्रीन फ्लॅश करा"</string>
<string name="assist_flash_summary" msgid="9160668468824099262">"साहाय्य अॅप स्क्रीन किंवा स्क्रीनशॉट मधून मजकूरअॅक्सेस करते तेव्हा स्क्रीनच्या किनारी फ्लॅश करा"</string>
- <string name="assist_footer" msgid="1982791172085896864">"साहाय्यक अॅप्स तुम्ही पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर आपल्याला मदत करू शकतात. काही अॅप्स आपल्याला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना समर्थन देतात."</string>
+ <string name="assist_footer" msgid="1982791172085896864">"साहाय्यक अॅप्स तुम्ही पाहत असलेल्या स्क्रीनवरील माहितीच्या आधारावर तुम्हाला मदत करू शकतात. काही अॅप्स तुम्हाला एकत्रित सहाय्य देण्यासाठी लॉन्चर आणि व्हॉइस इनपुट सेवा दोघांना समर्थन देतात."</string>
<string name="average_memory_use" msgid="829566450150198512">"सरासरी मेमरी वापर"</string>
<string name="maximum_memory_use" msgid="7493720799710132496">"कमाल मेमरी वापर"</string>
<string name="memory_usage" msgid="1781358557214390033">"मेमरी वापर"</string>
@@ -3667,7 +3638,7 @@
<string name="running_frequency" msgid="6622624669948277693">"वारंवारता"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"कमाल वापर"</string>
<string name="no_data_usage" msgid="9131454024293628063">"कोणताही डेटा वापरला नाही"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> साठी व्यत्यय आणू नका ला प्रवेशाची अनुमती द्यायची?"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> वर व्यत्यय आणू नका ला अॅक्सेस द्यायचा का?"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"व्यत्यय आणू नका चालू/बंद करण्यात आणि संबंधित स्ट्रिंगमध्ये बदल करण्यात अॅप सक्षम असेल."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"सूचना प्रवेश चालू असल्याने चालू केलेले ठेवणे आवश्यक आहे"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> साठी व्यत्यय आणू नका मध्ये प्रवेश करणे रद्द करायचे?"</string>
@@ -3742,6 +3713,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"अंतर्गत स्टोरेज: <xliff:g id="PERCENTAGE">%1$s</xliff:g> वापरले - <xliff:g id="FREE_SPACE">%2$s</xliff:g> मोकळे"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> च्या निष्क्रियतेनंतर निष्क्रिय करा"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"वॉलपेपर, निष्क्रिय करा, फॉंट आकार"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 मिनिटे निष्क्रिय झाल्यानंतर निष्क्रिय करा"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> पैकी सरासरी <xliff:g id="USED_MEMORY">%1$s</xliff:g> मेमरी वापरली"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> म्हणून साइन इन केले"</string>
@@ -3757,7 +3730,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ला अनुमती नाही"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"कॅमेर्याला अनुमती नाही"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"स्क्रीनशॉटला अनुमती नाही"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"बॅकअप बंद करू शकत नाही"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"हे अॅप उघडू शकत नाही"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"तुम्हाला कोणतेही प्रश्न असल्यास, तुमच्या आयटी प्रशासकाशी संपर्क साधा"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"अधिक तपशील"</string>
@@ -3792,7 +3764,7 @@
<string name="night_display_suggestion_title" msgid="6602129097059325291">"रात्रीच्या प्रकाशाचे वेळापत्रक सेट करा"</string>
<string name="night_display_suggestion_summary" msgid="228346372178218442">"दररोज रात्री स्क्रीन आपोआप टिंट करा"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"रात्रीचा प्रकाश चालू आहे"</string>
- <string name="condition_night_display_summary" msgid="5443722724310650381">"स्क्रीनची रंगछटा पिवळसर तपकिरी आहे. यामुळे आपल्याला झोप येण्यात मदत होईल."</string>
+ <string name="condition_night_display_summary" msgid="5443722724310650381">"स्क्रीनची रंगछटा पिवळसर तपकिरी आहे. यामुळे तुम्हाला झोप येण्यात मदत होईल."</string>
<string name="suggestions_title_v2" msgid="5601181602924147569">"तुमच्यासाठी सुचवलेले"</string>
<string name="suggestions_title" msgid="7280792342273268377">"सूचना"</string>
<string name="suggestions_summary" msgid="2509040178581728056">"+<xliff:g id="ID_1">%1$d</xliff:g>"</string>
@@ -3906,7 +3878,7 @@
<string name="notification_log_details_badge" msgid="3258183328267662285">"बॅज दर्शवू शकता"</string>
<string name="notification_log_details_content_intent" msgid="1113554570409128083">"हेतू"</string>
<string name="notification_log_details_delete_intent" msgid="905118520685297007">"हेतू हटवा"</string>
- <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"पूर्ण स्क्रीन हेतू"</string>
+ <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"फुल स्क्रीन हेतू"</string>
<string name="notification_log_details_actions" msgid="242523930165118066">"कृती:"</string>
<string name="notification_log_details_title" msgid="7177091647508863295">"शीर्षक"</string>
<string name="notification_log_details_remoteinput" msgid="8328591329858827409">"दूरस्थ इनपुट"</string>
@@ -3921,9 +3893,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"कटआउटसह डिस्प्लेचे अनुकरण करा"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"डिस्प्ले कटआउट"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"कटआउट, नॉच डिस्प्ले करा"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"काहीही नाही"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"डिव्हाइस डीफॉल्ट"</string>
<string name="special_access" msgid="3458780842491881155">"विशेष अॅप प्रवेश"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> अॅप अनिर्बंधित डेटा वापरू शकते</item>
@@ -3945,11 +3917,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>शी कनेक्ट केले"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"एकाधिक डिव्हाइसशी कनेक्ट केले"</string>
<string name="demo_mode" msgid="2798762752209330277">"सिस्टम UI डेमो मोड"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"नाइट मोड"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"नाइट मोड सेट करा"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"गडद मोड"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"गडद मोड सेट करा"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"द्रुत सेटिंग्ज डेव्हलपर टाइल"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"विनस्कोप ट्रेस"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफाइल सेटिंग्ज"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"संपर्क शोध"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कॉलर आणि संपर्कांना ओळखण्यासाठी आपल्या संस्थेनुसार संपर्क शोधांची अनुमती द्या"</string>
@@ -3990,13 +3961,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"फोन तपासण्यासाठी दोनदा-टॅप करा"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"टॅब्लेट तपासण्यासाठी दोनदा-टॅप करा"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"डिव्हाइस तपासण्यासाठी दोनदा टॅप करा"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"वेळ, सूचना आयकन आणि इतर माहिती तपासण्यासाठी तुमच्या स्क्रीनवर दोनदा टॅप करा."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"वेळ, सूचना आणि इतर माहिती तपासण्यासाठी, तुमच्या स्क्रीनवर दोनदा टॅप करा."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"फोन तपासण्यासाठी तो उचला"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"टॅब्लेट तपासण्यासाठी तो उचला"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"डिव्हाइस तपासण्यासाठी ते उचला"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"वेळ, सूचना आयकन आणि इतर माहिती तपासण्यासाठी, तुमचा फोन उचला."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"वेळ, सूचना आयकन आणि इतर माहिती तपासण्यासाठी, तुमचा टॅबलेट उचला."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"वेळ, सूचना आयकन आणि इतर माहिती तपासण्यासाठी, तुमचे डिव्हाइस उचला."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"वेक अप डिस्प्ले"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"वेळ, सूचना आणि इतर माहिती तपासण्यासाठी, तुमचा फोन उचला."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"वेळ, सूचना आणि इतर माहिती तपासण्यासाठी, तुमचे टॅबलेट उचला."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"वेळ, सूचना आणि इतर माहिती तपासण्यासाठी, तुमचे डिव्हाइस उचला."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"वेक लॉक स्क्रीन जेश्चर"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"सूचनांसाठी फिंगरप्रिंट स्वाइप करा"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"फिंगरप्रिंट स्वाइप करा"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"तुमच्या सूचना तपासण्यासाठी, तुमच्या फोनच्या पाठीमागे फिंगरप्रिंट सेन्सरवर खाली स्वाइप करा."</string>
@@ -4012,10 +3987,10 @@
<string name="oem_lock_info_message" msgid="9218313722236417510">"डिव्हाइस संरक्षण वैशिष्ट्य सुरू करण्यासाठी कृपया डिव्हाइस रीस्टार्ट करा."</string>
<string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"एकूण <xliff:g id="SIZE">%1$s</xliff:g> उपलब्ध केली \n\n<xliff:g id="DATE">%2$s</xliff:g> रोजी अंतिम चालविले"</string>
<string name="web_action_enable_title" msgid="4051513950976670853">"इन्स्टंट अॅप्स"</string>
- <string name="web_action_enable_summary" msgid="3108127559723396382">"अॅप्समध्ये दुवे उघडा, ते इंस्टॉल केलेले नसले तरीही"</string>
+ <string name="web_action_enable_summary" msgid="3108127559723396382">"अॅप्समध्ये लिंक उघडा, ते इंस्टॉल केलेले नसले तरीही"</string>
<string name="web_action_section_title" msgid="7364647086538399136">"इन्स्टंट अॅप्स"</string>
<string name="instant_apps_settings" msgid="8827777916518348213">"इंस्टंट अॅप्स प्राधान्ये"</string>
- <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्टॉल केलेले अॅप्स"</string>
+ <string name="domain_url_section_title" msgid="7046835219056428883">"इंस्टॉल केलेली अॅप्स"</string>
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"तुमचा स्टोरेज आता स्टोरेज व्यवस्थापक व्यवस्थापित करत आहे"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> साठी खाती"</string>
<string name="configure_section_header" msgid="7391183586410814450">"कॉन्फिगर करा"</string>
@@ -4041,7 +4016,7 @@
<string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"सर्वात अलीकडील बग रीपोर्ट"</string>
<string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"सर्वात अलीकडील सुरक्षा लॉग"</string>
<string name="enterprise_privacy_none" msgid="7706621148858381189">"काहीही नाही"</string>
- <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"इंस्टॉल केलेले अॅप्स"</string>
+ <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"इंस्टॉल केलेली अॅप्स"</string>
<string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"अॅपची संख्या अंदाजित आहे. त्यामध्ये कदाचित Play स्टोअर च्या बाहेर इंस्टॉल केलेली अॅप्स समाविष्ट नसतील."</string>
<plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
<item quantity="one">किमान <xliff:g id="COUNT_1">%d</xliff:g> अॅप</item>
@@ -4076,7 +4051,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> प्रयत्न</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> प्रयत्न</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"या डिव्हाइसच्या डेटाचा बॅकअप घेतला जात आहे"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"हे डिव्हाइस तुमच्या संस्थेने व्यवस्थापित केले आहे."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"हे डिव्हाइस <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> द्वारे व्यवस्थापित आहे."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4107,7 +4081,7 @@
<string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> पैकी वापरले"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"वापरलेली"</string>
<string name="clear_instant_app_data" msgid="2004222610585890909">"अॅप साफ करा"</string>
- <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"आपल्याला हे इन्स्टंट अॅप काढायचे आहे का?"</string>
+ <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"तुम्हाला हे इन्स्टंट अॅप काढायचे आहे का?"</string>
<string name="launch_instant_app" msgid="391581144859010499">"उघडा"</string>
<string name="game_storage_settings" msgid="3410689937046696557">"गेम"</string>
<string name="audio_files_title" msgid="4777048870657911307">"ऑडिओ फायली"</string>
@@ -4117,6 +4091,12 @@
<string name="autofill_app" msgid="7338387238377914374">"स्वयं-भरण सेवा"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"स्वयं, भरा, स्वयंभरण"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>तुमचा या अॅपवर विश्वास असल्याचे निश्चित करा</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ऑटोफिल काय होऊ शकते हे ठरवण्यासाठी तुमच्या स्क्रीनवर काय आहे याचा वापर करते."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"अॉटोफिल"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"लॉगिंग पातळी"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"प्रति सेशन कमाल विनंत्या"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"कमाल दृश्यमान डेटासेट"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"डीफॉल्ट मूल्यांवर रीसेट करा"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"ऑटोफिल डेव्हलपर पर्याय रीसेट केले गेले आहेत"</string>
<string name="device_theme" msgid="4571803018917608588">"डिव्हाइस थीम"</string>
<string name="default_theme" msgid="7085644992078579076">"डीफॉल्ट"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"नेटवर्कचे नाव"</string>
@@ -4131,15 +4111,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"वाहक तरतूद ट्रिगर करा"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"व्यत्यय आणू नका अपडेट करा"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"लक्ष केंद्रित केलेले राहण्यासाठी सूचना थांंबवा"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"नवीन आणि रोमांचक असे काय आहे?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"तुमच्या नवीन फोनबद्दल माहिती देणार्या सफरीवर चला"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"तुमच्या नवीन टॅबलेटबद्दल माहिती देणार्या सफरीवर चला"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"तुमच्या नवीन डीव्हाइसबद्दल माहिती देणार्या सफरीवर चला"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"हे वैशिष्ट्य या डिव्हाइसवर उपलब्ध नाही"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"पूर्ण GNSS मापांची सक्ती करा"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"कुठल्याही ड्युटी सायकलिंग शिवाय सर्व GNSS तारामंडळे आणि वारंवारता ट्रॅक करा"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"नेहमी क्रॅश डायलॉग दाखवा"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"अॅप क्रॅश झाल्यावर प्रत्येक वेळी डायलॉग दाखवा"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE सुरू केलेले अॅप निवडा"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"कोणतेही ANGLE सुरू केलेले अॅप्लिकेशन सेट करा"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE सुरू केलेले अॅप्लिकेशन: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"डिरेक्टरी अॅक्सेस"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"डिरेक्टरी अॅक्सेस"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4180,4 +4159,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"नेटवर्क तपशील"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"तुमचे डिव्हाइस नाव तुमच्या फोनवरील अॅप्सना दृश्यमान आहे. तुम्ही ब्लूटूथ डिव्हाइसशी जोडता किंवा वाय-फाय हॉटस्पॉट सेट करता, तेव्हा हे इतर लोकांद्वारे देखील बघितले जाऊ शकते."</string>
<string name="devices_title" msgid="7701726109334110391">"डिव्हाइस"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"सर्व सेटिंग्ज"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"सूचना"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS डेटा"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS डेटा"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"नेटवर्क निवडा"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"डिस्कनेक्ट केलेले"</string>
+ <string name="network_connected" msgid="4943925032253989621">"कनेक्ट केलेले"</string>
+ <string name="network_connecting" msgid="76404590784733557">"कनेक्ट करत आहे…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"कनेक्ट करता आले नाही"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"कोणतीही नेटवर्क आढळली नाहीत."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"नेटवर्क मिळू शकले नाहीत. पुन्हा प्रयत्न करा."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(मनाई केलेले)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"सिम कार्ड नाही"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"प्रगत कॉलिंग"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"प्राधान्यकृत नेटवर्क मोड: WCDMA प्राधान्यकृत"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"प्राधान्यकृत नेटवर्क मोड: केवळ GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"प्राधान्यकृत नेटवर्क प्रकार: केवळ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"प्राधान्यकृत नेटवर्क मोड: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"प्राधान्यकृत नेटवर्क मोड: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"प्राधान्यकृत नेटवर्क मोड: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"प्राधान्यकृत नेटवर्क मोड: केवळ CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"प्राधान्यकृत नेटवर्क मोड: केवळ EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"प्राधान्यकृत नेटवर्क मोड: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"प्राधान्यकृत नेटवर्क मोड: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"प्राधान्यकृत नेटवर्क मोड: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"प्राधान्यकृत नेटवर्क मोड: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"प्राधान्यकृत नेटवर्क मोड: जागतिक"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"प्राधान्यकृत नेटवर्क मोड: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"प्राधान्यकृत नेटवर्क मोड: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"प्राधान्यकृत नेटवर्क मोड: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"प्राधान्यकृत नेटवर्क मोड: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"प्राधान्यकृत नेटवर्क मोड: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"प्राधान्यकृत नेटवर्क मोड: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"प्राधान्यकृत नेटवर्क मोड: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"प्राधान्यकृत नेटवर्क मोड: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"प्राधान्यकृत नेटवर्क मोड: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"प्राधान्यकृत नेटवर्क मोड: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"प्राधान्यकृत नेटवर्क मोड: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"प्राधान्यकृत नेटवर्क मोड: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"प्राधान्यकृत नेटवर्क मोड: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (शिफारस केलेले)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (शिफारस केलेले)"</string>
+ <string name="network_global" msgid="959947774831178632">"जागतिक"</string>
+ <string name="label_available" msgid="1731547832803057893">"उपलब्ध नेटवर्क"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"शोधत आहे…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> वर नोंदणी करत आहे…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"तुमचे सिम कार्ड या नेटवर्कच्या कनेक्शनला अनुमती देत नाही."</string>
+ <string name="connect_later" msgid="978991102125216741">"आत्ता या नेटवर्कशी कनेक्ट करू शकत नाही. नंतर पुन्हा प्रयत्न करा."</string>
+ <string name="registration_done" msgid="4573820010512184521">"नेटवर्कवर नोंदणी केली."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"आपोआप नेटवर्क निवडायचे का"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"वाहक सेटिंग्ज"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"डेटा सेवा सेट करा"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"मोबाइल डेटा"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"मोबाइल नेटवर्क वापरून डेटा अॅक्सेस करा"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"प्राधान्यकृत नेटवर्क प्रकार"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"नेटवर्क कार्य करण्याचा मोड बदला"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"प्राधान्यकृत नेटवर्क प्रकार"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"वाहक"</string>
+ <string name="call_category" msgid="8108654745239563833">"कॉलिंग"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"वाहक व्हिडिओ कॉलिंग"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"सिस्टम निवडा"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA रोमिंग मोड बदला"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"सिस्टम निवडा"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"नेटवर्क"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"नेटवर्क"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA सदस्यत्व"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/सिम आणि NV मध्ये बदला"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"सदस्यत्व"</string>
+ <string name="register_automatically" msgid="518185886971595020">"आपोआप नोंदणी…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"डेटा रोमिंगला अनुमती द्यायची का?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"किमतींबद्दल तुमच्या नेटवर्क पुरवठादाराला विचारा."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"अॅप डेटा वापर"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"चुकीचा नेटवर्क मोड <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. दुर्लक्ष करा."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g>शी कनेक्ट केले असल्यास उपलब्ध नाही"</string>
+ <string name="see_more" msgid="5953815986207345223">"आणखी पाहा"</string>
+ <string name="see_less" msgid="1250265310929558370">"कमी पहा"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 5f3da49..547b7e8 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Anggap sebagai bermeter"</item>
<item msgid="2266114985518865625">"Anggap sebagai tidak bermeter"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Lalai (gunakan MAC terawak)"</item>
+ <item msgid="5398461510512959597">"Dipercayai"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Tidak"</item>
<item msgid="3863157480502955888">"Ya"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Sentiasa hidup"</item>
<item msgid="6385301106124765323">"Sentiasa mati"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Mati"</item>
+ <item msgid="2182686878828390312">"Nyahpepijat"</item>
+ <item msgid="5286514712714822064">"Berjela-jela"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Rumah sahaja"</item>
+ <item msgid="5034813753274486448">"Automatik"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA diutamakan"</item>
+ <item msgid="807926878589867564">"GSM sahaja"</item>
+ <item msgid="488474605709912156">"WCDMA sahaja"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA auto"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo auto"</item>
+ <item msgid="370391313511477301">"CDMA tanpa EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo sahaja"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA sahaja"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index ace57f0..f98f513 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Buat"</string>
<string name="allow" msgid="3349662621170855910">"Benarkan"</string>
<string name="deny" msgid="6947806159746484865">"Nafikan"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Tutup"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Tukar"</string>
<string name="device_info_default" msgid="7847265875578739287">"Tidak diketahui"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Anda kini <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> langkah daripada menjadi pembangun.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, anda sudah pun menjadi pembangun."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Sila dayakan pilihan pembangun terlebih dahulu."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Wayarles & rangkaian"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Sambungan"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Peranti"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Peribadi"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Akses"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Dayakan Sambungan Data"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Lumpuhkan Sambungan Data"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Alamat Bluetooth peranti: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Putuskan sambungan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Penyiaran"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Peranti Bluetooth tanpa nama"</string>
<string name="progress_scanning" msgid="192587958424295789">"Mencari"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Tiada peranti Bluetooth berdekatan ditemui."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Terdapat apl yang mahu menghidupkan Bluetooth dan memperlihatkan telefon anda kepada peranti yang lain. Anda boleh menukar tetapan ini kemudian dalam tetapan Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Menghidupkan Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Mematikan Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Autosambung"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Permintaan sambungan Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Sentuh untuk menyambung ke \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Adakah anda mahu menyambung kepada \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Peranti panggilan yang tersedia"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Tersambung pada masa ini"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Peranti disimpan"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Tambahkan peranti"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth akan dihidupkan untuk bergandingan"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Pilihan sambungan"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Peranti yang tersambung sebelum ini"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Disambungkan sebelum ini"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth dihidupkan"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Lihat semua"</string>
<string name="date_and_time" msgid="9062980487860757694">"Tarikh & masa"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Pilih zon masa"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Langkau"</string>
<string name="next_label" msgid="4693520878012668114">"Seterusnya"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Bahasa"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Pilihan bahasa"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Alih keluar"</string>
<string name="add_a_language" msgid="2330538812283783022">"Tambahkan bahasa"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Tetapan"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Pintasan tetapan"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Mod pesawat"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Lagi"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wayarles & rangkaian"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Urus Wi‑Fi, Bluetooth, mod pesawat, rangkaian mudah alih & VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Data mudah alih"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privasi"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Dilumpuhkan oleh pentadbir"</string>
<string name="security_status_title" msgid="5848766673665944640">"Status keselamatan"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Kunci skrin, wajah buka kunci"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Kunci skrin, cap jari"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Kunci skrin"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Wajah ditambahkan"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Buka kunci dengan wajah anda"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Gunakan wajah untuk membuat pengesahan"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Gunakan wajah anda untuk membuka kunci telefon, membenarkan pembelian atau log masuk ke apl."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Gunakan anda"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Gunakan wajah anda untuk membuka kunci telefon atau membenarkan pembelian.\n\nPerhatian: Anda tidak boleh menggunakan wajah anda untuk membuka kunci peranti ini. Untuk mendapatkan maklumat lanjut, hubungi pentadbir organisasi anda."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Gunakan wajah anda untuk membuka kunci telefon, membenarkan pembelian atau log masuk ke apl"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Anda boleh menambah sehingga <xliff:g id="COUNT">%d</xliff:g> cap jari"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Tengahkan wajah anda dalam bulatan"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Lakukan kemudian"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Anda boleh menambah sehingga <xliff:g id="COUNT">%d</xliff:g> wajah"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Anda telah menambahkan bilangan maksimum wajah"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Tidak dapat menambahkan lagi wajah"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Pendaftaran tidak selesai"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Had masa pendaftaran wajah dicapai. Cuba lagi."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Pendaftaran wajah tidak berjaya."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Selesai. Nampak bagus."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Selesai"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Gunakan wajah untuk"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Buka kunci peranti"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Log masuk apl & pembayaran"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Buka mata untuk membuka kunci"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Apabila menggunakan pengesahan wajah, mata anda mesti dibuka"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Alh kluar data wajah"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Tingkatkan data wajah anda"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Wajah anda boleh digunakan untuk membuka kunci peranti anda dan mengakses apl. "<annotation id="url">"Ketahui lebih lanjut"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Cap jari"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Urus cap jari"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gunakan cap jari untuk"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Pilih sekurang-kurangnya satu jalur untuk tempat liputan Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Tetapan IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privasi"</string>
<string name="wifi_shared" msgid="844142443226926070">"Kongsi dengan pengguna peranti yang lain"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(tidak berubah)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Sila pilih"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Batal"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Lupakan rangkaian?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Semua kata laluan untuk rangkaian ini akan dipadamkan"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Rangkaian yang disimpan"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d rangkaian</item>
<item quantity="one">1 rangkaian</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Kecerahan"</string>
<string name="brightness_summary" msgid="838917350127550703">"Laraskan kecerahan skrin"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Kecerahan mudah suai"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Hidup"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Mati"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Kecerahan pilihan adalah sangat rendah"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Kecerahan pilihan adalah rendah"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Tidak boleh menukar PIN.\nBerkemungkinan PIN salah."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM berjaya ditukar"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Tidak boleh menukar keadaan kunci kad SIM.\nMungkin PIN salah."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Tidak dapat melumpuhkan PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Tidak dapat mendayakan PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Batal"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Berbilang SIM ditemui"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Proses ini memerlukan <xliff:g id="NAME_0">^1</xliff:g> diformatkan. \n\n"<b>"Pemformatan akan memadamkan semua data yang disimpan pada <xliff:g id="NAME_1">^1</xliff:g>."</b>" Untuk mengelakkan data daripada hilang, sila sandarkan data itu."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Padam & format"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Memformat <xliff:g id="NAME">^1</xliff:g>..."</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Jangan tanggalkan <xliff:g id="NAME">^1</xliff:g> semasa sedang diformat."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Jangan keluarkan <xliff:g id="NAME">^1</xliff:g> semasa sedang diformat."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Alihkan data ke storan baharu"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Anda boleh mengalihkan foto, fail dan beberapa apl anda ke <xliff:g id="NAME">^1</xliff:g> baharu ini. \n\nPeralihan ini mengambil masa kira-kira <xliff:g id="TIME">^2</xliff:g> dan akan mengosongkan storan dalaman sebesar <xliff:g id="SIZE">^3</xliff:g>. Sesetengah apl tidak akan berfungsi semasa proses ini sedang dijalankan."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Alihkan sekarang"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Dipasang"</string>
<string name="no_applications" msgid="7336588977497084921">"Tiada aplikasi."</string>
<string name="internal_storage" msgid="1584700623164275282">"Storan dalaman"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"storan dalaman"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Storan USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Storan kad SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Mengira semula saiz..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Padamkan data aplikasi?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Semua data aplikasi ini akan dipadamkan secara kekal. Ini termasuk semua fail, tetapan, akaun, pangkalan data, dll."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikasi tidak ditemui dalam senarai aplikasi yang dipasang."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Tidak dapat mengosongkan storan untuk apl."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Aplikasi ini boleh mengakses yang berikut pada tablet anda:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Aplikasi ini boleh mengakses yang berikut pada telefon anda:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Apl ini boleh mengakses yang berikut pada tablet anda. Untuk meningkatkan prestasi dan mengurangkan penggunaan memori, beberapa kebenaran ini tersedia kepada <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> kerana berfungsi dalam proses yang sama seperti <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Apl ini boleh mengakses yang berikut pada telefon anda. Untuk meningkatkan prestasi dan mengurangkan penggunaan memori, beberapa kebenaran adalah tersedia kepada <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> kerana berfungsi dalam proses yang sama seperti <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> da <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Aplikasi ini boleh mengenakan bayaran kepada anda:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Hantar SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"Mengira..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Tidak dapat mengira saiz pakej."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Anda tidak mempunyai sebarang aplikasi pihak ketiga dipasangkan."</string>
<string name="version_text" msgid="9189073826278676425">"versi <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Alih"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Alih ke tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Alihkan ke telefon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Alih ke storan USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Alihkan ke kad SD"</string>
- <string name="moving" msgid="6431016143218876491">"Mengalihkan"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Penghijrahan lain sedang berjalan."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Tiada ruang storan mencukupi."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplikasi tidak wujud."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Apl pentadbir peranti tidak boleh dipasang pada media luaran"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Henti paksa?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Jika anda menghentikan aplikasi secara paksa, mungkin fungsinya akan terganggu."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Tidak boleh memindahkan aplikasi. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Lokasi pemasangan pilihan"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Tukar lokasi pemasangan pilihan untuk aplikasi baru"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Lumpuhkan aplikasi terbina dalam?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Lumpuhkan apl"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Jika anda melumpuhkan apl ini, Android dan apl lain mungkin tidak berfungsi seperti yang dimaksudkan lagi."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Padam data dan lumpuhkan apl?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Jika anda melumpuhkan apl ini, Android dan apl lain mungkin tidak berfungsi seperti yang dimaksudkan lagi. Data anda akan turut dipadamkan."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Matikan pemberitahuan"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jika anda mematikan pemberitahuan untuk apl ini, anda mungkin terlepas amaran dan kemas kini penting."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Gedung"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Butiran apl"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Apl dipasang daripada <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Gunakan perkhidmatan"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Gunakan pembetulan warna"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Gunakan kapsyen"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Teruskan"</string>
<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="6371077608778830020">"Tambah alat bantu pendengaran"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jika anda mengehadkan aktiviti latar belakang untuk apl, fungsi apl itu mungkin terganggu"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Apl ini tidak boleh dihadkan kerana tidak ditetapkan untuk mengoptimumkan bateri.\n\nHidupkan pengoptimuman bateri dahulu."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Penggunaan skrin sejak cas penuh"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Penggunaan skrin"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Pengimbasan rangkaian mudah alih"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Penggunaan bateri sejak cas penuh"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Jumlah masa skrin dihidupkan sejak cas penuh"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Penggunaan peranti sejak cas penuh"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Butiran penggunaan"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Laraskan penggunaan kuasa"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Pakej yang disertakan"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apl yang menyusutkan kuasa bateri"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Memastikan peranti sentiasa berjaga"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Membangkitkan peranti dalam latar belakang"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Kerap meminta lokasi"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apl bergelagat tak normal"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Apl berjalan seperti biasa"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon menunjukkan penggunaan bateri latar belakang seperti biasa"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet menunjukkan penggunaan biasa bateri latar belakang"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Mengehadkan penggunaan bateri untuk %1$d apl</item>
<item quantity="one">Mengehadkan penggunaan bateri untuk %1$d apl</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Terhad <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Apl ini telah menggunakan bateri di latar belakang. Apl terhad mungkin tidak berfungsi dengan betul dan pemberitahuan mungkin ditangguhkan."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Gunakan Pengurus Bateri"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Kesan apabila apl menyusutkan bateri"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Batal"</string>
<string name="tts_reset" msgid="2661752909256313270">"Tetapkan semula"</string>
<string name="tts_play" msgid="2628469503798633884">"Main"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Kawalan kuasa"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Mengemas kini tetapan Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mengemas kini tetapan Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"hidup"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"mati"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"menghidupkan"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"mematikan"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Lokasi"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Segerakkan"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Kecerahan <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"auto"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"penuh"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"separuh"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"mati"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Storan bukti kelayakan"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Pasang daripada storan"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Pilih semua"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Penggunaan data apl"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Data mudah alih & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Cara pengiraan data pembawa mungkin berbeza dengan peranti anda."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Penggunaan apl"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"MAKLUMAT APL"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Tunjukkan %d item yang tersembunyi</item>
<item quantity="one">Tunjukkan %d item yang tersembunyi</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Runtuhkan"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Rangkaian & Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mudah alih"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"penggunaan data"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apl & pemberitahuan"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Kebenaran, apl lalai"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Akses pemberitahuan tidak tersedia untuk apl dalam profil kerja."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Akaun"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Tiada akaun yang ditambahkan"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Apl lalai"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Bahasa, masa, sandaran, kemas kini"</string>
<string name="search_results_title" msgid="1796252422574886932">"Tetapan"</string>
- <string name="search_menu" msgid="6283419262313758339">"Carian tetapan"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, sambungan rangkaian, Internet, wayarles, data, wi-fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, togol, kawalan"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"mesej teks, penghantaran teks, mesej, pemesejan, lalai"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"bayar, ketik, bayaran"</string>
<string name="keywords_backup" msgid="470070289135403022">"sandaran, sandarkan"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gerak isyarat"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"wajah, buka kunci, auth, daftar masuk"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versi prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"rangkaian, keadaan rangkaian mudah alih, keadaan perkhidmatan, kekuatan isyarat, jenis rangkaian mudah alih, perayauan, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"nombor siri, versi perkakasan"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema gelap"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"pepijat"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Paparan ambien, Paparan skrin kunci"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"pemberitahuan skrin kunci"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"wajah"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"cap jari"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"malapkan skrin, skrin sentuh, bateri, kecerahan pintar, kecerahan dinamik"</string>
@@ -3309,7 +3281,7 @@
<string name="notification_content_block_summary" msgid="7746185794438882389">"Jangan sekali-kali tunjukkan pemberitahuan dalam bidai atau pada peranti persisian"</string>
<string name="notification_badge_title" msgid="6370122441168519809">"Benarkan titik pemberitahuan"</string>
<string name="notification_channel_badge_title" msgid="2240827899882847087">"Tunjukkan titik pemberitahuan"</string>
- <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Atasi Jangan Ganggu"</string>
+ <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Batalkan Jangan Ganggu"</string>
<string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"Benarkan pemberitahuan ini terus mengganggu apabila Jangan Ganggu dihidupkan"</string>
<string name="app_notification_visibility_override_title" msgid="7821124557634786985">"Pada skrin kunci"</string>
<string name="app_notification_row_banned" msgid="5983655258784814773">"Disekat"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Apabila anda memasukkan PIN anda untuk memulakan peranti ini, perkhidmatan kebolehaksesan seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum tersedia lagi."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Apabila anda memasukkan corak anda untuk memulakan peranti ini, perkhidmatan kebolehaksesan seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum tersedia lagi."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Apabila anda memasukkan kata laluan anda untuk memulakan peranti ini, perkhidmatan kebolehaksesan seperti <xliff:g id="SERVICE">%1$s</xliff:g> belum tersedia lagi."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Perhatian: Selepas but semula, apl ini tidak dapat dimulakan sehingga anda membuka kunci telefon"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Nota: Jika anda memulakan semula telefon dan telah menyediakan kunci skrin, apl ini tidak boleh dimulakan sehingga anda membuka kunci telefon"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Maklumat IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Maklumat relatif IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Peribadi"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Kerja"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apl: Semua"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apl: Dimatikan"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Dimatikan"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategori: Kepentingan segera"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategori: Kepentingan rendah"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategori: Dimatikan"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Makluman penggunaan"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Tunjukkan penggunaan peranti penuh"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Tunjukkan penggunaan apl"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Penggunaan tinggi"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apl bergelagat luar biasa</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> bergelagat luar biasa</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Storan dalaman: <xliff:g id="PERCENTAGE">%1$s</xliff:g> digunakan - <xliff:g id="FREE_SPACE">%2$s</xliff:g> kosong"</string>
<string name="display_summary" msgid="6737806235882127328">"Tidur selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Kertas dinding, tidur, saiz fon"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Tidur selepas 10 minit tidak aktif"</string>
<string name="memory_summary" msgid="8080825904671961872">"Purata <xliff:g id="USED_MEMORY">%1$s</xliff:g> daripada <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memori digunakan"</string>
<string name="users_summary" msgid="1674864467098487328">"Dilog masuk sebagai <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS tidak dibenarkan"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kamera tidak dibenarkan"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Tangkapan skrin tidak dibenarkan"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Sandaran tidak boleh dimatikan"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Apl ini tidak boleh dibuka"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Jika anda ingin mengemukakan soalan, hubungi pentadbir IT anda"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Lagi butiran"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulasikan paparan dengan potongan"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Potongan paparan"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"potongan paparan, takuk"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Tiada"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Lalai peranti"</string>
<string name="special_access" msgid="3458780842491881155">"Akses apl khas"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apl boleh menggunakan data tanpa had</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Dihubungkan ke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Dihubungkan ke berbilang peranti"</string>
<string name="demo_mode" msgid="2798762752209330277">"Mod tunjuk cara UI sistem"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Mod malam"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Tetapkan mod Malam"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Mod gelap"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Tetapkan mod Gelap"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Jubin pembangun tetapan pantas"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Surih Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Tetapan profil kerja"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Carian kenalan"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Benarkan carian kenalan oleh organisasi anda untuk mengenal pasti pemanggil dan kenalan"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Ketik dua kali untuk menyemak telefon"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Ketik dua kali untuk menyemak tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Ketik dua kali untuk menyemak peranti"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Untuk menyemak masa, ikon pemberitahuan dan maklumat lain, ketik dua kali pada skrin anda."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Untuk menyemak masa, pemberitahuan dan maklumat lain, ketik dua kali pada skrin anda."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Angkat utk menyemak telefon"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Angkat untuk menyemak tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Angkat untuk menyemak peranti"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Untuk menyemak masa, ikon pemberitahuan dan maklumat lain, angkat telefon anda."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Untuk menyemak masa, ikon pemberitahuan dan maklumat lain, angkat tablet anda."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Untuk menyemak masa, ikon pemberitahuan dan maklumat lain, angkat peranti anda."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Paparan waktu bangkit daripada tidur"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Untuk menyemak masa, pemberitahuan dan maklumat lain, angkat telefon anda."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Untuk menyemak masa, pemberitahuan dan maklumat lain, angkat tablet anda."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Untuk menyemak masa, pemberitahuan dan maklumat lain, angkat peranti anda."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gerak isyarat skrin wake lock"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Leret cap jari untuk pemberitahuan"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Leret cap jari"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Untuk menyemak pemberitahuan, leret ke bawah pada penderia cap jari di bahagian belakang telefon anda."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> percubaan</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> percubaan</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Data peranti ini sedang disandarkan"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Peranti ini diurus oleh organisasi anda."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Peranti ini diurus oleh <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Perkhidmatan autolengkap"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"auto, lengkap, autolengkap"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Pastikan anda mempercayai apl ini</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> menggunakan item yang terdapat pada skrin anda untuk menentukan perkara yang boleh dilengkapkan secara automatik."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Autolengkap"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Tahap pengelogan"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Permintaan maks per sesi"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Set data maksimum yang kelihatan"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Tetapkan semula kepada nilai lalai"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Ciri autolengkapkan pilihan pembangun telah ditetapkan semula"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema peranti"</string>
<string name="default_theme" msgid="7085644992078579076">"Lalai"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nama rangkaian"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cetus Peruntukan Pembawa"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Kemas Kini Jangan Ganggu"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Jeda pemberitahuan untuk mengekalkan tumpuan"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Apakah yang baharu dan menarik?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Teroka telefon baharu anda"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Teroka tablet baharu anda"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Teroka peranti baharu anda"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Video ini tidak tersedia pada peranti ini"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Paksa ukuran GNSS penuh"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Jejak semua gugusan dan kekerapan GNSS tanpa kitaran tugas"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Sentiasa tunjukkan dialog ranap sistem"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Tunjukkan dialog setiap kali apl ranap"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Pilih apl didayakan ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Tiada aplikasi yang didayakan ANGLE dipilih"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplikasi didayakan ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Akses direktori"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"akses direktori"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Butiran rangkaian"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Nama peranti anda kelihatan kepada apl pada telefon anda. Nama ini mungkin dapat dilihat oleh orang lain juga apabila anda menyambung ke peranti Bluetooth atau menyediakan tempat liputan Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Peranti"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Semua Tetapan"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Cadangan"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Pilih rangkaian"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Diputuskan sambungan"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Disambungkan"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Menyambung…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Tidak dapat menyambung"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Tiada rangkaian ditemui."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Tidak menemui rangkaian. Cuba lagi."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(dilarang)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Tiada kad SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Panggilan Lanjutan"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Mod rangkaian pilihan: WCDMA diutamakan"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Mod rangkaian pilihan: GSM sahaja"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Mod rangkaian pilihan: WCDMA sahaja"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Mod rangkaian pilihan: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Mod rangkaian diutamakan: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Mod rangkaian diutamakan: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Mod rangkaian pilihan: CDMA sahaja"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Mod rangkaian pilihan: EvDo sahaja"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Mod rangkaian pilihan: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Mod rangkaian pilihan: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Mod rangkaian pilihan: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Mod rangkaian pilihan: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Mod rangkaian pilihan: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Mod rangkaian pilihan: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Mod rangkaian pilihan: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Mod rangkaian pilihan: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Mod rangkaian pilihan: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Mod rangkaian pilihan: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Mod rangkaian pilihan: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Mod rangkaian pilihan: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Mod rangkaian pilihan: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Mod rangkaian pilihan: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Mod rangkaian pilihan: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Mod rangkaian pilihan: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Mod rangkaian pilihan: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Mod rangkaian pilihan: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (disyorkan)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (disyorkan)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Rangkaian tersedia"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Mencari…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Mendaftar di <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Kad SIM anda tidak membenarkan sambungan ke rangkaian ini."</string>
+ <string name="connect_later" msgid="978991102125216741">"Tidak dapat menyambung ke rangkaian ini sekarang. Cuba lagi nanti."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Didaftarkan pada rangkaian."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Pilih rangkaian secara automatik"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Tetapan pembawa"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Sediakan perkhidmatan data"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Data mudah alih"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Akses data menggunakan rangkaian mudah alih"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Jenis rangkaian pilihan"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Tukar mod pengendalian rangkaian"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Jenis rangkaian pilihan"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Pembawa"</string>
+ <string name="call_category" msgid="8108654745239563833">"Memanggil"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Panggilan video pembawa"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Pilihan sistem"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Tukar mod perayauan CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Pilihan sistem"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Rangkaian"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Rangkaian"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Langganan CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Tukar antara RUIM/SIM dengan NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"langganan"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Pendaftaran automatik…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Benarkan perayauan data?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Semak dengan penyedia rangkaian untuk mendapatkan harga."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Penggunaan data apl"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Mod Rangkaian <xliff:g id="NETWORKMODEID">%1$d</xliff:g> Tidak Sah. Abaikan."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Tidak tersedia apabila disambungkan ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Lihat lagi"</string>
+ <string name="see_less" msgid="1250265310929558370">"Lihat kurang"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index a6dfe90..d01fe28 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"အခမဲ့ မဟုတ်သော အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်"</item>
<item msgid="2266114985518865625">"အခမဲ့ အသုံးပြုခြင်းအဖြစ် သတ်မှတ်ရန်"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"မူရင်း (ကျပန်း MAC ကို အသုံးပြုသည်)"</item>
+ <item msgid="5398461510512959597">"ယုံကြည်ထားသည်"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"No"</item>
<item msgid="3863157480502955888">"Yes"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"အမြဲတမ်း ဖွင့်ထားခြင်း"</item>
<item msgid="6385301106124765323">"အမြဲပိတ်ခြင်း"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"ပိတ်ထားသည်"</item>
+ <item msgid="2182686878828390312">"အမှားရှာပြင်ခြင်း"</item>
+ <item msgid="5286514712714822064">"Verbose"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"အိမ်ကိုသာ"</item>
+ <item msgid="5034813753274486448">"အလိုအလျောက်"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA သုံးလိုပါသည်"</item>
+ <item msgid="807926878589867564">"GSM သာ"</item>
+ <item msgid="488474605709912156">"WCDMA သာ"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA အလိုအလျောက်ပြောင်းရန်"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo အလိုအလျောက်ပြောင်းရန်"</item>
+ <item msgid="370391313511477301">"EvDo မပါသည့် CDMA"</item>
+ <item msgid="4678789463133969294">"EvDo သာ"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"ကမ္ဘာအနှံ့"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA သာ"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"၀"</item>
+ <item msgid="8113210705878681550">"၁"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"ကမ္ဘာအနှံ့"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"၁၀"</item>
+ <item msgid="4187053702071521357">"၈"</item>
+ <item msgid="5461421967189969022">"၉"</item>
+ </string-array>
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 7a9f896..8deb6fe 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"ဖန်တီးရန်"</string>
<string name="allow" msgid="3349662621170855910">"ခွင့်ပြုပါ"</string>
<string name="deny" msgid="6947806159746484865">"ငြင်းပယ်ရန်"</string>
- <string name="dlg_close" msgid="7471087791340790015">"ပိတ်ရန်"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Switch"</string>
<string name="device_info_default" msgid="7847265875578739287">"မသိပါ"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">သင်သည် ယခု ဆောဖ့်ဝဲရေးသားသူထံမှ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> အဆင့်အကွာအဝေးတွင် ရှိနေပါသည်။</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"မလိုတော့ပါ။ သင်သည် တည်ဆောက်သူတစ်ယောက် ဖြစ်နေပြီ ဖြစ်သည်။"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"တီထွင်သူများရွေးစရာကို ဦးစွာဖွင့်ပါ။"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"ကြိုးမဲ့ & ကွန်ရက်များ"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"အဆက်အသွယ်များ"</string>
- <string name="header_category_device" msgid="4544026001618307754">"ကိရိယာ"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ကိုယ်ရေး"</string>
- <string name="header_category_access" msgid="7580499097416970962">"ရယူသုံးခြင်း"</string>
<string name="header_category_system" msgid="2816866961183068977">"စနစ်"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ဒေတာချိတ်ဆက်မှုကို ဖွင့်ပါ"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ဒေတာချိတ်ဆက်မှုကို ပိတ်ပါ"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"စက်ပစ္စည်း၏ ဘလူးတုသ်လိပ်စာ- <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ကို အဆက်ဖြတ်ရမလား?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"ထုတ်လွှင့်ခြင်း"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"အမည်မသိသောဘလူးတုသ်စက်"</string>
<string name="progress_scanning" msgid="192587958424295789">"ရှာဖွေနေသည်…"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"အနီးအနားတွင် မည်သည့်ဘလူးတုသ်စက်မှမရှိပါ"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"အက်ပ်တစ်ခုက ဘလူးတုသ် ဖွင့်၍ အခြားစက်ပစ္စည်းများက သင့်ဖုန်းကို မြင်တွေ့စေလိုသည်။ နောက်ပိုင်းတွင် ဘလူးတုသ်ဆက်တင်များသို့ သွား၍ ဤအရာကို ပြောင်းလဲနိုင်ပါသည်။"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ဘလူးတုသ်ကို ဖွင့်နေစဉ်.."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ဘလူးတုသ်ကိုပိတ်ခြင်း"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"အလိုအလျောက်ချိတ်ဆက်မှု"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ဘလူးတုသ်ချိတ်ဆက်ရန် တောင်းခံသည်။"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" သို့ချိတ်ဆက်ရန် တို့ပါ။"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"နှင့်ချိတ်ဆက်ချင်ပါသလား"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"ရနိုင်သည့် ခေါ်ဆိုရန်စက်များ"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"လောလောဆယ် ချိတ်ဆက်ထားခြင်း"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"သိမ်းဆည်းထားသည့် စက်ပစ္စည်းများ"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"စက်ပစ္စည်း ထည့်ပါ"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"တွဲချိတ်ရန် \'ဘလူးတုသ်\' ကို ဖွင့်ပါမည်"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"ချိတ်ဆက်မှု ဦးစားပေးများ"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"ယခင်က ချိတ်ဆက်ထားသော စက်များ"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ယခင်က ချိတ်ဆက်ထားသော"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ဘလူးတုသ် ဖွင့်ထားသည်"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"အားလုံး ကြည့်ရန်"</string>
<string name="date_and_time" msgid="9062980487860757694">"ရက်စွဲနှင့် အချိန်"</string>
<string name="choose_timezone" msgid="1362834506479536274">"အချိန်ဇုန်အား ရွေးချယ်ခြင်း"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"ကျော်ရန်"</string>
<string name="next_label" msgid="4693520878012668114">"ရှေ့သို့"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ဘာသာစကားများ"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"စိတ်ကြိုက်ဘာသာစကား"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"ဖယ်ရှားပါ"</string>
<string name="add_a_language" msgid="2330538812283783022">"ဘာသာစကားတစ်ခု ပေါင်းထည့်ပါ"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"ဆက်တင်များ"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"ဆက်တင်အတိုကောက်"</string>
<string name="airplane_mode" msgid="8837269988154128601">"လေယာဉ်ပျံမုဒ်"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"နောက်ထပ်"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"ကြိုးမဲ့နှင့် ကွန်ယက်များ"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi ၊ ဘလူးတုသ်၊ လေယာဉ်ပေါ်အသုံးပြုစနစ်၊ မိုဘိုင်းလ်ကွန်ရက်များနှင့် VPN များကို စီမံခန့်ခွဲရန်"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"မိုဘိုင်းဒေတာ"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"ကန့်သတ်ရန် ဆက်တင်"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"စီမံခန့်ခွဲသူက ပိတ်ထားသည်"</string>
<string name="security_status_title" msgid="5848766673665944640">"လုံခြုံရေး အခြေအနေ"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"ဖုန်းမျက်နှာပြင် လော့ခ်၊ မျက်နှာမှတ် သော့ဖွင့်ခြင်း"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"ဖန်သားပြင် လော့ခ်ချခြင်း၊ လက်ဗွေ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ဖန်သားပြင် လော့ခ်ချခြင်း"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"မျက်နှာ ထည့်သွင်းပြီး"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"သင့်မျက်နှာဖြင့် လော့ခ်ဖွင့်ပါ"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"အထောက်အထားစိစစ်ရန် သင့်မျက်နှာသုံးပါ"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"သင့်ဖုန်းကိုလော့ခ်ဖွင့်ရန်၊ ဝယ်ယူမှုများကို အတည်ပြုရန် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန် သင့်မျက်နှာကို အသုံးပြုပါ။"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"သင့်ကို အသုံးပြုပါ"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများကို ခွင့်ပြုပေးရန် သင့်မျက်နှာကို အသုံးပြုပါ။\n\nမှတ်ချက်- ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန် သင့်မျက်နှာကို အသုံးပြု၍ မရနိုင်ပါ။ အသေးစိတ်အချက်များအတွက် သင့်အဖွဲ့အစည်း၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"သင့်ဖုန်းကိုလော့ခ်ဖွင့်ရန်၊ ဝယ်ယူမှုများကို အတည်ပြုရန် သို့မဟုတ် အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန် သင့်မျက်နှာကို အသုံးပြုပါ"</string>
- <string name="face_add_max" msgid="2342250989212694454">"လက်ဗွေ <xliff:g id="COUNT">%d</xliff:g> ခုအထိ ထည့်နိုင်သည်"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"သင့်မျက်နှာကို စက်ဝိုင်းအလယ်တွင်ဖြစ်အောင် ချိန်ပါ"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"နောက်မှလုပ်ရန်"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"မျက်နှာ <xliff:g id="COUNT">%d</xliff:g> ခုအထိ ထည့်နိုင်သည်"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"အများဆုံးထည့်နိုင်သည့် မျက်နှာအရေအတွက် ပြည့်သွားပါပြီ"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"မျက်နှာများ ထပ်ထည့်၍မရပါ"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"စာရင်းသွင်းမှု မပြီးစီးခဲ့ပါ"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"မျက်နှာစာရင်းသွင်းခြင်း ကန့်သတ်ချိန် ကုန်သွားပါပြီ။ ထပ်စမ်းကြည့်ပါ။"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"မျက်နှာကို စာရင်းသွင်း၍မရပါ။"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"အားလုံး သတ်မှတ်ပြီးပါပြီ။ အဆင်သင့်ဖြစ်ပါပြီ။"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"ပြီးပါပြီ"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"သင့်မျက်နှာ သုံးပါ-"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"သင့်စက်ကို ဖွင့်ရန်"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"အက်ပ်ဝင်ခြင်း၊ ငွေပေးချေမှု"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"လော့ခ်ဖွင့်ရန် မျက်လုံးဖွင့်ပါ"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"မျက်နှာဖြင့် အထောက်အထားစိစစ်ခြင်းကို သုံးသည့်အခါ မျက်လုံးဖွင့်ထားရမည်"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"မျက်နှာဒေတာ ဖယ်ရန်"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"သင့်မျက်နှာဒေတာ ပိုကောင်းစေရန်"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"သင်၏ စက်ပစ္စည်းကို ဖွင့်ရန်နှင့် အက်ပ်များကို သုံးရန် သင့်မျက်နှာကို အသုံးပြုနိုင်ပါသည်။ "<annotation id="url">"ပိုမို လေ့လာရန်"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"လက်ဗွေရာ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"လက်ဗွေရာများ စီမံရန်"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"လက်ဗွေရာအား သုံးရန်"</string>
@@ -864,7 +871,7 @@
<string name="wifi_speed" msgid="3526198708812322037">"လိုင်းအမြန်နှုန်း"</string>
<string name="wifi_frequency" msgid="7791090119577812214">"လှိုင်းနှုန်း"</string>
<string name="wifi_ip_address" msgid="1440054061044402918">"အိုင်ပီလိပ်စာ"</string>
- <string name="passpoint_label" msgid="6381371313076009926">"မှတဆင့် သိမ်းဆည်းရန်"</string>
+ <string name="passpoint_label" msgid="6381371313076009926">"မှတဆင့် သိမ်းရန်"</string>
<string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> အထောက်အထားများ"</string>
<string name="wifi_eap_method" msgid="8529436133640730382">"EAPနည်းလမ်း"</string>
<string name="please_select_phase2" msgid="5231074529772044898">"အဆင့်(၂) စစ်မှန်ကြောင်းအတည်ပြုခြင်း"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"၅.၀ GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi‑Fi ဟော့စပေါ့အတွက် အနည်းဆုံး လိုင်းတစ်လိုင်းရွေးပါ−"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ဆက်တင်များ"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"ပုဂ္ဂိုလ်ရေး"</string>
<string name="wifi_shared" msgid="844142443226926070">"အခြားစက်ပစ္စည်းအသုံးပြုသူများဖြင့် မျှဝေ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ပြောင်းလဲခြင်းမရှိ)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"ကျေးဇူးပြု၍ ရွေးချယ်ပါ"</string>
@@ -891,7 +899,7 @@
<string name="wifi_use_system_certs" msgid="5270879895056893783">"စနစ်ပိုင်း အသိအမှတ်ပြုလက်မှတ်များကို သုံးပါ"</string>
<string name="wifi_do_not_provide_eap_user_cert" msgid="5160499244977160665">"မပေးထားပါ"</string>
<string name="wifi_do_not_validate_eap_server" msgid="4266754430576348471">"အတည်မပြုပါ"</string>
- <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"အသိမှတ်ပြုလက်မှတ် မသတ်မှတ်ထားပါ။ သင့်ချိတ်ဆက်မှု တသီးတသန့်ဖြစ်မည် မဟုတ်ပါ။"</string>
+ <string name="wifi_do_not_validate_eap_server_warning" msgid="1787190245542586660">"အသိမှတ်ပြုလက်မှတ် သတ်မှတ်မထားပါ။ သင့်ချိတ်ဆက်မှု တသီးတသန့်ဖြစ်မည် မဟုတ်ပါ။"</string>
<string name="wifi_ssid_too_long" msgid="3474753269579895244">"ကွန်ရက်အမည် ရှည်လွန်းပါသည်။"</string>
<string name="wifi_no_domain_warning" msgid="5223011964091727376">"ဒိုမိန်းတစ်ခု သတ်မှတ်ပေးရပါမည်။"</string>
<string name="wifi_wps_available_first_item" msgid="4422547079984583502">"WPSရရှိုနိုင်သည်"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"မလုပ်တော့"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"ကွန်ရက်အား မေ့ပစ်လိုပါသလား။"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ဤကွန်ရက်အတွက် စကားဝှက်များ အားလုံးကို ဖျက်လိုက်ပါမည်"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"သိမ်းထားသောကွန်ရက်များ"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">ကွန်ရက် %d ခု</item>
<item quantity="one">ကွန်ရက် ၁ ခု</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"တောက်ပမှု"</string>
<string name="brightness_summary" msgid="838917350127550703">"စကရင်၏ အလင်းကိုချိန်ရန်"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"အလိုက်သင့် တောက်ပမှု"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ဖွင့်ရန်"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ပိတ်ထားသည်"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"တောက်ပမှုအရောင် အလွန်နိမ့်သည်အထိ လျှော့ထားရန် လိုလားပါသည်"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"တောက်ပမှုအရောင်လျှော့ထားရန် လိုလားပါသည်"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"ပင်နံပါတ်ပြောင်း၍မရပါ\nပင်နံပါတ်အမှား ဖြစ်နိုင်သည်"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"ဆင်းကဒ် ပင်နံပါတ် ပြောင်းခြင်းအောင်မြင်ပါသည်"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"ဆင်းမ်ကဒ်သော့ကျနေမှုအခြေအနေအား ပြောင်းမရပါ။ \nပင်နံပါတ်မှားယွင်းမှု ဖြစ်နိုင်သည်။"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"ပင်နံပါတ်ကို ပိတ်၍မရပါ။"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"ပင်နံပါတ်ကို ဖွင့်၍မရပါ။"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"မလုပ်တော့"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"ဆင်းမ်များ အများအပြား တွေ့ထား"</string>
@@ -1360,7 +1368,7 @@
<string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> အား လေ့လာပါ"</string>
<string name="storage_detail_dialog_other" msgid="8845766044697204852">"အခြားပါဝင်မှုများမှာ အက်ပ်များမှ သိမ်းဆည်းလိုက်သည့် မျှဝေထားသော ဖိုင်များ၊ အင်တာနက် သို့မဟုတ် ဘလူးတုသ်မှ ဒေါင်းလုဒ်လုပ်ထားသည့် ဖိုင်များ၊ Android ဖိုင်များ စသည်တို့ဖြစ်သည်။ \n\n ဤ <xliff:g id="NAME">^1</xliff:g> ၏ မြင်နိုင်သော အကြောင်းအရာများကိုကြည့်ရန် လေ့လာရန် ကိုတို့ပါ။"</string>
<string name="storage_detail_dialog_system" msgid="862835644848361569">"စနစ်တွင် Android ဗားရှင်း <xliff:g id="VERSION">%s</xliff:g> ဖြင့် ဖွင့်ခဲ့သည့်ဖိုင်များ ပါဝင်သည်"</string>
- <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> သည် ဓာတ်ပုံ၊ ဂီတ၊ အက်ပ် သို့မဟုတ် အခြားဒေတာများအား သိမ်းဆည်းရန် သိုလှောင်ခန်း၏ <xliff:g id="SIZE">^2</xliff:g> အထိ နေရာယူထားသည်။\n\nအသေးစိတ်ကို ကြည့်ရန် <xliff:g id="USER_1">^1</xliff:g> သို့ ပြောင်းပါ။"</string>
+ <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> သည် ဓာတ်ပုံ၊ ဂီတ၊ အက်ပ် သို့မဟုတ် အခြားဒေတာများအား သိမ်းရန် သိုလှောင်ခန်း၏ <xliff:g id="SIZE">^2</xliff:g> အထိ နေရာယူထားသည်။\n\nအသေးစိတ်ကို ကြည့်ရန် <xliff:g id="USER_1">^1</xliff:g> သို့ ပြောင်းပါ။"</string>
<string name="storage_wizard_init_title" msgid="5085400514028585772">"သင့် <xliff:g id="NAME">^1</xliff:g> ကိုတပ်ဆင်မည်"</string>
<string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ရွှေ့လျားနိုင်သည့် သိုလှောင်မှုအဖြစ် သုံးမည်"</string>
<string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"စက်ပစ္စည်းများအကြား ပုံများနှင့် အခြားမီဒီယာများရွှေ့လျားရန်အတွက်။"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> အား ပုံစံချရန် လိုအပ်သည်။ \n\n"<b>" ပုံစံချပါက <xliff:g id="NAME_1">^1</xliff:g> တွင် လတ်တလော သိမ်းထားသည်များအားလုံးအား ပျက်သွားမည်။ "</b>" ဒေတာများပျောက်ပျက်သွားခြင်းမှ ကာကွယ်လိုပါ၊ အရံသိမ်းဆည်းခြင်းပြုရန် စဉ်းစားပါ။"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ဖျက်မည် & ပုံစံချမည်"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>ပုံစံချနေသည်…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"ဖော်မက်လုပ်နေချိန် <xliff:g id="NAME">^1</xliff:g> ကို မဖယ်ရှားပါနှင့်။"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"ဖော်မက်လုပ်နေစဉ် <xliff:g id="NAME">^1</xliff:g> ကို မဖယ်ရှားပါနှင့်။"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ဒေတာကို သိုလှောင်မှုအသစ်သို့ ရွှေ့မည်"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"သင့်ပုံများ၊ ဖိုင်များနှင့် အချို့ အက်ပ်များကို ဤ<xliff:g id="NAME">^1</xliff:g> အသစ်ပေါ်သို့ ရွှေ့နိုင်သည်။ \n\nရွှေ့ခြင်းသည်<xliff:g id="TIME">^2</xliff:g> ခန့်ကြာမည်ဖြစ်ပြီး အတွင်းသိုလှောင်မှုတွင် <xliff:g id="SIZE">^3</xliff:g> ခန့်နေရာလွတ်သွားပါမည်။ ၎င်းပြုလုပ်နေစဉ် အချို့သော အက်ပ်များ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ယခုရွှေ့မည်"</string>
@@ -1405,7 +1413,7 @@
<string name="storage_wizard_init_v2_external_action" msgid="8662451480642784031">"ဖြုတ်လွယ်သွင်းလွယ် သိုလှောင်ခန်း"</string>
<string name="storage_wizard_init_v2_later" msgid="1080613420170749130">"နောက်မှ စနစ်သတ်မှတ်ရန်"</string>
<string name="storage_wizard_format_confirm_v2_title" msgid="5744790239994621663">"<xliff:g id="NAME">^1</xliff:g> ကို ဖော်မက်လုပ်လိုပါသလား။"</string>
- <string name="storage_wizard_format_confirm_v2_body" msgid="4614199613500900975">"ဤ <xliff:g id="NAME_0">^1</xliff:g> တွင် အက်ပ်၊ ဖိုင်နှင့် မီဒီယာများကို သိမ်းဆည်းရန် ဖော်မက်လုပ်ရပါမည်။ \n\nဖော်မက်လုပ်ခြင်းဖြင့် <xliff:g id="NAME_1">^2</xliff:g> ရှိ အရာအားလုံးကို ဖျက်လိုက်ပါမည်။ အကြောင်းအရာများ မဆုံးရှုံးစေရန် အခြား <xliff:g id="NAME_2">^3</xliff:g> သို့မဟုတ် စက်ပစ္စည်းတစ်ခုသို့ မိတ္တူကူးထားပါ။"</string>
+ <string name="storage_wizard_format_confirm_v2_body" msgid="4614199613500900975">"ဤ <xliff:g id="NAME_0">^1</xliff:g> တွင် အက်ပ်၊ ဖိုင်နှင့် မီဒီယာများကို သိမ်းရန် ဖော်မက်လုပ်ရပါမည်။ \n\nဖော်မက်လုပ်ခြင်းဖြင့် <xliff:g id="NAME_1">^2</xliff:g> ရှိ အရာအားလုံးကို ဖျက်လိုက်ပါမည်။ အကြောင်းအရာများ မဆုံးရှုံးစေရန် အခြား <xliff:g id="NAME_2">^3</xliff:g> သို့မဟုတ် စက်ပစ္စည်းတစ်ခုသို့ မိတ္တူကူးထားပါ။"</string>
<string name="storage_wizard_format_confirm_v2_action" msgid="8258363472135537500">"<xliff:g id="NAME">^1</xliff:g> ဖော်မက်လုပ်ရန်"</string>
<string name="storage_wizard_migrate_v2_title" msgid="31406330052996898">"အကြောင်းအရာကို <xliff:g id="NAME">^1</xliff:g> သို့ ရွှေ့မလား။"</string>
<string name="storage_wizard_migrate_v2_body" product="tablet" msgid="4476553430145054781">"ဖိုင်၊ မီဒီယာနှင့် အချို့သော အက်ပ်များကို ဤ <xliff:g id="NAME">^1</xliff:g> သို့ ရွှေ့နိုင်ပါသည်။ \n\nဤသို့ ရွှေ့ခြင်းအားဖြင့် သင့်တက်ဘလက်သိုလှောင်ခန်းတွင် <xliff:g id="SIZE">^2</xliff:g> နေရာလွတ်သွားစေမည်ဖြစ်ပြီး <xliff:g id="DURATION">^3</xliff:g> ခန့် ကြာနိုင်ပါသည်။"</string>
@@ -1429,7 +1437,7 @@
<string name="battery_level_title" msgid="2965679202786873272">"ဘက်ထရီ အားအဆင့်"</string>
<string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
<string name="apn_edit" msgid="1354715499708424718">"ဝင်ရောက်မည့်ပွိုင့်အားပြင်ဆင်ရန်"</string>
- <string name="apn_not_set" msgid="4974192007399968164">"မသတ်မှတ်ထားပါ"</string>
+ <string name="apn_not_set" msgid="4974192007399968164">"သတ်မှတ်မထားပါ"</string>
<string name="apn_name" msgid="4115580098369824123">"အမည်"</string>
<string name="apn_apn" msgid="2479425126733513353">"APN"</string>
<string name="apn_http_proxy" msgid="1826885957243696354">"ပရောက်စီ"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ထည့်သွင်းထားသည်"</string>
<string name="no_applications" msgid="7336588977497084921">"အက်ပ် မရှိပါ။"</string>
<string name="internal_storage" msgid="1584700623164275282">"စက်တွင်း သိုလှောင်ထားမှု"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"စက်အတွင်းသိမ်းဆည်းရန်နေရာ"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USBသိုလှောင်မှု"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SDကဒ်သိုလှောင်မှုများ"</string>
<string name="recompute_size" msgid="7722567982831691718">"အရွယ်အစားကို ပြန်လည်တွက်ချက်နေသည်"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"အပ်ပလီကေးရှင်းဒေတာအား ပယ်ဖျက်မည်လား?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"ဤအပလီကေးရှင်၏ဒေတာများအားလုံးကို ထာဝရဖျက်ပါမည်။ ဖိုင်များအားလုံး၊ ဆက်တင်များ၊ အကောင့်များ၊ ဒေတာဘေ့စ်စသည်တို့ပါဝင်ပါမည်။"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ထည့်သွင်းထားသော အပ်ပလီကေးရှင်းထဲတွင် ဤအပ်ပလီကေးရှင်းအား မတွေ့ရှိပါ"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"အက်ပ်အတွက် သိုလှောင်ခန်းကို ရှင်းလင်း၍မရပါ။"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ဤအပလီကေးရှင်းမှာ သင့်တက်ဘလက်၏အောက်ပါတို့ကို ဝင်ရောက်ကြည့်နိုင်သည်"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"ဤအပလီကေးရှင်းမှာ သင့်ဖုန်း၏အောက်ပါတို့ကို ဝင်ရောက်ကြည့်နိုင်သည်"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ဤအပလီကေးရှင်းသည် သင့်တက်ဘလက်ပေါ်မှ အောက်ပါတို့ကို ရယူအသုံးပြုနိုင်သည်။ စွမ်းဆောင်ရည်တိုးတက်ရန်နှင့် မှတ်ဉာဏ်အသုံးပြုမှုလျှော့ချရန် အလို့ငှာ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> မှ အချို့ ခွင့်ပြုမိန့်များ လိုအပ်သည်။ အဘယ်ကြောင့်ဆိုသော် ၎င်းသည် <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ကဲ့သို့တူသော လုပ်ငန်းစဉ်ကို လုပ်ဆောင်နေသောကြောင့်ဖြစ်သည်။"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ဤအပလီကေးရှင်းသည် သင့်ဖုန်းမှာ အောက်ပါအချက်များကို ရယူနိုင်သည်။ ဖုန်း၏ မှတ်ဉာဏ်သုံးစွဲမှုနှင့် စွမ်းဆောင်ရည် ပိုမိုတိုးတက်လာစေရန် <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>သည် အချို့ ခွင့်ပြုချက်များ ရရှိနိုင်သည်။ အဘယ့်ကြောင့်ဆိုသော် ၎င်းသည် <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> နှင့် လုပ်ငန်းစဉ်တူညီနေ၍ ဖြစ်သည်။"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> နှင့် <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>၊ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"ဤအပလီကေးရှင်းသည် သင့်ထံမှ အသုံးပြုခတောင်းခံလိမ့်မည်။"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"အရည်အသွေးကောင်းသောစာတိုပို့ရန်"</string>
<string name="computing_size" msgid="1599186977475211186">"တွက်ချက်နေသည်…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"အချက်အလက်အစု ပမာဏကို တွက်ချက်မရပါ။"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"သင့်တွင်မည်သည့် တတိယလူမှအပလီကေးရှင်းအားထည့်သွင်းထားခြင်းမရှိပါ"</string>
<string name="version_text" msgid="9189073826278676425">"<xliff:g id="VERSION_NUM">%1$s</xliff:g>ဗားရှင်း"</string>
<string name="move_app" msgid="5042838441401731346">"ရွေ့မည်"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"တက်ဘလက်သို့ရွေ့မည်"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ဖုန်းသို့ရွေ့မည်"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USBသိုလှောင်မှုသို့ရွေ့ပါ"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SDကဒ်သို့ရွေ့မည်"</string>
- <string name="moving" msgid="6431016143218876491">"ရွေ့နေသည်"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"အခြားရွှေ့ပြောင်းမှု တစ်ခုလုပ်ဆောင်နေပါသည်။"</string>
<string name="insufficient_storage" msgid="481763122991093080">"သိမ်းဆည်းရန်နေရာအလုံအလောက်မရှိပါ"</string>
<string name="does_not_exist" msgid="1501243985586067053">"အပလီကေးရှင်းမှာ မရှိပါ"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"ပြင်ပမီဒီယာတွင် စက်ပစ္စည်းကို စီမံခန့်ခွဲရန်အက်ပ်ကို ထည့်သွင်း၍မရပါ"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"မဖြစ်မနေ ရပ်ခိုင်းမလား။"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"အကယ်၍ အက်ပ်အားမဖြစ်မနေရပ်ခိုင်းလျှင် အမှားအယွင်းဖြစ်နိုင်သည်။"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"အပ်ပလီကေးရှင်းရွေ့မရပါ <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"ပိုမိုလိုလားသောထည့်သွင်းမည့်နေရာ"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"အပလီကေးရှင်းအသစ်အတွက် လိုလားသောတည်နေရာထည့်သွင်းခြင်းကို ပြောင်းရန်။"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"နဂိုပါအပလီကေးရှင်းများပိတ်မလား"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"အက်ပ်ပိတ်ထားရန်"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"ဤအက်ပ်ကို ပိတ်လိုက်လျှင် Android နှင့် အခြားအက်ပ်များသည် ပုံမှန် အလုပ်လုပ်တော့မည် မဟုတ်ပါ။"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"အချက်အလက်များကိုဖျက်၍ အပလီကေးရှင်းအား ပိတ်မည်လား ?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ဤအက်ပ်ကို သင်ပိတ်လိုက်ပါက အခြားအက်ပ်များသည် ပုံမှန် အလုပ်လုပ်တော့မည် မဟုတ်ပါ။ သင့် ဒေတာများကိုလည်း ဖျက်လိုက်ပါမည်။"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"အကြောင်းကြားချက်များကို ပိတ်မည်လား ?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ဤအပလီကေးရှင်း၏ အကြောင်းကြားစာများကို ပိတ်ထားလျှင် အရေးကြီး သတိပေးချက်များနှင့် အဆင့်မြှင့်မှုများကို သင် လွတ်သွားနိုင်ပါသည်။"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"စတိုး"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"အက်ပ်အသေးစိတ်"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"အက်ပ်ကို <xliff:g id="APP_STORE">%1$s</xliff:g> ကထည့်သွင်းထားသည်"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ဝန်ဆောင်မှုကို သုံးရန်"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"အရောင်ပြင်ဆင်ခြင်းကို သုံးရန်"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"စာတန်းကို ထိုးရန်"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"ရှေ့ဆက်ရန်"</string>
<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="6371077608778830020">"နားကြားကိရိယာကို ထည့်ပါ"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"အက်ပ်အတွက် နောက်ခံလုပ်ဆောင်ချက်ကို ကန့်သတ်လိုက်ပါက ပုံမှန်အလုပ်လုပ်မည် မဟုတ်ပါ"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ဤအက်ပ်ကို ဘက်ထရီချိန်ညှိသုံးရန် သတ်မှတ်မထားသဖြင့် ကန့်သတ်၍မရပါ။\n\nအက်ပ်ကိုကန့်သတ်ရန် ဘက်ထရီချိန်ညှိသုံးခြင်း အရင်ဖွင့်ပါ။"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"အားအပြည့်သွင်းကတည်းက မျက်နှာပြင်သုံးမှု"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"မျက်နှာပြင် သုံးစွဲမှု"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"မိုဘိုင်းကွန်ရက် ရှာဖွေခြင်း"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"အားအပြည့်သွင်းပြီးသည့် အချိန်မှစ၍ ဘက်ထရီအသုံးပြုမှု"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"အားအပြည့်သွင်းပြီးသည့် အချိန်မှစ၍ မျက်နှာပြင်ကို ဖွင့်ထားသောအချိန်"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"အားအပြည့်သွင်းထားသည့် အချိန်မှစ၍ စက်ပစ္စည်း အသုံးပြုမှု"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"အသေးစိတ် အသုံးပြုခြင်း"</string>
<string name="controls_subtitle" msgid="390468421138288702">"ပါဝါအသုံးပြုမှုအား ချိန်တွယ်ခြင်း"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"ပါဝင်သော ဆော့ဝဲလ်များ"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"အက်ပ်များက ဓာတ်ခဲကို အားကုန်စေသည်"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"စက်ပစ္စည်းကို ပွင့်နေစေသည်"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"စက်ပစ္စည်းကို နောက်ခံ၌ ပွင့်နေစေသည်"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"တည်နေရာကို မကြာခဏတောင်းဆိုနေသည်"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"အက်ပ် <xliff:g id="NUMBER">%1$d</xliff:g> ခုသည် ပုံမှန်အလုပ်မလုပ်ပါ"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"အက်ပ်များ ပုံမှန်လုပ်ဆောင်နေပါသည်"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ဖုန်းနောက်ခံတွင် ဘက်ထရီ အသုံးပြုမှု ပုံမှန်ဖြစ်သည်"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"တက်ဘလက်နောက်ခံတွင် ဘက်ထရီ အသုံးပြုမှု ပုံမှန်ဖြစ်သည်"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">အက်ပ် %1$d ခု အတွက် ဘက်ထရီအသုံးပြုမှုကို ကန့်သတ်ထားသည်</item>
<item quantity="one">အက်ပ် %1$d ခု အတွက် ဘက်ထရီအသုံးပြုမှုကို ကန့်သတ်ထားသည်</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> ကန့်သတ်ထားသည်"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"ဤအက်ပ်များသည် နောက်ခံတွင် ဘက်ထရီအသုံးပြုနေပါသည်။ ကန့်သတ်ထားသည့်အက်ပ်များသည် ကောင်းကောင်းအလုပ်လုပ်မည် မဟုတ်ဘဲ အကြောင်းကြားချက်များ ကြန့်ကြာမှု ရှိနိုင်ပါသည်။"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"\'ဘက်ထရီ မန်နေဂျာ\' အသုံးပြုပါ"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"ဓာတ်ခဲအားကုန်စေသည့် အက်ပ်များကို ဖော်ထုတ်ပေးသည်"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"မလုပ်တော့"</string>
<string name="tts_reset" msgid="2661752909256313270">"ပြန်သတ်မှတ်ရန်"</string>
<string name="tts_play" msgid="2628469503798633884">"ဖွင့်ရန်"</string>
- <string name="gadget_title" msgid="5519037532720577836">"ဖွင့်ပိတ်ထိန်းချုပ်မှု"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"ဝိုင်ဖိုင်ဆက်တင်းများကို နောက်ဆုံးအခြေရောက်အောင်လုပ်သည်"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ဘလူးတုသ်ဆက်တင်ကို တိုးမြင့်မှု"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ဖွင့်ထားသည်"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ပိတ်ထားသည်"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ပွင့်နေသည်"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"ပိတ်နေသည်"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ဘလူးတုသ်"</string>
- <string name="gadget_location" msgid="2974757497945178165">"တည်နေရာ"</string>
- <string name="gadget_sync" msgid="858895763714222152">"ထပ်တူညီအောင်လုပ်သည်"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"တောက်ပမှု<xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"အလိုအလျောက်"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"အပြည့်"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"တဝက်"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"ပိတ်ထားသည်"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ယုံကြည်စိတ်ချရသောသိုလှောင်နေရာ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"သိုလှောင်နေရာမှ ထည့်သွင်းမှု"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>ထဲမှ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"အားလုံးရွေးချယ်ရန်"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ဒေတာအသုံးပြုမှု"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"အက်ပ်ဒေတာ သုံးစွဲမှု"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"မိုဘိုင်းဒေတာနှင့် Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"စီမံပေးသူ၏ ဒေတာ စာရင်းမှာ သင့် ကိရိယာ ထဲကနှင့် ခြားနားနိုင်သည်။။"</string>
<string name="data_usage_app" msgid="4970478397515423303">"အက်ပ်သုံးစွဲမှု"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"အက်ပ် အချက်အလက်များ"</string>
@@ -2853,7 +2824,7 @@
<string name="nfc_payment_how_it_works" msgid="3028822263837896720">"အဲဒါ အလုပ် လုပ်ပုံ"</string>
<string name="nfc_payment_no_apps" msgid="5477904979148086424">"စတိုးဆိုင်များတွင် သင်၏ ဖုန်းဖြင့် ငွေပေးချေပါ"</string>
<string name="nfc_payment_default" msgid="8648420259219150395">"ငွေချေရန် မူရင်းသတ်မှတ်ခြင်း"</string>
- <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"မသတ်မှတ်ထားပါ"</string>
+ <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"သတ်မှတ်မထားပါ"</string>
<string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
<string name="nfc_payment_use_default" msgid="3234730182120288495">"မူရင်းသတ်မှတ်ချက် သုံးရန်"</string>
<string name="nfc_payment_favor_default" msgid="5743781166099608372">"အမြဲတမ်း"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">ဖျောက်ထားသည့် %d ခုကို ပြပါ</item>
<item quantity="one">ဖျောက်ထားသည့် %d ခုကို ပြပါ</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ချုံ့ကြည့်ရန်"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"ကွန်ရက်နှင့် အင်တာနက်"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"မိုဘိုင်း"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ဒေတာသုံးစွဲမှု"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ဘလူးတုသ်"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"အက်ပ်နှင့်အကြောင်းကြားချက်"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ခွင့်ပြုချက်များ၊ မူရင်းအက်ပ်များ"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"အလုပ်ပရိုဖိုင်အတွင်းရှိ အက်ပ်များအတွက် အကြောင်းကြားချက် ဝင်ကြည့်၍ မရနိုင်ပါ။"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"အကောင့်များ"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"မည်သည့်အကောင့်ကိုမျှ ထည့်သွင်းမထားပါ"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"မူရင်းအက်ပ်များ"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ဘာသာစကားများ၊ အချိန်၊ မိတ္တူ၊ အပ်ဒိတ်များ"</string>
<string name="search_results_title" msgid="1796252422574886932">"ဆက်တင်များ"</string>
- <string name="search_menu" msgid="6283419262313758339">"ဆက်တင်များတွင် ရှာရန်"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi၊ wi-fi၊ ကွန်ရက်ချိတ်ဆက်မှု၊ အင်တာနက်၊ ကြိုးမဲ့၊ ဒေတာ၊ wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi၊ wi-fi၊ ဖွင့်ပိတ်၊ ထိန်းချုပ်မှု"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"စာတိုမက်ဆေ့ဂျ်၊ စာတိုပို့ခြင်း၊ မက်ဆေ့ဂျ်များ၊ မက်ဆေ့ဂျ်ပို့ခြင်း၊ မူရင်း"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ပေးချေမှု၊ တို့ခြင်း၊ ငွေပေးချေခြင်းများ"</string>
<string name="keywords_backup" msgid="470070289135403022">"မိတ္တူ၊ မိတ္တူကူးပါ"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ဟန်"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"မျက်နှာ၊ လော့ခ်ဖွင့်ခြင်း၊ အထောက်အထား စိစစ်ခြင်း၊ လက်မှတ်ထိုးဝင်ခြင်း"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl ဗားရှင်း၊ imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"ကွန်ရက်၊ မိုဘိုင်း ကွန်ရက်၊ ဝန်ဆောင်မှု အခြေအနေ၊ ထုတ်လွှင့်မှု အချက်ပြ၊ မိုဘိုင်း ကွန်ရက် အမျိုးအစား၊ ရိုမင်း၊ iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"အမှတ်စဉ်၊ ဟာ့ဒ်ဝဲ ဗားရှင်း"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"မှောင်သည့် အပြင်အဆင်"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ချွတ်ယွင်းမှု"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ဝန်းကျင်ကို ပြကွက်၊ လော့ခ်ချထားချိန် မျက်နှာပြင်"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"လော့ခ်ချထားချိန် မျက်နှာပြင် အကြောင်းကြားချက်"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"မျက်နှာ"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"လက်ဗွေ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"မျက်နှာပြင် အမှိန်၊ တို့ထိမျက်နှာပြင်၊ ဘက်ထရီ၊ အဆင့်မြင့် တောက်ပမှု၊ အားကောင်းသောတောက်ပမှု"</string>
@@ -3308,7 +3280,7 @@
<string name="notification_content_block_title" msgid="5854232570963006360">"အကြောင်းကြားချက်များ ပြပါ"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"အရိပ်ထဲ သို့မဟုတ် တွဲချိတ်ထားသည့် စက်ပစ္စည်းများပေါ်တွင် အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
<string name="notification_badge_title" msgid="6370122441168519809">"အကြောင်းကြားချက်အမှတ်အသားကို ခွင့်ပြုရန်"</string>
- <string name="notification_channel_badge_title" msgid="2240827899882847087">"အကြောင်းကြားချက်အမှတ်အသားကို ပြသရန်"</string>
+ <string name="notification_channel_badge_title" msgid="2240827899882847087">"အကြောင်းကြားချက် အစက် ပြရန်"</string>
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\'မနှောင့်ယှက်ရ\' နေရာတွင် အစားထိုးခြင်း"</string>
<string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"\"မနှောင့်ယှက်ရ\" ဖွင့်ထားသည့်အခါ ဤသတိပေးချက်များကို ဆက်ပြီး ဖော်ပြခွင့် ပြုပါ"</string>
<string name="app_notification_visibility_override_title" msgid="7821124557634786985">"လော့ခ်ချချိန် မျက်နှာပြင်တွင်"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"ဤစက်ပစ္စည်း စရန် သင့် PIN ရိုက်ထည့်ပြီးသောအခါ၊<xliff:g id="SERVICE">%1$s</xliff:g> ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"ဤစက်ပစ္စည်း စရန် သင့် ပုံဆွဲရေးဆွဲပြီး သော့ဖွင့်သောအခါ၊<xliff:g id="SERVICE">%1$s</xliff:g> ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"ဤစက်ပစ္စည်း စရန် သင့် လျှို့ဝှက်ကုဒ် ရိုက်သွင်းသောအခါ၊<xliff:g id="SERVICE">%1$s</xliff:g> ကဲ့သို့သော ရယူသုံးခွင့်ရှိ ဝန်ဆောင်မှုများအား သုံးနိုင်မည်မဟုတ်သေးပါ။"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"မှတ်ချက် − ပြန်လည်စတင်ပြီးနောက် သင့်ဖုန်းကိုလော့ခ်မဖွင့်မချင်း ဤအက်ပ်ကို အသုံးပြု၍မရပါ"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"မှတ်ချက်- သင်၏ဖုန်းကို ပြန်လည်စတင်ပြီး မျက်နှာပြင်လော့ခ်ချထားလျှင် သင့်ဖုန်းကို လော့ခ်မဖွင့်မချင်း ဤအက်ပ်ကို အသုံးပြု၍မရပါ"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI အချက်အလက်များ"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI ဆက်စပ် အချက်အလက်များ"</string>
<string name="slot_number" msgid="3762676044904653577">"(အပေါက်<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ကိုယ်ရေး"</string>
<string name="filter_work_apps" msgid="24519936790795574">"အလုပ်"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"အက်ပ်− အားလုံး"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"အက်ပ်များ− ပိတ်ထားသည်"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ပိတ်ထားသည်"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ကဏ္ဍများ - အလွန်အရေးကြီး"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ကဏ္ဍများ− အရေးမကြီး"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ကဏ္ဍများ− ပိတ်ထားသည်"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"သုံးစွဲမှုသတိပေးချက်များ"</string>
<string name="show_all_apps" msgid="1512506948197818534">"စက်ပစ္စည်း အသုံးပြုမှု အပြည့်အစုံကို ပြရန်"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"အက်ပ်အသုံးပြုမှုကို ပြရန်"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ပါဝါအသုံးပြုမှု မြင့်သည်"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other">အက်ပ် <xliff:g id="NUMBER">%2$d</xliff:g> ခု ပုံမှန် အလုပ်မလုပ်ပါ</item>
<item quantity="one">အက်ပ် <xliff:g id="APP">%1$s</xliff:g> ခု ပုံမှန် အလုပ်မလုပ်ပါ</item>
@@ -3667,7 +3638,7 @@
<string name="memory_maximum_usage" msgid="6513785462055278341">"အများဆုံး အသုံးပြုမှု"</string>
<string name="no_data_usage" msgid="9131454024293628063">"မည်သည့်ဒေတာမျှ အသုံးမပြုပါ"</string>
<string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g>အတွက် မနှောင့်ယှက်ရန်ကို အသုံးပြုခွင့်ပေးမလား?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"အပ်ဖ်သည် မနှောင့်ယှက်ရန်ကို အဖွင့်/အပိတ်ပြုလုပ်နိုင်ကာ သက်ဆိုင်ရာ ချိန်ညှိချက်များကို ပြောင်းလဲနိုင်ပါသည်။"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"အက်ပ်သည် မနှောင့်ယှက်ရန်ကို အဖွင့်/အပိတ်ပြုလုပ်နိုင်ကာ သက်ဆိုင်ရာ ချိန်ညှိချက်များကို ပြောင်းလဲနိုင်ပါသည်။"</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"အကြောင်းကြားချက် အသုံးပြုခွင့်ကိုဖွင့်ထားသောကြောင့် ဆက်လက်ဖွင့်ထားရပါမည်"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g>အတွက် Do Not Disturb အား သုံးခွင့်ကို ပြန်ရုပ်သိမ်းမလား။"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ဤအက်ပ်မှ ဖန်တီးခဲ့သည့် Do Not Disturb စည်းမျဉ်းများ အားလုံးကို ဖယ်ရှားပစ်ပါမည်။"</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"စက်တွင်းသိုလှောင်ခန်း− <xliff:g id="PERCENTAGE">%1$s</xliff:g> ကို အသုံးပြုထားပြီး - <xliff:g id="FREE_SPACE">%2$s</xliff:g> လွတ်နေပါသည်"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ကြာမျှ လှုပ်ရှားမှုမရှိလျှင် ပိတ်လိုက်ပါ"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"နောက်ခံပုံ၊ နားခြင်း၊ ဖောင့်အရွယ်အစား"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"၁၀ မိနစ်ကြာမျှ လှုပ်ရှားမှုမရှိလျှင် ပိတ်လိုက်ပါ"</string>
<string name="memory_summary" msgid="8080825904671961872">"Avg သည်ယာယီမှတ်ဉာဏ် <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ၏ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ကိုအသုံးပြုထားသည်"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> အဖြစ် လက်မှတ်ထိုးဝင်ထားသည်"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ပို့ခွင့်မပြုပါ"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"ကင်မရာ အသုံးပြုခွင့်မရှိပါ"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ဖန်သားပြင်ဓာတ်ပုံ ရိုက်ခွင့်မပြုပါ"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"အရန်သိမ်းခြင်းကို ပိတ်၍မရပါ"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"ဤအက်ပ်ကို ဖွင့်၍မရပါ"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"မေးစရာများရှိလျှင် သင်၏ IT စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"နောက်ထပ် အသေးစိတ်များ"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"ဖြတ်ညှပ်ပုံဖြင့် အသွင်တူ မျက်နှာပြင်ပြသရန်"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"မျက်နှာပြင် ဖြတ်ညှပ်ပြသမှု"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"မျက်နှာပြင် ဖြတ်ညှပ်ပြသမှု၊ အမှတ်အသား"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"တစ်ခုမျှမဟုတ်"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ကိရိယာ မူရင်းပုံစံ"</string>
<string name="special_access" msgid="3458780842491881155">"အထူးအသုံးပြုခွင့်ရ အက်ပ်"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other">အက်ပ် <xliff:g id="COUNT">%d</xliff:g> ခုက ဒေတာကို အကန့်အသတ်မရှိ သုံးနိုင်သည်</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> နှင့် ချိတ်ဆက်ထားပါသည်"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"စက်ပစ္စည်းအများအပြားနှင့် ချိတ်ဆက်ထားပါသည်"</string>
<string name="demo_mode" msgid="2798762752209330277">"စနစ် UI သရုပ်ပြမုဒ်"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"ညသုံးမုဒ်"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"ညသုံးမုဒ် သတ်မှတ်ရန်"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"အမှောင်မုဒ်"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"အမှောင်မုဒ် သတ်မှတ်ရန်"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ဆော့ဖ်ဝဲအင်ဂျင်နီယာ အကွက်များကို အမြန်သတ်မှတ်ခြင်း"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope မှတ်တမ်းပြုခြင်း"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"အလုပ်ပရိုဖိုင်ဆက်တင်များ"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"အဆက်အသွယ်ကို ရှာဖွေပါ"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ခေါ်ဆိုသူများနှင့် အဆက်အသွယ်များကို မည်သူမည်ဝါဖြစ်ကြောင်း ခွဲခြားနိုင်ရန်အတွက် သင့်အဖွဲ့အစည်းအမည်ကို အဆက်အသွယ်အား ရှာဖွေခွင့်ပြုပါ"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ဖုန်းကိုစစ်ရန် နှစ်ချက်တို့ခြင်း"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"တက်ဘလက်ကို စစ်ဆေးကြည့်ရန် နှစ်ချက်တို့ပါ"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"စက်ပစ္စည်းကို စစ်ဆေးကြည့်ရန် နှစ်ချက်တို့ပါ"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို ကြည့်ရန် သင့်မျက်နှာပြင်ကို နှစ်ကြိမ်ဆက်တိုက်တို့ပါ။"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"အချိန်၊ အကြောင်းကြားချက်များနှင့် အခြားအချက်အလက်များကို စစ်ရန် သင့်ဖန်သားပြင်ကို နှစ်ချက်တို့ပါ။"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ဖုန်းစစ်ရန် ကောက်ယူခြင်း"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"တက်ဘလက်ကို စစ်ဆေးကြည့်ရန် မ လိုက်ပါ"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"စက်ပစ္စည်းကို စစ်ဆေးကြည့်ရန် မ လိုက်ပါ"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်ဖုန်းကို ကောက်ယူလိုက်ပါ။"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်တက်ဘလက်ကို ကောက်ယူလိုက်ပါ။"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"အချိန်၊ အကြောင်းကြားချက်သင်္ကေတများနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်စက်ပစ္စည်းကို ကောက်ယူလိုက်ပါ။"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"မျက်နှာပြင်ကို ဖွင့်ရန်"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"အချိန်၊ အကြောင်းကြားချက်များနှင့် အခြားအချက်အလက်များကို စစ်ရန် သင့်ဖုန်းကို မ လိုက်ပါ။"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"အချိန်၊ အကြောင်းကြားချက်များနှင့် အခြားအချက်အလက်များကို စစ်ရန် သင့်တက်ဘလက်ကို မ လိုက်ပါ။"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"အချိန်၊ အကြောင်းကြားချက်များနှင့် အခြားအချက်အလက်များကို စစ်ရန် သင့်စက်ပစ္စည်းကို မ လိုက်ပါ။"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"လော့ခ်ချထားချိန် မျက်နှာပြင်ကို ဖွင့်ရန်လက်ဟန်"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"သတိပေးချက်အတွက် လက်ဗွေပွတ်ဆွဲပါ"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"လက်ဗွေပွတ်ဆွဲခြင်း"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"အကြောင်းကြားချက်များကို ကြည့်ရန် ဖုန်း၏ နောက်ကျောဘက်ရှိ လက်ဗွေ အာရုံခံကိရိယာပေါ်တွင် အောက်သို့ ပွတ်ဆွဲပါ။"</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ကြိမ် ကြိုးပမ်းမှု</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ကြိမ် ကြိုးပမ်းမှု</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"ဤစက်ပစ္စည်း၏ ဒေတာများကို မိတ္တူကူးနေပါသည်"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"ဤစက်ပစ္စည်းကို သင်၏အဖွဲ့အစည်းက စီမံခန့်ခွဲထားသည်။"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"ဤစက်ပစ္စည်းကို <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> က စီမံခန့်ခွဲထားပါသည်။"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"အော်တိုဖြည့် ဝန်ဆောင်မှု"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"အလိုအလျောက်၊ ဖြည့်စွက်ခြင်း၊ အလိုအလျောက် ဖြည့်စွက်ခြင်း"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>သင်သည် ဤအက်ပ်ကို ယုံကြည်စိတ်ချရပါကြောင်း သေချာပါစေ</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> သည် သင်၏မျက်နှာပြင်ပေါ်ရှိ အရာများကို အသုံးပြု၍ မည်သည့်အရာများကို အော်တိုဖြည့်နိုင်ကြောင်း ဆုံးဖြတ်သည်။"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"အလိုအလျောက်ဖြည့်ရန်"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"မှတ်တမ်းတင်မှု အဆင့်"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"စက်ရှင်တစ်ခုအတွင်း အများဆုံးတောင်းဆိုချက် အရေအတွက်"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"အမြင့်ဆုံး မြင်နိုင်သည့် ဒေတာအတွဲများ"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"မူရင်းတန်ဖိုးများသို့ ပြင်ဆင်သတ်မှတ်ထားသည်"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"တီထွင်သူများရွေးစရာ အလိုအလျောက်ဖြည့်ခြင်းကို ပြင်ဆင်သတ်မှတ်ထားသည်"</string>
<string name="device_theme" msgid="4571803018917608588">"စက်ပစ္စည်း အပြင်အဆင်"</string>
<string name="default_theme" msgid="7085644992078579076">"မူရင်း"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"ကွန်ရက် အမည်"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\'မနှောင့်ယှက်ရ\' ကို အပ်ဒိတ်လုပ်ခြင်း"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"အာရုံစူးစိုက်နိုင်ရန် အကြောင်းကြားချက်များကို ခေတ္တရပ်ထားပါ"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"စိတ်လှုပ်ရှားဖွယ်ရာ အသစ်အဆန်း ရှိပါသလား။"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"သင်၏ဖုန်းအသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"သင်၏တက်ဘလက်အသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"သင်၏ စက်ပစ္စည်းအသစ်ကို လေ့လာကြည့်ရှုပါ"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"ဤဝန်ဆောင်မှုကို ဤစက်ပစ္စည်းတွင် မရရှိနိုင်ပါ"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"GNSS အတိုင်းအတာအပြည့် သက်ရောက်ရန်"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"လည်ပတ်ချိန်မပါဘဲ GNSS စက်ဝိုင်းပုံမြင်ကွင်းကျယ်ပုံများနှင့် ကြိမ်နှုန်းအားလုံးကို ခြေရာခံပါ"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"ရပ်တန့်သွားမှု ဒိုင်ယာလော့ကို အမြဲပြရန်"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"အက်ပ်ရပ်တန့်သွားသည့်အခါတိုင်း ဒိုင်ယာလော့ကို ပြရန်"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE ကို ဖွင့်ထားသည့်အက်ပ်ကို ရွေးပါ"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE ကို ဖွင့်ထားသည့် အပလီကေးရှင်း တစ်ခုမျှ သတ်မှတ်မထားပါ"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE ကို ဖွင့်ထားသည့် အပလီကေးရှင်း− <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ဖိုင်လမ်းညွှန် သုံးခွင့်"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ဖိုင်လမ်းညွှန် သုံးခွင့်"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4173,10 +4152,91 @@
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"တုန်ခါရန်"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"အသံတိတ်ရန်"</string>
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"ပြောင်းလဲမှု မလုပ်ပါနှင့်"</string>
- <string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"ဖွင့်ရန် (တုန်ခါမှု)"</string>
+ <string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"ဖွင့်ထားသည် (တုန်ခါမှု)"</string>
<string name="prevent_ringing_option_mute_summary" msgid="4472465110708640980">"ဖွင့်ရန် (အသံတိတ်ရန်)"</string>
<string name="prevent_ringing_option_none_summary" msgid="5013718946609276137">"ပိတ်ရန်"</string>
<string name="pref_title_network_details" msgid="7186418845727358964">"ကွန်ရက် အသေးစိတ်များ"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"သင့်စက်ပစ္စည်းအမည်ကို သင့်ဖုန်းပေါ်ရှိ အက်ပ်များက မြင်ရပါသည်။ သင် \'ဘလူးတုသ်\' စက်ပစ္စည်းများသို့ ချိတ်ဆက်သည့်အခါ သို့မဟုတ် Wi-Fi ဟော့စပေါ့ ထုတ်လွှင့်သည့်အခါ အခြားသူများက မြင်နိုင်ပါသည်။"</string>
<string name="devices_title" msgid="7701726109334110391">"စက်များ"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"ဆက်တင်အားလုံး"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"အကြံပြုချက်များ"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ဒေတာ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ဒေတာ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ကွန်ရက် ရွေးရန်"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ချိတ်ဆက်မထားပါ"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ချိတ်ဆက်ထားသည်"</string>
+ <string name="network_connecting" msgid="76404590784733557">"ချိတ်ဆက်နေသည်…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"ချိတ်ဆက်၍ မရပါ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ကွန်ရက်များ မတွေ့ပါ။"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ကွန်ရက် ရှာမတွေ့ပါ။ ထပ်စမ်းကြည့်ပါ။"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(တားမြစ်ထားသည်)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"ဆင်းမ်ကတ် မရှိပါ"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"အဆင့်မြင့်ဖုန်းခေါ်ဆိုခြင်း"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- GSM သီးသန့်"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- WCDMA သာ"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- CDMA only"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- EvDo သီးသန့်"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- ကမ္ဘာအနှံ့"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (အကြံပြုထားသည်)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (အကြုံပြုထားသည်)"</string>
+ <string name="network_global" msgid="959947774831178632">"ကမ္ဘာအနှံ့"</string>
+ <string name="label_available" msgid="1731547832803057893">"ရရှိနိုင်သော ကွန်ရက်များ"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"ရှာဖွေနေသည်…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> တွင် မှတ်ပုံတင်နေသည်…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"ဤကွန်ရက်နှင့် ချိတ်ဆက်ခြင်းအား သင့်ဆင်းမ်ကတ်က ခွင့်မပြုပါ။"</string>
+ <string name="connect_later" msgid="978991102125216741">"ဤကွန်ရက်ကို ဆက်သွယ်၍ မရပါ။ နောက်မှ ပြန်ကြိုးစားပါ။"</string>
+ <string name="registration_done" msgid="4573820010512184521">"ကွန်ရက်ပေါ်တွင် မှတ်ပုံတင်ထားသည်။"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"ကွန်ရက်ကို အလိုအလျောက် ရွေးချယ်ရန်"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"ဖုန်းကုမ္ပဏီ ဆက်တင်များ"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ဒေတာဝန်ဆောင်မှု စတင်ရန်"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"မိုဘိုင်းဒေတာ"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"မိုဘိုင်းကွန်ရက်သုံးပြီး ဒေတာကို ဝင်သုံးခွင့်ပေးပါ"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"အသုံးပြုလိုသော ကွန်ရက် အမျိုးအစား"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"ကွန်ရက် လုပ်ဆောင်မှုစနစ်ကို ပြောင်းပါ"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"အသုံးပြုလိုသော ကွန်ရက် အမျိုးအစား"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"ဝန်ဆောင်မှုပေးသူ"</string>
+ <string name="call_category" msgid="8108654745239563833">"ခေါ်ဆိုနေသည်"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"ဝန်ဆောင်မှုပေးသူ ဗီဒီယိုခေါ်ဆိုခြင်း"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"စနစ်ကို ရွေးချယ်ရန်"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA ပြင်ပကွန်ရက်နှင့် ချိတ်ဆက်ခြင်းစနစ်ကို ပြောင်းရန်"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"စနစ်ကို ရွေးချယ်ရန်"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"ကွန်ရက်"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"ကွန်ရက်"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA လျှောက်ထားမှု"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM နှင့် NV အကြားပြောင်းလဲခြင်း"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"စာရင်းသွင်းမှု"</string>
+ <string name="register_automatically" msgid="518185886971595020">"အလိုအလျောက် မှတ်ပုံတင်ခြင်း…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"ကွန်ရက်ပြင်ပဒေတာ သုံးခွင့်ပြုမလား။"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"ဈေးနှုန်းသိရှိရန် သင်၏ ကွန်ရက်ဝန်ဆောင်မှုပေးသူကို မေးပါ။"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"အက်ပ်ဒေတာ သုံးစွဲမှု"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"မမှန်ကန်သည့် ကွန်ရက်မုဒ် <xliff:g id="NETWORKMODEID">%1$d</xliff:g>။ လျစ်လျူရှုပါ။"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> တွင် ချိတ်ဆက်ထားသည့်အခါ မရနိုင်ပါ"</string>
+ <string name="see_more" msgid="5953815986207345223">"ပိုပြရန်"</string>
+ <string name="see_less" msgid="1250265310929558370">"လျှော့ ကြည့်ရန်"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <item quantity="other">စက်ပစ္စည်း <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> ခု ချိတ်ဆက်ထားသည်</item>
+ <item quantity="one">စက်ပစ္စည်း <xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> ခု ချိတ်ဆက်ထားသည်</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"ချိတ်ဆက်ထားသော စက်များမရှိပါ"</string>
</resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 8d7b4ef..3f0215e 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Behandle som med datamåling"</item>
<item msgid="2266114985518865625">"Behandle som uten datamåling"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Standard (bruk tilfeldig valgt MAC)"</item>
+ <item msgid="5398461510512959597">"Pålitelig"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nei"</item>
<item msgid="3863157480502955888">"Ja"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Alltid på"</item>
<item msgid="6385301106124765323">"Alltid av"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Av"</item>
+ <item msgid="2182686878828390312">"Feilsøk"</item>
+ <item msgid="5286514712714822064">"Omfattende"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Kun hjemmenett"</item>
+ <item msgid="5034813753274486448">"Automatisk"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA er foretrukket"</item>
+ <item msgid="807926878589867564">"Bare GSM"</item>
+ <item msgid="488474605709912156">"Bare WCDMA"</item>
+ <item msgid="1912421096218750039">"Automatisk GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Automatisk CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA uten EvDo"</item>
+ <item msgid="4678789463133969294">"Bare EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globalt"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Bare TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globalt"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 16b63f5..d06c9a0 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Opprett"</string>
<string name="allow" msgid="3349662621170855910">"Tillat"</string>
<string name="deny" msgid="6947806159746484865">"Avslå"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Lukk"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Bytt"</string>
<string name="device_info_default" msgid="7847265875578739287">"Ukjent"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Nå er du <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steg fra å bli utvikler.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Det trengs ikke, du er allerede utvikler."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Slå på utvikleralternativer først."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Trådløst og nettverk"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Tilkoblinger"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Enhet"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personlig"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Tilgang"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Slå på datatilkobling"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Slå av datatilkobling"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Enhetens Bluetooth-adresse: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vil du koble fra <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Kringkasting"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Bluetooth-enhet uten navn"</string>
<string name="progress_scanning" msgid="192587958424295789">"Søker"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Finner ingen Bluetooth-enheter."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"En app ønsker å slå på Bluetooth og gjøre telefonen din synlig for andre enheter. Du kan endre dette i Bluetooth-innstillingene senere."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Slår på Bluetooth …"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Slår av Bluetooth …"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisk tilkobling"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-tilkoblingsforespørsel"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Trykk for å koble til «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Ønsker du å koble til «<xliff:g id="DEVICE_NAME">%1$s</xliff:g>»?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Tilgjengelige ringeenheter"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Tilkoblet nå"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Lagrede enheter"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Legg til enhet"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth slås på for å koble til"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Tilkoblingsinnstillinger"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Enheter som har vært tilkoblet tidligere"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Tidligere tilkoblet"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth er på"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Se alle"</string>
<string name="date_and_time" msgid="9062980487860757694">"Dato og klokkeslett"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Velg tidssone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Hopp over"</string>
<string name="next_label" msgid="4693520878012668114">"Neste"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Språk"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Språkinnstillinger"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Fjern"</string>
<string name="add_a_language" msgid="2330538812283783022">"Legg til et språk"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Innstillinger"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Snarvei for Innstillinger"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Flymodus"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Mer"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådløst og nettverk"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Administrer Wi-Fi, Bluetooth, flymodus, mobilnettverk og VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobildata"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Personvern"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Avslått av administratoren"</string>
<string name="security_status_title" msgid="5848766673665944640">"Sikkerhetsstatus"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Skjermlås, ansiktslås"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Skjermlås, fingeravtrykk"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Skjermlås"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Ansiktet er lagt til"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Lås opp med ansiktet ditt"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Bruk ansiktet ditt til å godkjenne"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Bruk ansiktet til å låse opp telefonen, godkjenne kjøp eller logge på apper."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Bruk ansiktet ditt"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Bruk ansiktet ditt til å låse opp telefonen eller godta kjøp.\n\nMerk: Du kan ikke bruke ansiktet til å låse opp denne enheten. Ta kontakt med administratoren for organisasjonen din for å få mer informasjon."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Bruk ansiktet til å låse opp telefonen, godkjenne kjøp eller logge på apper"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Du kan legge til opptil <xliff:g id="COUNT">%d</xliff:g> fingeravtrykk"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Ha ansiktet ditt midt i sirkelen"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Gjør det senere"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Du kan legge til opptil <xliff:g id="COUNT">%d</xliff:g> ansikter"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Du har lagt til maksimalt antall ansikter"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Kan ikke legge til flere ansikter"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registreringen er ikke fullført"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Tidsgrensen for registrering av ansikt er nådd. Prøv på nytt."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Registreringen av ansiktet mislyktes."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Alt er klart. Det ser bra ut."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Ferdig"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Bruk ansiktet til å"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Lås opp enheten"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"App-pålogging og betalinger"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Åpne øyne for å låse opp"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Øynene dine må være åpne når du bruker ansiktsautentisering"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Fjern ansiktsdataene"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Få bedre ansiktsdata"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Du kan bruke ansiktet ditt til å låse opp enheten og åpne apper. "<annotation id="url">"Finn ut mer"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeravtrykk"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Admin. fingeravtrykk"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Bruk fingeravtrykk for"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Velg minst ett bånd for Wi-Fi-sonen:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP-innstillinger"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Personvern"</string>
<string name="wifi_shared" msgid="844142443226926070">"Del med andre brukere av enheten"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(uendret)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Velg"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Vil du glemme nettverket?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Alle passord for dette nettverket slettes"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Lagrede nettverk"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d nettverk</item>
<item quantity="one">1 nettverk</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Lysstyrke"</string>
<string name="brightness_summary" msgid="838917350127550703">"Juster skjermens lysstyrke"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Lysstyrken tilpasser seg"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"På"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Av"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Foretrukket lysstyrke er veldig lav"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Foretrukket lysstyrke er lav"</string>
@@ -1122,7 +1128,7 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"Optimaliser lysstyrken etter omgivelsene. Når denne funksjonen er på, kan du fremdeles justere lysstyrken midlertidig."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"Lysstyrken på skjermen din justeres automatisk etter omgivelser og aktiviteter. Du kan flytte glidebryteren manuelt for få tilpasset lysstyrke til å registrere preferansene dine."</string>
<string name="night_display_title" msgid="2626451512200357686">"Nattlys"</string>
- <string name="night_display_text" msgid="1837277457033025056">"Nattlys gir skjermen en ravgul nyanse. Dette gjør det mer komfortabelt å se på skjermen eller lese ved svakt lys, og det kan gjøre det enklere å sovne."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"Nattlys gir skjermen en ravgul nyanse. Dette gjør det mer komfortabelt å se eller lese på skjermen i svakt lys, og det kan gjøre det enklere å sovne."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Planlegg"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ingen"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Slås på på et egendefinert tidspunkt"</string>
@@ -1143,8 +1149,8 @@
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"Slå av nå"</string>
<string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Slå på til soloppgang"</string>
<string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Slå av til solnedgang"</string>
- <string name="night_display_activation_on_custom" msgid="5472029024427933598">"Slå av til <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="night_display_activation_off_custom" msgid="6169984658293744715">"Slå av til <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+ <string name="night_display_activation_on_custom" msgid="5472029024427933598">"Slå på til kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+ <string name="night_display_activation_off_custom" msgid="6169984658293744715">"Slå av til kl. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Hvilemodus"</string>
<string name="screen_timeout_title" msgid="5130038655092628247">"Skjermen slås av"</string>
<string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Kan ikke endre personlig kode.\nMuligens feil kode."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-koden for SIM-kortet ble endret."</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Kan ikke endre SIM-kortlåsens tilstand.\nMuligens feil personlig kode."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Kan ikke slå av PIN-koden."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Kan ikke slå på PIN-koden."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Avbryt"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Flere SIM-kort er funnet"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Dette krever at <xliff:g id="NAME_0">^1</xliff:g> formateres. \n\n"<b>"Formatering sletter alle dataene som er lagret på <xliff:g id="NAME_1">^1</xliff:g>."</b>" For å unngå tap av data, vurder å ta en sikkerhetskopi."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Slett og formatér"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formaterer <xliff:g id="NAME">^1</xliff:g> …"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Ikke fjern <xliff:g id="NAME">^1</xliff:g> mens det formateres."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Ikke fjern <xliff:g id="NAME">^1</xliff:g> mens det formateres."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Flytt data til ny lagring"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Du kan flytte bilder, filer og enkelte apper til <xliff:g id="NAME">^1</xliff:g>. \n\nFlyttingen tar ca. <xliff:g id="TIME">^2</xliff:g> og frigjør <xliff:g id="SIZE">^3</xliff:g> intern lagringsplass. Noen apper kommer ikke til å fungere mens flyttingen pågår."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Flytt nå"</string>
@@ -1745,7 +1753,7 @@
<string name="filter" msgid="2018011724373033887">"Filter"</string>
<string name="filter_dlg_title" msgid="8693024463731076091">"Velg filteralternativer"</string>
<string name="filter_apps_all" msgid="8899612398848280352">"Alle apper"</string>
- <string name="filter_apps_disabled" msgid="5862632369555319938">"Avslåtte apper"</string>
+ <string name="filter_apps_disabled" msgid="5862632369555319938">"Deaktiverte apper"</string>
<string name="filter_apps_third_party" msgid="7786348047690140979">"Tredjeparts"</string>
<string name="filter_apps_running" msgid="7767071454371350486">"Kjører"</string>
<string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installert"</string>
<string name="no_applications" msgid="7336588977497084921">"Ingen apper."</string>
<string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"Intern lagring"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortlagring"</string>
<string name="recompute_size" msgid="7722567982831691718">"Beregner størrelse på nytt…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Vil du slette appdataene?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Alle data i appen slettes permanent. Dette omfatter alle filer, innstillinger, kontoer, databaser osv."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Finner ikke appen i listen over installerte apper."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Kunne ikke frigi lagringsplass for appen."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Denne appen har tilgang til følgende på nettbrettet ditt:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Denne appen har tilgang til følgende på telefonen din:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Denne appen får tilgang til følgende på nettbrettet ditt. Enkelte av disse tillatelsene er tilgjengelig for <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> for å forbedre ytelsen og redusere minnebruken, ettersom denne appen kjører i samme prosess som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Denne appen får tilgang til følgende på telefonen din. Enkelte av disse tillatelsene er tilgjengelig for <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> for å forbedre ytelsen og redusere minnebruken, ettersom denne appen kjører i samme prosess som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> og <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Den appen kan belaste deg for penger:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Send premium-SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Beregner fortsatt…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Kunne ikke beregne pakkestørrelsen."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Du har ikke installert noen tredjepartsapper."</string>
<string name="version_text" msgid="9189073826278676425">"versjon <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Flytt"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Flytt til nettbrett"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Flytt til telefonen"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Flytt til USB-lagring"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Flytt til minnekort"</string>
- <string name="moving" msgid="6431016143218876491">"Flytter"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"En annen overføring pågår allerede."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Ikke nok lagringsplass."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Appen eksisterer ikke."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Administratorappen på enheten kan ikke installeres på eksterne medier"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Vil du tvinge avslutning?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Hvis du tvinger avslutning av en app, kan det oppstå problemer."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Kan ikke flytte appen. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Foretrukket installeringssted"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Endre foretrukket plassering for installasjon av nye apper"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Slå av innebygd app?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Deaktiver appen"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Hvis du slår av denne appen, slutter muligens Android og andre apper å fungere som de skal."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vil du slette dataene og deaktivere appen?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Hvis du slår av denne appen, kan det føre til at Android og andre apper slutter å fungere som de skal. Dataene dine blir også slettet."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vil du deaktivere varsler?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Hvis du slår av varsler for denne appen, kan du gå glipp av viktige beskjeder og oppdateringer."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Butikk"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Informasjon om appen"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Appen er installert fra <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Bruk tjenesten"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Bruk fargekorrigering"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Bruk teksting"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Fortsett"</string>
<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="6371077608778830020">"Legg til høreapparat"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Hvis du begrenser bakgrunnsaktivitet for en app, kan det oppstå problemer"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Du kan ikke begrense appen siden den ikke er satt til å optimalisere batteriet.\n\nFor å begrense appen, slå på batterioptimalisering."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Skjermbruk siden batteriet var fulladet"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Strømforbruk fra skjermen"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Skanning etter mobilnettverk"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Batteribruk siden batteriet var fulladet"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Hvor lenge skjermen har vært på siden batteriet var fulladet"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Enhetsbruk siden batteriet var fulladet"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Bruksdetaljer"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Juster strømforbruk"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Pakker"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apper som tapper batteriet"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Holder enheten aktiv"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Vekker enheten i bakgrunnen"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Forespør posisjon ofte"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apper fungerer ikke som de skal"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Appene kjører som normalt"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefonen har vanlig batteribruk i bakgrunnen"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Nettbrettet har vanlig batteribruk i bakgrunnen"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Begrenser batteribruken for %1$d apper</item>
<item quantity="one">Begrenser batteribruken for %1$d app</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Begrenset <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Disse appene har brukt batteri i bakgrunnen. Begrensede apper fungerer muligens ikke som de skal, og varsler kan bli forsinket."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Bruk batteristyring"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Oppdag når apper har for høyt batteriforbruk"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Avbryt"</string>
<string name="tts_reset" msgid="2661752909256313270">"Tilbakestill"</string>
<string name="tts_play" msgid="2628469503798633884">"Spill av"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Strømkontroll"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Oppdaterer innstilling for trådløst nett ..."</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Oppdatere Bluetooth-innstilling"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"på"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"av"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"slår på"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"slår av"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Sted"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synkronisering"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Lysstyrke <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisk"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"full"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"halv"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"av"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Legitimasjonslager"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer fra lagringsenhet"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> av totalt <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Velg alle"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Databruk"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens databruk"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobildata og Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Appbruk"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APPINFO"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Vis %d skjulte elementer</item>
<item quantity="one">Vis %d skjult element</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Skjul"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Nettverk og Internett"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"databruk"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apper og varsler"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Tillatelser, standardapper"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Tilgang til varsler er ikke tilgjengelig for apper i jobbprofilen."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Kontoer"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Ingen kontoer er lagt til"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Standardapper"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Språk, klokke, sikkerhetskopiering, oppdateringer"</string>
<string name="search_results_title" msgid="1796252422574886932">"Innstillinger"</string>
- <string name="search_menu" msgid="6283419262313758339">"Søk i innstillingene"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, Wi-Fi, nettverkstilkobling, Internett, trådløs, data, Wi Fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, Wi-Fi, slå av/på, kontroll"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"tekstmelding, teksting, meldinger, standard"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"betal, trykk på, betalinger"</string>
<string name="keywords_backup" msgid="470070289135403022">"sikkerhetskopi, sikkerhetskopiér"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"bevegelse"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ansikt, lås opp, autentisering, pålogging"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl-versjon, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"nettverk, status for mobilnettverk, servicestatus, signalstyrke, mobilnettverkstype, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serienummer, maskinvareversjon"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"mørkt tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"Feil"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Passiv skjerm, låseskjerm"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"varsel på låseskjermen"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ansikt"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingeravtrykk"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"dim skjermen, berøringsskjerm, batteri, smart lysstyrke, dynamisk lysstyrke"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Når du taster inn PIN-koden din for å starte denne enheten, er tilgjengelighetstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> ikke tilgjengelige ennå."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Når du tegner mønsteret ditt for å starte denne enheten, er tilgjengelighetstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> ikke tilgjengelige ennå."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Når du skriver inn passordet ditt for å starte denne enheten, er tilgjengelighetstjenester som <xliff:g id="SERVICE">%1$s</xliff:g> ikke tilgjengelige ennå."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Merk: Etter en omstart kan ikke denne appen starte før du låser opp telefonen din"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Merk: Hvis du starter telefonen på nytt og har en skjermlås angitt, kan ikke denne appen starte før du låser opp telefonen"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI-informasjon"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI-relatert informasjon"</string>
<string name="slot_number" msgid="3762676044904653577">"(Spor <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personlig"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Jobb"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apper: alle"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apper: slått av"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Slått av"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorier: svært høy viktighet"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorier: lav viktighet"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorier: slått av"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Bruksvarsler"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Vis fullstendig enhetsbruk"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Vis appbruk"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Høyt forbruk"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apper oppfører seg unormalt</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> oppfører seg unormalt</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Intern lagring: <xliff:g id="PERCENTAGE">%1$s</xliff:g> brukt – <xliff:g id="FREE_SPACE">%2$s</xliff:g> ledig"</string>
<string name="display_summary" msgid="6737806235882127328">"Hvilemodus etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Bakgrunn, hvilemodus, skriftstørrelse"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Hvilemodus etter 10 minutter uten aktivitet"</string>
<string name="memory_summary" msgid="8080825904671961872">"Gjennomsnittlig er <xliff:g id="USED_MEMORY">%1$s</xliff:g> av <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> minne er brukt"</string>
<string name="users_summary" msgid="1674864467098487328">"Logget på som <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS er ikke tillatt"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kameraet er ikke tillatt"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Skjermdump er ikke tillatt"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Kan ikke slå av sikkerhetskopier"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Kan ikke åpne denne appen"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Hvis du lurer på noe, kan du kontakte IT-administratoren din"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Mer informasjon"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simuler en skjerm med utklipp"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Skjermutklipp"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"skjermutklipp, hakk"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ingen"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Standard for enheten"</string>
<string name="special_access" msgid="3458780842491881155">"Spesiell apptilgang"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apper kan bruke ubegrenset med data</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Koblet til <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Koblet til flere enheter"</string>
<string name="demo_mode" msgid="2798762752209330277">"Demomodus for systembrukergrensesnittet"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Nattmodus"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Angi nattmodus"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Mørk modus"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Angi mørk modus"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Fliser med hurtiginnstillinger for utviklere"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-spor"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Innstillinger for jobbprofilen"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktsøk"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Tillat kontaktsøk for organisasjonen din for å identifisere innringere og kontakter"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dobbelttrykk for å sjekke telefonen"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dobbelttrykk for å sjekke nettbrettet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dobbelttrykk for å sjekke enheten"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Dobbelttrykk på skjermen for å sjekke klokkeslett, varselikoner og annen informasjon."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Dobbelttrykk på skjermen for å sjekke klokkeslettet, varsler og annen informasjon."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Løft for å sjekke telefonen"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Løft for å sjekke nettbrettet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Løft for å sjekke enheten"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ta opp telefonen for å sjekke klokkeslett, varselikoner og annen informasjon."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ta opp nettbrettet for å sjekke klokkeslett, varselikoner og annen informasjon."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ta opp enheten for å sjekke klokkeslett, varselikoner og annen informasjon."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Vekk skjermen"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Løft opp telefonen for å sjekke klokkeslettet, varsler og annen informasjon."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Løft opp nettbrettet for å sjekke klokkeslettet, varsler og annen informasjon."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Løft opp enheten for å sjekke klokkeslettet, varsler og annen informasjon."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Bevegelse for oppvekkingslåseskjerm"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Sveip fingersensoren for varsler"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Sveip på fingersensoren"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av telefonen."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> forsøk</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> forsøk</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Dataene på denne enheten blir sikkerhetskopiert"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Denne enheten administreres av organisasjonen din."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Denne enheten administreres av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Autofylltjeneste"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"auto, fyll, autofyll"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Sørg for at appen er pålitelig</b> <br/> <br/> <xliff:g id=app_name example=Google autofyll>%1$s</xliff:g> bruker det som er på skjermen til å fastslå hva som kan fylles ut automatisk."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Autofyll"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Loggføringsnivå"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maksimalt antall forespørsler per økt"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maksimalt antall synlige datasett"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Tilbakestill til standardverdier"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Autofyll av utvikleralternativer er tilbakestilt"</string>
<string name="device_theme" msgid="4571803018917608588">"Enhetstema"</string>
<string name="default_theme" msgid="7085644992078579076">"Standard"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nettverksnavn"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Utløs operatørhåndtering"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Oppdater «Ikke forstyrr»"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Sett varsler på pause for å holde deg fokusert"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Hva er nytt og spennende?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Få en innføring i den nye telefonen din"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Få en innføring i det nye nettbrettet ditt"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Få en innføring i den nye enheten din"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Denne funksjonen er ikke tilgjengelig på denne enheten"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Tving fullstendige GNSS-målinger"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Spor alle GNSS-konstellasjoner og -frekvenser uten syklus for oppgaver"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Vis alltid krasjdialogboksen"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Vis dialogboksen hver gang en app krasjer"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Velg en ANGLE-aktivert app"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Du har ikke angitt noen ANGLE-aktivert app"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE-aktivert app: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Katalogtilgang"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"katalogtilgang"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Nettverksdetaljer"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Enhetsnavnet ditt er synlig for apper på telefonen. Det kan også ses av andre personer når du kobler til Bluetooth-enheter eller konfigurerer en Wi-Fi-sone."</string>
<string name="devices_title" msgid="7701726109334110391">"Enheter"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Alle innstillinger"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Forslag"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-data"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-data"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Velg nettverk"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Frakoblet"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Tilkoblet"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Kobler til …"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Kunne ikke koble til"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Fant ingen nettverk."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Fant ingen nettverk. Prøv på nytt."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(forbudt)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM-kortet mangler"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Avansert ringemodus"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Foretrukket nettverksmodus: WCDMA foretrekkes"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Foretrukket nettverksmodus: kun GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Foretrukket nettverksmodus: kun WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Foretrukket nettverksmodus: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Foretrukket nettverksmodus: CMDA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Foretrukket nettverksmodus: CMDA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Foretrukket nettverksmodus: kun CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Foretrukket nettverksmodus: kun EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Foretrukket nettverksmodus: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Foretrukket nettverksmodus: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Foretrukket nettverksmodus: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Foretrukket nettverksmodus: CDMA + LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Foretrukket nettverksmodus: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Foretrukket nettverksmodus: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Foretrukket nettverksmodus: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Foretrukket nettverksmodus: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Foretrukket nettverksmodus: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Foretrukket nettverksmodus: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Foretrukket nettverksmodus: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Foretrukket nettverksmodus: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Foretrukket nettverksmodus: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Foretrukket nettverksmodus: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Foretrukket nettverksmodus: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Foretrukket nettverksmodus: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Foretrukket nettverksmodus: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Foretrukket nettverksmodus: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (anbefalt)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (anbefalt)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globalt"</string>
+ <string name="label_available" msgid="1731547832803057893">"Tilgjengelige nettverk"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Søker …"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registrerer på <xliff:g id="NETWORK">%s</xliff:g> …"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM-kortet ditt tillater ingen tilkobling til dette nettverket."</string>
+ <string name="connect_later" msgid="978991102125216741">"Kan ikke koble til dette nettverket akkurat nå. Prøv på nytt senere."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registrert på nettverket."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Velg nettverk automatisk"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operatørinnstillinger"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Konfigurer datatjeneste"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobildata"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Bruk data via mobilnettverket"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Foretrukket nettverkstype"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Bytt nettverksmodus"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Foretrukket nettverkstype"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operatør"</string>
+ <string name="call_category" msgid="8108654745239563833">"Anrop"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videoanrop via mobiloperatør"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Systemvalg"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Endre CDMA-roamingmodus"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Systemvalg"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Nettverk"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Nettverk"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA-abonnement"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Bytt mellom RUIM/SIM og NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"Abonnement"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatisk registrering"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Vil du tillate data-roaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Sjekk med nettverksleverandøren din for priser."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Appens databruk"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Ugyldig nettverksmodus (<xliff:g id="NETWORKMODEID">%1$d</xliff:g>). Ignorer."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Utilgjengelig når du er koblet til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Se flere"</string>
+ <string name="see_less" msgid="1250265310929558370">"Se mindre"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 1455a53..d4cfb71 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"मिटर गरिएको रूपमा व्यवहार गर्नुहोस्"</item>
<item msgid="2266114985518865625">"मिटर नगरिएको रूपमा व्यवहार गर्नुहोस्"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"पूर्वनिर्धारित (क्रमरहित MAC प्रयोग गर्नुहोस्)"</item>
+ <item msgid="5398461510512959597">"विश्वसनीय"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"होइन"</item>
<item msgid="3863157480502955888">"हो"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"सधैँ सक्रिय"</item>
<item msgid="6385301106124765323">"सधैँ निष्क्रिय"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"निष्क्रिय छ"</item>
+ <item msgid="2182686878828390312">"डिबग"</item>
+ <item msgid="5286514712714822064">"भर्बोज"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"घरमा मात्र"</item>
+ <item msgid="5034813753274486448">"स्वचालित"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA रुचाइयो"</item>
+ <item msgid="807926878589867564">"GSM मात्र"</item>
+ <item msgid="488474605709912156">"WCDMA मात्र"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA स्वतः"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo स्वतः"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo मात्र"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"विश्वव्यापी"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA मात्र"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"विश्वव्यापी"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 870fc36..3cf7a18 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"सिर्जना गर्नुहोस्"</string>
<string name="allow" msgid="3349662621170855910">"अनुमति दिनुहोस्"</string>
<string name="deny" msgid="6947806159746484865">"अस्वीकार गर्नुहोस्"</string>
- <string name="dlg_close" msgid="7471087791340790015">"बन्द गर्नुहोस्"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"स्विच गर्नुहोस्"</string>
<string name="device_info_default" msgid="7847265875578739287">"अज्ञात"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">अहिले तपाईं विकासकर्ता हुनका लागि <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> चरण टाढा हुनुहुन्छ।</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"आवश्यक छैन, तपाईं आफैँ नै एउटा विकासकर्ता हुनुहुन्छ।"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"कृपया पहिले विकासकर्ताका विकल्पहरूलाई सक्षम पार्नुहोस्"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"ताररहित र सञ्जालहरू"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"जडानहरू"</string>
- <string name="header_category_device" msgid="4544026001618307754">"उपकरण"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"व्यक्तिगत"</string>
- <string name="header_category_access" msgid="7580499097416970962">"पहुँच"</string>
<string name="header_category_system" msgid="2816866961183068977">"प्रणाली"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"डेटामा जडानलाई सक्रिय गर्नुहोस्"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"डेटामा जडानलाई असक्षम गर्नुहोस्"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"यन्त्रको ब्लुटुथ ठेगाना: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>विच्छेद गर्नुहुन्छ?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"प्रसारण"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"बेनामी ब्लुटुथ उपकरण"</string>
<string name="progress_scanning" msgid="192587958424295789">"खोजी गर्दै"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"नजिकै कुनै ब्लुटुथ उपकरण भेटिएन।"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"एउटा अनुप्रयोग ब्लुटुथ सक्रिय गर्न र अन्य यन्त्रहरूले तपाईंको फोन देख्न सक्ने बनाउन चाहन्छ। तपाईं पछि ब्लुटुथ सम्बन्धी सेटिङहरूमा गई यसलाई परिवर्तन गर्न सक्नुहुन्छ।"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ब्लुटुथ खुल्दै..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ब्लुटुथ बन्द हुँदैछ..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"स्वतःजडान"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ब्लुटुथ जडान अनुरोध"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" सँग जडान गर्न ट्याप गर्नुहोस्।"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" सँग जडित हुन चाहनु हुन्छ?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"कल गर्ने सुविधा भएका उपलब्ध यन्त्रहरू"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"हाल जडान अवस्थामा छ"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"सुरक्षित गरिएका यन्त्रहरू"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"यन्त्र थप्नुहोस्"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"जोडा बनाउनका लागि ब्लुटुथ सक्रिय हुने छ"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"जडानसम्बन्धी प्राथमिकताहरू"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"यसअघि जडान भएका यन्त्रहरू"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"यसअघि जडान भएका यन्त्रहरू"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ब्लुटुथ सक्रिय गरियो"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"सबै हेर्नुहोस्"</string>
<string name="date_and_time" msgid="9062980487860757694">"मिति र समय"</string>
<string name="choose_timezone" msgid="1362834506479536274">"समय क्षेत्र चयन गर्नुहोस्"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"छोड्नुहोस्"</string>
<string name="next_label" msgid="4693520878012668114">"अर्को"</string>
<string name="language_picker_title" msgid="3596315202551687690">"भाषाहरू"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"भाषासम्बन्धी प्राथमिकता"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"हटाउनुहोस्"</string>
<string name="add_a_language" msgid="2330538812283783022">"भाषा थप्नुहोस्"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"सेटिङहरू"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"सेटिङ सर्टकट"</string>
<string name="airplane_mode" msgid="8837269988154128601">"हवाइजहाज मोड"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"थप"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"ताररहित सञ्जाल"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, ब्लुटुथ, हवाइजहाज मोड, मोबाइल नेटवर्क, र VPNs व्यवस्थापन गर्नुहोस्"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"मोबाइल डेटा"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"गोपनीयता"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"प्रशासकद्वारा असक्षम पारिएको छ"</string>
<string name="security_status_title" msgid="5848766673665944640">"सुरक्षाको स्थिति"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"स्क्रिन लक, फेस अनलक"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"स्क्रिन लक, फिंगरप्रिन्ट"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"स्क्रिन लक"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"अनुहार थपियो"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"आफ्नो अनुहारमार्फत अनलक गर्नु…"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"प्रमाणीकरण गर्न आफ्नो अनुहार प्रयोग गर्नु…"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"आफ्नो फोन अनलक गर्न, खरिद अधिकार दिन वा अनुप्रयोगहरूमा साइन इन गर्न आफ्नो अनुहार प्रयोग गर्नुहोस्।"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"आफ्नो"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्ना अनुहारको प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईं यो यन्त्र अनलक गर्न आफ्नो अनुहारको प्रयोग गर्न सक्नुहुन्न। थप जानकारीका लागि आफ्नो सङ्गठनको प्रशासकसँग सम्पर्क गर्नुहोस्।"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"आफ्नो फोन अनलक गर्न, खरिद अधिकार दिन वा अनुप्रयोगहरूमा साइन इन गर्न आफ्नो अनुहार प्रयोग गर्नुहोस्"</string>
- <string name="face_add_max" msgid="2342250989212694454">"तपाईं अधिकतम <xliff:g id="COUNT">%d</xliff:g> फिंगरप्रिन्टहरू थप्न सक्नुहुन्छ"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"आफ्नो अनुहार वृतको बिचमा पार्नुहोस्"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"यो कार्य पछि गर्नुहोस्"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"तपाईं अधिकतम <xliff:g id="COUNT">%d</xliff:g> अनुहारहरू थप्न सक्नुहुन्छ"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"तपाईंले थप्न मिल्ने अधिकतम सङ्ख्या बराबरका अनुहारहरू थप्नुभएको छ"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"थप अनुहारहरू थप्न सकिँदैन"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"दर्ता गर्ने कार्य पूर्ण भएन"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ठिक छ"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"अनुहार दर्ताको समय सीमा पुग्यो। फेरि प्रयास गर्नुहोस्।"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"अनुहार दर्ता गर्ने प्रक्रियाले काम गरेन।"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"सबै कुरा तयार छ। राम्रो देखिँदै छ।"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"सम्पन्न भयो"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"निम्न प्रयोजनका लागि आफ्नो अनुहार प्रयोग गर्नुहोस्"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"आफ्नो यन्त्र अनलक गर्नुहोस्"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"अनुप्रयोगको साइन इन र भुक्तानी"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"अनलक गर्न आँखा खुल्ला छन्"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"अनुहारको प्रमाणीकरण प्रयोग गर्दा तपाईंका आँखा खुल्ला हुनै पर्छ"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"अनुहारसम्बन्धी डेटा हटाउनुहोस्"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"आफ्नो अनुहारसम्बन्धी डेटामा सुधार गर्नुहोस्"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"तपाईंको यन्त्र अनलक गर्न र अनुप्रयोगहरूमाथि पहुँच राख्न तपाईंको अनुहार प्रयोग गर्न सकिन्छ। "<annotation id="url">"थप जान्नुहोस्"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"औंठाछाप"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"औंठाछापहरू व्यवस्थापन गर्नुहोस्"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"निम्नको लागि औठाछाप प्रयोग गर्नुहोस्"</string>
@@ -465,7 +472,7 @@
<string name="fingerprint_last_delete_title" msgid="6410310101247028988">"सबै फिंगरप्रिन्टहरू हटाउने हो?"</string>
<string name="fingerprint_delete_title" msgid="1368196182612202898">"\'<xliff:g id="FINGERPRINT_ID">%1$s</xliff:g>\' हटाउनुहोस्"</string>
<string name="fingerprint_delete_message" msgid="8597787803567398131">"तपाईं यो फिंगरप्रिन्ट मेट्न चाहनुहुन्छ?"</string>
- <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"तपाईं फोन अनलक गर्न, खरिद अधिकार प्रदान गर्न वा तिनीहरूमार्फत अनुप्रयोगहरूमा साइन इन गर्नाका लागि तपाईं आफ्नो फिंगरप्रिन्टहरूको प्रयोग गर्न सक्षम हुनुहुने छैन।"</string>
+ <string name="fingerprint_last_delete_message" msgid="7852321001254275878">"तपाईं फोन अनलक गर्न, खरिद अधिकार प्रदान गर्न वा तिनीहरूमार्फत अनुप्रयोगहरूमा साइन इन गर्नाका लागि तपाईं आफ्नो फिंगरप्रिन्टहरूको प्रयोग गर्न सक्षम हुनु हुने छैन।"</string>
<string name="fingerprint_last_delete_message_profile_challenge" msgid="6521520787746771912">"तपाईं आफ्नो कार्य प्रोफाइल अनलक गर्न, खरिद गर्ने अनुमति दिन, वा कार्यसँग सम्बन्धित अनुप्रयोगहरूमा साइन इन गर्नाका लागि आफ्नो फिंगरप्रिन्ट प्रयोग गर्न सक्नुहुने छैन।"</string>
<string name="fingerprint_last_delete_confirm" msgid="2634726361059274289">"हो, हटाउनुहोस्"</string>
<string name="confirm_fingerprint_icon_content_description" msgid="5255544532157079096">"जारी राख्न तपाईँको फिंगरप्रिन्ट प्रयोग गर्नुहोस्।"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"५.० GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi‑Fi हटस्पटका लागि कम्तीमा एक ब्यान्ड छनौट गर्नुहोस्:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP सेटिङहरू"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"गोपनीयता"</string>
<string name="wifi_shared" msgid="844142443226926070">"अन्य यन्त्र प्रयोगकर्ताहरूसँग साझेदारी गर्नुहोस्"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(अपरिवर्तित)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"कृपया चयन गर्नुहोस्"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"रद्द गर्नुहोस्"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"नेटवर्क बिर्सने हो?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"यो नेटवर्कका सबै पासवर्डहरू मेटाइने छन्"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"सुरक्षित सञ्जालहरू"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d नेटवर्क</item>
<item quantity="one">१ नेटवर्क</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"उज्यालोपन"</string>
<string name="brightness_summary" msgid="838917350127550703">"स्क्रिनको उज्यालोपना मिलाउनुहोस्"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"अनुकूलीत चमक"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"सक्रिय छ"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"निष्क्रिय छ"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"रुचाइएको चमक धेरै कम छ"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"रूचाइएको चमक कम छ"</string>
@@ -1128,7 +1134,7 @@
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"आफू अनुकूल समयमा सक्रिय गर्छ"</string>
<string name="night_display_auto_mode_twilight" msgid="589042813708244059">"सूर्यास्तदेखि सूर्योदयसम्म सक्रिय गर्छ"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"सुरु समय"</string>
- <string name="night_display_end_time_title" msgid="8286061578083519350">"समय समाप्ति"</string>
+ <string name="night_display_end_time_title" msgid="8286061578083519350">"समाप्ति समय"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"स्थिति"</string>
<string name="night_display_temperature_title" msgid="1435292789272017136">"तीव्रता"</string>
<string name="night_display_summary_off" msgid="1792750041697946539">"निष्क्रिय / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN बदल्न सक्दैन।\n सम्भवत: गलत PIN।"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN सफलतापूर्वक परिवर्तन गरियो"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM कार्डको लक स्थितिलाई बदल्न सकिँदैन। \n सम्भवत गलत PIN।"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN असक्षम पार्न सकिँदैन।"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN सक्षम पार्न सकिँदैन।"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ठिक छ"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"रद्द गर्नुहोस्"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"धेरै SIM हरू भेटियो"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"यसको लागि <xliff:g id="NAME_0">^1</xliff:g> फरम्याट गर्न आवश्यक छ।\n\n"<b>"फरम्याट गर्दा <xliff:g id="NAME_1">^1</xliff:g> भण्डार गरिएका सबै डेटा नष्ट हुनेछ।"</b>"डेटा जोगाउन ब्याकअप गर्ने बारे बिचार गर्नुहोस्।"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ढाँचा मेटाउनुहोस्"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ढाँचा मिलाइदै ..."</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g> फर्म्याट गरिरहेका बेला यसलाई नहटाउनुहोस्।"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g> फर्म्याट भइरहेको बेला यसलाई नहटाउनुहोस्।"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"नयाँ भण्डारणमा डेटा सार्नुहोस्"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"तपाईँले यो नयाँ <xliff:g id="NAME">^1</xliff:g>मा आफ्नो तस्बिरहरु, फाइलहरू र केही अनुप्रयोगहरू सार्न सक्नुहुन्छ। \n\n स्थानान्तरणले करिब <xliff:g id="TIME">^2</xliff:g> लिन्छ र आन्तरिक भण्डारणमा <xliff:g id="SIZE">^3</xliff:g> खाली गर्नेछ। यस क्रममा केही अनुप्रयोगहरूले काम गर्ने छैनन्।"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"अब सार्नुहोस्"</string>
@@ -1572,7 +1580,7 @@
<string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS लाई सहयोग पुर्याउन सर्भरको प्रयोग गर्नुहोस् (सञ्जाल प्रयोग घटाउन अनचेक गर्नुहोस्)"</string>
<string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS लाई मद्दत पुर्याउन सर्भर प्रयोग गर्नुहोस् (GPS कार्यसम्पादन सुधार्न अनचेक गर्नुहोस्)"</string>
<string name="use_location_title" msgid="5206937465504979977">"स्थान; Google खोजी"</string>
- <string name="use_location_summary" msgid="3978805802386162520">"तपाईँको खोज परिणामहरू र अन्य सेवाहरू सुधार्नका लागि गुगललाई तपाईँको स्थान प्रयोग गर्न अनुमति दिनुहोस्"</string>
+ <string name="use_location_summary" msgid="3978805802386162520">"तपाईँको खोजका परिणाम र अन्य सेवाहरू सुधार्नका लागि गुगललाई तपाईँको स्थान प्रयोग गर्न अनुमति दिनुहोस्"</string>
<string name="location_access_title" msgid="7064108942964081243">"मेरो स्थानमा पहुँच गर्नुहोस्"</string>
<string name="location_access_summary" msgid="69031404093194341">"तपाईंको अनुमतिबाट अनुप्रयोगहरूलाई तपाईंको स्थान जानकारीको उपयोग गर्न दिनुहोस्।"</string>
<string name="location_sources_heading" msgid="1278732419851088319">"स्थान स्रोतहरू"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"स्थापना गरियो"</string>
<string name="no_applications" msgid="7336588977497084921">"कुनै अनुप्रयोगहरू छैनन्"</string>
<string name="internal_storage" msgid="1584700623164275282">"आन्तरिक भण्डारण"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"आन्तरिक भण्डारण"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB भण्डारण"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD कार्ड भण्डारण"</string>
<string name="recompute_size" msgid="7722567982831691718">"आकार पुनःगणना गर्दै ..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"अनुप्रयोग डेटा मेटाउन चाहनुहुन्छ?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"यस अनुप्रयोगका सम्पूर्ण डेटाहरू स्थायी रूपमा मेटाइने छ। यसमा सम्पूर्ण फाइल, सेटिङ, खाताहरू, डेटाबेस आदि पर्दछन्।"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"स्थापित अनुप्रयोगको सूचीमा अनुप्रयोग भेटिएन।"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"अनुप्रयोगका लागि भण्डारण खाली गर्न सकिएन।"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"यो अनुप्रयोगले तपाईँको ट्याब्लेटमा निम्न कुराहरू पहुँच गर्न सक्छ:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"यो अनुप्रयोगले तपाईँको फोनमा निम्न कुराहरू पहुँच गर्न सक्छ:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"यो अनुप्रयोगले तपाईँको ट्याब्लेटमा निम्न कुराहरू पहँच गर्न सक्छ। कार्यसम्पादनमा सुधार र मेमोरीको उपयोगलाई कम गर्नको लागि यी मध्ये केही अनुमतिहरू <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> का लागि उपलब्ध छन् किनभने यसले <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> मा जस्तै प्रक्रियाबाट चल्छ :"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"यो अनुप्रयोगले तपाईँको फोनमा निम्न कुराहरू पहुँच गर्न सक्छ। कार्यसम्पादनमा सुधार र मेमोरीको उपयोगलाई कम गर्नको लागि यी मध्ये केही अनुमतिहरू <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> उपलब्ध छन् किनभने यो <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>मा जस्तै प्रक्रियाबाट चल्छ :"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> र <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"यस अनुप्रयोगले तपाईँलाई पैसा असुल्न सक्छ:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"प्रिमियम SMS पठाउनुहोस्"</string>
<string name="computing_size" msgid="1599186977475211186">"कम्प्युटिङ ..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"प्याकेज आकार गणना गर्न सकिएन।"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"तपाईँसँग तेस्रो पार्टी अनुप्रयोगहरू स्थापित छैनन्।"</string>
<string name="version_text" msgid="9189073826278676425">"संस्करण <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"सार्नुहोस्"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ट्याब्लेटमा सार्नुहोस्"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"फोनमा सार्नुहोस्"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB भण्डारणमा सार्नुहोस्"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD कार्डमा सार्नुहोस्"</string>
- <string name="moving" msgid="6431016143218876491">"सरिँदै"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"अर्को माइग्रेसन पहिलेदेखि नै जारी छ।"</string>
<string name="insufficient_storage" msgid="481763122991093080">"पर्याप्त भण्डारण ठाउँ छैन।"</string>
<string name="does_not_exist" msgid="1501243985586067053">"अनुप्रयोग छैन"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"बाह्य मिडियामा यन्त्र प्रशासक अनुप्रयोगलाई स्थापना गर्न सकिँदैन"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"बलपूर्वक रोक्ने हो?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"यदि तपाईँले अनुप्रयोगलाई जबर्जस्ती रोक्नु भएको खण्डमा त्यसले चाहेअनुसार काम नगर्न सक्छ।"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"अनुप्रयोगलाई सार्न सकेन। <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"मन परेको स्थापना स्थान"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"नयाँ अनुप्रयोगका लागि रुचाइएको स्थापना स्थान बदल्नुहोस्"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"पूर्वनिर्मित अनुप्रयोग असक्षम पार्ने हो?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"अनुप्रयोग असक्षम गर्नुहोस्"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"तपाईंले यस अनुप्रयोगलाई असक्षम पार्नुभयो भने अब Android र अन्य अनुप्रयोगहरूले अपेक्षित कार्य नगर्न सक्छन्।"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"डेटा हटाएर अनुप्रयोग असक्षम पार्ने हो?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"तपाईंले यस अनुप्रयोगलाई असक्षम पार्नुभयो भने त्यस उकप्रन्त Android र अन्य अनुप्रयोगहरूले अपेक्षित कार्य नगर्न सक्छन्। तपाईंको डेटा पनि मेटाइने छ।"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"सूचनाहरू बन्द गर्नुहोस्?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"यदि तपाईं यस अनुप्रयोगको लागि सूचनाहरू बन्द गर्नुहुन्छ, तपाईंले महत्त्वपूर्ण अलर्ट र अपडेटहरू गुमाउन सक्नु हुने छ"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"स्टोर"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"अनुप्रयोग बारे विवरणहरू"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> बाट स्थापना गरिएको अनुप्रयोग"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"सुविधा प्रयोग गर्नुहोस्"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"रङ सुधार गर्ने सुविधा प्रयोग गर्नुहोस्"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"क्याप्सनहरू प्रयोग गर्नुहोस्"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"जारी राख्नुहोस्"</string>
<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="6371077608778830020">"श्रवण यन्त्र थप्नुहोस्"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"तपाईंले कुनै अनुप्रयोगको पृष्ठभूमिको गतिविधिलाई सीमित गर्नुभयो भने यसले सही तरिकाले काम नगर्न सक्छ"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"यो अनुप्रयोगलाई ब्याट्री अप्टिमाइज गर्न भनी सेट नगरिएको हुनाले तपाईं यसमा बन्देज लगाउन सक्नुहुन्न।\n\nअनुप्रयोगमा बन्देज लगाउन पहिले ब्याट्री अप्टिमाइजेसन सुविधा सक्रिय गर्नुहोस्।"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"पूर्ण चार्ज भएदेखि स्क्रिनको प्रयोग"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रिनले गरेको पावरको खपत"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्क्यान गर्ने कार्य"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"पूर्ण चार्ज भएदेखि ब्याट्रीको प्रयोग"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"पूर्ण चार्ज भएदेखि स्क्रिन सक्रिय रहेको समय"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"पूर्ण चार्ज भएदेखि यन्त्रको प्रयोग"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"विवरणहरू प्रयोग गर्नुहोस्"</string>
<string name="controls_subtitle" msgid="390468421138288702">"उर्जा प्रयोग मिलाउनुहोस्"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"सम्मिलित प्याकेजहरू"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ब्याट्री खपत गर्ने अनुप्रयोगहरू"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"यन्त्रलाई सक्रिय राख्दै"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"पृष्ठभूमिमा यन्त्रलाई सक्रिय गर्दै"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"बारम्बार स्थानसम्बन्धी जानकारी प्राप्त गर्ने अनुरोध गर्दैछ"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> अनुप्रयोगहरूले असामान्य व्यवहार देखाउँदैछन्"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"अनुप्रयोगहरू सामान्य रूपमा चलिरहेका छन्"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"फोनले पृष्ठभूमिमा ब्याट्री सामान्य खपत गरेको छ"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ट्याब्लेटले पृष्ठभूमिमा ब्याट्री सामान्य खपत गरेको छ"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">ब्याट्रीको प्रयोग %1$d अनुप्रयोगहरूमा सीमित पार्दै</item>
<item quantity="one">ब्याट्रीको प्रयोग %1$d अनुप्रयोगहरूमा सीमित पार्दै</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> बजे बन्देज लगाइएको"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"यी अनुप्रयोगहरूले पृष्ठभूमिमा ब्याट्री प्रयोग गरिरहेका छन्। प्रतिबन्ध लगाइएका अनुप्रयोगहरूले सही किसिमले काम नगर्न सक्छन् र सूचनाहरू आइपुग्न ढिलाइ हुन सक्छ।"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"ब्याट्री प्रबन्धकको प्रयोग गर्नुहोस्"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"अनुप्रयोगहरूले ब्याट्रीको चार्ज घटाउँदा थाहा पाउनुहोस्"</string>
@@ -2244,12 +2232,12 @@
<item quantity="one">%1$d अनुप्रयोगमा प्रतिबन्ध लगाइयो</item>
</plurals>
<string name="dialog_stop_title" msgid="6395127715596746479">"अनुप्रयोगलाई रोक्ने हो?"</string>
- <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
- <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
- <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
- <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g>ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको फोनले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं <xliff:g id="APP_1">%1$s</xliff:g>लाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
- <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g>ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको ट्याब्लेटले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं <xliff:g id="APP_1">%1$s</xliff:g>लाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
- <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g>ले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं <xliff:g id="APP_1">%1$s</xliff:g>लाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यप्रदर्शनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नुपर्ने हुनसक्छ।"</string>
+ <string name="dialog_stop_message" product="default" msgid="4006631636646776488">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।"</string>
+ <string name="dialog_stop_message" product="tablet" msgid="2369957934555162428">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।"</string>
+ <string name="dialog_stop_message" product="device" msgid="6195430620406365292">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त अनुप्रयोगलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।"</string>
+ <string name="dialog_stop_message_wakeup_alarm" product="default" msgid="1638726742782558262">"<xliff:g id="APP_0">%1$s</xliff:g>ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको फोनले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं <xliff:g id="APP_1">%1$s</xliff:g>लाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।"</string>
+ <string name="dialog_stop_message_wakeup_alarm" product="tablet" msgid="8771690983566539742">"<xliff:g id="APP_0">%1$s</xliff:g>ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको ट्याब्लेटले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं <xliff:g id="APP_1">%1$s</xliff:g>लाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।"</string>
+ <string name="dialog_stop_message_wakeup_alarm" product="device" msgid="2854944538238649520">"<xliff:g id="APP_0">%1$s</xliff:g>ले तपाईंको यन्त्रलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयास गर्न तपाईं <xliff:g id="APP_1">%1$s</xliff:g>लाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त अनुप्रयोगको स्थापना रद्द गर्नु पर्ने हुन सक्छ।"</string>
<string name="dialog_stop_ok" msgid="2319777211264004900">"अनुप्रयोगलाई रोक्नुहोस्"</string>
<string name="dialog_background_check_title" msgid="6936542136153283692">"पृष्ठभूमिको प्रयोग निष्क्रिय पार्ने र अनुप्रयोगलाई रोक्ने हो?"</string>
<string name="dialog_background_check_message" product="default" msgid="4045827746349279563">"<xliff:g id="APP_0">%1$s</xliff:g> ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको फोनले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्या समाधान गर्ने प्रयासस्वरूप तपाईं <xliff:g id="APP_1">%1$s</xliff:g> लाई रोक्न र यसलाई पृष्ठभूमिमा चल्नबाट रोक्न सक्नुहुन्छ।"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"रद्द गर्नुहोस्"</string>
<string name="tts_reset" msgid="2661752909256313270">"पुनःसेट गर्नुहोस्"</string>
<string name="tts_play" msgid="2628469503798633884">"प्ले गर्नुहोस्"</string>
- <string name="gadget_title" msgid="5519037532720577836">"उर्जा नियन्त्रण"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi सेटिङ अपडेट गर्दै"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लुटुथ सेटिङ अपडेट गर्दै"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"चालु"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"बन्द"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"खोल्दै"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"बन्द हुँदै"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ब्लुटुथ"</string>
- <string name="gadget_location" msgid="2974757497945178165">"स्थान"</string>
- <string name="gadget_sync" msgid="858895763714222152">"सिक्रोनाइज गर्नुहोस्"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"उज्यालोपना <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"स्वतः"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"पूर्ण"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"आधा"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"बन्द"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"प्रमाण संग्रहण"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"भण्डारणबाट स्थापना गर्नुहोस्"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> मा <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"सबैलाई चयन गर्नुहोस्"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"डेटाको प्रयोग"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"अनुप्रयोग सम्बन्धी डेटाको उपयोग"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"मोबाइल डेटा तथा Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"वाहक डेटा लेखा तपाईँको उपकरणबाट फरक हुन सक्छ।"</string>
<string name="data_usage_app" msgid="4970478397515423303">"अनुप्रयोग उपयोग"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APP INFO"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">लुकाइएका %d वस्तुहरू देखाउनुहोस्</item>
<item quantity="one">लुकाइएको %d वस्तु देखाउनुहोस्</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"संक्षिप्त गर्नुहोस्"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"नेटवर्क र इन्टरनेट"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"मोबाइल"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"डेटाको प्रयोग"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ब्लुटुथ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"अनुप्रयोग तथा सूचनाहरू"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"अनुमतिहरू, पूर्वनिर्धारित अनुप्रयोगहरू"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"कार्य प्रोफाइलका अनुप्रयोगहरूको सूचनामाथि पहुँच छैन।"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"खाताहरू"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"कुनै पनि खाता थप गरिएन"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"पूर्वनिर्धारित अनुप्रयोगहरू"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"भाषाहरू, समय, ब्याकअप, अद्यावधिकहरू"</string>
<string name="search_results_title" msgid="1796252422574886932">"सेटिङहरू"</string>
- <string name="search_menu" msgid="6283419262313758339">"सेटिङहरू खोज्नुहोस्"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, नेटवर्क जडान, इन्टरनेट, वायरलेस, डेटा, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, टगल, नियन्त्रण"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"पाठ सन्देश, पाठ सन्देश पठाउने कार्य, सन्देशहरू, सन्देश प्रवाह, पूर्वनिर्धारित"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"भुक्तानी गर्नुहोस्, ट्याप गर्नुहोस्, भुक्तानी"</string>
<string name="keywords_backup" msgid="470070289135403022">"ब्याकअप, ब्याकअप गर्नुहोस्"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"इसारा"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"अनुहार, अनलक, अधिकार दिने कार्य, साइन इन"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl संस्करण, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"नेटवर्क, मोबाइल नेटवर्कको स्थिति, सेवाको स्थिति, सिग्नलको क्षमता, मोबाइल नेटवर्कको प्रकार, रोमिङ, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"क्रम संख्या, हार्डवेयरको संस्करण"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"अँध्यारो विषयवस्तु"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"बग"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"परिवेशको प्रदर्शन, लक स्क्रिनको प्रदर्शन"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"लक स्क्रिनको सूचना"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"अनुहार"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"फिंगरप्रिन्ट"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"मधुरो स्क्रिन, टचस्क्रिन, ब्याट्री, स्मार्ट चमक, गतिशील उज्यालोपन"</string>
@@ -3287,8 +3259,8 @@
<string name="notification_channels" msgid="5346841743182627500">"कोटिहरू"</string>
<string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
<plurals name="notification_group_summary" formatted="false" msgid="3420621520561455358">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> कोटिहरू</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> कोटि</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> कोटीहरू</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> कोटी</item>
</plurals>
<string name="no_channels" msgid="3077375508177744586">"यो अनुप्रयोगले कुनै पनि सूचना पोस्ट गरेको छैन"</string>
<string name="app_settings_link" msgid="8894946007543660906">"अनुप्रयोगका अतिरिक्त सेटिङहरू"</string>
@@ -3298,8 +3270,8 @@
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> अनुप्रयोगका लागि निष्क्रिय परिएको छ</item>
</plurals>
<plurals name="deleted_channels" formatted="false" msgid="8028574302599397935">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मेटाइएका कोटिहरू</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> मेटाइएको कोटि</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> मेटाइएका कोटीहरू</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> मेटाइएको कोटी</item>
</plurals>
<string name="notification_toggle_on" msgid="650145396718191048">"सक्रिय छ"</string>
<string name="notification_toggle_off" msgid="2142010737190671762">"निष्क्रिय छ"</string>
@@ -3408,7 +3380,7 @@
<string name="zen_mode_when_every_night" msgid="3122486110091921009">"हरेक रात"</string>
<string name="zen_mode_when_weeknights" msgid="8354070633893273783">"सप्ताहरात"</string>
<string name="zen_mode_start_time" msgid="8102602297273744441">"सुरु हुने समय"</string>
- <string name="zen_mode_end_time" msgid="8774327885892705505">"समाप्ती समय"</string>
+ <string name="zen_mode_end_time" msgid="8774327885892705505">"समाप्ति समय"</string>
<string name="zen_mode_end_time_next_day_summary_format" msgid="4201521691238728701">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> अर्को दिन"</string>
<string name="zen_mode_summary_alarms_only_indefinite" msgid="2061973221027570123">"अलार्महरूलाई अनिश्चितकालीन मात्र परिवर्तन गर्नुहोस्"</string>
<plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="6122003583875424601">
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"यो उपकरण सुरु गर्न जब तपाईँले आफ्नो PIN प्रविष्टि गर्नुहुन्छ, पहुँच सेवा जस्तै <xliff:g id="SERVICE">%1$s</xliff:g> अझै उपलब्ध हुने छैन।"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"यो उपकरण सुरु गर्न जब तपाईँले आफ्नो ढाँचा प्रविष्टि गर्नुहुन्छ, पहुँच सेवा जस्तै <xliff:g id="SERVICE">%1$s</xliff:g> अझै उपलब्ध हुने छैन।"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"यो उपकरण सुरु गर्न जब तपाईँले आफ्नो पासवर्ड प्रविष्टि गर्नुहुन्छ, पहुँच सेवा <xliff:g id="SERVICE">%1$s</xliff:g> जस्तो अझै उपलब्ध हुने छैन।"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"टिपोट: पुनःबुट पछि तपाईँले आफ्नो फोनलाई अनलक नगरेसम्म यो अनुप्रयोग सुरु हुन सक्दैन"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"टिपोट: तपाईंले आफ्नो फोन पुनः सुरु गर्नुभयो र त्यसमा स्क्रिन लक सेट गरिएको छ भने तपाईंले आफ्नो फोन अनलक नगरून्जेल यो अनुप्रयोग सुरु हुन सक्दैन"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI जानकारी"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI सान्दर्भिक जानकारी"</string>
<string name="slot_number" msgid="3762676044904653577">"(घेरा<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3493,8 +3465,8 @@
<string name="notification_summary_level" msgid="2726571692704140826">"स्तर %d"</string>
<string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
<plurals name="notifications_categories_off" formatted="false" msgid="5583365573683409754">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> कोटिहरू निष्क्रिय पारिए</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> कोटि निष्क्रिय पारियो</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> कोटीहरू निष्क्रिय पारिए</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> कोटी निष्क्रिय पारियो</item>
</plurals>
<plurals name="permissions_summary" formatted="false" msgid="6402730318075959117">
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> अनुमतिहरू दिइयो</item>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"व्यक्तिगत"</string>
<string name="filter_work_apps" msgid="24519936790795574">"कार्य"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"अनुप्रयोगहरू: सबै"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"अनुप्रयोगहरू: निष्क्रिय पारिएका"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"निष्क्रिय पारियो"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"प्रकारहरू: अत्यन्तै महत्त्वका"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"प्रकारहरू: कम महत्त्वका"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"प्रकारहरू: निष्क्रिय पारिएका"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"ब्याट्रीको प्रयोग सम्बन्धी अलर्ट"</string>
<string name="show_all_apps" msgid="1512506948197818534">"यन्त्रको पूर्ण प्रयोग देखाउनुहोस्"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"अनुप्रयोगको प्रयोग देखाउनुहोस्"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ब्याट्रीको उच्च प्रयोग"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> अनुप्रयोगहरूले असामान्य व्यवहार देखाउँदैछन्</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ले असामान्य व्यवहार देखाउँदैछ</item>
@@ -3670,7 +3641,7 @@
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"अनुप्रयोगले बाधा नपुर्याउँनुहोस् सक्रिय/निष्क्रिय गर्न र सम्बन्धित सेटिङहरू परिवर्तन गर्न सक्षम हुनेछ।"</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"सूचना सम्बन्धी पहुँच सक्रिय हुनाले यसलाई अनिवार्य रूपमा सक्रिय राख्नु पर्छ"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> को बाधा नपुर्याउनुहोस् माथि पहुँच उल्टाउने हो?"</string>
- <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"यस अनुप्रयोगले बनाएका सबै बाधा नपुर्याउनुहोस् नियम हटाइनेछ।"</string>
+ <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"यस अनुप्रयोगले बनाएका सबै बाधा नपुर्याउनुहोस् नियम हटाइने छ।"</string>
<string name="ignore_optimizations_on" msgid="6915689518016285116">"आफू अनुकूल नगर्नुहोस्"</string>
<string name="ignore_optimizations_off" msgid="6153196256410296835">"अनुकुलन गर्नुहोस्"</string>
<string name="ignore_optimizations_on_desc" msgid="3549930955839111652">"यसले तपाईंको ब्याट्रीको चार्ज चाँडै घटाउन सक्छ। अनुप्रयोगलाई अब उप्रान्त पृष्ठभूमिमा ब्याट्री प्रयोग गर्न प्रतिबन्ध लगाइने छैन।"</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"आन्तरिक भण्डारण: <xliff:g id="PERCENTAGE">%1$s</xliff:g> प्रयोग गरिएको - <xliff:g id="FREE_SPACE">%2$s</xliff:g> खाली"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> को निष्क्रियता पछिको शयन"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"वालपेपर, शयन अवस्था, फन्टको आकार"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"१० मिनेटको निष्क्रियता पछिको शयन"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> मेमोरीमध्ये औसत <xliff:g id="USED_MEMORY">%1$s</xliff:g> प्रयोगमा छ"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> रूपमा साइन इन गरियो"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS लाई अनुमति छैन"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"यो क्यामेरालाई अनुमति छैन"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"स्क्रिनसटलाई अनुमति छैन"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"ब्याकअप कार्यहरूलाई निष्क्रिय पार्न सकिँदैन"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"यो अनुप्रयोग खोल्न सकिँदैन"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"तपाईंसँग प्रश्नहरू छन् भने आफ्नो IT प्रशासकलाई सम्पर्क गर्नुहोस्"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"थप विवरणहरु"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"कटआउटसहितको सिमुलेट प्रदर्शन गर्नुहोस्"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"प्रदर्शनसम्बन्धी कटआउट"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"प्रदर्शनसम्बन्धी कटआउट, नच"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"कुनै पनि होइन"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"पूर्वनिर्धारित यन्त्र"</string>
<string name="special_access" msgid="3458780842491881155">"विशेष अनुप्रयोगको पहुँच"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> अनुप्रयोगले असीमित डेटा प्रयोग गर्न सक्छन्</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> मा जडान गरियो"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"धेरै यन्त्रहरूमा जडान गरियो"</string>
<string name="demo_mode" msgid="2798762752209330277">"प्रणालीको UI को प्रदर्शन मोड"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"रात्रि मोड"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"रात्रि मोड सेट गर्नुहोस्"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"अँध्यारो मोड"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"अँध्यारो मोड सेट गर्नुहोस्"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"द्रुत सेटिङहरू सम्बन्धी विकासकर्ताका टाइलहरू"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope को ट्रेस"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"कार्य प्रोफाइलका सेटिङहरू"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"सम्पर्कको खोजी"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"कलर र सम्पर्कहरूको पहिचान गर्न तपाईँको संगठन अनुसार गरिने सम्पर्कका खोजीहरूलाई अनुमति दिनुहोस्"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"फोनको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ट्याब्लेटको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"यन्त्रको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"समय, सूचनाका आइकनहरू र अन्य जानकारी जाँच्न आफ्नो यन्त्रको स्क्रिनमा डबल ट्याप गर्नुहोस्।"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"समय, सूचना र अन्य जानकारीको जाँच गर्न आफ्नो यन्त्रको स्क्रिनमा डबल ट्याप गर्नुहोस्।"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"फोनको जाँच गर्न उठाउनुहोस्"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ट्याब्लेटको जाँच गर्न उठाउनुहोस्"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"यन्त्रको जाँच गर्न उठाउनुहोस्"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"समय, सूचनाका आइकनहरू र अन्य जानकारी जाँच्न आफ्नो फोन उठाउनुहोस्।"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"समय, सूचना आइकनहरू र अन्य जानकारी जाँच्न आफ्नो ट्याब्लेट उठाउनुहोस्।"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"समय, सूचना आइकनहरू र अन्य जानकारी जाँच्न आफ्नो यन्त्र उठाउनुहोस्।"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"सञ्चालन गर्नका लागि डिस्प्ले"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"समय, सूचना र अन्य जानकारीको जाँच गर्न आफ्नो फोन उठाउनुहोस्।"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"समय, सूचना र अन्य जानकारीको जाँच गर्न आफ्नो ट्याब्लेट उठाउनुहोस्।"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"समय, सूचना तथा अन्य जानकारीको जाँच गर्न आफ्नो यन्त्र उठाउनुहोस्।"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"सक्रियता लकसम्बन्धी स्क्रिनको इसारा"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"सूचनाहरू प्राप्त गर्न फिंगरप्रिन्ट स्वाइप गर्नुहोस्"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"फिंगरप्रिन्ट स्वाइप गर्नु"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"अफ्ना सूचनाहरूको जाँच गर्न आफ्नो फोनको पछाडिको भागमा रहेको फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्।"</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> प्रयासहरू</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> प्रयास</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"यो यन्त्रको डेटा ब्याकअप गरिँदै छ"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"तपाईंको संगठनले यस यन्त्रलाई व्यवस्थापन गर्दछ।"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"यो यन्त्र <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ले व्यवस्थापन गर्दछ।"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"स्वतः भरण सेवा"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"स्वतः, भरण, स्वतः भरण"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>तपाईं यो अनुप्रयोगमाथि भरोसा गर्नुहुन्छ भन्ने कुरा पक्का गर्नुहोस्</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> यस अनुप्रयोगले स्वतः भर्नसकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"स्वतः भरण"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"लगिङको स्तर"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"प्रति सत्र अनुरोधको अधिकतम सङ्ख्या"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"देख्न सकिने डेटासेटहरूको सङ्ख्या अधिकतम पार्नुहोस्"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"पूर्वनिर्धारित मानहरूमा रिसेट गर्नुहोस्"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"स्वतः भरणसम्बन्धी विकासकर्ताका विकल्पहरू रिसेट गरिएको छ"</string>
<string name="device_theme" msgid="4571803018917608588">"यन्त्रको विषयवस्तु"</string>
<string name="default_theme" msgid="7085644992078579076">"पूर्वनिर्धारित"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"नेटवर्कको नाम"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"सेवा प्रदायकको प्रावधानलाई ट्रिगर गर्नुहोस्"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"बाधा नपुर्याउनुहोस् नामक सेवालाई अद्यावधिक गर्नुहोस्"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"केन्द्रित रहन सूचनाहरू पज गर्नुहोस्"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"सेटिङहरूको गृहपृष्ठमा नयाँ र रोमाञ्चक के छ?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"आफ्नो नयाँ फोनको बारेमा राम्रोसँग जान्नुहोस्"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"आफ्नो नयाँ ट्याब्लेटको बारेमा राम्रोसँग जान्नुहोस्"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"आफ्नो नयाँ यन्त्रको बारेमा राम्रोसँग जान्नुहोस्"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"यस यन्त्रमा यो सुविधा उपलब्ध छैन"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"पूर्ण GNSS मापनहरू बलपूर्वक लागू गर्नुहोस्"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"कुनै उपयोगिता अनुपात बिना नै सबै GNSS कन्स्टेलेसन तथा फ्रिक्वेन्सीहरूलाई ट्र्याक गर्नुहोस्"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"सधैँ क्र्याससम्बन्धी संवाद देखाउनुस्"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"प्रत्येकपटक अनुप्रयोग क्र्यास हुँदा संवाद देखाउनुहोस्"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"कोण सक्षम पारिएको अनुप्रयोग चयन गर्नुहोस्"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"कोण सक्षम पारिएको कुनै पनि अनुप्रयोग सेट गरिएको छैन"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"कोण सक्षम पारिएको अनुप्रयोग: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"निर्देशिकामाथिको पहुँच"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"निर्देशिकामाथिको पहुँच"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"नेटवर्कसम्बन्धी विवरणहरू"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"तपाईंको फोनमा रहेका अनुप्रयोगहरूले तपाईंको यन्त्रको नाम देख्न सक्छन्। तपाईंले ब्लुटुथ यन्त्रहरूमा जडान गर्दा वा कुनै Wi-Fi हटस्पट सेटअप गर्दा अरू मान्छेहरू पनि यसलाई देख्न सक्छन्।"</string>
<string name="devices_title" msgid="7701726109334110391">"यन्त्रहरू"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"सबै सेटिङहरू"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"सुझावहरू"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS डेटा"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS डेटा"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"नेटवर्क छनौट गर्नुहोस्"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"विच्छेद गरियो"</string>
+ <string name="network_connected" msgid="4943925032253989621">"जडान गरियो"</string>
+ <string name="network_connecting" msgid="76404590784733557">"जडान गर्दै…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"जडान गर्न सकिएन"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"कुनै पनि नेटवर्क भेटिएन।"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"नेटवर्कहरू फेला पार्न सकिएन। फेरि प्रयास गर्नुहोस्।"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(निषेध गरिएको)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM कार्ड छैन"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"उन्नत कल गर्दै"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"रुचाइएको नेटवर्क मोड: WCDMA रुचाइएको"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"रुचाइएको नेटवर्क मोड: GSM मात्र"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"रुचाइएको नेटवर्क मोड: WCDMA मात्र"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"रुचाइएको नेटवर्क मोड: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"रुचाइएको नेटवर्क मोड: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"रुचाइएको नेटवर्क मोड: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"रुचाइएको नेटवर्क मोड: CDMA मात्र"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"रुचाइएको नेटवर्क मोड: EvDo मात्र"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"रुचाइएको नेटवर्क मोड: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"रुचाइएको नेटवर्क मोड: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"रुचाइएको नेटवर्क मोड: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"रुचाइएको नेटवर्क मोड: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"रुचाइएको नेटवर्क मोड: विश्वव्यापी"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"रुचाइएको नेटवर्क मोड: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"रुचाइएको नेटवर्क मोड: LTE /GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"रुचाइएको नेटवर्क मोड: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"रुचाइएको नेटवर्क मोड: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"रुचाइएको नेटवर्क मोड: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"रुचाइएको नेटवर्क मोड: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"रुचाइएको नेटवर्क मोड: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"रुचाइएको नेटवर्क मोड: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"रुचाइएको नेटवर्क मोड: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"रुचाइएको नेटवर्क मोड: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"रुचाइएको नेटवर्क मोड: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"रुचाइएको नेटवर्क मोड: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"रुचाइएको नेटवर्क मोड: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (सिफारिस गरिएको)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (सिफारिस गरिएको)"</string>
+ <string name="network_global" msgid="959947774831178632">"विश्वव्यापी"</string>
+ <string name="label_available" msgid="1731547832803057893">"उपलब्ध नेटवर्कहरू"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"खोजी गरिँदै छ…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> मा दर्ता गर्दै…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"तपाईंको SIM कार्ड यो नेटवर्कलाई जडानको अनुमति दिँदैन।"</string>
+ <string name="connect_later" msgid="978991102125216741">"यो नेटवर्कमा अहिले नै जडान गर्न सकिँदैन। पछि फेरि प्रयास गर्नुहोस्।"</string>
+ <string name="registration_done" msgid="4573820010512184521">"नेटवर्कमा दर्ता गरियो।"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"स्वतः नेटवर्क चयन गर्नुहोस्"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"सेवा प्रदायकसम्बन्धी सेटिङहरू"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"डेटा सेवा सेटअप गर्नुहोस्"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"मोबाइल डेटा"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"मोबाइल नेटवर्क प्रयोग गरी डेटामाथि पहुँच राख्नुहोस्"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"रुचाइएको नेटवर्कको प्रकार"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"नेटवर्क अपरेटिङ मोड परिवर्तन गर्नुहोस्"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"रुचाइएको नेटवर्कको प्रकार"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"सेवा प्रदायक"</string>
+ <string name="call_category" msgid="8108654745239563833">"कल गर्दै"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"सेवा प्रदायकको भिडियो कल"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"प्रणाली चयन गर्नुहोस्"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA रोमिङ मोड परिवर्तन गर्नुहोस्"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"प्रणाली चयन गर्नुहोस्"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"नेटवर्क"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"नेटवर्क"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA को सदस्यता"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM र NV का बीच बदल्नुहोस्"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"सदस्यता"</string>
+ <string name="register_automatically" msgid="518185886971595020">"स्वतः दर्ता…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"डेटा रोमिङलाई अनुमति दिने हो?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"मूल्यसम्बन्धी जानकारीका लागि आफ्नो नेटवर्क प्रदायकलाई सोध्नुहोस्।"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"अनुप्रयोगको डेटाको प्रयोग"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"अमान्य नेटवर्क मोड <xliff:g id="NETWORKMODEID">%1$d</xliff:g>। बेवास्ता गर्नुहोस्।"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> मा जडान हुँदा उपलब्ध छैन"</string>
+ <string name="see_more" msgid="5953815986207345223">"थप हेर्नुहोस्"</string>
+ <string name="see_less" msgid="1250265310929558370">"कम हेर्नुहोस्"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/layout/dashboard_spacer.xml b/res/values-night/themes.xml
similarity index 62%
copy from res/layout/dashboard_spacer.xml
copy to res/values-night/themes.xml
index 3ebcb09..725fe17 100644
--- a/res/layout/dashboard_spacer.xml
+++ b/res/values-night/themes.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!--
+ 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.
@@ -14,8 +15,11 @@
limitations under the License.
-->
-<View
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="8dp"
- android:background="?android:attr/colorSecondary"/>
+<resources>
+
+ <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
+ <item name="colorPrimary">@*android:color/primary_device_default_settings</item>
+ <item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
+ </style>
+
+</resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index c79b094..f231665 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -268,7 +268,7 @@
<item msgid="7136963238377062018">"stemvolume"</item>
<item msgid="4270236897655923007">"beltoonvolume"</item>
<item msgid="6325739889222559394">"mediavolume"</item>
- <item msgid="5762123934816216821">"alarmvolume"</item>
+ <item msgid="5762123934816216821">"wekkervolume"</item>
<item msgid="785049718065337473">"meldingsvolume"</item>
<item msgid="6700305533746877052">"bluetooth-volume"</item>
<item msgid="2029227495214047094">"ingeschakeld houden"</item>
@@ -285,7 +285,7 @@
<item msgid="8582699692765917557">"telefoonstatus lezen"</item>
<item msgid="1474039653814954902">"voicemail toevoegen"</item>
<item msgid="7222837656938871633">"SIP gebruiken"</item>
- <item msgid="6108267038969274380">"uitgaande oproep verwerken"</item>
+ <item msgid="6108267038969274380">"uitgaand gesprek verwerken"</item>
<item msgid="4823402479973873358">"vingerafdruk"</item>
<item msgid="5895843015407713543">"lichaamssensoren"</item>
<item msgid="1436446526955010826">"cell broadcasts lezen"</item>
@@ -335,7 +335,7 @@
<item msgid="5660213838861789350">"Stemvolume"</item>
<item msgid="7983336752371254444">"Beltoonvolume"</item>
<item msgid="7878027809189330917">"Mediavolume"</item>
- <item msgid="7260546305036218513">"Alarmvolume"</item>
+ <item msgid="7260546305036218513">"Wekkervolume"</item>
<item msgid="9103719301075748925">"Meldingsvolume"</item>
<item msgid="7025966722295861512">"Bluetooth-volume"</item>
<item msgid="4665183401128289653">"Ingeschakeld houden"</item>
@@ -352,7 +352,7 @@
<item msgid="8571369610363539266">"Telefoonstatus lezen"</item>
<item msgid="4542463358215230845">"Voicemail toevoegen"</item>
<item msgid="864565065016166003">"SIP gebruiken"</item>
- <item msgid="1958009349883195116">"Uitgaande oproep verwerken"</item>
+ <item msgid="1958009349883195116">"Uitgaand gesprek verwerken"</item>
<item msgid="8526563410140613458">"Vingerafdruk"</item>
<item msgid="7864822459293570891">"Lichaamssensoren"</item>
<item msgid="6798698496904810960">"Cell broadcasts lezen"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Behandelen als gemeten"</item>
<item msgid="2266114985518865625">"Behandelen als niet-gemeten"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Standaard (willekeurig MAC-adres gebruiken)"</item>
+ <item msgid="5398461510512959597">"Betrouwbaar"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nee"</item>
<item msgid="3863157480502955888">"Ja"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Altijd aan"</item>
<item msgid="6385301106124765323">"Altijd uit"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Uit"</item>
+ <item msgid="2182686878828390312">"Fouten opsporen"</item>
+ <item msgid="5286514712714822064">"Uitgebreid"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Alleen thuis"</item>
+ <item msgid="5034813753274486448">"Automatisch"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Voorkeur voor GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Alleen GSM"</item>
+ <item msgid="488474605709912156">"Alleen WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automatisch"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automatisch"</item>
+ <item msgid="370391313511477301">"CDMA zonder EvDo"</item>
+ <item msgid="4678789463133969294">"Alleen EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Algemeen"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Alleen TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Algemeen"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7b45156..c82b8c5 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Aanmaken"</string>
<string name="allow" msgid="3349662621170855910">"Toestaan"</string>
<string name="deny" msgid="6947806159746484865">"Weigeren"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Sluiten"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Overschakelen"</string>
<string name="device_info_default" msgid="7847265875578739287">"Onbekend"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Je moet nog <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> stappen uitvoeren om ontwikkelaar te worden.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Niet nodig, je bent al ontwikkelaar."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Schakel eerst de opties voor ontwikkelaars in."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Draadloos en netwerken"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Verbindingen"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Apparaat"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Persoonlijk"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Toegang"</string>
<string name="header_category_system" msgid="2816866961183068977">"Systeem"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Gegevensverbinding inschakelen"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Gegevensverbinding uitschakelen"</string>
@@ -53,7 +47,7 @@
<string name="radio_info_ims_reg_status_not_registered" msgid="4438054067642750717">"Niet geregistreerd"</string>
<string name="radio_info_ims_feature_status_available" msgid="3687807290327566879">"Beschikbaar"</string>
<string name="radio_info_ims_feature_status_unavailable" msgid="4606182208970114368">"Niet beschikbaar"</string>
- <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"IMS-registratie: <xliff:g id="STATUS">%1$s</xliff:g>\nBellen via LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nBellen via wifi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideo-oproepen: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT-interface: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+ <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"IMS-registratie: <xliff:g id="STATUS">%1$s</xliff:g>\nBellen via LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nBellen via wifi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nVideogesprekken: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT-interface: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
<string name="radioInfo_service_in" msgid="1697703164394784618">"In gebruik"</string>
<string name="radioInfo_service_out" msgid="7999094221728929681">"Niet in gebruik"</string>
<string name="radioInfo_service_emergency" msgid="6274434235469661525">"Alleen noodoproepen"</string>
@@ -62,7 +56,7 @@
<string name="radioInfo_roaming_not" msgid="4849214885629672819">"Geen roaming"</string>
<string name="radioInfo_phone_idle" msgid="7489244938838742820">"Inactief"</string>
<string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Telefoon gaat over"</string>
- <string name="radioInfo_phone_offhook" msgid="5873835692449118954">"Actieve oproep"</string>
+ <string name="radioInfo_phone_offhook" msgid="5873835692449118954">"Actief gesprek"</string>
<string name="radioInfo_data_disconnected" msgid="1959735267890719418">"Verbinding verbroken"</string>
<string name="radioInfo_data_connecting" msgid="8404571440697917823">"Verbinding maken"</string>
<string name="radioInfo_data_connected" msgid="7074301157399238697">"Verbonden"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth-adres van je apparaat: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ontkoppelen?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitzending"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Naamloos Bluetooth-apparaat"</string>
<string name="progress_scanning" msgid="192587958424295789">"Zoeken"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Geen Bluetooth-apparaten in de buurt."</string>
@@ -153,12 +146,11 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Een app wil Bluetooth inschakelen en je telefoon zichtbaar maken voor andere apparaten. Je kunt dit later wijzigen in de Bluetooth-instellingen."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth inschakelen.."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth uitschakelen…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisch verbinding maken"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth-verbindingsverzoek"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tik om verbinding te maken met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Wil je verbinding maken met \'<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\'?"</string>
<string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Toegangsverzoek voor telefoonboek"</string>
- <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang hebben tot je contacten en oproepgeschiedenis. Toegang verlenen aan <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>?"</string>
+ <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> wil toegang hebben tot je contacten en gespreksgeschiedenis. Toegang verlenen aan <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>?"</string>
<string name="bluetooth_remember_choice" msgid="6919682671787049800">"Niet meer vragen"</string>
<string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"Niet meer vragen"</string>
<string name="bluetooth_map_request" msgid="4595727689513143902">"Toegangsverzoek voor berichten"</string>
@@ -178,15 +170,15 @@
<string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm" msgid="2053793518537051975">"Herstarten"</string>
<string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel" msgid="2382443064737856652">"Annuleren"</string>
<string name="connected_device_available_media_title" msgid="2560067541413280645">"Beschikbare media-apparaten"</string>
- <string name="connected_device_available_call_title" msgid="697154660967595684">"Beschikbare apparaten voor oproepen"</string>
+ <string name="connected_device_available_call_title" msgid="697154660967595684">"Beschikbare apparaten voor gesprekken"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Momenteel verbonden"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Opgeslagen apparaten"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Apparaat toevoegen"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth wordt ingeschakeld om te koppelen"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Verbindingsvoorkeuren"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Eerder verbonden apparaten"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Eerder verbonden"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth ingeschakeld"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Alles weergeven"</string>
<string name="date_and_time" msgid="9062980487860757694">"Datum en tijd"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Een tijdzone kiezen"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -221,13 +213,13 @@
<string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Gegevensservice:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
<string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI-nummer:"</string>
- <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"Oproep omleiden:"</string>
+ <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"Gesprek omleiden:"</string>
<string name="radio_info_ppp_resets_label" msgid="3587319503902576102">"Aantal PPP-resets sinds opstarten:"</string>
<string name="radio_info_current_network_label" msgid="9151285540639134945">"Huidig netwerk:"</string>
<string name="radio_info_ppp_received_label" msgid="363579470428151850">"Ontvangen gegevens:"</string>
<string name="radio_info_gsm_service_label" msgid="1370863866816125489">"Spraakservice:"</string>
<string name="radio_info_signal_strength_label" msgid="5155734002519307416">"Signaalsterkte:"</string>
- <string name="radio_info_call_status_label" msgid="2611065018172747413">"Status van spraakoproep:"</string>
+ <string name="radio_info_call_status_label" msgid="2611065018172747413">"Status van audiogesprek:"</string>
<string name="radio_info_ppp_sent_label" msgid="7748668735880404586">"Gegevens verzonden:"</string>
<string name="radio_info_message_waiting_label" msgid="1037302619943328273">"Wachtend bericht:"</string>
<string name="radio_info_phone_number_label" msgid="7942153178953255231">"Telefoonnummer:"</string>
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Overslaan"</string>
<string name="next_label" msgid="4693520878012668114">"Volgende"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Talen"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Taalvoorkeuren"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Verwijderen"</string>
<string name="add_a_language" msgid="2330538812283783022">"Een taal toevoegen"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,11 +294,10 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Instellingen"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Snelle link voor instellingen"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Vliegtuigmodus"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Meer"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Draadloos en netwerken"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wifi, Bluetooth, vliegtuigmodus, mobiele netwerken en VPN\'s beheren"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobiele data"</string>
- <string name="calls_title" msgid="3544471959217176768">"Oproepen"</string>
+ <string name="calls_title" msgid="3544471959217176768">"Gesprekken"</string>
<string name="sms_messages_title" msgid="1778636286080572535">"Sms\'jes"</string>
<string name="cellular_data_summary" msgid="4660351864416939504">"Datagebruik via mobiel netwerk toestaan"</string>
<string name="allow_data_usage_title" msgid="2238205944729213062">"Geg.gebr. bij roaming toestaan"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Uitgeschakeld door beheerder"</string>
<string name="security_status_title" msgid="5848766673665944640">"Beveiligingsstatus"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Schermvergrendeling, ontgrendelen via gezichtsherkenning"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Schermvergrendeling, vingerafdruk"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Schermvergrendeling"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Gezicht toegevoegd"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Ontgrendelen met je gezicht"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Gebruik je gezicht voor verificatie"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Gebruik je gezicht om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Je gezicht gebruiken"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Gebruik je gezicht om je telefoon te ontgrendelen of aankopen goed te keuren.\n\nOpmerking: Je kunt je gezicht niet gebruiken om dit apparaat te ontgrendelen. Neem contact op met de beheerder van je organisatie voor meer informatie."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Gebruik je gezicht om je telefoon te ontgrendelen, aankopen te autoriseren of in te loggen bij apps"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Je kunt maximaal <xliff:g id="COUNT">%d</xliff:g> gezichten toevoegen"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centreer je gezicht in de cirkel"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Later doen"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Je kunt maximaal <xliff:g id="COUNT">%d</xliff:g> gezichten toevoegen"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Je hebt het maximum aantal gezichten toegevoegd"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Kan geen extra gezichten toevoegen"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registratie is niet voltooid"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Tijdlimiet voor gezichtsregistratie is bereikt. Probeer het opnieuw."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Gezichtsregistratie is mislukt"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Alles is ingesteld."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Gereed"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Je gezicht gebruiken voor"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Je apparaat ontgrendelen"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"App-login en -betalingen"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Ogen open om te ontgrendelen"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Wanneer je gezichtsherkenning gebruikt, moeten je ogen open zijn"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Gezichtsgegevens verwijderen"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Je gezichtsgegevens verbeteren"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Met je gezicht kun je je apparaat ontgrendelen en toegang tot apps krijgen. "<annotation id="url">"Meer informatie"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vingerafdruk"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Vingerafdrukbeheer"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Vingerafdruk voor"</string>
@@ -697,7 +704,7 @@
<string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Koppelen met:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>Zorg ervoor dat de volgende toegangscode wordt vermeld:<br><b><xliff:g id="PASSKEY">%2$s</xliff:g></b>"</string>
<string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Van:<br><b><xliff:g id="DEVICE_NAME">%1$s</xliff:g></b><br><br>Koppelen met dit apparaat?"</string>
<string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Koppelen met:<xliff:g id="BOLD1_0"><br><b></xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1"></b><br><br></xliff:g>Typ het volgende:<xliff:g id="BOLD2_1"><br><b></xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2"></b></xliff:g> en druk op Enter."</string>
- <string name="bluetooth_pairing_shares_phonebook" msgid="9082518313285787097">"Toegang geven tot je contacten en oproepgeschiedenis"</string>
+ <string name="bluetooth_pairing_shares_phonebook" msgid="9082518313285787097">"Toegang geven tot je contacten en gespreksgeschiedenis"</string>
<string name="bluetooth_error_title" msgid="6850384073923533096"></string>
<string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"Kan geen verbinding maken met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
<string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Zoeken naar apparaten"</string>
@@ -707,11 +714,11 @@
<string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"Gekoppeld apparaat"</string>
<string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"Internetverbinding"</string>
<string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"Toetsenbord"</string>
- <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"Contacten en oproepgeschiedenis"</string>
+ <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"Contacten en gespreksgeschiedenis"</string>
<string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"Koppelen met dit apparaat?"</string>
<string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"Telefoonboek delen?"</string>
- <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wil toegang tot je contacten en oproepgeschiedenis."</string>
- <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wil koppelen via Bluetooth. Na verbinding heeft het toegang tot je contacten en oproepgeschiedenis."</string>
+ <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wil toegang tot je contacten en gespreksgeschiedenis."</string>
+ <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> wil koppelen via Bluetooth. Na verbinding heeft het toegang tot je contacten en gespreksgeschiedenis."</string>
<string name="bluetooth_preference_found_media_devices" msgid="1617401232446299411">"Beschikbare apparaten"</string>
<string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Geen apparaten beschikbaar"</string>
<string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Verbinden"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Kies ten minste één band voor je wifi-hotspot:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP-instellingen"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacy"</string>
<string name="wifi_shared" msgid="844142443226926070">"Delen met andere apparaatgebruikers"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ongewijzigd)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Maak een keuze"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Annuleren"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Netwerk vergeten?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Alle wachtwoorden voor dit netwerk worden verwijderd"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Opgeslagen netwerken"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d netwerken</item>
<item quantity="one">1 netwerk</item>
@@ -1024,7 +1031,7 @@
<item msgid="2339246858001475047">"2"</item>
<item msgid="6200207341126893791">"1"</item>
</string-array>
- <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wanneer bellen via wifi is ingeschakeld, kan je telefoon oproepen doorschakelen via wifi-netwerken of het netwerk van je provider, afhankelijk van je voorkeur en welk signaal sterker is. Voordat je deze functie inschakelt, neem je contact met je provider op over de kosten en andere details."</string>
+ <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Wanneer bellen via wifi is ingeschakeld, kan je telefoon gesprekken doorschakelen via wifi-netwerken of het netwerk van je provider, afhankelijk van je voorkeur en welk signaal sterker is. Voordat je deze functie inschakelt, neem je contact met je provider op over de kosten en andere details."</string>
<string name="wifi_calling_off_explanation_2" msgid="2329334487851497223"></string>
<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>
@@ -1043,7 +1050,7 @@
<string name="notification_sound_title" msgid="5137483249425507572">"Standaard meldingsgeluid"</string>
<string name="incoming_call_volume_title" msgid="8073714801365904099">"Beltoon"</string>
<string name="notification_volume_title" msgid="2012640760341080408">"Melding"</string>
- <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Volume van inkomende oproepen gebruiken voor meldingen"</string>
+ <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Volume van inkomende gesprekken gebruiken voor meldingen"</string>
<string name="home_work_profile_not_supported" msgid="1357721012342357037">"Ondersteunt geen werkprofielen"</string>
<string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standaard meldingsgeluid"</string>
<string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Helderheid"</string>
<string name="brightness_summary" msgid="838917350127550703">"Helderheid van het scherm aanpassen"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Helderheid aanpassen"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Aan"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Uit"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Voorkeurshelderheid is zeer laag"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Voorkeurshelderheid is laag"</string>
@@ -1141,7 +1147,7 @@
<string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Wordt automatisch uitgeschakeld bij zonsopgang"</string>
<string name="night_display_activation_on_manual" msgid="277343561277625826">"Nu inschakelen"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"Nu uitschakelen"</string>
- <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Inschakelen tot zonsopkomst"</string>
+ <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Inschakelen tot zonsopgang"</string>
<string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Uitschakelen tot zonsondergang"</string>
<string name="night_display_activation_on_custom" msgid="5472029024427933598">"Inschakelen tot <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"Uitschakelen tot <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Kan pincode niet wijzigen.\nPincode mogelijk onjuist."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-pincode gewijzigd"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Kan status van simkaartblokkering niet wijzigen.\nPincode mogelijk onjuist."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Kan pincode niet uitschakelen."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Kan pincode niet inschakelen."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Annuleren"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Meerdere simkaarten gevonden"</string>
@@ -1206,7 +1214,7 @@
<string name="sim_change_data_title" msgid="294357201685244532">"Sim voor gegevens wijzigen?"</string>
<string name="sim_change_data_message" msgid="5854582807996717811">"<xliff:g id="NEW_SIM">%1$s</xliff:g> in plaats van <xliff:g id="OLD_SIM">%2$s</xliff:g> gebruiken voor mobiele data?"</string>
<string name="sim_preferred_title" msgid="5567909634636045268">"Voorkeurs-simkaart updaten?"</string>
- <string name="sim_preferred_message" msgid="8466930554330635780">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is de enige simkaart in je apparaat. Wil je deze simkaart gebruiken voor mobiele data, oproepen en sms-berichten?"</string>
+ <string name="sim_preferred_message" msgid="8466930554330635780">"<xliff:g id="NEW_SIM">%1$s</xliff:g> is de enige simkaart in je apparaat. Wil je deze simkaart gebruiken voor mobiele data, gesprekken en sms-berichten?"</string>
<string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Onjuiste pincode voor simkaart. Je moet nu contact opnemen met je provider om je apparaat te ontgrendelen."</string>
<plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
<item quantity="other">Onjuiste pincode voor simkaart. Je hebt nog <xliff:g id="NUMBER_1">%d</xliff:g> pogingen over.</item>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Hiervoor moet de <xliff:g id="NAME_0">^1</xliff:g> worden geformatteerd. \n\n"<b>"Bij formatteren worden alle gegevens gewist die momenteel zijn opgeslagen op de <xliff:g id="NAME_1">^1</xliff:g>."</b>" Als je wilt voorkomen dat je gegevens kwijtraakt, kun je eerst een back-up maken."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Wissen en formatteren"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> formatteren…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Verwijder de <xliff:g id="NAME">^1</xliff:g> niet tijdens het formatteren."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Verwijder de <xliff:g id="NAME">^1</xliff:g> niet tijdens het formatteren."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Gegevens verpl. n. nieuwe opslag"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Je kunt je foto\'s, bestanden en bepaalde apps verplaatsen naar deze nieuwe <xliff:g id="NAME">^1</xliff:g>. \n\nHet overzetten duurt ongeveer <xliff:g id="TIME">^2</xliff:g> en maakt <xliff:g id="SIZE">^3</xliff:g> interne opslag vrij. Tijdens het overzetten werken sommige apps niet."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Nu verplaatsen"</string>
@@ -1510,8 +1518,8 @@
<string name="master_clear_not_available" msgid="1000370707967468909">"Terugzetten op fabrieksinstellingen is niet beschikbaar voor deze gebruiker"</string>
<string name="master_clear_progress_title" msgid="5194793778701994634">"Wissen"</string>
<string name="master_clear_progress_text" msgid="6559096229480527510">"Even geduld..."</string>
- <string name="call_settings_title" msgid="5188713413939232801">"Oproepinstellingen"</string>
- <string name="call_settings_summary" msgid="7291195704801002886">"Voicemail, oproepen doorschakelen, wisselgesprek, beller-ID instellen"</string>
+ <string name="call_settings_title" msgid="5188713413939232801">"Gespreksinstellingen"</string>
+ <string name="call_settings_summary" msgid="7291195704801002886">"Voicemail, gesprekken doorschakelen, wisselgesprek, beller-ID instellen"</string>
<string name="tether_settings_title_usb" msgid="6688416425801386511">"USB-tethering"</string>
<string name="tether_settings_title_wifi" msgid="3277144155960302049">"Draagbare hotspot"</string>
<string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-tethering"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Geïnstalleerd"</string>
<string name="no_applications" msgid="7336588977497084921">"Geen apps."</string>
<string name="internal_storage" msgid="1584700623164275282">"Interne opslag"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"interne opslag"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-opslag"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kaartopslag"</string>
<string name="recompute_size" msgid="7722567982831691718">"Grootte opnieuw berekenen..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Gegevens van app verwijderen?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Alle gegevens van deze app worden permanent verwijderd. Dit omvat alle bestanden, instellingen, accounts, databases, enzovoort."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"De app is niet gevonden in de lijst met geïnstalleerde apps."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Kan opslag voor app niet wissen."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Deze app heeft toegang tot de volgende opties van je telefoon:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Deze app heeft toegang tot de volgende opties van je telefoon:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Deze app heeft toegang tot het volgende op je telefoon. Om de prestaties te verbeteren en het geheugengebruik te beperken, zijn sommige van deze machtigingen beschikbaar voor <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> omdat deze wordt uitgevoerd in hetzelfde proces als <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Deze app heeft toegang tot het volgende op je telefoon. Om de prestaties te verbeteren en het geheugengebruik te beperken, zijn sommige van deze machtigingen beschikbaar voor <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> omdat deze wordt uitgevoerd in hetzelfde proces als <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> en <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Deze app kan je kosten in rekening brengen:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Premium-sms verzenden"</string>
<string name="computing_size" msgid="1599186977475211186">"Berekenen…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Kan pakketgrootte niet berekenen."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Je hebt geen apps van derden geïnstalleerd."</string>
<string name="version_text" msgid="9189073826278676425">"versie <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Verplaatsen"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Verplaatsen naar tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Verplaatsen naar telefoon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Verpl. naar USB-opslag"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Verplaatsen naar SD-kaart"</string>
- <string name="moving" msgid="6431016143218876491">"Verplaatsen"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Er wordt al een andere migratie uitgevoerd."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Niet voldoende opslagruimte."</string>
<string name="does_not_exist" msgid="1501243985586067053">"App bestaat niet."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Apparaatbeheer-app kan niet worden geïnstalleerd op externe media"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Gedwongen stoppen?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Als je een app gedwongen stopt, kan deze onverwacht gedrag vertonen."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Kan app niet verplaatsen. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Voorkeursinstallatielocatie"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"De voorkeursinstallatielocatie voor nieuwe apps wijzigen"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Ingebouwde app uitschakelen?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"App uitschakelen"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Als je deze app uitschakelt, werken Android en andere apps mogelijk niet meer zoals bedoeld."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Gegevens verwijderen en app uitschakelen?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Als je deze app uitschakelt, werken Android en andere apps mogelijk niet meer zoals bedoeld. Je gegevens worden ook verwijderd."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Meldingen uitschakelen?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Als je meldingen voor deze app uitschakelt, mis je misschien belangrijke waarschuwingen en updates."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"App-details"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App geïnstalleerd vanuit <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1978,7 +1971,7 @@
<string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Tekst met hoog contrast"</string>
<string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Schermvergroting automatisch updaten"</string>
<string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Schermvergroting updaten bij app-overgangen"</string>
- <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Aan/uit-knop beëindigt oproep"</string>
+ <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Aan/uit-knop beëindigt gesprek"</string>
<string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Grote muisaanwijzer"</string>
<string name="accessibility_disable_animations" msgid="5876035711526394795">"Animaties verwijderen"</string>
<string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monogeluid"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Service gebruiken"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Kleurcorrectie gebruiken"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Ondertiteling gebruiken"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Doorgaan"</string>
<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="6371077608778830020">"Gehoorapparaat toevoegen"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Als je de achtergrondactiviteit voor een app beperkt, functioneert de app mogelijk niet meer correct"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Batterijoptimalisatie is niet ingesteld voor deze app. Je kunt de app dus niet beperken.\n\nSchakel eerst batterijoptimalisatie in als je de app wilt beperken."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Schermgebruik sinds volledige lading"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Schermverbruik"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Scannen naar mobiele netwerken"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Batterijgebruik sinds volledige lading"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tijd die het scherm is ingeschakeld sinds volledige lading"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Apparaatgebruik sinds volledige lading"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Gebruiksdetails"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Energieverbruik aanpassen"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Bijgeleverde pakketten"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps met hoog batterijgebruik"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Houdt apparaat ingeschakeld"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Schakelt apparaat in op de achtergrond"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Vraagt regelmatig om locatie"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps veroorzaken problemen"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Apps worden normaal uitgevoerd"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefoon heeft normaal batterijverbruik op de achtergrond"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet heeft normaal batterijverbruik op de achtergrond"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Batterijgebruik voor %1$d apps wordt beperkt</item>
<item quantity="one">Batterijgebruik voor %1$d app wordt beperkt</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> beperkt"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Deze apps hebben op de achtergrond batterijlading verbruikt. Beperkte apps werken mogelijk niet goed en meldingen kunnen worden vertraagd."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Batterijbeheer gebruiken"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detecteren wanneer apps de batterij snel leegmaken"</string>
@@ -2267,7 +2255,7 @@
<string name="power_wifi" msgid="1135085252964054957">"Wifi"</string>
<string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
<string name="power_cell" msgid="3392999761958982492">"Mobiel netwerk stand-by"</string>
- <string name="power_phone" msgid="5392641106474567277">"Spraakoproepen"</string>
+ <string name="power_phone" msgid="5392641106474567277">"Audiogesprekken"</string>
<string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactief"</string>
<string name="power_idle" product="default" msgid="9055659695602194990">"Telefoon inactief"</string>
<string name="power_unaccounted" msgid="709925017022660740">"Diversen"</string>
@@ -2299,7 +2287,7 @@
<string name="battery_action_display" msgid="7338551244519110831">"Scherminstellingen"</string>
<string name="battery_action_wifi" msgid="8181553479021841207">"Wifi-instellingen"</string>
<string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-instellingen"</string>
- <string name="battery_desc_voice" msgid="8980322055722959211">"Batterij gebruikt door spraakoproepen"</string>
+ <string name="battery_desc_voice" msgid="8980322055722959211">"Batterij gebruikt door audiogesprekken"</string>
<string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batterij gebruikt wanneer tablet inactief is"</string>
<string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Batterij gebruikt wanneer telefoon inactief is"</string>
<string name="battery_desc_radio" msgid="5479196477223185367">"Batterij gebruikt door radio"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Annuleren"</string>
<string name="tts_reset" msgid="2661752909256313270">"Resetten"</string>
<string name="tts_play" msgid="2628469503798633884">"Afspelen"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Energiebeheer"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wifi-instelling bijwerken"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth-instelling bijwerken"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"aan"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"uit"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"inschakelen"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"uitschakelen"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wifi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Locatie"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synchronisatie"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Helderheid <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatisch"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"volledig"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"half"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"uit"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Opslag certificaatgegevens"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installeren vanuit opslag"</string>
@@ -2471,8 +2442,8 @@
<string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Er is momenteel geen account ingesteld voor het opslaan van back-upgegevens"</string>
<string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
<string name="backup_erase_dialog_message" msgid="5221011285568343155">"Weet je zeker dat je het maken van back-ups van je wifi-wachtwoorden, bladwijzers, andere instellingen en app-gegevens wilt stoppen en alle kopieën op Google-servers wilt wissen?"</string>
- <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Wil je stoppen met het maken van back-ups van apparaatgegevens (zoals wifi-wachtwoorden en oproepgeschiedenis) en app-gegevens (zoals instellingen en bestanden opgeslagen door apps), en alle kopieën op externe servers wissen?"</string>
- <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatisch op afstand een back-up maken van apparaatgegevens (zoals wifi-wachtwoorden en oproepgeschiedenis) en app-gegevens (zoals instellingen en bestanden opgeslagen door apps).\n\nAls je de functie voor automatische back-ups inschakelt, worden apparaat- en app-gegevens periodiek op afstand opgeslagen. App-gegevens kunnen gegevens omvatten die een app heeft opgeslagen (op basis van de instellingen van de ontwikkelaar), waaronder potentieel gevoelige gegevens als contacten, berichten en foto\'s."</string>
+ <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Wil je stoppen met het maken van back-ups van apparaatgegevens (zoals wifi-wachtwoorden en gespreksgeschiedenis) en app-gegevens (zoals instellingen en bestanden opgeslagen door apps), en alle kopieën op externe servers wissen?"</string>
+ <string name="fullbackup_data_summary" msgid="960850365007767734">"Automatisch op afstand een back-up maken van apparaatgegevens (zoals wifi-wachtwoorden en gespreksgeschiedenis) en app-gegevens (zoals instellingen en bestanden opgeslagen door apps).\n\nAls je de functie voor automatische back-ups inschakelt, worden apparaat- en app-gegevens periodiek op afstand opgeslagen. App-gegevens kunnen gegevens omvatten die een app heeft opgeslagen (op basis van de instellingen van de ontwikkelaar), waaronder potentieel gevoelige gegevens als contacten, berichten en foto\'s."</string>
<string name="device_admin_settings_title" msgid="4960761799560705902">"Instellingen voor apparaatbeheer"</string>
<string name="active_device_admin_msg" msgid="578748451637360192">"Apparaatbeheer-app"</string>
<string name="remove_device_admin" msgid="9207368982033308173">"Deze apparaatbeheer-app uitschakelen"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Alles selecteren"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Datagebruik van app"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobiele data en wifi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"De door de provider berekende gegevens kunnen afwijken van de berekening van je apparaat."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Appgebruik"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APP-INFO"</string>
@@ -2841,9 +2812,9 @@
<string name="user_enable_calling_sms" msgid="9172507088023097063">"Telefoonoproepen en sms inschakelen"</string>
<string name="user_remove_user" msgid="6490483480937295389">"Gebruiker verwijderen"</string>
<string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Telefoonoproepen inschakelen?"</string>
- <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"De oproepgeschiedenis wordt met deze gebruiker gedeeld."</string>
+ <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"De gespreksgeschiedenis wordt met deze gebruiker gedeeld."</string>
<string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Telefoonoproepen en sms inschakelen?"</string>
- <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"De oproep- en sms-geschiedenis wordt gedeeld met deze gebruiker."</string>
+ <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"De gespreks- en sms-geschiedenis wordt gedeeld met deze gebruiker."</string>
<string name="emergency_info_title" msgid="208607506217060337">"Informatie bij nood"</string>
<string name="emergency_info_summary" msgid="5062945162967838521">"Informatie en contacten voor <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
<string name="application_restrictions" msgid="8207332020898004394">"Apps en content toestaan"</string>
@@ -2870,7 +2841,7 @@
<string name="restriction_menu_reset" msgid="2067644523489568173">"Beperkingen verwijderen"</string>
<string name="restriction_menu_change_pin" msgid="740081584044302775">"Pincode wijzigen"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Meldingen weergeven"</string>
- <string name="help_label" msgid="6886837949306318591">"Help en feedback"</string>
+ <string name="help_label" msgid="6886837949306318591">"Hulp en feedback"</string>
<string name="support_summary" msgid="2705726826263742491">"Help-artikelen, bel- en chatondersteuning, aan de slag"</string>
<string name="user_account_title" msgid="1127193807312271167">"Account voor content"</string>
<string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
@@ -2882,7 +2853,7 @@
<string name="amber_alerts_summary" msgid="4312984614037904489">"Berichten ontvangen over ontvoerde kinderen"</string>
<string name="repeat_title" msgid="6473587828597786996">"Herhalen"</string>
<string name="call_manager_enable_title" msgid="7718226115535784017">"Oproepbeheer inschakelen"</string>
- <string name="call_manager_enable_summary" msgid="8458447798019519240">"Deze service toestaan te beheren hoe je oproepen worden uitgevoerd."</string>
+ <string name="call_manager_enable_summary" msgid="8458447798019519240">"Deze service toestaan te beheren hoe je gesprekken worden uitgevoerd."</string>
<string name="call_manager_title" msgid="4479949569744516457">"Oproepbeheer"</string>
<!-- no translation found for call_manager_summary (5918261959486952674) -->
<skip />
@@ -2924,7 +2895,7 @@
<string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Tik om activiteiten in te stellen"</string>
<string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Mobiele data niet beschikbaar"</string>
<string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Tik om een simkaart voor gegevens te selecteren"</string>
- <string name="sim_calls_always_use" msgid="7936774751250119715">"Altijd gebruiken voor oproepen"</string>
+ <string name="sim_calls_always_use" msgid="7936774751250119715">"Altijd gebruiken voor gesprekken"</string>
<string name="select_sim_for_data" msgid="2366081042162853044">"Selecteer een simkaart voor gegevens"</string>
<string name="data_switch_started" msgid="2040761479817166311">"Schakelen naar simkaart voor mobiele data, dit kan even duren…"</string>
<string name="select_sim_for_calls" msgid="3503094771801109334">"Bellen met"</string>
@@ -2944,7 +2915,7 @@
<string name="sim_status_title" msgid="6744870675182447160">"Simkaartstatus"</string>
<string name="sim_status_title_sim_slot" msgid="5725659316463979194">"Simkaartstatus (simkaartsleuf %1$d)"</string>
<string name="sim_call_back_title" msgid="5181549885999280334">"Terugbellen via standaard-simkaart"</string>
- <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Simkaart voor uitgaande oproepen"</string>
+ <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Simkaart voor uitgaande gesprekken"</string>
<string name="sim_other_call_settings" msgid="8247802316114482477">"Andere instellingen voor bellen"</string>
<string name="preferred_network_offload_title" msgid="1605829724169550275">"Voorrang voorkeursnetwerk"</string>
<string name="preferred_network_offload_header" msgid="2321173571529106767">"Broadcast v. netwerkn. uitsch."</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">%d verborgen items weergeven</item>
<item quantity="one">%d verborgen item weergeven</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Samenvouwen"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Netwerk en internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobiel"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"datagebruik"</string>
@@ -2974,17 +2944,17 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps en meldingen"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Machtigingen, standaard-apps"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Toegang tot meldingen is niet beschikbaar voor apps in het werkprofiel."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Accounts"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Geen accounts toegevoegd"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Standaard-apps"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Talen, tijd, back-up, updates"</string>
<string name="search_results_title" msgid="1796252422574886932">"Instellingen"</string>
- <string name="search_menu" msgid="6283419262313758339">"Zoeken in de instellingen"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wifi-netwerk, netwerkverbinding, internet, draadloos, gegevens, wifi-verbinding"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, schakelen, inschakelen, uitschakelen, beheren"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"sms, sms\'en, sms\'jes, berichten, sms-berichten, standaard"</string>
<string name="keywords_more_mobile_networks" msgid="8995946622054642367">"mobiel, gsm, provider, draadloos, gegevens, data, 4g, 3g, 2g, lte"</string>
- <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, oproep, gesprek, bellen, gebeld"</string>
+ <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, gesprek, gesprek, bellen, gebeld"</string>
<string name="keywords_home" msgid="294182527446892659">"launcher, standaard, apps"</string>
<string name="keywords_display" msgid="8910345814565493016">"scherm, touchscreen"</string>
<string name="keywords_display_brightness_level" msgid="3138350812626210404">"scherm dimmen, touchscreen, batterij, helder"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"betalen, tikken, betalingen"</string>
<string name="keywords_backup" msgid="470070289135403022">"back-up, back-up maken, back-uppen"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gebaar"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"gezicht, ontgrendelen, auth, inloggen"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl-versie, imei-softwareversie"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"netwerk, status mobiel netwerk, servicestatus, signaalsterkte, type mobiel netwerk, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serienummer, hardwareversie"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"donker thema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Inactieve display, vergrendelingsscherm"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"melding op vergrendelingsscherm"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"gezicht"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"vingerafdruk"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"scherm dimmen, touchscreen, batterij, slimme helderheid, dynamische helderheid"</string>
@@ -3064,7 +3036,7 @@
<string name="sound_settings_example_summary" msgid="2404914514266523165">"Belvolume op 80%"</string>
<string name="media_volume_option_title" msgid="2811531786073003825">"Mediavolume"</string>
<string name="call_volume_option_title" msgid="1265865226974255384">"Belvolume"</string>
- <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolume"</string>
+ <string name="alarm_volume_option_title" msgid="8219324421222242421">"Wekkervolume"</string>
<string name="ring_volume_option_title" msgid="6767101703671248309">"Beltoonvolume"</string>
<string name="notification_volume_option_title" msgid="6064656124416882130">"Meldingsvolume"</string>
<string name="ringtone_title" msgid="5379026328015343686">"Beltoon telefoon"</string>
@@ -3072,7 +3044,7 @@
<string name="notification_unknown_sound_title" msgid="2535027767851838335">"Door app geleverd geluid"</string>
<string name="notification_sound_default" msgid="565135733949733766">"Standaard meldingsgeluid"</string>
<string name="alarm_ringtone_title" msgid="6344025478514311386">"Standaard alarmgeluid"</string>
- <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Ook trillen voor oproepen"</string>
+ <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Ook trillen voor gesprekken"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Andere geluiden"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Toetsenbloktonen"</string>
<string name="screen_locking_sounds_title" msgid="1340569241625989837">"Geluid schermvergrendeling"</string>
@@ -3190,7 +3162,7 @@
<string name="zen_onboarding_settings" msgid="9046451821239946868">"Instellingen"</string>
<string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Geen zichtbare of hoorbare meldingen"</string>
<string name="zen_onboarding_current_setting_title" msgid="776426065129609376">"Geen geluid van meldingen"</string>
- <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Je ziet of hoort geen meldingen. Oproepen van contacten met ster en terugkerende bellers zijn toegestaan."</string>
+ <string name="zen_onboarding_new_setting_summary" msgid="6293026064871880706">"Je ziet of hoort geen meldingen. Gesprekken met contacten met ster en terugkerende bellers zijn toegestaan."</string>
<string name="zen_onboarding_current_setting_summary" msgid="1280614488924843713">"(Huidige instelling)"</string>
<string name="zen_onboarding_dnd_visual_disturbances_header" msgid="1352808651270918932">"Instellingen voor meldingen in modus \'Niet storen\' wijzigen?"</string>
<string name="sound_work_settings" msgid="6774324553228566442">"Geluiden voor werkprofiel"</string>
@@ -3360,9 +3332,9 @@
<string name="summary_divider_text" msgid="7228986578690919294">", "</string>
<string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
<string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> t/m <xliff:g id="END">%2$s</xliff:g>"</string>
- <string name="zen_mode_calls" msgid="7051492091133751208">"Oproepen"</string>
- <string name="zen_mode_calls_title" msgid="623395033931747661">"Oproepen toestaan"</string>
- <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Wanneer \'Niet storen\' is ingeschakeld, worden inkomende oproepen geblokkeerd. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
+ <string name="zen_mode_calls" msgid="7051492091133751208">"Gesprekken"</string>
+ <string name="zen_mode_calls_title" msgid="623395033931747661">"Gesprekken toestaan"</string>
+ <string name="zen_mode_calls_footer" msgid="3618700268458237781">"Wanneer \'Niet storen\' is ingeschakeld, worden inkomende gesprekken geblokkeerd. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
<string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"Contacten met ster"</string>
<plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="500105380255018671">
<item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> anderen</item>
@@ -3443,12 +3415,12 @@
<string name="experimental_preference" msgid="7083015446690681376">"(Experimenteel)"</string>
<string name="encryption_interstitial_header" msgid="468015813904595613">"Beveiligd opstarten"</string>
<string name="encryption_continue_button" msgid="1121880322636992402">"Doorgaan"</string>
- <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Je kunt dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat te starten?"</string>
- <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Je kunt dit apparaat verder beveiligen door je patroon te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een patroon vereist is om het apparaat te starten?"</string>
- <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Je kunt dit apparaat verder beveiligen door het wachtwoord ook te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten en meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd. Wil je instellen dat een wachtwoord vereist is om het apparaat te starten?"</string>
- <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat te starten?"</string>
- <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je patroon moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een patroon vereist is om het apparaat te starten?"</string>
- <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wachtwoord vereisen om je apparaat op te starten?"</string>
+ <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Je kunt dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat te starten?"</string>
+ <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Je kunt dit apparaat verder beveiligen door je patroon te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een patroon vereist is om het apparaat te starten?"</string>
+ <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Je kunt dit apparaat verder beveiligen door het wachtwoord ook te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten en meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd. Wil je instellen dat een wachtwoord vereist is om het apparaat te starten?"</string>
+ <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat te starten?"</string>
+ <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je patroon moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een patroon vereist is om het apparaat te starten?"</string>
+ <string name="encryption_interstitial_message_password_for_fingerprint" msgid="5560954719370251702">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wachtwoord vereisen om je apparaat op te starten?"</string>
<string name="encryption_interstitial_message_pin_for_face" msgid="2017438765366716760">"Naast het gebruik van je gezicht om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat op te starten?"</string>
<string name="encryption_interstitial_message_pattern_for_face" msgid="3551827507967661552">"Naast het gebruik van je gezicht om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je patroon moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een patroon vereist is om het apparaat op te starten?"</string>
<string name="encryption_interstitial_message_password_for_face" msgid="3452793542112093614">"Naast het gebruik van je gezicht om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een wachtwoord vereist is om het apparaat op te starten?"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Wanneer je je pincode opgeeft om dit apparaat te starten, zijn toegankelijkheidsservices zoals <xliff:g id="SERVICE">%1$s</xliff:g> nog niet beschikbaar."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Wanneer je je patroon opgeeft om dit apparaat te starten, zijn toegankelijkheidsservices zoals <xliff:g id="SERVICE">%1$s</xliff:g> nog niet beschikbaar."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Wanneer je je wachtwoord opgeeft om dit apparaat te starten, zijn toegankelijkheidsservices zoals <xliff:g id="SERVICE">%1$s</xliff:g> nog niet beschikbaar."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Opmerking: Wanneer je telefoon opnieuw is opgestart, kan deze app pas worden gestart nadat je je telefoon hebt ontgrendeld"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Opmerking: Als je de telefoon opnieuw opstart en een schermvergrendeling hebt ingesteld, kan deze app pas worden gestart nadat je de telefoon hebt ontgrendeld"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI-informatie"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Relatieve IMEI-informatie"</string>
<string name="slot_number" msgid="3762676044904653577">"(Positie <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Persoonlijk"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Werk"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: alle"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: uitgeschakeld"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Uitgeschakeld"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorieën: urgent belang"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorieën: klein belang"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorieën: uitgeschakeld"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Gebruiksmeldingen"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Volledig apparaatgebruik weergeven"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"App-gebruik weergeven"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Intensief gebruik"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> vertonen abnormaal gedrag</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> vertoont abnormaal gedrag</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Interne opslag: <xliff:g id="PERCENTAGE">%1$s</xliff:g> gebruikt - <xliff:g id="FREE_SPACE">%2$s</xliff:g> vrij"</string>
<string name="display_summary" msgid="6737806235882127328">"Slaapstand na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Achtergrond, slaapstand, lettergrootte"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Slaapstand na 10 minuten inactiviteit"</string>
<string name="memory_summary" msgid="8080825904671961872">"Gem. <xliff:g id="USED_MEMORY">%1$s</xliff:g> van <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> geheugen gebruikt"</string>
<string name="users_summary" msgid="1674864467098487328">"Ingelogd als <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Sms niet toegestaan"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Camera niet toegestaan"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Screenshot niet toegestaan"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Kan back-ups niet uitschakelen"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Kan deze app niet openen"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Neem bij vragen contact op met je IT-beheerder"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Meer informatie"</string>
@@ -3783,11 +3755,11 @@
<string name="condition_device_muted_action_turn_on_sound" msgid="4930240942726349213">"Geluid inschakelen"</string>
<string name="condition_device_muted_title" product="tablet" msgid="3095044864508335783">"Apparaat is gedempt"</string>
<string name="condition_device_muted_title" product="default" msgid="5818278137378379647">"Telefoon is gedempt"</string>
- <string name="condition_device_muted_summary" msgid="5445341185705628047">"Oproepen en meldingen zijn gedempt"</string>
+ <string name="condition_device_muted_summary" msgid="5445341185705628047">"Gesprekken en meldingen zijn gedempt"</string>
<string name="condition_device_vibrate_title" product="tablet" msgid="1983420639621523345">"Apparaat is ingesteld op trillen"</string>
<string name="condition_device_vibrate_title" product="default" msgid="1087633233379991925">"Telefoon is ingesteld op trillen"</string>
- <string name="condition_device_vibrate_summary" product="tablet" msgid="433514444618164607">"Apparaat gaat trillen bij oproepen en meldingen"</string>
- <string name="condition_device_vibrate_summary" product="default" msgid="5877034997839162763">"Telefoon gaat trillen bij oproepen en meldingen"</string>
+ <string name="condition_device_vibrate_summary" product="tablet" msgid="433514444618164607">"Apparaat gaat trillen als je wordt gebeld en bij meldingen"</string>
+ <string name="condition_device_vibrate_summary" product="default" msgid="5877034997839162763">"Telefoon gaat trillen als je wordt gebeld en bij meldingen"</string>
<string name="night_display_suggestion_title" msgid="6602129097059325291">"Planning van Nachtverlichting instellen"</string>
<string name="night_display_suggestion_summary" msgid="228346372178218442">"Scherm elke avond automatisch een tint geven"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"Nachtverlichting ingeschakeld"</string>
@@ -3875,9 +3847,9 @@
<string name="home_app" msgid="4066188520886810030">"Startscherm-app"</string>
<string name="no_default_home" msgid="7184117487704520238">"Geen standaard startscherm"</string>
<string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Beveiligd opstarten"</string>
- <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Patroon vereisen om je apparaat op te starten. Als het apparaat is uitgeschakeld, kan het geen oproepen, berichten, meldingen of wekkers ontvangen."</string>
- <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Pincode vereisen om je apparaat op te starten. Als het apparaat is uitgeschakeld, kan het geen oproepen, berichten, meldingen of wekkers ontvangen."</string>
- <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Wachtwoord vereisen om je apparaat op te starten. Als het apparaat is uitgeschakeld, kan het geen oproepen, berichten, meldingen of wekkers ontvangen."</string>
+ <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Patroon vereisen om je apparaat op te starten. Als het apparaat is uitgeschakeld, kan het geen gesprekken, berichten, meldingen of wekkers ontvangen."</string>
+ <string name="lockpattern_settings_require_pin_before_startup_summary" msgid="6022831284097476933">"Pincode vereisen om je apparaat op te starten. Als het apparaat is uitgeschakeld, kan het geen gesprekken, berichten, meldingen of wekkers ontvangen."</string>
+ <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Wachtwoord vereisen om je apparaat op te starten. Als het apparaat is uitgeschakeld, kan het geen gesprekken, berichten, meldingen of wekkers ontvangen."</string>
<string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Nog een vingerafdruk toevoegen"</string>
<string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Ontgrendelen met een andere vinger"</string>
<string name="battery_saver_on_summary" msgid="7722791295871319534">"Aan"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Een beeldscherm met een cutout simuleren"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Display-cutout"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"display-cutout, inkeping"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Geen"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Apparaatstandaard"</string>
<string name="special_access" msgid="3458780842491881155">"Speciale app-toegang"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps kunnen onbeperkt data gebruiken</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Verbonden met <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Verbonden met meerdere apparaten"</string>
<string name="demo_mode" msgid="2798762752209330277">"Demomodus voor systeemgebruikersinterface"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Nachtmodus"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Nachtmodus instellen"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Donkere modus"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Donkere modus instellen"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ontwikkelaarstegels voor Snelle instellingen"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope-tracering"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Instellingen voor werkprofiel"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Contacten zoeken"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Contactzoekopdrachten door je organisatie toestaan om bellers en contacten te identificeren"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dubbeltikken om telefoon te checken"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dubbeltikken om tablet te checken"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dubbeltikken om apparaat te checken"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Dubbeltik op je scherm om de tijd, meldingspictogrammen en andere informatie te bekijken."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Dubbeltik op je scherm om de tijd, meldingen en andere informatie te bekijken."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Oppakken om telefoon te checken"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Oppakken om tablet te checken"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Oppakken om apparaat te checken"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Pak je telefoon op om de tijd, meldingspictogrammen en andere informatie te bekijken."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Pak je tablet op om de tijd, meldingspictogrammen en andere informatie te bekijken."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Pak je apparaat op om de tijd, meldingspictogrammen en andere informatie te bekijken."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Scherm activeren"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Pak je telefoon op om de tijd, meldingen en andere informatie te bekijken."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Pak je tablet op om de tijd, meldingen en andere informatie te bekijken."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Pak je apparaat op om de tijd, meldingen en andere informatie te bekijken."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Vergrendelingsschermgebaar activeren"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Over vingerafdruksensor vegen voor meldingen"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Over vingerafdruksensor vegen"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je telefoon."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pogingen</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> poging</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Er wordt een back-up gemaakt van de apparaatgegevens"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Dit apparaat wordt beheerd door je organisatie."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Dit apparaat wordt beheerd door <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Service voor automatisch aanvullen"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"auto, automatisch, invullen, aanvullen"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Zorg dat je deze app vertrouwt</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> maakt gebruik van de content op je scherm om te bepalen wat automatisch kan worden aangevuld."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automatisch aanvullen"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Logniveau"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Max. aantal verzoeken per sessie"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Max. zichtbare gegevenssets"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Resetten naar standaardwaarden"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Ontwikkelaarsopties voor automatisch aanvullen zijn gereset"</string>
<string name="device_theme" msgid="4571803018917608588">"Apparaatthema"</string>
<string name="default_theme" msgid="7085644992078579076">"Standaard"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Netwerknaam"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Providerregistratie activeren"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\'Niet storen\' updaten"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Meldingen onderbreken om gefocust te blijven"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Wat is er nieuw en interessant?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Een rondleiding volgen voor je nieuwe telefoon"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Een rondleiding volgen voor je nieuwe tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Een rondleiding volgen voor je nieuwe apparaat"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Deze functie is niet beschikbaar op dit apparaat"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Volledige GNSS-metingen afdwingen"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Alle GNSS-constellaties en -frequenties bijhouden zonder duty cycling"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Altijd een crashvenster weergeven"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Bij gecrashte apps altijd een venster weergeven"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"App met ANGLE-functionaliteit selecteren"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Geen app met ANGLE-functionaliteit ingesteld"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"App met ANGLE-functionaliteit: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Toegang tot directory"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"toegang tot directory"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4160,16 +4139,16 @@
<string name="media_output_summary" product="default" msgid="6839458453831567167">"Telefoon"</string>
<string name="media_output_summary" product="tablet" msgid="7217221078578554515">"Tablet"</string>
<string name="media_output_summary" product="device" msgid="5677420090811068649">"Apparaat"</string>
- <string name="media_out_summary_ongoing_call_state" msgid="3533731701018680693">"Niet beschikbaar tijdens oproepen"</string>
+ <string name="media_out_summary_ongoing_call_state" msgid="3533731701018680693">"Niet beschikbaar tijdens gesprekken"</string>
<string name="media_output_summary_unavailable" msgid="7970304720507697019">"Onbeschikbaar"</string>
- <string name="take_call_on_title" msgid="6066362463436122655">"Oproep aannemen op"</string>
+ <string name="take_call_on_title" msgid="6066362463436122655">"Opnemen op"</string>
<string name="battery_suggestion_title" product="tablet" msgid="752439050748267917">"De batterijduur van de tablet verbeteren"</string>
<string name="battery_suggestion_title" product="device" msgid="1507272328369733005">"De batterijduur van het apparaat verbeteren"</string>
<string name="battery_suggestion_title" product="default" msgid="4038053023336285165">"De batterijduur van de telefoon verbeteren"</string>
<string name="battery_suggestion_summary" msgid="4585677159811722359"></string>
- <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Beltoon voorkomen"</string>
+ <string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Beltoon uitschakelen"</string>
<string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Druk tegelijkertijd op de aan/uit-knop en de knop \'Volume omhoog\'"</string>
- <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Snelkoppeling om beltoon te voorkomen"</string>
+ <string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Snelkoppeling om beltoon uit te schakelen"</string>
<string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Trillen"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Dempen"</string>
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"Niets doen"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Netwerkgegevens"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"De naam van je apparaat is zichtbaar voor apps op je telefoon. De apparaatnaam kan ook door andere mensen worden gezien wanneer je verbinding maakt met Bluetooth-apparaten of een wifi-hotspot instelt."</string>
<string name="devices_title" msgid="7701726109334110391">"Apparaten"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Alle instellingen"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Suggesties"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS-gegevens"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS-gegevens"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Netwerk kiezen"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Verbinding verbroken"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Verbonden"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Verbinding maken…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Kan geen verbinding maken"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Geen netwerken gevonden."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Kan geen netwerken vinden. Probeer het opnieuw."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(niet toegestaan)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Geen simkaart"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Geavanceerd bellen"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Voorkeursnetwerkmodus: voorkeur voor WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Voorkeursnetwerkmodus: alleen GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Voorkeursnetwerkmodus: alleen WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Voorkeursnetwerkmodus: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Voorkeursnetwerkmodus: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Voorkeursnetwerkmodus: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Voorkeursnetwerkmodus: alleen CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Voorkeursnetwerkmodus: alleen EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Voorkeursnetwerkmodus: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Voorkeursnetwerkmodus: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Voorkeursnetwerkmodus: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Voorkeursnetwerkmodus: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Voorkeursnetwerkmodus: Wereldwijd"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Voorkeursnetwerkmodus: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Voorkeursmodus voor netwerk: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Voorkeursnetwerkmodus: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Voorkeursnetwerkmodus: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Voorkeursnetwerkmodus: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Voorkeursnetwerkmodus: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Voorkeursnetwerkmodus: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Voorkeursnetwerkmodus: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Voorkeursnetwerkmodus: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Voorkeursnetwerkmodus: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Voorkeursnetwerkmodus: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Voorkeursnetwerkmodus: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Voorkeursnetwerkmodus: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (aanbevolen)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (aanbevolen)"</string>
+ <string name="network_global" msgid="959947774831178632">"Algemeen"</string>
+ <string name="label_available" msgid="1731547832803057893">"Beschikbare netwerken"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Zoeken…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registreren op <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Je simkaart staat geen verbinding met dit netwerk toe."</string>
+ <string name="connect_later" msgid="978991102125216741">"Kan nu geen verbinding maken met dit netwerk. Probeer het later opnieuw."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Geregistreerd op netwerk."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Netwerk automatisch selecteren"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Providerinstellingen"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Gegevensservice instellen"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobiele data"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Datatoegang via mobiel netwerk"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Voorkeursnetwerktype"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"De netwerkgebruiksmodus wijzigen"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Voorkeursnetwerktype"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Provider"</string>
+ <string name="call_category" msgid="8108654745239563833">"Bellen"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Provider videogesprekken"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Systeem selecteren"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"De CDMA-roamingmodus wijzigen"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Systeem selecteren"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Netwerk"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Netwerk"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA-abonnement"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Schakelen tussen RUIM/SIM en NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"abonnement"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatische registratie…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Dataroaming toestaan?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Neem contact op met je netwerkprovider over de prijzen."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Datagebruik van app"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Ongeldige netwerkmodus <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Negeren."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Niet beschikbaar wanneer verbonden met <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Meer bekijken"</string>
+ <string name="see_less" msgid="1250265310929558370">"Minder weergeven"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Geen verbonden apparaten"</string>
</resources>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 06895b6..9bccadd 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"ମାପ ହୋଇଥିବା ସଂଯୋଗ ରୂପେ ବିବେଚନା କରନ୍ତୁ"</item>
<item msgid="2266114985518865625">"ଅପରିମିତ ସଂଯୋଗ ରୂପେ ବିବେଚନା କରନ୍ତୁ"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ଡିଫଲ୍ଟ (ରେଣ୍ଡମ୍ MAC ବ୍ୟବହାର କରନ୍ତୁ)"</item>
+ <item msgid="5398461510512959597">"ବିଶ୍ବସ୍ତ"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"ନା"</item>
<item msgid="3863157480502955888">"ହଁ"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"ସର୍ବଦା ଅନ୍"</item>
<item msgid="6385301106124765323">"ସର୍ବଦା ଅଫ୍"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"ଅଫ୍"</item>
+ <item msgid="2182686878828390312">"ଡିବଗ୍ କରନ୍ତୁ"</item>
+ <item msgid="5286514712714822064">"ଶବ୍ଦବହୁଳ"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"କେବଳ ହୋମ୍ ନେଟ୍ୱର୍କ"</item>
+ <item msgid="5034813753274486448">"ସ୍ୱଚାଳିତ"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA ପସନ୍ଦ କରାଯାଇଛି"</item>
+ <item msgid="807926878589867564">"କେବଳ GSM"</item>
+ <item msgid="488474605709912156">"କେବଳ WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA ଅଟୋ"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo ଅଟୋ"</item>
+ <item msgid="370391313511477301">"EvDo ବିନା CDMA"</item>
+ <item msgid="4678789463133969294">"କେବଳ EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"ଗ୍ଲୋବାଲ୍"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"କେବଳ TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"ଗ୍ଲୋବାଲ୍"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 6d3d7be..f001d87 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"ତିଆରି କରନ୍ତୁ"</string>
<string name="allow" msgid="3349662621170855910">"ଅନୁମତି"</string>
<string name="deny" msgid="6947806159746484865">"ପ୍ରତ୍ୟାଖ୍ୟାନ"</string>
- <string name="dlg_close" msgid="7471087791340790015">"ବନ୍ଦ କରନ୍ତୁ"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"ପରିବର୍ତ୍ତନ"</string>
<string name="device_info_default" msgid="7847265875578739287">"ଅଜଣା"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">ଜଣେ ଡେଭଲପର୍ ହେବାରେ ଆପଣ ବର୍ତ୍ତମାନ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ଟି ପଦାଙ୍କ ଦୂରରେ ଅଛନ୍ତି।</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"ଆବଶ୍ୟକତା ନାହିଁ, ଆପଣ ଜଣେ ଡେଭଲପର୍ ହିଁ ଅଟନ୍ତି।"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ଦୟାକରି ପ୍ରଥମେ ଡେଭଲପର୍ ବିକଳ୍ପଗୁଡିକ ସକ୍ଷମ କରନ୍ତୁ।"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"ୱେୟାରଲେସ୍ ଓ ନେଟୱାର୍କଗୁଡିକ"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"ସଂଯୋଗ"</string>
- <string name="header_category_device" msgid="4544026001618307754">"ଡିଭାଇସ୍"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ବ୍ୟକ୍ତିଗତ"</string>
- <string name="header_category_access" msgid="7580499097416970962">"ଆକ୍ସେସ୍"</string>
<string name="header_category_system" msgid="2816866961183068977">"ସିଷ୍ଟମ୍"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ଡାଟା ସଂଯୋଗ ସକ୍ରିୟ କରନ୍ତୁ"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ଡାଟା ସଂଯୋଗ ଅକ୍ଷମ ହୋଇଛି"</string>
@@ -120,7 +114,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ଡିଭାଇସ୍ର ବ୍ଲୁ-ଟୂଥ୍ ଠିକଣା ହେଉଛି: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>କୁ ବିଚ୍ଛିନ୍ନ କରିବେ?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"ବ୍ରଡ୍କାଷ୍ଟିଙ୍ଗ"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"ନାମହୀନ ବ୍ଲୁ-ଟୂଥ୍ ଡିଭାଇସ୍"</string>
<string name="progress_scanning" msgid="192587958424295789">"ଖୋଜୁଛି..."</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"କୌଣସି ନିକଟସ୍ଥ ବ୍ଲୁ-ଟୂଥ୍ ମିଳିଲା ନାହିଁ।"</string>
@@ -152,7 +145,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"ଗୋଟିଏ ଆପ୍, ବ୍ଲୁ-ଟୂଥ୍ ଅନ୍ କରି ଆପଣଙ୍କ ଫୋନ୍କୁ, ଅନ୍ୟ ଡିଭାଇସ୍ଗୁଡ଼ିକୁ ଦେଖାଇବାକୁ ଚାହୁଁଛି। ଏହାକୁ ଆପଣ ପରେ ବ୍ଲୁ-ଟୂଥ୍ ସେଟିଙ୍ଗରେ ବଦଳାଇପାରିବେ।"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ବ୍ଲୁ-ଟୂଥ୍ ଅନ୍ କରାଯାଉଛି…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ବ୍ଲୁ-ଟୂଥ୍ ଅଫ୍ କରାଯାଉଛି…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"ଅଟୋ-କନେକ୍ଟ"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ବ୍ଲୁ-ଟୂଥ୍ ସଂଯୋଗ ଅନୁରୋଧ"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" କୁ ସଂଯୋଗ କରିବାକୁ ଟାପ୍ କରନ୍ତୁ।"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ସହ ସଂଯୋଗ କରିବେ?"</string>
@@ -180,12 +172,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"କଲ୍ କରିବା ପାଇଁ ସୁବିଧା ଉପଲବ୍ଧ ଥିବା ଡିଭାଇସ୍"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"ବର୍ତ୍ତମାନ କନେକ୍ଟ ଅଛି"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"ସେଭ୍ ହୋଇଥିବା ଡିଭାଇସ୍ଗୁଡିକ"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"ଡିଭାଇସ୍ ଯୋଡ଼ନ୍ତୁ"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"ପେୟାର୍ କରିବା ପାଇଁ ବ୍ଲୁ-ଟୂଥ୍ ଚାଲୁ ହେବ"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"ନିଜ ପସନ୍ଦର କନେକ୍ସନ୍"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"ପୂର୍ବରୁ ଯୋଡ଼ିହୋଇଥିବା ଡିଭାଇସ୍"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ପୂର୍ବରୁ କନେକ୍ଟ ହୋଇଛି"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ବ୍ଲୁ-ଟୁଥ୍ ଅନ୍ କରାଗଲା"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"ସବୁ ଦେଖନ୍ତୁ"</string>
<string name="date_and_time" msgid="9062980487860757694">"ତାରିଖ ଓ ସମୟ"</string>
<string name="choose_timezone" msgid="1362834506479536274">"ସମୟ ଅଞ୍ଚଳ ବାଛନ୍ତୁ"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -268,7 +260,6 @@
<string name="skip_label" msgid="47510779345218297">"ଛାଡ଼ି ଦିଅନ୍ତୁ"</string>
<string name="next_label" msgid="4693520878012668114">"ପରବର୍ତ୍ତୀ"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ଭାଷାଗୁଡିକ"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ଭାଷା ପସନ୍ଦ"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"ବାହାର କରନ୍ତୁ"</string>
<string name="add_a_language" msgid="2330538812283783022">"ଗୋଟିଏ ଭାଷା ଯୋଡ଼ନ୍ତୁ"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -302,7 +293,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"ସେଟିଙ୍ଗ"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"ସେଟିଙ୍ଗ ଶର୍ଟକଟ୍"</string>
<string name="airplane_mode" msgid="8837269988154128601">"ଏୟାର୍ପ୍ଲେନ୍ ମୋଡ୍"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"ଅଧିକ"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"ୱାୟର୍ଲେସ୍ ଓ ନେଟ୍ୱର୍କ"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"ୱାଇ-ଫାଇ, ବ୍ଲୁ-ଟୂଥ୍, ବିମାନ ମୋଡ୍, ମୋବାଇଲ୍ ନେଟ୍ୱର୍କସ୍, ଓ VPNଗୁଡିକର ପରିଚାଳନା କରନ୍ତୁ"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"ମୋବାଇଲ୍ ଡାଟା"</string>
@@ -387,6 +377,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"ଗୋପନୀୟତା"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ଆଡମିନ୍ଙ୍କ ଦ୍ଵାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
<string name="security_status_title" msgid="5848766673665944640">"ସୁରକ୍ଷା ସ୍ଥିତି"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"ସ୍କ୍ରିନ୍ ଲକ୍, ଫେସ୍ ଅନ୍ଲକ୍"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"ସ୍କ୍ରୀନ୍ ଲକ୍, ଆଙ୍ଗୁଠି ଚିହ୍ନ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ସ୍କ୍ରୀନ୍ ଲକ୍"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ଫେସ୍ ଯୋଡ଼ାଗଲା"</string>
@@ -396,11 +387,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"ନିଜର ଫେସ୍ରେ ଅନଲକ୍ କରନ୍ତୁ"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"ପ୍ରମାଣ ପାଇଁ ନିଜର ଫେସ୍କୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ନିଜର ଫୋନ୍ ଅନଲକ୍ କରିବା ପାଇଁ ନିଜର ଫେସ୍ ବ୍ୟବହାର କରନ୍ତୁ, କିଣାକିଣିକଗୁଡ଼ିକୁ ସ୍ୱୀକୃତି ଦିଅନ୍ତୁ, କିମ୍ବା ଆପ୍ଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରନ୍ତୁ।"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"ନିଜେ"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ଫୋନ୍କୁ ଅନ୍ଲକ୍ କରିବା କିମ୍ୱା କିଣାକିଣିକୁ ଅନୁମୋଦନ କରିବା ପାଇଁ ନିଜ ମୁହଁର ବ୍ୟବହାର କରନ୍ତୁ।\n\nନୋଟ୍ କରନ୍ତୁ: ଏହି ଡିଭାଇସ୍ ଅନଲକ୍ କରିବାକୁ ଆପଣ ଆପଣଙ୍କ ମୁହଁ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଅଧିକ ସୂଚନା ପାଇଁ, ଆପଣଙ୍କ ସଂସ୍ଥାର ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ନିଜର ଫୋନ୍ ଅନଲକ୍ କରିବା ପାଇଁ ନିଜର ଫେସ୍ ବ୍ୟବହାର କରନ୍ତୁ, କିଣାକିଣିକଗୁଡ଼ିକୁ ସ୍ୱୀକୃତି ଦିଅନ୍ତୁ, କିମ୍ବା ଆପ୍ଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରନ୍ତୁ।"</string>
- <string name="face_add_max" msgid="2342250989212694454">"ଆପଣ ସର୍ବାଧିକ <xliff:g id="COUNT">%d</xliff:g>ଟି ଆଙ୍ଗୁଠି ଚିହ୍ନ ଯୋଡ଼ିପାରିବେ"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ବୃତ୍ତରେ ଆପଣଙ୍କ ମୁହଁ କେନ୍ଦ୍ରରେ ରଖନ୍ତୁ"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ଏହାକୁ ପରେ କରନ୍ତୁ"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"ଆପଣ ସର୍ବାଧିକ <xliff:g id="COUNT">%d</xliff:g>ଟି ମୁହଁ ଯୋଡ଼ିପାରିବେ"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"ଆପଣ ସର୍ବାଧିକ ସଂଖ୍ୟାର ଫେସ୍ଗୁଡ଼ିକୁ ଯୋଡିଛନ୍ତି"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"ଆଉ ଅଧିକ ଫେସ୍ଗୁଡ଼ିକୁ ଯୋଡିପାରିବ ନାହିଁ"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"ନାମାଙ୍କନ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇନାହିଁ"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ଠିକ୍ ଅଛି"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"ମୁହଁ ନାମାଙ୍କନର ସମୟ ସମାପ୍ତ ହୋଇଯାଇଛି। ପୁଣିଥରେ ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ମୁହଁ ନାମାଙ୍କନ ହୋଇପାରିଲା ନାହିଁ।"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"ସବୁ ପ୍ରସ୍ତୁତ। ଠିକ୍ଥିବା ପରି ଜଣାପଡୁଛି।"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"ହୋଇଗଲା"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"ମୁହଁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"ଆପଣଙ୍କର ଡିଭାଇସ୍ ଅନ୍ଲକ୍ କରନ୍ତୁ"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ଆପ୍ ସାଇନ୍ ଇନ୍ ଓ ପେମେଣ୍ଟ"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"ଅନଲକ୍ କରିବା ପାଇଁ ଆଖି ଖୋଲନ୍ତୁ"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"ମୁହଁ ପ୍ରମାଣୀକରଣ ବ୍ୟବହାର କରିବା ସମୟରେ, ଆପଣଙ୍କ ଆଖି ଖୋଲା ରହିଥିବା ଦରକାର"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"ମୁହଁ ଡାଟା କାଢ଼ନ୍ତୁ"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"ଆପଣଙ୍କର ମୁହଁ ଡାଟା ଉନ୍ନତ କରନ୍ତୁ"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"ଆପଣଙ୍କର ଡିଭାଇସ୍ ଅନ୍ଲକ୍ ଏବଂ ଆପ୍ସ ଆକ୍ସେସ୍ କରିବାକୁ ଆପଣଙ୍କ ମୁହଁକୁ ବ୍ୟବହାର କରି ହେବ। "<annotation id="url">"ଅଧିକ ଜାଣନ୍ତୁ"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ଆଙ୍ଗୁଠି ଚିହ୍ନ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ଆଙ୍ଗୁଠି ଚିହ୍ନଗୁଡ଼ିକର ପରିଚାଳନା କରନ୍ତୁ"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ଏହା ପାଇଁ ଆଙ୍ଗୁଠି ଚିହ୍ନର ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -883,6 +890,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"2.4 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"ୱାଇ-ଫାଇ ହଟସ୍ପଟ୍ ପାଇଁ ଅତିକମ୍ରେ ଗୋଟିଏ ବ୍ୟାଣ୍ଡକୁ ଚୟନ କରନ୍ତୁ:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ସେଟିଙ୍ଗ"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"ଗୋପନୀୟତା"</string>
<string name="wifi_shared" msgid="844142443226926070">"ଅନ୍ୟାନ୍ୟ ଡିଭାଇସ୍ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ସହ ଶେୟାର୍ କରନ୍ତୁ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ଅପରିବର୍ତ୍ତିତ)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"ଦୟାକରି ଚୟନ କରନ୍ତୁ"</string>
@@ -922,7 +930,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"କ୍ୟାନ୍ସଲ୍"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"ନେଟୱର୍କକୁ ଭୁଲିଯିବେ?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ଏହି ନେଟ୍ୱର୍କ ପାଇଁ ଥିବା ସବୁ ପାସ୍ୱର୍ଡକୁ ଡିଲିଟ୍ କରିଦିଆଯିବ"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"ସେଭ୍ ହୋଇଥିବା ନେଟ୍ୱର୍କ"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d ନେଟୱାର୍କଗୁଡିକ</item>
<item quantity="one">1 ନେଟୱାର୍କ</item>
@@ -1101,8 +1108,7 @@
<string name="brightness_title" msgid="5746272622112982836">"ଉଜ୍ଜ୍ୱଳତା"</string>
<string name="brightness_summary" msgid="838917350127550703">"ସ୍କ୍ରିନ୍ର ଉଜ୍ଜ୍ୱଳତା ଆଡ୍ଜଷ୍ଟ କରନ୍ତୁ"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"ଅନୁକୂଳ ଉଜ୍ଜ୍ୱଳତା"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ଅନ୍"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ବନ୍ଦ"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"ପସନ୍ଦର ଉଜ୍ଜ୍ୱଳତା ବହୁତ କମ୍ ଅଛି"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"ପସନ୍ଦର ଉଜ୍ଜ୍ୱଳତା ନିମ୍ନ ଅଛି"</string>
@@ -1198,6 +1204,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN ପରିବର୍ତ୍ତନ କରିପାରିବ ନାହିଁ।\nସମ୍ଭବତଃ ଭୁଲ୍ PIN।"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"ସିମ୍ ପିନ୍ ବଦଳାଇଦିଆଗଲା"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM କାର୍ଡ ଲକ୍ ସ୍ଥିତି ପରିବର୍ତ୍ତନ କରିପାରିବେ ନାହିଁ।\nସମ୍ଭବତଃ ଭୁଲ୍ PIN ଅଟେ।"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN ଅକ୍ଷମ କରିହେବ ନାହିଁ।"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN ସକ୍ଷମ କରିହେବ ନାହିଁ।"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ଠିକଅଛି"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"କ୍ୟାନ୍ସଲ୍ କରନ୍ତୁ"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"ଏକାଧିକ ସିମ୍ ମିଳିଛି"</string>
@@ -1371,7 +1379,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ଏହି <xliff:g id="NAME_0">^1</xliff:g> କୁ ଫର୍ମାଟ୍ କରିବା ଦରକାର। \n\n"<b>"ଫର୍ମାଟ୍ କଲେ, ବର୍ତ୍ତମାନ <xliff:g id="NAME_1">^1</xliff:g>ରେ ଥିବା ସମସ୍ତ ଡାଟା ଖାଲି ହୋଇଯିବ।"</b>" ଡାଟା ହରାଇବା ଏଡ଼ାଇବା ପାଇଁ, ଏହାର ବ୍ୟାକ୍ଅପ୍ ନେଇଯାଆନ୍ତୁ।"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ଖାଲି ଓ ଫର୍ମାଟ୍ କରନ୍ତୁ"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ଫର୍ମାଟ୍ କରାଯାଉଛି…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"ଫର୍ମାଟ୍ ହେଉଥିବାବେଳେ <xliff:g id="NAME">^1</xliff:g>କୁ କାଢ଼ନ୍ତୁ ନାହିଁ।"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"ଫର୍ମାଟ୍ ହେଉଥିବାବେଳେ <xliff:g id="NAME">^1</xliff:g>କୁ କାଢ଼ନ୍ତୁ ନାହିଁ।"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ନୂତନ ଷ୍ଟୋରେଜ୍କୁ ଡାଟା ନିଅନ୍ତୁ"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"ଆପଣ, ନିଜ ଫୋଟୋ, ଫାଇଲ ଓ କିଛି ଆପ୍କୁ ଏହି ନୂଆ <xliff:g id="NAME">^1</xliff:g>କୁ ନେଇପାରିବେ। \n\nଏହି ପ୍ରକ୍ରିୟା ପ୍ରାୟ <xliff:g id="TIME">^2</xliff:g> ସମୟ ନେଇଥାଏ ଏବଂ ଇଣ୍ଟର୍ନାଲ୍ ଷ୍ଟୋରେଜ୍ରେ <xliff:g id="SIZE">^3</xliff:g> ସ୍ଥାନ ଖାଲି କରିବ। ଏହା ଚାଲୁଥିବା ସମୟରେ କେତେକ ଆପ୍ କାମ କରିନପାରେ।"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ବର୍ତ୍ତମାନ ଚଳାନ୍ତୁ"</string>
@@ -1753,9 +1761,6 @@
<string name="installed" msgid="3070865169422600098">"ଇନ୍ଷ୍ଟଲ୍ କରାଯାଇଛି"</string>
<string name="no_applications" msgid="7336588977497084921">"କୌଣସି ଆପ୍ ନାହିଁ।"</string>
<string name="internal_storage" msgid="1584700623164275282">"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ଆଭ୍ୟନ୍ତରୀଣ ଷ୍ଟୋରେଜ୍"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB ଷ୍ଟୋରେଜ୍"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD କାର୍ଡ ଷ୍ଟୋରେଜ୍"</string>
<string name="recompute_size" msgid="7722567982831691718">"ଆକାରକୁ ପୁଣି ଗଣୁଛି…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"ଆପ୍ର ଡାଟା ଡିଲିଟ୍ କରିବେ?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"ଏହି ଆପ୍ର ସମସ୍ତ ଡାଟା ସ୍ଥାୟୀ ଭାବେ ଡିଲିଟ୍ ହୋଇଯିବ। ଏଥିରେ ରହିଛି, ସମସ୍ତ ଫାଇଲ୍, ସେଟିଙ୍ଗ, ଆକାଉଣ୍ଟ, ଡାଟାବେସ୍ ଆଦି"</string>
@@ -1764,24 +1769,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ଇନଷ୍ଟଲ୍ ହୋଇଥିବା ଆପ୍ଗୁଡ଼ିକର ତାଲିକାରେ ଏହି ଆପ୍ଟି ମିଳିଲାନାହିଁ।"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"ଆପ୍ ପାଇଁ ଷ୍ଟୋରେଜ୍କୁ ଖାଲି କରିପାରିବ ନାହିଁ|"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ଏହି ଆପ୍ ଆପଣଙ୍କ ଟାବଲେଟ୍ରେ ନିମ୍ନଗୁଡ଼ିକ ଅନୁସରଣ କରିପାରେ:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"ଏହି ଆପ୍ ନିମ୍ନଗୁଡିକ ଆପଣଙ୍କ ଫୋନ୍ରେ ଆକସେସ୍ କରିପାରେ:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ଏହି ଆପ୍ ଆପଣଙ୍କ ଟାବ୍ଲେଟ୍ରେ ନିମ୍ନଗୁଡ଼ିକ ଆକ୍ସେସ୍ କରିପାରେ। କାର୍ଯ୍ୟଦକ୍ଷତା ବଢାଇବାକୁ ତଥା ମେମୋରୀ ବ୍ୟବହାର କମ୍ କରିବାକୁ, ଏହି ଅନୁମତିଗୁଡ଼ିକରୁ କିଛି <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ରେ ଉପଲବ୍ଧ ଅଛି କାରଣ ଏହା <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ପରି ସମାନ ପ୍ରକ୍ରିୟାରେ ଚାଲେ:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ଏହି ଆପ୍ ଆପଣଙ୍କ ଫୋନ୍ରେ ନିମ୍ନଗୁଡିକ ଆକସେସ୍ କରିପାରେ। କାର୍ଯ୍ୟଦକ୍ଷତା ବଢାଇବାକୁ ତଥା ମେମୋରୀ ବ୍ୟବହାର କମ୍ କରିବାକୁ, ଏହି ଅନୁମତିଗୁଡିକରୁ କିଛି <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ରେ ଉପଲବ୍ଧ ଅଛି କାରଣ ଏହା <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ପରି ସମାନ ପ୍ରକ୍ରିୟାରେ ଚାଲେ:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ଓ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"ଏହି ଆପ୍ରେ ଆପଣଙ୍କୁ ପଇସା ଦେବାକୁ ପଡ଼ିପାରେ:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ପ୍ରିମିୟମ୍ SMS ପଠାନ୍ତୁ"</string>
<string name="computing_size" msgid="1599186977475211186">"ଗଣୁଛି…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"ପ୍ୟାକେଜ୍ ଆକାର ଗଣଣା କରିପାରିଲା ନାହିଁ"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"ଆପଣ କୌଣସି ତୃତୀୟ ପକ୍ଷ ଆପ୍ ଇନ୍ଷ୍ଟଲ୍ କରିନାହାନ୍ତି।"</string>
<string name="version_text" msgid="9189073826278676425">"ସଂସ୍କରଣ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"ନିଅନ୍ତୁ"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ଟାବ୍ଲେଟ୍କୁ ନେଇଯାଆନ୍ତୁ"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍କୁ ନେଇଯା’ନ୍ତୁ"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB ଷ୍ଟୋରେଜକୁ ଘୁଞ୍ଚାନ୍ତୁ"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD କାର୍ଡକୁ ନିଅନ୍ତୁ"</string>
- <string name="moving" msgid="6431016143218876491">"ନେଉଛି"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"ଅନ୍ୟ ମାଇଗ୍ରେସନ୍ ପୂର୍ବରୁ ଚାଲୁ ଅଛି"</string>
<string name="insufficient_storage" msgid="481763122991093080">"ଷ୍ଟୋରେଜ୍ରେ ପର୍ଯ୍ୟାପ୍ତ ସ୍ଥାନ ନାହିଁ।"</string>
<string name="does_not_exist" msgid="1501243985586067053">"ଆପ୍ ନାହିଁ"</string>
@@ -1791,17 +1788,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"ବାହାର ମିଡିଆରେ ଡିଭାଇସ୍ ଆଡମିନ୍ ସଂସ୍ଥାପିତ ହୋଇପାରିବ ନାହିଁ"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"ଜବରଦସ୍ତି ବନ୍ଦ କରିବେ?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"ଯଦି ଆପଣ ଏକ ଆପ୍ ବାଧ୍ୟ ବନ୍ଦ କରନ୍ତି, ଏହା ଅସାମାନ୍ୟ ବ୍ୟବହାର କରିବ।"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ଏପକୁ ଘୁଞ୍ଚାଇପାରୁନାହିଁ। <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"ଇନ୍ଷ୍ଟଲ୍ କରିବା ପାଇଁ ନିଜ ପସନ୍ଦର ଲୋକେଶନ୍ ବାଛନ୍ତୁ"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"ନୂଆ ଆପ୍ଗୁଡ଼ିକ ପାଇଁ ନିଜ ପସନ୍ଦର ଇନଷ୍ଟଲେସନ୍ ଲୋକେଶନ୍ ବଦଳାନ୍ତୁ"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"ବିଲ୍ଟ-ଇନ୍ ଆପ୍ ଅକ୍ଷମ କରିବେ?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"ଆପ୍ ଅକ୍ଷମ କରନ୍ତୁ"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"ଯଦି ଆପଣ ଏହି ଆପ୍କୁ ନିଷ୍କ୍ରିୟ କରନ୍ତି, ତେବେ Android ଓ ଅନ୍ୟାନ୍ୟ ଆପ୍ଗୁଡ଼ିକ ଆଉ କାମ ନକରିପାରେ।"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ଡାଟା ବିଲୋପ କରିବେ ତଥା ଆପ୍ ଅକ୍ଷମ କରିବେ କି?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ଯଦି ଆପଣ ଏହି ଆପ୍କୁ ଅକ୍ଷମ କରନ୍ତି, ତେବେ Android ଓ ଅନ୍ୟ ଆପ୍ଗୁଡ଼ିକ ଆଉ ଠିକ୍ ଭାବେ କାମ ନକରିପାରେ। ଆପଣଙ୍କର ଡାଟା ମଧ୍ୟ ଡିଲିଟ୍ ହୋଇଯିବ।"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ବନ୍ଦ କରିବେ?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ଏହି ଆପ୍ ପାଇଁ ଯଦି ବିଜ୍ଞପ୍ତି ବନ୍ଦ କରନ୍ତି, ତେବେ ଆପଣ ଜରୁରୀ ଆଲର୍ଟ ଓ ଅପ୍ଡେଟ୍ ଦେଖିପାରିବେ ନାହିଁ।"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"ଷ୍ଟୋର୍"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"ଆପ୍ ବିବରଣୀ"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> ରୁ ଇନ୍ଷ୍ଟଲ୍ ହୋଇଥିବା ଆପ୍"</string>
@@ -1994,6 +1987,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ସେବା ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ରଙ୍ଗ ସଂଶୋଧନକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"କ୍ୟାପଶନ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"ଜାରି ରଖନ୍ତୁ"</string>
<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="6371077608778830020">"ଶ୍ରବଣ ଯନ୍ତ୍ର ଯୋଡ଼ନ୍ତୁ"</string>
@@ -2137,8 +2131,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ଯଦି ଆପଣ ଗୋଟିଏ ଆପ୍ର ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପକୁ ସୀମିତ କରିବେ, ଏହା ଠିକ୍ ଭାବରେ କାମ କରିନପାରେ"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ବ୍ୟାଟେରୀକୁ ଅପ୍ଟିମାଇଜ୍ କରିବା ପାଇଁ ଯେହେତୁ ଏହି ଆପ୍କୁ ସେଟ୍ କରାଯାଇନାହିଁ, ତେଣୁ ଆପଣ ଏହାକୁ ସୀମାବଦ୍ଧ କରିପାରିବେ ନାହିଁ। \n\nଆପ୍କୁ ସୀମାବଦ୍ଧ କରିବା ପାଇଁ ପ୍ରଥମେ ବ୍ୟାଟେରୀ ଅପ୍ଟିମାଇଜେଶନ୍କୁ ଚାଲୁ କରନ୍ତୁ।"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ସ୍କ୍ରୀନ୍ର ବ୍ୟବହାର"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"ସ୍କ୍ରୀନ୍ ବ୍ୟବହାର"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"ମୋବାଇଲ୍ ନେଟ୍ୱର୍କ ଖୋଜୁଛି"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"ଫୁଲ୍ ଚାର୍ଜ ହେବା ପରଠାରୁ ଖର୍ଚ୍ଚ ହୋଇଥିବା ବ୍ୟାଟେରୀ"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ ହେବା ପରଠାରୁ ସ୍କ୍ରୀନ୍ ଅନ୍ ହୋଇଥିବାର ସମୟ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ଫୁଲ୍ ଚାର୍ଜ ପରଠାରୁ ଡିଭାଇସ୍ର ବ୍ୟବହାର"</string>
@@ -2165,11 +2157,6 @@
<string name="details_subtitle" msgid="32593908269911734">"ବିବରଣୀ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="controls_subtitle" msgid="390468421138288702">"ପାୱାର୍ ବ୍ୟବହାର ଆଡ୍ଜଷ୍ଟ କରନ୍ତୁ"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"ଅନ୍ତର୍ଭୁକ୍ତ ଥିବା ପ୍ୟାକେଜ୍ଗୁଡିକ"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ଆପ୍ଗୁଡ଼ିକ ବ୍ୟାଟେରୀ ସାରୁଛନ୍ତି"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ଡିଭାଇସ୍କୁ ଜାଗ୍ରତ ରଖାଯାଇଛି"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡରେ ଡିଭାଇସ୍ ଜାଗ୍ରତ ରହୁଛି"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ଲଗାତର ଲୋକେଶନ୍ର ଅନୁରୋଧ କରାଯାଉଛି"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g>ଟି ଆପ୍ ଠିକ୍ ଭାବେ କାମ କରୁନି"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"ଆପ୍ ଠିକ୍ ଭାବେ ଚାଲୁଛି"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ଫୋନ୍ର ବିଶେଷ ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡ ବ୍ୟାଟେରୀ ବ୍ୟବହାର ରହିଛି"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ଟାବଲେଟ୍ର ବିଶେଷ ବ୍ୟାକ୍ଗ୍ରାଉଣ୍ଡ ବ୍ୟାଟେରୀ ବ୍ୟବହାର ରହିଛି"</string>
@@ -2233,6 +2220,7 @@
<item quantity="other">%1$dଟି ଆପ୍ ପାଇଁ ବ୍ୟାଟେରୀର ବ୍ୟବହାରକୁ ସୀମିତ କରାଯାଉଛି</item>
<item quantity="one"> %1$dଟି ଆପ୍ ପାଇଁ ବ୍ୟାଟେରୀର ବ୍ୟବହାରକୁ ସୀମିତ କରାଯାଉଛି</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"ପ୍ରତିବନ୍ଧିତ <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"ଏହିସବୁ ଆପ୍ ଦ୍ୱାରା ବ୍ୟାକଗ୍ରାଉଣ୍ଡରେ ବ୍ୟାଟେରୀ ଖର୍ଚ୍ଚ କରାଯାଉଛି। ଅବରୋଧ କରାଯାଇଥିବା ଆପ୍ ଠିକ୍ ଭାବେ କାମ ନକରିପାରେ ଏବଂ ବିଜ୍ଞପ୍ତି ମିଳିବାରେ ଡେରି ହୋଇପାରେ।"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"ବ୍ୟାଟେରୀ ମ୍ୟାନେଜର୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"କେତେବେଳେ ଆପ୍ ବ୍ୟାଟେରୀ ଖର୍ଚ୍ଚ କରୁଛି, ତାହା ଠାବ କରନ୍ତୁ"</string>
@@ -2410,23 +2398,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"କ୍ୟାନ୍ସଲ୍"</string>
<string name="tts_reset" msgid="2661752909256313270">"ରିସେଟ୍ କରନ୍ତୁ"</string>
<string name="tts_play" msgid="2628469503798633884">"ଚଲାନ୍ତୁ"</string>
- <string name="gadget_title" msgid="5519037532720577836">"ପାୱାର୍ ନିୟନ୍ତ୍ରଣ"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"ୱାଇ-ଫାଇ ସେଟିଙ୍ଗ ଅପଡେଟ୍ କରାଯାଉଛି"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ବ୍ଲୁ-ଟୂଥ୍ ସେର୍ଟିଙ୍ଗ ଅପଡେଟ୍ କରୁଛି"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ଅନ୍"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ବନ୍ଦ"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ଅନ୍ କରୁଛି"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"ବନ୍ଦ କରୁଛି"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"ୱାଇ-ଫାଇ"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ବ୍ଲୁ-ଟୂଥ୍"</string>
- <string name="gadget_location" msgid="2974757497945178165">"ଅବସ୍ଥାନ"</string>
- <string name="gadget_sync" msgid="858895763714222152">"ସିଙ୍କ୍"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"ଉଜ୍ଜ୍ୱଳତା <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ସ୍ୱତଃ"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"ଫୁଲ୍"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"ଅଧା"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"ଅଫ୍"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"କ୍ରେଡେନ୍ସିଆଲ୍ ଷ୍ଟୋରେଜ୍"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ଷ୍ଟୋରେଜ୍ରୁ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
@@ -2584,7 +2555,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ରୁ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"ସମସ୍ତକୁ ବାଛନ୍ତୁ"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ଡାଟାର ବ୍ୟବହାର"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ଆପ୍ ଦ୍ୱାରା ଡାଟା ବ୍ୟବହାର"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"ମୋବାଇଲ୍ ଡାଟା ଏବଂ ୱାଇ-ଫାଇ"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"ଆପଣଙ୍କ ଡିଭାଇସ୍ ତୁଳନାରେ କେରିଅର୍ ଡାଟାକୁ ଅଲଗା ରୂପେ ଗଣନା କରିପାରନ୍ତି।"</string>
<string name="data_usage_app" msgid="4970478397515423303">"ଆପ୍ର ବ୍ୟବହାର"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ଆପ୍ ସୂଚନା"</string>
@@ -2961,7 +2932,6 @@
<item quantity="other">ଲୁଚିଥିବା %d ଆଇଟମ୍ଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ</item>
<item quantity="one">ଲୁଚିଥିବା %d ଆଇଟମ୍ ଦେଖାନ୍ତୁ</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"କୋଲାପ୍ସ"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"ନେଟ୍ୱର୍କ ଓ ଇଣ୍ଟରନେଟ୍"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ମୋବାଇଲ୍"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ଡାଟା ଉପଯୋଗ"</string>
@@ -2973,12 +2943,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ବ୍ଲୁ-ଟୂଥ୍"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ଆପ୍ ଓ ବିଜ୍ଞପ୍ତି"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ଅନୁମତି, ଡିଫଲ୍ଟ ଆପ୍"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"ୱାର୍କ ପ୍ରୋଫାଇଲ୍ରେ ଆପ୍ସ ପାଇଁ ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ ଉପଲବ୍ଧ ନାହିଁ."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"ଆକାଉଣ୍ଟ"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"କୌଣସି ଆକାଉଣ୍ଟ ଯୋଡ଼ାଯାଇନାହିଁ"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ଡିଫଲ୍ଟ ଆପ୍"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ଭାଷା, ସମୟ, ବ୍ୟାକଅପ୍, ଅପଡେଟ୍"</string>
<string name="search_results_title" msgid="1796252422574886932">"ସେଟିଙ୍ଗ"</string>
- <string name="search_menu" msgid="6283419262313758339">"ସର୍ଚ୍ଚ ସେଟିଙ୍ଗ"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"ୱାଇଫାଇ, ୱାଇ-ଫାଇ, ନେଟ୍ୱର୍କ କନେକ୍ସନ୍, ଇଣ୍ଟରନେଟ୍, ୱାୟରଲେସ୍, ଡାଟା, ୱାଇ ଫାଇ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"ୱାଇଫାଇ, ୱାଇ-ଫାଇ, ଟୋଗଲ୍, ନିୟନ୍ତ୍ରଣ"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"ଟେକ୍ସଟ୍ ମେସେଜ୍, ଟେକ୍ସଟିଙ୍ଗ୍, ମେସେଜ୍, ମେସେଜିଙ୍ଗ, ଡିଫଲ୍ଟ"</string>
@@ -3023,6 +2993,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ପୈଠ, ଟାପ୍, ପେମେଣ୍ଟ"</string>
<string name="keywords_backup" msgid="470070289135403022">"ବ୍ୟାକ୍ଅପ୍, ବ୍ୟାକ୍ ଅପ୍ ନିଅନ୍ତୁ"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ଇଙ୍ଗିତ"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ମୁହଁ, ଅନଲକ୍, ପ୍ରମାଣୀକରଣ, ସାଇନ୍ ଇନ୍"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl ଭର୍ସନ୍, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"ନେଟ୍ୱର୍କ, ମୋବାଇଲ୍ ନେଟ୍ୱର୍କ ସ୍ଥିତି, ସେବା ସ୍ଥିତି, ସିଗ୍ନାଲ୍ ଶକ୍ତି, ମୋବାଇଲ୍ ନେଟ୍ୱର୍କ ପ୍ରକାର, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"କ୍ରମିକ ସଂଖ୍ୟା, ହାର୍ଡୱେର୍ ଭର୍ସନ୍"</string>
@@ -3030,6 +3001,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ଡାର୍କ ଥିମ୍"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ବଗ୍"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ଆମ୍ବିଏଣ୍ଟ ଡିସ୍ପ୍ଲେ, ଲକ୍ ସ୍କ୍ରୀନ୍ ଡିସ୍ପ୍ଲେ"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"ସ୍କ୍ରିନ୍ ବିଜ୍ଞପ୍ତିକୁ ଲକ୍ କରନ୍ତୁ"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ଫେସ୍"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ଆଙ୍ଗୁଠି ଚିହ୍ନ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"କମ୍ ଆଲୋକ ଥିବା ସ୍କ୍ରୀନ୍, ଟଚ୍ସ୍କ୍ରୀନ୍, ବ୍ୟାଟେରୀ, ସ୍ମାର୍ଟ ଉଜ୍ଵଳତା, ଡାଇନାମିକ୍ ଉଜ୍ଵଳତା"</string>
@@ -3461,7 +3433,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"ଏହି ଡିଭାଇସ୍କୁ ଆରମ୍ଭ କରିବା ପାଇଁ ଯେତେବେଳେ ଆପଣ ନିଜ ପିନ୍ ଲେଖିବେ, ପ୍ରବେଶଯୋଗ୍ୟତା ସେବା, ଯେପରି <xliff:g id="SERVICE">%1$s</xliff:g> ଉପଲବ୍ଧ ହେବନାହିଁ।"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"ଏହି ଡିଭାଇସ୍ ଆରମ୍ଭ କରିବାକୁ ଆପଣଙ୍କ ଶୈଳୀ ଆପଣ ପ୍ରବେଶ କରିବା ବେଳେ, <xliff:g id="SERVICE">%1$s</xliff:g> ପରି ସେବାଗୁଡିକ ଏପର୍ଯ୍ୟନ୍ତ ଉପଲବ୍ଧ ହୋଇନାହିଁ।"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"ଏହି ଡିଭାଇସ୍ ଆରମ୍ଭ କରିବାକୁ ଆପଣ ଯେତେବେଳେ ନିଜ ପାସ୍ୱର୍ଡ ଦିଅନ୍ତି, <xliff:g id="SERVICE">%1$s</xliff:g> ଭଳି ଆକ୍ସେସିବିଲିଟୀ ସେବା କାମ କରେନାହିଁ ।"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ଧ୍ୟାନଦିଅନ୍ତୁ: ରିବୁଟ୍ କରିବା ପରେ, ଆପଣଙ୍କ ଫୋନ୍ ଅନଲକ୍ ନହେବା ପର୍ଯ୍ୟନ୍ତ ଏହି ଆପ୍ ଆରମ୍ଭ ହୋଇପାରିବ ନାହିଁ"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"ଟିପନ୍ତୁ: ଯଦି ଆପଣ ଆପଣଙ୍କ ଫୋନ୍ ରିଷ୍ଟାର୍ଟ କରିବେ ଏବଂ ସ୍କ୍ରିନ୍ ଲକ୍ ସେତ୍ ହବେ, ଆପଣଙ୍କ ଫୋନ୍ ଅନଲକ୍ ନହେବା ପର୍ଯ୍ୟନ୍ତ ଏହି ଆପ୍ ଆରମ୍ଭ ହୋଇପାରିବ ନାହିଁ"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI ସୂଚନା"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI ସମ୍ପର୍କିତ ସୂଚନା"</string>
<string name="slot_number" msgid="3762676044904653577">"(ସ୍ଲଟ୍<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ବ୍ୟକ୍ତିଗତ"</string>
<string name="filter_work_apps" msgid="24519936790795574">"କାର୍ଯ୍ୟ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ଆପ୍: ସମସ୍ତ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ଆପ୍: ବନ୍ଦ ଅଛି"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ବନ୍ଦ କରାଯାଇଛି"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ବର୍ଗ: ଅତ୍ୟନ୍ତ ମହତ୍ତ୍ୱପୂର୍ଣ୍ଣ"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ବର୍ଗ: କମ୍ ଗୁରୁତ୍ୱପୂର୍ଣ୍ଣ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ବର୍ଗ: ଅଫ୍ ରହିଛି"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"ବ୍ୟବହାର ସତର୍କଗୁଡିକ"</string>
<string name="show_all_apps" msgid="1512506948197818534">"ପୂର୍ଣ୍ଣ ଡିଭାଇସ୍ ବ୍ୟବହାର ଦେଖାନ୍ତୁ"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"ଆପ୍ର ବ୍ୟବହାର ଦେଖନ୍ତୁ"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ଉଚ୍ଚ ବ୍ୟବହାର"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ଟି ଆପ୍ ଅସାମାନ୍ୟ ବ୍ୟବହାର କରୁଛି</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ଅସାମାନ୍ୟ ବ୍ୟବହାର କରୁଛି</item>
@@ -3743,6 +3714,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"ଇଣ୍ଟର୍ନାଲ୍ ଷ୍ଟୋରେଜ୍: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ବ୍ୟବହୃତ - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ଖାଲି"</string>
<string name="display_summary" msgid="6737806235882127328">"ନିଷ୍କ୍ରିୟତାର <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ପରେ ସୁପ୍ତାବସ୍ଥା"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"ୱାଲ୍ପେପର୍, ସୁପ୍ତ, ଫଣ୍ଟ ସାଇଜ୍"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"କାମ ନ କରିବାର ୧୦ ମିନିଟ ପରେ ଶୁଆଇଦିଅ"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ମେମୋରୀର ହାରାହାରି <xliff:g id="USED_MEMORY">%1$s</xliff:g> ବ୍ୟବହୃତ"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> ଭାବରେ ସାଇନ୍ ଇନ୍ କରିଛନ୍ତି"</string>
@@ -3758,7 +3731,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ପଠାଇବାର ଅନୁମତି ନାହିଁ"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"କ୍ୟାମେରା ଅନୁମୋଦିତ ନୁହେଁ"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ସ୍କ୍ରୀନ୍ଶଟ୍ ପାଇଁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"ବ୍ୟାକଅପ୍କୁ ବନ୍ଦ କରିହେବ ନାହିଁ"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"ଏହି ଆପ୍କୁ ଖୋଲିହେବ ନାହିଁ"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"ଯଦି ଆପଣଙ୍କର କିଛି ପ୍ରଶ୍ନ ଥାଏ, ତେବେ ନିଜ IT ଆଡମିନ୍ଙ୍କ ସହ ସମ୍ପର୍କ କରନ୍ତୁ"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ଅଧିକ ବିବରଣୀ"</string>
@@ -3922,9 +3894,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"ଗୋଟିଏ କଟଆଉଟ୍ ସହିତ ଏକ ଡିସ୍ପ୍ଲେକୁ ସିମୁଲେଟ୍ କରନ୍ତୁ"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ପ୍ରଦର୍ଶନ ଫଳକ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ଡିସ୍ପ୍ଲେ କଟଆଉଟ୍, ନଚ୍"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"କିଛିନୁହେଁ"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଡିଭାଇସ୍"</string>
<string name="special_access" msgid="3458780842491881155">"ଆପ୍ ଆକ୍ସେସ୍ ବାଛନ୍ତୁ"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ଟି ଆପ୍, ପ୍ରତିବନ୍ଧିତ ଡାଟା ବ୍ୟବହାର କରିପାରନ୍ତି</item>
@@ -3946,11 +3918,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>କୁ ସଂଯୁକ୍ତ ହେଲା"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ଏକାଧିକ ଡିଭାଇସ୍ରେ ସଂଯୁକ୍ତ"</string>
<string name="demo_mode" msgid="2798762752209330277">"ସିଷ୍ଟମ୍ UI ଡେମୋ ମୋଡ୍"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"ନାଇଟ୍ ମୋଡ୍"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"ନାଇଟ୍ ମୋଡ୍କୁ ସେଟ୍ କରନ୍ତୁ"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"ଡାର୍କ ମୋଡ୍"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"ଡାର୍କ ମୋଡ୍ ସେଟ୍ କରନ୍ତୁ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ତ୍ୱରିତ ସେଟିଙ୍ଗ ଡେଭେଲପର୍ ଟାଇଲ୍ସ"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope ଟ୍ରେସ୍"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ୍ ସେଟିଙ୍ଗ"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ସମ୍ପର୍କ ସନ୍ଧାନ"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"କଲର୍ ଓ ଯୋଗାଯୋଗଗୁଡ଼ିକୁ ଚିହ୍ନିବା ପାଇଁ ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ଯୋଗାଯୋଗ ଖୋଜିବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
@@ -3991,13 +3962,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ଫୋନ୍ ଯାଞ୍ଚ କରିବାକୁ ଡବଲ୍ ଟାପ୍ କରନ୍ତୁ"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ଟାବ୍ଲେଟ୍ ଯାଞ୍ଚ କରିବାକୁ ଡବଲ୍-ଟାପ୍ କରନ୍ତୁ"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"ଡିଭାଇସ୍ ଯାଞ୍ଚ କରିବାକୁ ଡବଲ୍-ଟାପ୍ କରନ୍ତୁ"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"ସମୟ, ବିଜ୍ଞପ୍ତି ଆଇକନ୍ ଓ ଅନ୍ୟାନ୍ୟ ସୂଚନା ଦେଖିବା ପାଇଁ, ନିଜର ସ୍କ୍ରୀନ୍ ଉପରେ ଡବଲ୍-ଟାପ୍ କରନ୍ତୁ"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"ସମୟ, ବିଜ୍ଞପ୍ତି, ଏବଂ ଅନ୍ୟ ସୂଚନା ଦେଖିବାକୁ, ଆପଣଙ୍କ ସ୍କ୍ରିନ୍କୁ ଦୁଇଥର ଟାପ୍ କରନ୍ତୁ।"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ଫୋନ୍କୁ ପରଖିବା ପାଇଁ ଉଠାନ୍ତୁ"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ଟାବଲେଟ୍ ଯାଞ୍ଚ କରିବାକୁ ଉଠାନ୍ତୁ"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ଡିଭାଇସ୍ ଯାଞ୍ଚ କରିବାକୁ ଉଠାନ୍ତୁ"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ସମୟ, ବିଜ୍ଞପ୍ତି ଆଇକନ୍ ଓ ଅନ୍ୟାନ୍ୟ ସୂଚନା ଦେଖିବା ପାଇଁ, ନିଜର ଫୋନ୍କୁ ଉଠାନ୍ତୁ"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ସମୟ, ବିଜ୍ଞପ୍ତି ଆଇକନ୍ ଓ ଅନ୍ୟାନ୍ୟ ସୂଚନା ଦେଖିବା ପାଇଁ, ନିଜର ଫୋନ୍କୁ ଉଠାନ୍ତୁ"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ସମୟ, ବିଜ୍ଞପ୍ତି ଆଇକନ୍ ତଥା ଅନ୍ୟାନ୍ୟ ସୂଚନା ଦେଖାଇବାକୁ, ନିଜ ଡିଭାଇସ୍କୁ ଉଠାନ୍ତୁ।"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ୱେକ୍ ଅପ୍ ଡିସ୍ପ୍ଲେ"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"ସମୟ, ବିଜ୍ଞପ୍ତି, ଏବଂ ଅନ୍ୟ ସୂଚନା ଦେଖିବାକୁ, ଆପଣଙ୍କ ଫୋନ୍ ଉଠାନ୍ତୁ।"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"ସମୟ, ବିଜ୍ଞପ୍ତି, ଏବଂ ଅନ୍ୟ ସୂଚନା ଦେଖିବାକୁ, ଆପଣଙ୍କ ଟାବ୍ଲେଟ୍ ଉଠାନ୍ତୁ।"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"ସମୟ, ବିଜ୍ଞପ୍ତି, ଏବଂ ଅନ୍ୟ ସୂଚନା ଦେଖିବାକୁ, ଆପଣଙ୍କ ଡିଭାଇସ୍ ଉଠାନ୍ତୁ।"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"ୱେକ୍ ଲକ୍ ସ୍କ୍ରୀନ୍ ଜେଶ୍ଚର୍"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ବିଜ୍ଞପ୍ତି ପାଇଁ ଆଙ୍ଗୁଠି ଚିହ୍ନ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ଆଙ୍ଗୁଠି ଚିହ୍ନ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖିବା ପାଇଁ, ନିଜ ଫୋନ୍ ପଛପଟେ ଥିବା ଆଙ୍ଗୁଠି ଚିହ୍ନ ସେନ୍ସର୍ ଉପରେ ଆଙ୍ଗୁଠି ରଖି ତଳକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ।"</string>
@@ -4077,7 +4052,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ପ୍ରୟାସ</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ପ୍ରୟାସ</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"ଏହି ଡିଭାଇସ୍ର ଡାଟାକୁ ବ୍ୟାକଅପ୍ କରାଯିବାର ଅଛି"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"ଏହି ଡିଭାଇସ୍ ଆପଣଙ୍କ ସଂସ୍ଥା ଦ୍ୱାରା ପରିଚାଳିତ"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"ଏହି ଡିଭାଇସ୍ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ଦ୍ୱାରା ପରିଚାଳିତ ହେଉଛି।"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4118,6 +4092,12 @@
<string name="autofill_app" msgid="7338387238377914374">"ସ୍ୱତଃପୂରଣ ସେବା"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ଅଟୋ, ଫିଲ, ଅଟୋଫିଲ"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ଆପଣ ଏହି ଆପ୍କୁ ବିଶ୍ୱାସ କରୁଥିବା ନିଶ୍ଚିତ କରନ୍ତୁ</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> କ\'ଣ ଅଟୋଫିଲ୍ କରାଯାଇପାରିବ ନିର୍ଦ୍ଧାରଣ କରିବା ପାଇଁ, Google Autofill ଆପଣଙ୍କ ସ୍କ୍ରୀନ୍ରେ ଯାହା ଥାଏ, ତାହା ବ୍ୟବହାର କରେ।"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"ଅଟୋଫିଲ୍"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"ଲଗିଂ ସ୍ତର"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"ଗୋଟିଏ ଅବଧିରେ ସର୍ବାଧିକ ଅନୁରୋଧ"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"ସର୍ବଧିକ ଦେଖାଯାଉଥିବା ଡାଟାସେଟ୍ଗୁଡିକ"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ଡିଫଲ୍ଟ ମୂଲ୍ୟକୁ ରିସେଟ୍ କରନ୍ତୁ"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"ଅଟୋଫିଲ୍ ଡେଭଲପର୍ ବିକଳ୍ପଗୁଡିକ ରିସେଟ୍ ହୋଇଛି"</string>
<string name="device_theme" msgid="4571803018917608588">"ଡିଭାଇସ୍ ଥିମ୍"</string>
<string name="default_theme" msgid="7085644992078579076">"ପ୍ରାକ୍-ନିର୍ଦ୍ଧାରିତ"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"ନେଟୱାର୍କ ନାମ"</string>
@@ -4132,15 +4112,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"କେରିଅର୍ ପ୍ରୋଭିଜନିଙ୍ଗ ଟ୍ରିଗର୍ କରନ୍ତୁ"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅପଡେଟ୍ କରନ୍ତୁ"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"ଫୋକସ୍ ରହିବା ପାଇଁ ବିଜ୍ଞପ୍ତି ବିରତି କରନ୍ତୁ"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"କଣ ନୂତନ ତଥା ମଜାଦାର ଅଛି?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ଆପଣଙ୍କ ନୂଆ ଫୋନ୍କୁ ଚଲାଇ ଦେଖନ୍ତୁ"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ଆପଣଙ୍କ ନୂଆ ଟାବ୍ଲେଟ୍କୁ ଚଲାଇ ଦେଖନ୍ତୁ"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ଆପଣଙ୍କ ନୂତନ ଡିଭାଇସ୍ ପରଖି ନିଅନ୍ତୁ"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"ଏହି ଡିଭାଇସ୍ରେ ଏହି ବୈଶିଷ୍ଟ୍ୟ ଉପଲବ୍ଧ ନୁହେଁ"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ପୂର୍ଣ୍ଣ GNSS ପରିମାପ ବାଧ୍ୟ କରନ୍ତୁ"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ଉପଯୋଗିତା ଅନୁପାତ ନଥିବା ସମସ୍ତ GNSS ଉପଗ୍ରହ ସମଷ୍ଟି ଓ ଫ୍ରିକ୍ୱେନ୍ସୀକୁ ଟ୍ରାକ୍ କରନ୍ତୁ"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"କ୍ରାଶ୍ ହୋଇଥିବା ଡାୟଲଗ୍କୁ ସର୍ବଦା ଦେଖାନ୍ତୁ"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"ପ୍ରତ୍ୟେକ ଥର ଗୋଟିଏ ଆପ୍ କ୍ରାଶ୍ ହେବାପରେ ଡାୟଲଗ୍ ଦେଖାନ୍ତୁ"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE ସକ୍ଷମ ଥିବା ଆପ୍ ଚୟନ କରନ୍ତୁ"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"କୌଣସି ANGLE ସକ୍ଷମ ଥିବା ଆପ୍ଲିକେଶନ୍ ସେଟ୍ କରାଯାଇନାହିଁ"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE ସକ୍ଷମ ଆପ୍ଲିକେଶନ୍: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ଡାଇରେକ୍ଟୋରୀ ଆକ୍ସେସ୍"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ଡାଇରେକ୍ଟୋରୀ ଆକ୍ସେସ୍"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4181,4 +4160,84 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"ନେଟୱର୍କ୍ର ବିବରଣୀ"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"ଆପଣଙ୍କ ଡିଭାଇସ୍ରେ ଥିବା ଆପ୍ଗୁଡ଼ିକୁ ଆପଣଙ୍କର ଡିଭାଇସ୍ ନାମ ଦେଖାଯାଉଛି। ବ୍ଲୁ-ଟୂଥ୍ ଡିଭାଇସ୍ ସହ ଯୋଡ଼ି ହେବାବେଳେ କିମ୍ୱା ଏକ ୱାଇ-ଫାଇ ହଟସ୍ପଟ୍ ସେଟ୍ କରିବା ସମୟରେ, ଏହା ଅନ୍ୟ ଲୋକମାନଙ୍କୁ ମଧ୍ୟ ଦେଖାଦେଇପାରେ।"</string>
<string name="devices_title" msgid="7701726109334110391">"ଡିଭାଇସ୍"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"ସମସ୍ତ ସେଟିଂସ୍"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"ପରାମର୍ଶ"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ଡାଟା"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ଡାଟା"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ନେଟ୍ୱର୍କ ବାଛନ୍ତୁ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ବିଛିନ୍ନ ହୋଇଗଲା"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ସଂଯୋଗ ହୋଇଛି"</string>
+ <string name="network_connecting" msgid="76404590784733557">"ସଂଯୋଗ କରୁଛି…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"ସଂଯୋଗ କରିହେଲା ନାହିଁ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"କୌଣସି ନେଟ୍ୱର୍କ ମିଳୁନାହିଁ"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ନେଟ୍ୱର୍କ ମିଳୁନାହିଁ। ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ଅନୁମତିପ୍ରାପ୍ତ ନୁହେଁ)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM କାର୍ଡ ନାହିଁ"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"ଉନ୍ନତ କଲିଂ"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: WCDMAକୁ ପସନ୍ଦ କରାଯାଇଛି"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: GSM କେବଳ"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: କେବଳ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: CDMA କେବଳ"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: EvDo କେବଳ"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"ନିଜ ପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: ଗ୍ଲୋବାଲ୍"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: LTE /GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ମୋଡ୍: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (ସୁପାରିଶ କରାଯାଇଛି)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (ସୁପାରିଶ କରାଯାଇଛି)"</string>
+ <string name="network_global" msgid="959947774831178632">"ଗ୍ଲୋବାଲ୍"</string>
+ <string name="label_available" msgid="1731547832803057893">"ଉପଲବ୍ଧ ଥିବା ନେଟ୍ୱର୍କ"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"ସନ୍ଧାନ କରୁଛି…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g>ରେ ପଞ୍ଜିକରଣ ହେଉଛି…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"ଆପଣଙ୍କର SIM କାର୍ଡ ଏହି ନେଟ୍ୱର୍କରେ ସଂଯୁକ୍ତ ହେବା ପାଇଁ ଅନୁମତି ଦିଏ ନାହିଁ।"</string>
+ <string name="connect_later" msgid="978991102125216741">"ବର୍ତ୍ତମାନ ଏହି ନେଟ୍ୱର୍କରେ ସଂଯୋଗ କରାଯାଇପାରିବ ନାହିଁ। ପରେ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
+ <string name="registration_done" msgid="4573820010512184521">"ଏହି ନେଟ୍ୱର୍କରେ ପଞ୍ଜିକୃତ କରାଯାଇଛି।"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"ସ୍ଵଚାଳିତ ଭାବେ ନେଟ୍ୱର୍କ ଚୟନ କରନ୍ତୁ"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"ବାହକ ସେଟିଂସ୍"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ଡାଟା ସେବା ସେଟ୍ଅପ୍ କରନ୍ତୁ"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"ମୋବାଇଲ୍ ଡାଟା"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"ମୋବାଇଲ୍ ନେଟ୍ୱର୍କକୁ ବ୍ୟବହାର କରି ଡାଟା ଆକ୍ସେସ୍ କରନ୍ତୁ"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ପ୍ରକାର"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"ନେଟ୍ୱର୍କ ଅପରେଟିଙ୍ଗ ମୋଡ୍କୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"ମନପସନ୍ଦର ନେଟ୍ୱର୍କ ପ୍ରକାର"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"ବାହକ"</string>
+ <string name="call_category" msgid="8108654745239563833">"କଲିଂ"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"ବାହକ ଭିଡିଓ କଲିଂ"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"ସିଷ୍ଟମ୍ ଚୟନ କରନ୍ତୁ"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMAର ରୋମିଂ ମୋଡ୍କୁ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"ସିଷ୍ଟମ୍ ଚୟନ କରନ୍ତୁ"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"ନେଟ୍ୱର୍କ"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"ନେଟ୍ୱର୍କ"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA ସଦସ୍ୟତା"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM ଓ NV ମଧ୍ୟରେ ଅଦଳବଦଳ କରନ୍ତୁ"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"ସଦସ୍ୟତା"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ସ୍ଵଚାଳିତ ପଞ୍ଜିକରଣ…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"ଡାଟା ରୋମିଂର ଅନୁମତି ଦେବେ?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"ମୂଲ୍ୟ ଜାଣିବା ପାଇଁ ନିଜର ନେଟ୍ୱର୍କ ପ୍ରଦାତାଙ୍କ ସହ ସମ୍ପର୍କ କରନ୍ତୁ।"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ଆପ୍ର ଡାଟା ବ୍ୟବହାର"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"ଅବୈଧ ନେଟ୍ୱର୍କ ମୋଡ୍ <xliff:g id="NETWORKMODEID">%1$d</xliff:g>। ଅବଜ୍ଞା କରନ୍ତୁ।"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g>କୁ ସଂଯୁକ୍ତ ହୋଇଥିବା ସମୟରେ ଉପଲବ୍ଧ ନଥାଏ"</string>
+ <string name="see_more" msgid="5953815986207345223">"ଅଧିକ ଦେଖନ୍ତୁ"</string>
+ <!-- no translation found for see_less (1250265310929558370) -->
+ <skip />
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 7d0cd17..d834304 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"ਮੀਟਰਬੱਧ ਮੰਨੋ"</item>
<item msgid="2266114985518865625">"ਗੈਰ-ਮੀਟਰਬੱਧ ਮੰਨੋ"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ਪੂਰਵ-ਨਿਰਧਾਰਤ (ਬੇਤਰਤੀਬਾ MAC ਵਰਤੋ)"</item>
+ <item msgid="5398461510512959597">"ਭਰੋਸੇਯੋਗ"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"ਨਹੀਂ"</item>
<item msgid="3863157480502955888">"ਹਾਂ"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"ਹਮੇਸ਼ਾਂ ਚਾਲੂ"</item>
<item msgid="6385301106124765323">"ਹਮੇਸ਼ਾਂ ਬੰਦ"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"ਬੰਦ"</item>
+ <item msgid="2182686878828390312">"ਡੀਬੱਗ"</item>
+ <item msgid="5286514712714822064">"ਵਰਬੋਸ"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"ਸਿਰਫ਼ ਹੋਮ"</item>
+ <item msgid="5034813753274486448">"ਸਵੈਚਲਿਤ"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA ਤਰਜੀਹੀ"</item>
+ <item msgid="807926878589867564">"ਸਿਰਫ਼ GSM"</item>
+ <item msgid="488474605709912156">"ਸਿਰਫ਼ WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA ਸਵੈਚਲਿਤ"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo ਸਵੈਚਲਿਤ"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"ਸਿਰਫ਼ EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"ਗਲੋਬਲ"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"ਸਿਰਫ਼ TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"ਗਲੋਬਲ"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 30f91cc..e7784dd 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"ਬਣਾਓ"</string>
<string name="allow" msgid="3349662621170855910">"ਆਗਿਆ ਦਿਓ"</string>
<string name="deny" msgid="6947806159746484865">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
- <string name="dlg_close" msgid="7471087791340790015">"ਬੰਦ ਕਰੋ"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"ਸਵਿੱਚ ਕਰੋ"</string>
<string name="device_info_default" msgid="7847265875578739287">"ਅਗਿਆਤ"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">ਤੁਸੀਂ ਹੁਣ ਇੱਕ ਵਿਕਾਸਕਾਰ ਬਣਨ ਤੋਂ <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ਕਦਮ ਦੂਰ ਹੋ।</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"ਕੋਈ ਲੋੜ ਨਹੀਂ, ਤੁਸੀਂ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਵਿਕਾਸਕਾਰ ਹੋ।"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"ਕਿਰਪਾ ਕਰਕੇ ਪਹਿਲਾਂ ਵਿਕਾਸਕਾਰ ਵਿਕਲਪਾਂ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"ਵਾਇਰਲੈੱਸ ਅਤੇ ਨੈੱਟਵਰਕ"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"ਕਨੈਕਸ਼ਨ"</string>
- <string name="header_category_device" msgid="4544026001618307754">"ਡੀਵਾਈਸ"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ਨਿੱਜੀ"</string>
- <string name="header_category_access" msgid="7580499097416970962">"ਪਹੁੰਚ"</string>
<string name="header_category_system" msgid="2816866961183068977">"ਸਿਸਟਮ"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਚਾਲੂ ਕਰੋ"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਬੰਦ ਕਰੋ"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ਡੀਵਾਈਸ ਦਾ ਬਲੂਟੁੱਥ ਪਤਾ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ਕੀ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"ਪ੍ਰਸਾਰਨ"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"ਬਿਨਾਂ ਨਾਮ ਦਾ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ"</string>
<string name="progress_scanning" msgid="192587958424295789">"ਖੋਜ ਰਿਹਾ ਹੈ"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ਕੋਈ ਨੇੜਲੀਆਂ Bluetooth ਡਿਵਾਈਸਾਂ ਨਹੀਂ ਮਿਲੀਆਂ।"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"ਇੱਕ ਐਪ ਬਲੂਟੁੱਥ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਹੋਰ ਡੀਵਾਈਸਾਂ ਵਾਸਤੇ ਦਿਖਣਯੋਗ ਬਣਾਉਣਾ ਚਾਹੁੰਦੀ ਹੈ। ਤੁਸੀਂ ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਬਲੂਟੁੱਥ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ।"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"ਬਲੂਟੁੱਥ ਚਾਲੂ ਹੋ ਰਿਹਾ ਹੈ…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"ਬਲੂਟੁੱਥ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"ਆਟੋ-ਕਨੈਕਟ ਕਰੋ"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth ਕਨੈਕਸ਼ਨ ਬੇਨਤੀ"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"ਕੀ ਤੁਸੀਂ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ਨਾਲ ਕਨੈਕਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"ਉਪਲਬਧ ਕਾਲ ਡੀਵਾਈਸ"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"ਇਸ ਵੇਲੇ ਕਨੈਕਟ ਹੈ"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"ਰੱਖਿਅਤ ਕੀਤੀਆਂ ਡੀਵਾਈਸਾਂ"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"ਜੋੜਾਬੱਧ ਕਰਨ ਲਈ ਬਲੂਟੁੱਥ ਚਾਲੂ ਹੋਵੇਗਾ"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"ਕਨੈਕਸ਼ਨ ਤਰਜੀਹਾਂ"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"ਪਹਿਲਾਂ ਤੋਂ ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ਪਹਿਲਾਂ ਤੋਂ ਕਨੈਕਟ ਕੀਤੇ"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"ਬਲੂਟੁੱਥ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"ਸਭ ਦੇਖੋ"</string>
<string name="date_and_time" msgid="9062980487860757694">"ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ"</string>
<string name="choose_timezone" msgid="1362834506479536274">"ਸਮਾਂ ਜ਼ੋਨ ਚੁਣੋ"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"ਛੱਡੋ"</string>
<string name="next_label" msgid="4693520878012668114">"ਅੱਗੇ"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ਭਾਸ਼ਾਵਾਂ"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ਭਾਸ਼ਾ ਤਰਜੀਹਾਂ"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"ਹਟਾਓ"</string>
<string name="add_a_language" msgid="2330538812283783022">"ਇੱਕ ਭਾਸ਼ਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"ਸੈਟਿੰਗਾਂ"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"ਸੈਟਿੰਗਾਂ ਸ਼ਾਰਟਕੱਟ"</string>
<string name="airplane_mode" msgid="8837269988154128601">"ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"ਹੋਰ"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"ਵਾਇਰਲੈੱਸ ਅਤੇ ਨੈੱਟਵਰਕ"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"ਵਾਈ‑ਫਾਈ, ਬਲੂਟੁੱਥ, ਹਵਾਈ ਜਹਾਜ਼ ਮੋਡ, ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ & VPN ਪ੍ਰਬੰਧਿਤ ਕਰੋ"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
@@ -388,7 +378,8 @@
<string name="security_passwords_title" msgid="2881269890053568809">"ਪਰਦੇਦਾਰੀ"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
<string name="security_status_title" msgid="5848766673665944640">"ਸੁਰੱਖਿਆ ਸਥਿਤੀ"</string>
- <string name="security_dashboard_summary" msgid="6757421634477554939">"ਸਕ੍ਰੀਨ ਲਾਕ , ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"ਸਕ੍ਰੀਨ ਲਾਕ, ਚਿਹਰਾ ਅਣਲਾਕ"</string>
+ <string name="security_dashboard_summary" msgid="6757421634477554939">"ਸਕ੍ਰੀਨ ਲਾਕ, ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ਸਕ੍ਰੀਨ ਲਾਕ"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ਚਿਹਰਾ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
<string name="security_settings_face_preference_summary_none" msgid="5460349732790152186">"ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਰਨ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"ਆਪਣੇ ਚਿਹਰੇ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"ਪ੍ਰਮਾਣੀਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰਾ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ, ਖਰੀਦਾਂ ਨੂੰ ਅਧਿਕਾਰਿਤ ਕਰਨ ਜਾਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
- <string name="face_add_max" msgid="2342250989212694454">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"ਚੱਕਰ ਦੇ ਅੰਦਰ ਆਪਣਾ ਚਿਹਰਾ ਕੇਂਦਰਿਤ ਕਰੋ"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ਇਸਨੂੰ ਬਾਅਦ ਵਿੱਚ ਕਰੋ"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"ਤੁਸੀਂ <xliff:g id="COUNT">%d</xliff:g> ਤੱਕ ਚਿਹਰੇ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"ਤੁਸੀਂ ਵੱਧ ਤੋਂ ਵੱਧ ਗਿਣਤੀ ਵਿੱਚ ਚਿਹਰੇ ਸ਼ਾਮਲ ਕੀਤੇ ਹੋਏ ਹਨ"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"ਹੋਰ ਚਿਹਰਿਆਂ ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"ਦਾਖਲਾ ਪੂਰਾ ਨਹੀਂ ਹੋਇਆ"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ਠੀਕ ਹੈ"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"ਚਿਹਰਾ ਦਰਜ ਕਰਨ ਦੀ ਸਮਾਂ ਸੀਮਾ ਪੂਰੀ ਹੋ ਗਈ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ਚਿਹਰਾ ਦਰਜ ਕਰਨਾ ਕੰਮ ਨਹੀਂ ਕਰਦਾ ਹੈ।"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"ਸਭ ਸੈੱਟ ਹੈ। ਠੀਕ ਕੰਮ ਕਰ ਰਿਹਾ ਹੈ।"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"ਹੋ ਗਿਆ"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"ਚਿਹਰਾ ਇਹਨਾਂ ਲਈ ਵਰਤੋ"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"ਡੀਵਾਈਸ ਅਣਲਾਕ ਕਰੋ"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ਐਪ ਸਾਈਨ-ਇਨ ਅਤੇ ਭੁਗਤਾਨ"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"ਅਣਲਾਕ ਕਰਨ ਲਈ ਅੱਖਾਂ ਖੁੱਲ੍ਹੀਆਂ ਹਨ"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"ਚਿਹਰਾ ਪ੍ਰਮਾਣੀਕਰਨ ਵਰਤਣ ਵੇਲੇ ਤੁਹਾਡੀਆਂ ਅੱਖਾਂ ਦਾ ਖੁੱਲ੍ਹੇ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"ਚਿਹਰੇ ਦਾ ਡਾਟਾ ਹਟਾਓ"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"ਆਪਣੇ ਚਿਹਰੇ ਦਾ ਡਾਟਾ ਬਿਹਤਰ ਬਣਾਓ"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਅਤੇ ਐਪਾਂ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ। "<annotation id="url">"ਹੋਰ ਜਾਣੋ"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ਫਿੰਗਰਪ੍ਰਿੰਟਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ਇਸ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਲਈ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਬੈਂਡ ਚੁਣੋ:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ਸੈਟਿੰਗਾਂ"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"ਪਰਦੇਦਾਰੀ"</string>
<string name="wifi_shared" msgid="844142443226926070">"ਹੋਰ ਡੀਵਾਈਸ ਵਰਤੋਂਕਾਰਾਂ ਨਾਲ ਸਾਂਝਾ ਕਰੋ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ਬਿਨਾਂ ਬਦਲਿਆ)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"ਕਿਰਪਾ ਕਰਕੇ ਚੁਣੋ"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"ਰੱਦ ਕਰੋ"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"ਕੀ ਨੈੱਟਵਰਕ ਛੱਡਣਾ ਹੈ?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ਇਸ ਨੈੱਟਵਰਕ ਦੇ ਸਾਰੇ ਪਾਸਵਰਡ ਮਿਟਾਏ ਜਾਣਗੇ"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"ਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d ਨੈੱਟਵਰਕ</item>
<item quantity="other">%d ਨੈੱਟਵਰਕ</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"ਚਮਕ"</string>
<string name="brightness_summary" msgid="838917350127550703">"ਸਕ੍ਰੀਨ ਦੀ ਚਮਕ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"ਅਨੁਕੂਲਨਯੋਗ ਚਮਕ"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ਚਾਲੂ"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ਬੰਦ"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"ਤਰਜੀਹੀ ਚਮਕ ਬਹੁਤ ਘੱਟ ਹੈ"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"ਤਰਜੀਹੀ ਚਮਕ ਘੱਟ ਹੈ"</string>
@@ -1121,11 +1127,11 @@
<string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"ਬੈਟਰੀ ਵਰਤੋਂ ਵਧ ਜਾਵੇਗੀ"</string>
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"ਉਪਲਬਧ ਲਾਈਟ ਲਈ ਚਮਕ ਦੇ ਪੱਧਰ ਨੂੰ ਸੁਯੋਗ ਬਣਾਓ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਦੇ ਚਾਲੂ ਹੋਣ \'ਤੇ ਵੀ ਤੁਸੀਂ ਚਮਕ ਨੂੰ ਅਸਥਾਈ ਤੌਰ \'ਤੇ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"ਤੁਹਾਡੇ ਸਕ੍ਰੀਨ ਦੀ ਚਮਕ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਵਾਤਾਵਰਣ ਅਤੇ ਤੁਹਾਡੇ ਵੱਲੋਂ ਕੀਤੀਆਂ ਜਾਣ ਵਾਲੀਆਂ ਸਰਗਰਮੀ ਦੇ ਮੁਤਾਬਕ ਵੱਧ-ਘੱਟ ਹੋਵੇਗੀ। ਢਲਨਹਾਰ ਚਮਕ ਨੂੰ ਤੁਹਾਡੀਆਂ ਤਰਜੀਹਾਂ ਬਾਰੇ ਸਿੱਖਣ ਵਿੱਚ ਮਦਦ ਕਰਨ ਲਈ ਤੁਸੀਂ ਸਲਾਈਡਰ ਨੂੰ ਹੱਥੀਂ ਹਿਲਾ ਸਕਦੇ ਹੋ।"</string>
- <string name="night_display_title" msgid="2626451512200357686">"ਰਾਤਰੀ ਲਾਈਟ"</string>
- <string name="night_display_text" msgid="1837277457033025056">"ਰਾਤਰੀ ਲਾਈਟ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਭੂਰੇ ਪੀਲੇ ਰੰਗ ਦੀ ਭਾਹ ਦਿੰਦੀ ਹੈ। ਇਸ ਨਾਲ ਮੱਧਮ ਰੋਸ਼ਨੀ ਵਿੱਚ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਦੇਖਣਾ ਜਾਂ ਪੜ੍ਹਨਾ ਵਧੇਰੇ ਆਸਾਨ ਹੋ ਜਾਂਦਾ ਹੈ ਅਤੇ ਤੁਹਾਨੂੰ ਵਧੇਰੇ ਆਸਾਨੀ ਨਾਲ ਸੌਣ ਵਿੱਚ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।"</string>
+ <string name="night_display_title" msgid="2626451512200357686">"ਰਾਤ ਦੀ ਰੋਸ਼ਨੀ"</string>
+ <string name="night_display_text" msgid="1837277457033025056">"\'ਰਾਤ ਦੀ ਰੋਸ਼ਨੀ\' ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਭੂਰੇ ਪੀਲੇ ਰੰਗ ਦੀ ਭਾਹ ਦਿੰਦੀ ਹੈ। ਇਸ ਨਾਲ ਮੱਧਮ ਰੋਸ਼ਨੀ ਵਿੱਚ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਦੇਖਣਾ ਜਾਂ ਪੜ੍ਹਨਾ ਵਧੇਰੇ ਆਸਾਨ ਹੋ ਜਾਂਦਾ ਹੈ ਅਤੇ ਤੁਹਾਨੂੰ ਵਧੇਰੇ ਆਸਾਨੀ ਨਾਲ ਸੌਣ ਵਿੱਚ ਮਦਦ ਮਿਲ ਸਕਦੀ ਹੈ।"</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"ਸਮਾਂ-ਸੂਚੀ"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"ਕੋਈ ਨਹੀਂ"</string>
- <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ਵਿਉਂਂਤੀ ਸਮੇਂ ਤੇ ਚਾਲੂ ਹੋ ਜਾਂਦੀ ਹੈ"</string>
+ <string name="night_display_auto_mode_custom" msgid="2379394568898721765">"ਵਿਉਂਂਤੇ ਸਮੇਂ \'ਤੇ ਚਾਲੂ ਹੋ ਜਾਂਦੀ ਹੈ"</string>
<string name="night_display_auto_mode_twilight" msgid="589042813708244059">"ਸੂਰਜ ਡੁੱਬਣ ਤੋਂ ਲੈਕੇ ਸੂਰਜ ਚੜ੍ਹਨ ਤੱਕ ਚਾਲੂ ਰਹਿੰਦੀ ਹੈ"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"ਸ਼ੁਰੂੂਆਤ ਦਾ ਸਮਾਂ"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"ਸਮਾਪਤੀ ਦਾ ਸਮਾਂ"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"ਪਿੰਨ ਨਹੀਂ ਬਦਲ ਸਕਦਾ।\nਸ਼ਾਇਦ ਪਿੰਨ ਗਲਤ ਹੈ।"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"ਸਿਮ ਪਿੰਨ ਸਫਲਤਾਪੂਰਵਕ ਬਦਲਿਆ ਗਿਆ"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"ਸਿਮ ਕਾਰਡ ਲਾਕ ਦੀ ਸਥਿਤੀ ਨਹੀਂ ਬਦਲ ਸਕਦੀ।\nਸੰਭਾਵਿਤ ਤੌਰ \'ਤੇ ਗਲਤ ਪਿੰਨ।"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"ਪਿੰਨ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"ਪਿੰਨ ਨੂੰ ਚਾਲੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ਠੀਕ"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"ਰੱਦ ਕਰੋ"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"ਮਲਟੀਪਲ SIM ਮਿਲੇ"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ਇਸਨੂੰ <xliff:g id="NAME_0">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ। \n\n"<b>"ਫਾਰਮੈਟ ਕਰਨਾ <xliff:g id="NAME_1">^1</xliff:g> \'ਤੇ ਵਰਤਮਾਨ ਵਿੱਚ ਸਟੋਰ ਕੀਤੇ ਸਾਰੇ ਡਾਟਾ ਨੂੰ ਮਿਟਾ ਦਿੰਦਾ ਹੈ।"</b>" ਡਾਟਾ ਨੂੰ ਗੁਆਚਣ ਤੋਂ ਬੱਚਣ ਲਈ, ਇਸਦਾ ਬੈੱਕ ਅੱਪ ਲੈਣ \'ਤੇ ਵਿਚਾਰ ਕਰੋ।"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ਸਾਫ਼ ਕਰੋ ਅਤੇ ਫਾਰਮੈਟ ਕਰੋ"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਫਾਰਮੈਟ ਕਰ ਰਿਹਾ ਹੈ…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"ਫਾਰਮੈਟ ਕਰਨ ਵੇਲੇ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ।"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"ਫਾਰਮੈਟ ਕੀਤੇ ਜਾਣ ਵੇਲੇ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਨਾ ਹਟਾਓ।"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ਡਾਟਾ ਨੂੰ ਨਵੀਂ ਸਟੋਰੇਜ ਵਿੱਚ ਲਿਜਾਓ"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"ਤੁਸੀਂ ਇਸ ਨਵੇਂ <xliff:g id="NAME">^1</xliff:g> ਵਿੱਚ ਆਪਣੀਆਂ ਫ਼ੋਟੋਆਂ, ਫ਼ਾਈਲਾਂ ਅਤੇ ਐਪ ਦਾ ਡਾਟਾ ਲੈ ਕੇ ਜਾ ਸਕਦੇ ਹੋ।\n\nਲਿਜਾਣ ਵਿੱਚ ਲਗਭਗ <xliff:g id="TIME">^2</xliff:g> ਲੱਗਣਗੇ, ਅਤੇ ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ \'ਤੇ <xliff:g id="SIZE">^3</xliff:g> ਖਾਲੀ ਹੋ ਜਾਵੇਗੀ। ਕੁਝ ਐਪਾਂ ਇਹ ਕਿਰਿਆ ਹੋਣ ਵੇਲੇ ਕੰਮ ਨਹੀਂ ਕਰਨਗੀਆਂ।"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ਹੁਣੇ ਮੂਵ ਕਰੋ"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ਸਥਾਪਤ"</string>
<string name="no_applications" msgid="7336588977497084921">"ਕੋਈ ਐਪਾਂ ਨਹੀਂ।"</string>
<string name="internal_storage" msgid="1584700623164275282">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB ਸਟੋਰੇਜ"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD ਕਾਰਡ ਸਟੋਰੇਜ"</string>
<string name="recompute_size" msgid="7722567982831691718">"ਅਕਾਰ ਰੀਕੰਪਿਊਟ ਕਰ ਰਿਹਾ ਹੈ..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"ਕੀ ਐਪ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"ਇਸ ਐਪ ਦਾ ਸਾਰਾ ਡਾਟਾ ਸਥਾਈ ਤੌਰ ਤੇ ਮਿਟਾਇਆ ਜਾਏਗਾ। ਇਸ ਵਿੱਚ ਸਾਰੀਆਂ ਫ਼ਾਈਲਾਂ, ਸੈਟਿੰਗਾਂ, ਖਾਤੇ, ਡਾਟਾਬੇਸ ਆਦਿ ਸ਼ਾਮਲ ਹਨ।"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ਐਪ ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਦੀ ਸੂਚੀ ਵਿੱਚ ਨਹੀਂ ਮਿਲਿਆ ਸੀ।"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"ਐਪ ਦੀ ਸਟੋਰੇਜ ਕਲੀਅਰ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੀ ਹੈ:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਇਹ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰ ਸਕਦੀ ਹੈ:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਸਕਦੀ ਹੈ। ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਬਣਾਉਣ ਅਤੇ ਮੈਮਰੀ ਵਰਤੋਂ ਘਟਾਉਣ ਲਈ, ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਇਜਾਜ਼ਤਾਂ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> \'ਤੇ ਉਪਲਬਧ ਹਨ, ਕਿਉਂਕਿ ਇਹ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ਦੇ ਤੌਰ ਤੇ ਸਮਾਨ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਚੱਲਦੀਆਂ ਹਨ:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ਇਹ ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਤੇ ਇਹਨਾਂ ਤੱਕ ਪਹੁੰਚ ਸਕਦਾ ਹੈ। ਪਰਫੌਰਮੈਂਸ ਬਿਹਤਰ ਬਣਾਉਣ ਅਤੇ ਮੈਮਰੀ ਵਰਤੋਂ ਘਟਾਉਣ ਲਈ, ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੁਝ ਇਜਾਜ਼ਤਾਂ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ਤੇ ਉਪਲਬਧ ਹਨ ਕਿਉਂਕਿ ਇਹ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ਦੇ ਤੌਰ ਤੇ ਸਮਾਨ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਚੱਲਦੀਆਂ ਹਨ:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ਅਤੇ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"ਇਸ ਐਪ ਨਾਲ ਤੁਹਾਨੂੰ ਖ਼ਰਚਾ ਪੈ ਸਕਦਾ ਹੈ:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ਪ੍ਰੀਮੀਅਮ SMS ਭੇਜੋ"</string>
<string name="computing_size" msgid="1599186977475211186">"ਹਿਸਾਬ ਲਗਾ ਰਿਹਾ ਹੈ…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"ਪੈਕੇਜ ਅਕਾਰ ਨੂੰ ਕੰਪਿਊਟ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਤੀਜੀ-ਪਾਰਟੀ ਦੇ ਇੰਸਟੌਲ ਕੀਤੇ ਐਪਸ ਨਹੀਂ ਹਨ।"</string>
<string name="version_text" msgid="9189073826278676425">"ਵਰਜਨ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"ਮੂਵ ਕਰੋ"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ਟੈਬਲੈੱਟ ਵਿੱਚ ਲਿਜਾਓ"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ਫ਼ੋਨ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB ਸਟੋਰੇਜ ਵਿੱਚ ਲਿਜਾਓ"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD ਕਾਰਡ ਵਿੱਚ ਮੂਵ ਕਰੋ"</string>
- <string name="moving" msgid="6431016143218876491">"ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"ਕੋਈ ਹੋਰ ਮਾਈਗ੍ਰੇਸ਼ਨ ਪਹਿਲਾਂ ਤੋਂ ਹੀ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ ਹੈ।"</string>
<string name="insufficient_storage" msgid="481763122991093080">"ਸਟੋਰੇਜ ਲਈ ਲੋੜੀਂਦੀ ਜਗ੍ਹਾ ਨਹੀਂ ਹੈ।"</string>
<string name="does_not_exist" msgid="1501243985586067053">"ਐਪ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਬਾਹਰੀ ਮੀਡੀਆ \'ਤੇ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"ਕੀ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"ਜੇ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਇਹ ਠੀਕ ਤਰ੍ਹਾਂ ਕਾਰਜ ਨਾ ਕਰੇ।"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ਐਪ ਮੂਵ ਨਹੀਂ ਕਰ ਸਕਿਆ। <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"ਤਰਜੀਹੀ ਸਥਾਪਤ ਟਿਕਾਣਾ"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"ਨਵੇਂ ਐਪਸ ਲਈ ਤਰਜੀਹੀ ਇੰਸਟੌਲੇਸ਼ਨ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਬਦਲੋ"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"ਕੀ ਬਿਲਟ-ਇਨ ਐਪ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਉਣਾ ਹੈ?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"ਐਪ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਓ"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਅਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ Android ਅਤੇ ਹੋਰ ਐਪਾਂ ਉਸ ਤਰ੍ਹਾਂ ਕੰਮ ਨਾ ਕਰਨ ਜਿਵੇਂ ਇਹਨਾਂ ਤੋਂ ਉਮੀਦ ਕੀਤੀ ਜਾਂਦੀ ਹੈ।"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ਕੀ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ ਅਤੇ ਐਪ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਨੂੰ ਅਯੋਗ ਬਣਾਉਂਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ Android ਅਤੇ ਹੋਰ ਐਪਾਂ ਉਸ ਤਰ੍ਹਾਂ ਕੰਮ ਨਾ ਕਰਨ ਜਿਵੇਂ ਇਹਨਾਂ ਤੋਂ ਉਮੀਦ ਕੀਤੀ ਜਾਂਦੀ ਹੈ। ਤੁਹਾਡਾ ਡਾਟਾ ਵੀ ਮਿਟਾ ਦਿੱਤਾ ਜਾਏਗਾ।"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ਕੀ ਸੂਚਨਾਵਾਂ ਬੰਦ ਕਰਨੀਆਂ ਹਨ?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਐਪ ਲਈ ਸੂਚਨਾਵਾਂ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਤੁਹਾਡੇ ਤੋਂ ਮਹੱਤਵਪੂਰਣ ਚਿਤਾਵਨੀਆਂ ਅਤੇ ਅਪਡੇਟਾਂ ਖੁੰਝ ਸਕਦੀਆਂ ਹਨ।"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"ਸਟੋਰ"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"ਐਪ ਵੇਰਵੇ"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> ਤੋਂ ਸਥਾਪਤ ਕੀਤੀ ਗਈ ਐਪ"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ਸੇਵਾ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ਰੰਗ ਸੁਧਾਈ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ਸੁਰਖੀਆਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"ਜਾਰੀ ਰੱਖੋ"</string>
<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="6371077608778830020">"ਸੁਣਨ ਦਾ ਸਾਧਨ ਸ਼ਾਮਲ ਕਰੋ"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਨੂੰ ਸੀਮਿਤ ਕਰਦੇ ਹੋ, ਤਾਂ ਉਹ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਸਕਦੀ ਹੈ"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ਇਹ ਐਪ ਬੈਟਰੀ ਨੂੰ ਸੁਯੋਗ ਕਰੋ \'ਤੇ ਸੈੱਟ ਨਾ ਕੀਤੀ ਹੋਣ ਕਰਕੇ, ਤੁਸੀਂ ਇਸ \'ਤੇ ਪਾਬੰਧੀ ਨਹੀਂ ਲਗਾ ਸਕਦੇ।\n\nਐਪ \'ਤੇ ਪਾਬੰਧੀ ਲਗਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਬੈਟਰੀ ਸੁਯੋਗਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਸਕ੍ਰੀਨ ਵਰਤੋਂ"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"ਸਕ੍ਰੀਨ ਖਪਤ"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਸਕ੍ਰੀਨ ਕਿੰਨੇ ਸਮੇਂ ਤੱਕ ਚਾਲੂ ਰਹੀ"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਡੀਵਾਈਸ ਵਰਤੋਂ"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"ਵਰਤੋਂ ਵੇਰਵੇ"</string>
<string name="controls_subtitle" msgid="390468421138288702">"ਪਾਵਰ ਵਰਤੋਂ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"ਸ਼ਾਮਲ ਕੀਤੇ ਪੈਕੇਜ"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ਬੈਟਰੀ ਦੀ ਖਪਤ ਕਰਨ ਵਾਲੀਆਂ ਐਪਾਂ"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਡੀਵਾਈਸ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ਵਾਰ-ਵਾਰ ਟਿਕਾਣੇ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ਐਪਾਂ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਰਹੀਆਂ ਹਨ"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"ਐਪਾਂ ਆਮ ਵਾਂਗ ਚੱਲ ਰਹੀਆਂ ਹਨ"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ਫ਼ੋਨ ਆਮ ਵਾਂਗ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਬੈਟਰੀ ਵਰਤ ਰਿਹਾ ਹੈ"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ਟੈਬਲੈੱਟ ਆਮ ਵਾਂਗ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਬੈਟਰੀ ਵਰਤ ਰਿਹਾ ਹੈ"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">%1$d ਐਪ ਲਈ ਬੈਟਰੀ ਵਰਤੋਂ ਨੂੰ ਸੀਮਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</item>
<item quantity="other">%1$d ਐਪਾਂ ਲਈ ਬੈਟਰੀ ਵਰਤੋਂ ਨੂੰ ਸੀਮਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"ਪ੍ਰਤਿਬੰਧਿਤ <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"ਇਹ ਐਪਾਂ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਬੈਟਰੀ ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀਆਂ ਹਨ। ਸ਼ਾਇਦ ਪਾਬੰਦੀਸ਼ੁਦਾ ਐਪਾਂ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਾ ਕਰਨ ਅਤੇ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਦੇਰੀ ਹੋ ਸਕਦੀ ਹੈ।"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"ਬੈਟਰੀ ਪ੍ਰਬੰਧਕ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"ਐਪਾਂ ਵੱਲੋਂ ਜ਼ਿਆਦਾ ਬੈਟਰੀ ਵਰਤੇ ਜਾਣ ਦਾ ਪਤਾ ਲਗਾਓ"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"ਰੱਦ ਕਰੋ"</string>
<string name="tts_reset" msgid="2661752909256313270">"ਰੀਸੈੱਟ ਕਰੋ"</string>
<string name="tts_play" msgid="2628469503798633884">"ਚਲਾਓ"</string>
- <string name="gadget_title" msgid="5519037532720577836">"ਪਾਵਰ ਨਿਯੰਤਰਣ"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"ਵਾਈ‑ਫਾਈ ਸੈਟਿੰਗ ਅੱਪਡੇਟ ਹੋ ਰਹੀ ਹੈ"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ਸੈਟਿੰਗ ਅੱਪਡੇਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ਚਾਲੂ"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ਬੰਦ"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ਚਾਲੂ ਕਰ ਰਿਹਾ ਹੈ"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"ਬੰਦ ਕਰ ਰਿਹਾ ਹੈ"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"ਵਾਈ‑ਫਾਈ"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"ਬਲੂਟੁੱਥ"</string>
- <string name="gadget_location" msgid="2974757497945178165">"ਟਿਕਾਣਾ"</string>
- <string name="gadget_sync" msgid="858895763714222152">"ਸਿੰਕ ਕਰੋ"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"ਚਮਕ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ਆਟੋ"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"ਪੂਰੀ"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"ਅੱਧੀ"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"ਬੰਦ"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ਸਟੋਰੇਜ ਤੋਂ ਸਥਾਪਤ ਕਰੋ"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ਵਿੱਚੋਂ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"ਸਭ ਚੁਣੋ"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ਡਾਟਾ ਵਰਤੋਂ"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ਐਪ ਡਾਟਾ ਵਰਤੋਂ"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"ਮੋਬਾਈਲ ਡਾਟਾ ਅਤੇ ਵਾਈ-ਫਾਈ"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"ਕੈਰੀਅਰ ਦਾ ਡਾਟਾ ਹਿਸਾਬ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਵੱਖ ਹੋ ਸਕਦਾ ਹੈ।"</string>
<string name="data_usage_app" msgid="4970478397515423303">"ਐਪ ਵਰਤੋਂ"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ਐਪ ਜਾਣਕਾਰੀ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ ਦਿਖਾਓ </item>
<item quantity="other">%d ਲੁਕੀਆਂ ਹੋਈਆਂ ਆਈਟਮਾਂ ਦਿਖਾਓ </item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ਸਮੇਟੋ"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"ਨੈੱਟਵਰਕ ਅਤੇ ਇੰਟਰਨੈੱਟ"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ਮੋਬਾਈਲ"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ਡਾਟਾ ਵਰਤੋਂ"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"ਬਲੂਟੁੱਥ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ਐਪਾਂ ਅਤੇ ਸੂਚਨਾਵਾਂ"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ਇਜਾਜ਼ਤਾਂ, ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਾਂ"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਵਿੱਚ ਐਪਾਂ ਲਈ ਸੂਚਨਾ ਪਹੁੰਚ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"ਖਾਤੇ"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"ਕੋਈ ਖਾਤੇ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤੇ ਗਏ"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਐਪਾਂ"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ਭਾਸ਼ਾਵਾਂ, ਸਮਾਂ, ਬੈਕਅੱਪ, ਅੱਪਡੇਟ"</string>
<string name="search_results_title" msgid="1796252422574886932">"ਸੈਟਿੰਗਾਂ"</string>
- <string name="search_menu" msgid="6283419262313758339">"ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਖੋਜੋ"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"ਵਾਈਫਾਈ, ਵਾਈ-ਫਾਈ, ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ, ਇੰਟਰਨੈੱਟ, ਵਾਇਰਲੈੱਸ, ਡਾਟਾ, ਵਾਈ ਫਾਈ"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"ਵਾਈ ਫਾਈ, ਵਾਈ-ਫਾਈ, ਟੌਗਲ, ਕੰਟਰੋਲ"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"ਲਿਖਤ ਸੁਨੇਹਾ, ਲਿਖਤ ਸੁਨੇਹੇ ਭੇਜਣਾ, ਸੁਨੇਹੇ, ਸੁਨੇਹਾ ਭੇਜਣਾ, ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ਭੁਗਤਾਨ ਕਰੋ, ਟੈਪ ਕਰੋ, ਭੁਗਤਾਨ"</string>
<string name="keywords_backup" msgid="470070289135403022">"ਬੈਕਅੱਪ, ਬੈਕ ਅੱਪ"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ਸੰਕੇਤ"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ਚਿਹਰਾ, ਅਣਲਾਕ, ਪ੍ਰਮਾਣੀਕਰਨ, ਸਾਈਨ-ਇਨ"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl ਵਰਜਨ, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"ਨੈੱਟਵਰਕ, ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਅਵਸਥਾ, ਸੇਵਾ ਅਵਸਥਾ, ਸਿਗਨਲ ਸ਼ਕਤੀ, ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਕਿਸਮ, ਰੋਮਿੰਗ, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"ਸੀਰੀਅਲ ਨੰਬਰ, ਹਾਰਡਵੇਅਰ ਵਰਜਨ"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ਗੂੜ੍ਹਾ ਥੀਮ"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ਬੱਗ"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ਤੱਕਣੀਯੋਗ ਡਿਸਪਲੇ, ਲਾਕ ਸਕ੍ਰੀਨ ਡਿਸਪਲੇ"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"ਲਾਕ ਸਕ੍ਰੀਨ ਸੂਚਨਾ"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ਚਿਹਰਾ"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ਡਿਮ ਸਕ੍ਰੀਨ, ਟੱਚਸਕ੍ਰੀਨ, ਬੈਟਰੀ, ਸਮਾਰਟ ਚਮਕ, ਗਤੀਸ਼ੀਲ ਚਮਕ"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪਿੰਨ ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪੈਟਰਨ ਦਰਜ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"ਜਦੋਂ ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਦੇ ਹੋ, ਤਾਂ ਪਹੁੰਚਯੋਗਤਾ ਸੇਵਾਵਾਂ ਜਿਵੇਂ <xliff:g id="SERVICE">%1$s</xliff:g> ਅਜੇ ਉਪਲਬਧ ਨਹੀਂ ਹੋਣਗੀਆਂ।"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"ਨੋਟ ਕਰੋ: ਰੀਬੂਟ ਤੋਂ ਬਾਅਦ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਨਹੀਂ ਕਰਦੇ ਤਦ ਤੱਕ ਇਹ ਐਪ ਚਾਲੂ ਨਹੀਂ ਹੋ ਸਕਦੀ"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"ਨੋਟ-ਕਥਨ: ਜੇਕਰ ਤੁਸੀਂ ਆਪਣਾ ਫ਼ੋਨ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਦੇ ਹੋ ਅਤੇ ਸਕ੍ਰੀਨ ਲਾਕ ਸੈੱਟ ਕੀਤਾ ਹੋਇਆ ਹੈ, ਤਾਂ ਇਹ ਐਪਾ ਤੁਹਾਡੇ ਵੱਲੋਂ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕੀਤੇ ਨਾ ਹੋਣ ਤੱਕ ਸ਼ੁਰੂ ਨਹੀਂ ਹੋਵੇਗੀ"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI ਜਾਣਕਾਰੀ"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI ਸੰਬੰਧਿਤ ਜਾਣਕਾਰੀ"</string>
<string name="slot_number" msgid="3762676044904653577">"(ਸਲੌਟ<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3476,7 +3448,7 @@
<string name="storage_type_internal" msgid="6042049833565674948">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string>
<string name="storage_type_external" msgid="7738894330670001898">"ਬਾਹਰੀ ਸਟੋਰੇਜ"</string>
<string name="app_data_usage" msgid="7942375313697452803">"ਐਪ ਡਾਟਾ ਵਰਤੋਂ"</string>
- <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="SIZE">%1$s</xliff:g> <xliff:g id="DATE">%2$s</xliff:g> ਤੋਂ ਵਰਤਿਆ ਗਿਆ"</string>
+ <string name="data_summary_format" msgid="6213211533341068366">"<xliff:g id="DATE">%2$s</xliff:g> ਤੋਂ <xliff:g id="SIZE">%1$s</xliff:g> ਵਰਤਿਆ ਗਿਆ"</string>
<string name="storage_used" msgid="7128074132917008743">"ਸਟੋਰੇਜ ਵਰਤੀ"</string>
<string name="change" msgid="6657848623929839991">"ਬਦਲੋ"</string>
<string name="change_storage" msgid="600475265207060436">"ਸਟੋਰੇਜ ਬਦਲੋ"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ਨਿੱਜੀ"</string>
<string name="filter_work_apps" msgid="24519936790795574">"ਦਫ਼ਤਰ"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ਐਪਾਂ: ਸਾਰੀਆਂ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ਐਪਾਂ: ਬੰਦ ਹਨ"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ਬੰਦ ਕੀਤੀਆਂ ਗਈਆਂ"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ਸ਼੍ਰੇਣੀਆਂ: ਜ਼ਰੂਰੀ ਮਹੱਤਵ"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ਸ਼੍ਰੇਣੀਆਂ: ਘੱਟ ਮਹੱਤਵ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ਸ਼੍ਰੇਣੀਆਂ: ਬੰਦ ਹਨ"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"ਵਰਤੋਂ ਬਾਰੇ ਸੁਚੇਤਨਾਵਾਂ"</string>
<string name="show_all_apps" msgid="1512506948197818534">"ਡੀਵਾਈਸ ਦੀ ਪੂਰੀ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"ਐਪ ਵਰਤੋਂ ਦਿਖਾਓ"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ਉੱਚ ਵਰਤੋਂ"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> ਐਪ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਰਹੀ ਹੈ</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ਐਪਾਂ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਰਹੀਆਂ ਹਨ</item>
@@ -3667,7 +3638,7 @@
<string name="memory_maximum_usage" msgid="6513785462055278341">"ਅਧਿਕਤਮ ਵਰਤੋਂ"</string>
<string name="no_data_usage" msgid="9131454024293628063">"ਕੋਈ ਡਾਟਾ ਨਹੀਂ ਵਰਤਿਆ"</string>
<string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"ਕੀ <xliff:g id="APP">%1$s</xliff:g> ਨੂੰ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਤੱਕ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"ਐਪ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਨੂੰ ਚਾਲੂ/ਬੰਦ ਕਰਨ ਅਤੇ ਸੰਬੰਧਿਤ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲਾਵ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗਾ।"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"ਐਪ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਚਾਲੂ/ਬੰਦ ਕਰਨ ਅਤੇ ਸੰਬੰਧਿਤ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲਾਵ ਕਰਨ ਵਿੱਚ ਸਮਰੱਥ ਹੋਵੇਗੀ।"</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"ਸੂਚਨਾ ਪਹੁੰਚ ਦੇ ਚਾਲੂ ਹੋਣ ਕਾਰਨ ਇਸ ਦਾ ਚਾਲੂ ਰਹਿਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"ਕੀ <xliff:g id="APP">%1$s</xliff:g> ਲਈ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' \'ਤੇ ਪਹੁੰਚ ਰੱਦ ਕਰਨੀ ਹੈ?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"ਇਸ ਐਪ ਵੱਲੋਂ ਬਣਾਏ ਸਾਰੇ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨਿਯਮ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ।"</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ਵਰਤੀ ਗਈ - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ਖਾਲੀ"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ਅਕਿਰਿਆਸ਼ੀਲ ਰਹਿਣ ਤੋਂ ਬਾਅਦ ਸਲੀਪ ਮੋਡ ਵਿੱਚ ਜਾਓ"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"ਵਾਲਪੇਪਰ, ਸਲੀਪ ਮੋਡ, ਫੌਂਟ ਆਕਾਰ"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 ਮਿੰਟ ਅਕਿਰਿਆਸ਼ੀਲ ਰਹਿਣ ਤੋਂ ਬਾਅਦ ਸਲੀਪ ਮੋਡ ਵਿੱਚ ਜਾਓ"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ਵਿੱਚੋਂ ਔਸਤ <xliff:g id="USED_MEMORY">%1$s</xliff:g> ਮੇਮੋਰੀ ਵਰਤੀ ਗਈ"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> ਵਜੋਂ ਸਾਈਨ ਇਨ ਕੀਤਾ ਗਿਆ"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"ਕੈਮਰੇ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ਸਕ੍ਰੀਨਸ਼ਾਟ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"ਬੈਕਅੱਪ ਬੰਦ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"ਇਹ ਐਪ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"ਜੇਕਰ ਤੁਹਾਡੇ ਕੋਈ ਸਵਾਲ ਹਨ, ਤਾਂ ਆਪਣੇ ਆਈ.ਟੀ. ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"ਹੋਰ ਵੇਰਵੇ"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"ਇੱਕ ਕੱਟਆਉਟ ਨਾਲ ਇੱਕ ਡਿਸਪਲੇ ਦੀ ਨਕਲ ਕਰੋ"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ਡਿਸਪਲੇ ਕੱਟਆਊਟ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ਡਿਸਪਲੇ ਕੱਟਆਊਟ, ਨੌਚ"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ਕੋਈ ਨਹੀਂ"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਡੀਵਾਈਸ"</string>
<string name="special_access" msgid="3458780842491881155">"ਵਿਸ਼ੇਸ਼ ਐਪ ਪਹੁੰਚ"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> ਐਪ ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡਾਟੇ ਦੀ ਵਰਤੋਂ ਕਰ ਸਕਦੀ ਹੈ</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"ਇੱਕ ਤੋਂ ਜ਼ਿਆਦਾ ਡੀਵਾਈਸਾਂ ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
<string name="demo_mode" msgid="2798762752209330277">"ਸਿਸਟਮ UI ਡੈਮੋ ਮੋਡ"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"ਰਾਤ ਵਾਲਾ ਮੋਡ"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"ਰਾਤ ਵਾਲਾ ਮੋਡ ਸੈੱਟ ਕਰੋ"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"ਗੂੜ੍ਹਾ ਮੋਡ"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"ਗੂੜ੍ਹਾ ਮੋਡ ਸੈੱਟ ਕਰੋ"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਦੀਆਂ ਵਿਕਾਸਕਾਰ ਟਾਇਲਾਂ"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope ਟ੍ਰੇਸ"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਸੈਟਿੰਗਾਂ"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ਸੰਪਰਕ ਖੋਜ"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ਕਾਲ ਕਰਨ ਵਾਲਿਆਂ ਅਤੇ ਸੰਪਰਕਾਂ ਦੀ ਪਛਾਣ ਕਰਨ ਲਈ ਤੁਹਾਡੀ ਸੰਸਥਾ ਵਿੱੱਚ ਸੰਪਰਕ ਖੋਜਾਂ ਕਰਨ ਦਿਓ"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"ਫ਼ੋਨ ਚੈੱਕ ਕਰਨ ਲਈ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਟੈਬਲੈੱਟ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਡੀਵਾਈਸ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ।"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"ਸਮਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਡਬਲ ਟੈਪ ਕਰੋ।"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ਫ਼ੋਨ ਚੈੱਕ ਕਰਨ ਲਈ ਚੁੱਕੋ"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਕੋ"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਚੁੱਕੋ।"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ।"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"ਸਮਾਂ, ਸੂਚਨਾ ਪ੍ਰਤੀਕਾਂ, ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਕੋ।"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ਡਿਸਪਲੇ ਕਿਰਿਆਸ਼ੀਲ ਕਰੋ"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"ਸਮਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਚੁੱਕੋ।"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"ਸਮਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ।"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"ਸਮਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਚੁੱਕੋ।"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"ਚੇਤਨ ਲਾਕ ਸਕ੍ਰੀਨ ਸੰਕੇਤ"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ਸੂਚਨਾਵਾਂ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਵਾਈਪ ਕਰੋ"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨੂੰ ਸਵਾਈਪ ਕਰੋ"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ, ਆਪਣੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ਾਂ</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"ਡੀਵਾਈਸ ਦੇ ਡਾਟੇ ਦਾ ਬੈਕਅੱਪ ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ ਤੁਹਾਡੇ ਸੰਗਠਨ ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"ਇਸ ਡੀਵਾਈਸ ਦਾ ਪ੍ਰਬੰਧਨ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ਵੱਲੋਂ ਕੀਤਾ ਜਾਂਦਾ ਹੈ।"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"ਆਟੋਫਿਲ ਸੇਵਾ"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ਆਟੋ, ਫਿਲ, ਆਟੋਫਿਲ"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ਪੱਕਾ ਕਰੋ ਕਿ ਤੁਸੀਂ ਇਸ ਐਪ \'ਤੇ ਭਰੋਸਾ ਕਰਦੇ ਹੋ</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ਆਪਣੇ-ਆਪ ਭਰੀਆਂ ਜਾ ਸਕਣ ਵਾਲੀਆਂ ਚੀਜ਼ਾਂ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਮੌਜੂਦ ਚੀਜ਼ਾਂ ਦੀ ਵਰਤੋਂ ਕਰਦਾ ਹੈ।"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"ਆਟੋਫਿਲ"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"ਲੌਗ ਕੀਤੀ ਜਾਣਕਾਰੀ ਦਾ ਪੱਧਰ"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"ਹਰ ਸੈਸ਼ਨ ਮੁਤਾਬਕ ਵੱਧ-ਤੋਂ ਵੱਧ ਬੇਨਤੀਆਂ"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"ਵੱਧ-ਤੋਂ-ਵੱਧ ਦਿਖਣਯੋਗ ਡਾਟਾਸੈੱਟ"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਮੁੱਲਾਂ \'ਤੇ ਰੀਸੈੱਟ ਕਰੋ"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"ਆਟੋਫਿਲ ਵਿਕਾਸਕਾਰ ਵਿਕਲਪਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰ ਦਿੱਤਾ ਹੈ"</string>
<string name="device_theme" msgid="4571803018917608588">"ਡੀਵਾਈਸ ਥੀਮ"</string>
<string name="default_theme" msgid="7085644992078579076">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"ਨੈੱਟਵਰਕ ਦਾ ਨਾਮ"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ਕੈਰੀਅਰ ਵਿਵਸਥਾਕਰਨ ਨੂੰ ਤੂਲ ਦਿਓ"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"ਧਿਆਨ ਕੇਂਦਰਿਤ ਰੱਖਣ ਲਈ ਸੂਚਨਾਵਾਂ ਰੋਕੋ"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"ਕੀ ਕੁਝ ਨਵਾਂ ਅਤੇ ਦਿਲਚਸਪ ਹੈ?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Take a tour of your new phone"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ਆਪਣਾ ਨਵਾਂ ਟੈਬਲੈੱਟ ਵਰਤਣ ਬਾਰੇ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Take a tour of your new device"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"ਪੂਰੇ GNSS ਮਾਪ ਜ਼ਬਰਦਰਸਤੀ ਲਾਗੂ ਕਰੋ"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ਡਿਊਟੀ ਸਾਈਕਲਿੰਗ ਤੋਂ ਬਿਨਾਂ ਸਾਰੇ GNSS ਉਪਗ੍ਰਹਿ ਗਰੁੱਪਾਂ ਅਤੇ ਵਾਰਵਾਰਤਾਵਾਂ ਨੂੰ ਟਰੈਕ ਕਰੋ"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"ਹਮੇਸ਼ਾਂ ਕ੍ਰੈਸ਼ ਵਿੰਡੋ ਦਿਖਾਓ"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"ਕਿਸੇ ਐਪ ਦੇ ਕ੍ਰੈਸ਼ ਹੋਣ \'ਤੇ ਹਰ ਵਾਰ ਵਿੰਡੋ ਦਿਖਾਓ"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE ਸਮਰਥਿਤ ਐਪ ਚੁਣੋ"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE ਸਮਰਥਿਤ ਕੋਈ ਐਪਲੀਕੇਸ਼ਨ ਸੈੱਟ ਨਹੀਂ"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE ਸਮਰਥਿਤ ਐਪਲੀਕੇਸ਼ਨ: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ਡਾਇਰੈਕਟਰੀ ਤੱਕ ਪਹੁੰਚ"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ਡਾਇਰੈਕਟਰੀ ਪਹੁੰਚ"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"ਨੈੱਟਵਰਕ ਵੇਰਵੇ"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦਾ ਨਾਮ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਐਪਾਂ ਨੂੰ ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ। ਇਹ ਤੁਹਾਡੇ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਜਾਂ ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਸੈੱਟਅੱਪ ਕਰਨ \'ਤੇ ਹੋਰ ਲੋਕਾਂ ਵੱਲੋਂ ਵੀ ਦੇਖਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
<string name="devices_title" msgid="7701726109334110391">"ਡੀਵਾਈਸਾਂ"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"ਸੁਝਾਅ"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ਡਾਟਾ"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ਡਾਟਾ"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ਨੈੱਟਵਰਕ ਚੁਣੋ"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"ਡਿਸਕਨੈਕਟ ਹੋਇਆ"</string>
+ <string name="network_connected" msgid="4943925032253989621">"ਕਨੈਕਟ ਹੈ"</string>
+ <string name="network_connecting" msgid="76404590784733557">"ਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ਕੋਈ ਨੈੱਟਵਰਕ ਨਹੀਂ ਮਿਲੇ।"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ਨੈੱਟਵਰਕ ਨਹੀਂ ਮਿਲ ਸਕੇ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ਵਰਜਿਤ)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"ਕੋਈ ਸਿਮ ਕਾਰਡ ਨਹੀਂ"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"ਉੱਨਤ ਕਾਲਿੰਗ"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਤਰਜੀਹੀ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਸਿਰਫ਼ GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਸਿਰਫ਼ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਸਿਰਫ਼ CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਸਿਰਫ਼ EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਗਲੋਬਲ"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (ਸਿਫ਼ਾਰਸ਼ੀ)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (ਸਿਫ਼ਾਰਸ਼ੀ)"</string>
+ <string name="network_global" msgid="959947774831178632">"ਗਲੋਬਲ"</string>
+ <string name="label_available" msgid="1731547832803057893">"ਉਪਲਬਧ ਨੈੱਟਵਰਕ"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"ਖੋਜਿਆ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> \'ਤੇ ਰਜਿਸਟਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"ਤੁਹਾਡਾ ਸਿਮ ਕਾਰਡ ਇਸ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੋਣ ਦਿੰਦਾ ਹੈ।"</string>
+ <string name="connect_later" msgid="978991102125216741">"ਫਿਲਹਾਲ ਇਸ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
+ <string name="registration_done" msgid="4573820010512184521">"ਨੈੱਟਵਰਕ \'ਤੇ ਰਜਿਸਟਰ ਕੀਤਾ ਗਿਆ।"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਨੈੱਟਵਰਕ ਚੁਣੋ"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"ਕੈਰੀਅਰ ਸੈਟਿੰਗਾਂ"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ਡਾਟਾ ਸੇਵਾ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਦੀ ਕਿਸਮ"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"ਨੈੱਟਵਰਕ ਓਪਰੇਟਿੰਗ ਮੋਡ ਬਦਲੋ"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਦੀ ਕਿਸਮ"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"ਕੈਰੀਅਰ"</string>
+ <string name="call_category" msgid="8108654745239563833">"ਕਾਲਿੰਗ"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"ਕੈਰੀਅਰ ਵੀਡੀਓ ਕਾਲਿੰਗ"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"ਸਿਸਟਮ ਵੱਲੋਂ ਚੁਣਿਆ"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA ਰੋਮਿੰਗ ਮੋਡ ਬਦਲੋ"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"ਸਿਸਟਮ ਵੱਲੋਂ ਚੁਣਿਆ"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"ਨੈੱਟਵਰਕ"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"ਨੈੱਟਵਰਕ"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA ਗਾਹਕੀ"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM ਅਤੇ NV ਵਿਚਾਲੇ ਬਦਲੋ"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"ਗਾਹਕੀ"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ਸਵੈਚਲਿਤ ਰਜਿਸਟਰੇਸ਼ਨ…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"ਕੀ ਡਾਟਾ ਰੋਮਿੰਗ ਵਿਕਲਪ ਵਰਤਣਾ ਹੈ?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"ਕੀਮਤਾਂ ਜਾਣਨ ਲਈ ਆਪਣੇ ਨੈੱਟਵਰਕ ਪ੍ਰਦਾਨਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ਐਪ ਡਾਟਾ ਵਰਤੋਂ"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"ਅਵੈਧ ਨੈੱਟਵਰਕ ਮੋਡ <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. ਅਣਡਿੱਠ ਕਰੋ।"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋਣ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+ <string name="see_more" msgid="5953815986207345223">"ਹੋਰ ਦੇਖੋ"</string>
+ <string name="see_less" msgid="1250265310929558370">"ਘੱਟ ਵੇਖੋ"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 424fc9e..89a2dd9 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Traktuj jako sieć z pomiarem użycia danych"</item>
<item msgid="2266114985518865625">"Traktuj jako sieć bez pomiaru użycia danych"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Domyślny (używaj randomizowanego adresu MAC)"</item>
+ <item msgid="5398461510512959597">"Zaufany"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nie"</item>
<item msgid="3863157480502955888">"Tak"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Zawsze włączony"</item>
<item msgid="6385301106124765323">"Zawsze wyłączony"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Wyłącz"</item>
+ <item msgid="2182686878828390312">"Debuguj"</item>
+ <item msgid="5286514712714822064">"Szczegółowe"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Tylko domowe"</item>
+ <item msgid="5034813753274486448">"Automatycznie"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Preferowany GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Tylko GSM"</item>
+ <item msgid="488474605709912156">"Tylko WCDMA"</item>
+ <item msgid="1912421096218750039">"Automatyczny GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Automatyczny CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA bez EvDo"</item>
+ <item msgid="4678789463133969294">"Tylko EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globalny"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Tylko TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globalny"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 01d4558..78105e6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Utwórz"</string>
<string name="allow" msgid="3349662621170855910">"Zezwól"</string>
<string name="deny" msgid="6947806159746484865">"Odmów"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Zamknij"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Przełącz"</string>
<string name="device_info_default" msgid="7847265875578739287">"Nieznane"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="few">Od zostania programistą dzielą Cię już tylko <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> kroki.</item>
@@ -34,10 +32,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"W porządku, już jesteś programistą."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Najpierw włącz opcje dla programistów."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Sieci zwykłe i bezprzewodowe"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Połączenia"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Urządzenie"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Osobiste"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Dostęp"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Włącz transmisję danych"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Wyłącz transmisję danych"</string>
@@ -123,7 +117,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adres Bluetooth urządzenia: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odłączyć urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisja"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Urządzenie Bluetooth bez nazwy"</string>
<string name="progress_scanning" msgid="192587958424295789">"Wyszukiwanie"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Brak urządzeń Bluetooth w pobliżu"</string>
@@ -155,7 +148,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Aplikacja chce włączyć Bluetooth i ustawić telefon jako widoczny dla innych urządzeń. Później możesz to zmienić w ustawieniach Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Włączanie Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Wyłączam Bluetootha..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Połącz automatycznie"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Żądanie nawiązania połączenia Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Dotknij, by połączyć z: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Czy chcesz nawiązać połączenie z urządzeniem „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
@@ -183,12 +175,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dostępne urządzenia telefoniczne"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Obecnie połączone"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Zapisane urządzenia"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Dodaj urządzenie"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth włączy się, by sparować urządzenia"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Ustawienia połączeń"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Wcześniej połączone urządzenia"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Wcześniej połączone"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Włączony Bluetooth"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Pokaż wszystko"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data i godzina"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Wybierz strefę czasową"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -271,7 +263,6 @@
<string name="skip_label" msgid="47510779345218297">"Pomiń"</string>
<string name="next_label" msgid="4693520878012668114">"Dalej"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Języki"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Ustawienia języka"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Usuń"</string>
<string name="add_a_language" msgid="2330538812283783022">"Dodaj język"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -307,7 +298,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Ustawienia"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Skrót do ustawień"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Tryb samolotowy"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Więcej"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sieci zwykłe i bezprzewodowe"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Zarządzaj połączeniami Wi-Fi i Bluetooth, trybem samolotowym, sieciami komórkowymi i VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobilna transmisja danych"</string>
@@ -392,6 +382,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Prywatność"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Wyłączone przez administratora"</string>
<string name="security_status_title" msgid="5848766673665944640">"Stan zabezpieczeń"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Blokada ekranu, rozpoznanie twarzy"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Blokada ekranu, odcisk palca"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Blokada ekranu"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Dodano twarz"</string>
@@ -401,11 +392,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Odblokowywanie skanem twarzy"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Użyj własnej twarzy do uwierzytelniania"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Używaj skanu twarzy do odblokowywania telefonu, autoryzowania zakupów i logowania się w aplikacjach."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Użyj swojej twarzy"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Odblokowuj telefon i zatwierdzaj zakupy skanem twarzy.\n\nUwaga: nie możesz odblokowywać tego urządzenia skanem twarzy. Więcej informacji uzyskasz od administratora swojej organizacji."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Używaj skanu twarzy do odblokowywania telefonu, autoryzowania zakupów i logowania się w aplikacjach"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Możesz dodać do <xliff:g id="COUNT">%d</xliff:g> odcisków palców"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Ustaw twarz w środku okręgu"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Później"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Możesz dodać do <xliff:g id="COUNT">%d</xliff:g> skanów twarzy"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Dodano maksymalną liczbę skanów twarzy"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Nie można dodać więcej skanów twarzy"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Nie ukończono rejestracji"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Osiągnięto limit czasu rejestracji twarzy. Spróbuj ponownie."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Nie udało się zarejestrować twarzy."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Wszystko gotowe. Jest świetnie."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Gotowe"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Użyj własnej twarzy"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Odblokowywanie urządzenia"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Logowanie do aplikacji i płatności"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Otwórz oczy, by odblokować"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Gdy korzystasz z uwierzytelniania twarzą, musisz mieć otwarte oczy"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Usuń dane dotyczące twarzy"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Zaktualizuj dane dotyczące twarzy"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Twoja twarz wystarczy, by odblokować urządzenie i otworzyć aplikacje."<annotation id="url">"Dowiedz się więcej"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Odcisk palca"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Zarządzaj odciskami"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Używaj odcisku palca do"</string>
@@ -914,6 +921,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wybierz co najmniej jedno pasmo dla hotspotu Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Ustawienia IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Prywatność"</string>
<string name="wifi_shared" msgid="844142443226926070">"Udostępnij innym użytkownikom urządzenia"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nie zmieniono)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Wybierz"</string>
@@ -953,7 +961,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Anuluj"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Zapomnieć sieć?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Wszystkie hasła do tej sieci zostaną usunięte"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Zapisane sieci"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="few">%d sieci</item>
<item quantity="many">%d sieci</item>
@@ -1134,8 +1141,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Jasność"</string>
<string name="brightness_summary" msgid="838917350127550703">"Dostosuj jasność ekranu"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Automatyczna jasność"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Włączono"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Wył."</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Wolę bardzo niską jasność"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Wolę niską jasność"</string>
@@ -1231,6 +1237,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Nie można zmienić kodu PIN.\nWpisany kod PIN może być błędny."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Kod PIN do karty SIM został pomyślnie zmieniony"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Nie można zmienić stanu blokady karty SIM.\nWpisany kod PIN może być błędny."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Nie można wyłączyć kodu PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Nie można włączyć kodu PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Anuluj"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Znaleziono wiele kart SIM"</string>
@@ -1406,7 +1414,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Nośnik „<xliff:g id="NAME_0">^1</xliff:g>” musi zostać sformatowany. \n\n"<b>"Sformatowanie spowoduje wykasowanie wszystkich danych, które zawiera <xliff:g id="NAME_1">^1</xliff:g>."</b>" Aby uniknąć utraty danych, utwórz ich kopię zapasową."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Wykasuj i sformatuj"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatuję: <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Nie wyjmuj tego nośnika (<xliff:g id="NAME">^1</xliff:g>) w trakcie formatowania."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Nie wyjmuj tego nośnika (<xliff:g id="NAME">^1</xliff:g>) w trakcie formatowania."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Przenieś dane w nowe miejsce"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Możesz przenieść zdjęcia, pliki i niektóre aplikacje na nowy nośnik <xliff:g id="NAME">^1</xliff:g>. \n\nTa czynność potrwa około <xliff:g id="TIME">^2</xliff:g> i zwolni <xliff:g id="SIZE">^3</xliff:g> pamięci wewnętrznej. Podczas tego procesu niektóre aplikacje nie będą działać."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Przenieś teraz"</string>
@@ -1790,9 +1798,6 @@
<string name="installed" msgid="3070865169422600098">"Zainstalowana"</string>
<string name="no_applications" msgid="7336588977497084921">"Brak aplikacji"</string>
<string name="internal_storage" msgid="1584700623164275282">"Pamięć wewnętrzna"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"pamięć wewnętrzna"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Nośnik USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Pamięć karty SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Przeliczanie rozmiaru..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Usunąć dane aplikacji?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Wszystkie dane tej aplikacji zostaną trwale usunięte. Dotyczy to wszystkich plików, ustawień, kont, baz danych itd."</string>
@@ -1801,24 +1806,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikacji nie znaleziono na liście zainstalowanych aplikacji."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Nie można wyczyścić miejsca na aplikację."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Aplikacja ma dostęp do następujących elementów na tablecie:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Aplikacja ma dostęp do następujących elementów na telefonie:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Aplikacja ma dostęp do tych elementów na tablecie. Aby poprawić wydajność i zmniejszyć użycie pamięci, aplikacja <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ma niektóre z tych uprawnień, bo działa wewnątrz tego samego procesu co <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Aplikacja ma dostęp do tych elementów na telefonie. Aby poprawić wydajność i zmniejszyć użycie pamięci, aplikacja <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ma niektóre z tych uprawnień, bo działa wewnątrz tego samego procesu co <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> i <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"W aplikacji mogą być pobierane opłaty:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Wyślij droższego SMS-a"</string>
<string name="computing_size" msgid="1599186977475211186">"Przetwarzanie..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Nie udało się obliczyć rozmiaru pakietu."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Nie masz zainstalowanych żadnych aplikacji firm zewnętrznych."</string>
<string name="version_text" msgid="9189073826278676425">"wersja <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Przenieś"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Przenieś do tabletu"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Przenieś do telefonu"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Przenieś na nośnik USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Przenieś na kartę SD"</string>
- <string name="moving" msgid="6431016143218876491">"Przenoszenie"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Inna migracja jest już w toku."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Za mało miejsca w pamięci."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplikacja nie istnieje."</string>
@@ -1828,17 +1825,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Aplikacji do administrowania urządzeniem nie można zainstalować na nośnikach zewnętrznych."</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Wymusić zatrzymanie?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Jeśli wymusisz zatrzymanie aplikacji, może ona zadziałać nieprawidłowo."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Nie można przenieść aplikacji. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Preferowana lokalizacja instalacji"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Zmień preferowaną lokalizację instalacji nowych aplikacji."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Wyłączyć wbudowaną aplikację?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Wyłącz aplikację"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Jeśli wyłączysz tę aplikację, Android i inne aplikacje mogą działać nieprawidłowo."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Usunąć dane i wyłączyć aplikację?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Jeśli wyłączysz tę aplikację, Android i inne aplikacje mogą działać nieprawidłowo. Zostaną też usunięte Twoje dane."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Wyłączyć powiadomienia?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jeśli wyłączysz powiadomienia tej aplikacji, możesz przeoczyć ważne alerty i aktualizacje."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Sklep"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Szczegóły aplikacji"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacja zainstalowana z: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2031,6 +2024,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Użyj usługi"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Użyj korekcji kolorów"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Użyj napisów"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Dalej"</string>
<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="6371077608778830020">"Dodaj aparat słuchowy"</string>
@@ -2190,8 +2184,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Jeśli ograniczysz aktywność aplikacji w tle, może ona działać nieprawidłowo"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Ta aplikacja nie jest skonfigurowana do optymalnego wykorzystywania baterii, więc nie możesz wprowadzić dla niej ograniczeń.\n\nAby wprowadzić ograniczenia dla aplikacji, najpierw włącz optymalizację baterii."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Wykorzystanie przez ekran od ostatniego naładowania"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Zużycie przez ekran"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Skanowanie sieci komórkowej"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Wykorzystanie baterii od pełnego naładowania"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Czas włączenia ekranu od pełnego naładowania"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Wykorzystanie przez urządzenie od ostatniego naładowania"</string>
@@ -2218,11 +2210,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Szczegóły użycia"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Dostosuj wykorzystanie energii"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Dołączone pakiety"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacje zużywające baterię"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Nie pozwala uśpić urządzenia"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Wybudza urządzenie w tle"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Często prosi o informację o lokalizacji"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Liczba aplikacji działających nieprawidłowo: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikacje działają normalnie"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon zużywa typową ilość energii w tle"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet zużywa typową ilość energii w tle"</string>
@@ -2298,6 +2285,7 @@
<item quantity="other">Ograniczam zużycie baterii przez %1$d aplikacji</item>
<item quantity="one">Ograniczam zużycie baterii przez %1$d aplikację</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Ograniczono <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Te aplikacje zużywają baterię w tle. Aplikacje z ograniczeniami mogą nie działać prawidłowo, a powiadomienia mogą być opóźnione."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Użyj Menedżera baterii"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Wykrywaj, gdy aplikacje szybko rozładowują baterię"</string>
@@ -2421,7 +2409,7 @@
<string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Włącz automatycznie"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nigdy"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"przy <xliff:g id="PERCENT">%1$s</xliff:g> baterii"</string>
- <string name="battery_percentage" msgid="723291197508049369">"Poziom naładowania baterii w %%"</string>
+ <string name="battery_percentage" msgid="723291197508049369">"Poziom naładowania baterii w procentach"</string>
<string name="battery_percentage_description" msgid="8511658577507384014">"Pokazuj procentowy poziom naładowania baterii na pasku stanu"</string>
<string name="process_stats_summary_title" msgid="1144688045609771677">"Statystyki procesów"</string>
<string name="process_stats_summary" msgid="109387941605607762">"Rozbudowane statystyki uruchomionych procesów"</string>
@@ -2477,23 +2465,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Anuluj"</string>
<string name="tts_reset" msgid="2661752909256313270">"Resetuj"</string>
<string name="tts_play" msgid="2628469503798633884">"Odtwórz"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Zarządzanie energią"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Aktualizowanie ustawień Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualizowanie ustawień Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"wł."</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"wył."</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"włączanie"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"wyłączanie"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Lokalizacja"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synchronizacja"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Jasność <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatyczna"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"pełna"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"do połowy"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"wyłączona"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Magazyn danych logowania"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Zainstaluj z nośnika"</string>
@@ -2651,7 +2622,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Wybierz wszystkie"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Użycie danych"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Użycie danych w aplikacji"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Dane komórkowe i Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operator sieci komórkowej może obliczać ilość przesłanych danych inaczej niż urządzenie."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Transmisja danych w aplikacjach"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACJE O APLIKACJI"</string>
@@ -3038,7 +3009,6 @@
<item quantity="other">Pokaż %d ukrytego elementu</item>
<item quantity="one">Pokaż %d ukryty element</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Zwiń"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Sieć i internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"sieć komórkowa"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"użycie danych"</string>
@@ -3050,12 +3020,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacje i powiadomienia"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Uprawnienia, aplikacje domyślne"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Aplikacje w profilu do pracy nie mają dostępu do powiadomień."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Konta"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nie dodano kont"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Domyślne aplikacje"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Języki, kopia zapasowa, aktualizacje"</string>
<string name="search_results_title" msgid="1796252422574886932">"Ustawienia"</string>
- <string name="search_menu" msgid="6283419262313758339">"Wyszukaj ustawienia"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, połączenie z siecią, internet, bezprzewodowe, dane, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, przełącz, sterowanie"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, wysyłanie SMS-ów, wiadomości, wysyłanie wiadomości, domyślna"</string>
@@ -3100,6 +3070,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"płacenie, klikanie, płatności"</string>
<string name="keywords_backup" msgid="470070289135403022">"kopia zapasowa, tworzenie kopii zapasowej"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gest"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"twarz, odblokowanie, uwierzytelnienie, logowanie"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, wersja prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"sieć, stan sieci komórkowej, stan usługi, moc sygnału, typ sieci komórkowej, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"numer seryjny, wersja sprzętu"</string>
@@ -3107,6 +3078,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ciemny motyw"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"błąd"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ekran dostosowany do otoczenia, ekran blokady"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"powiadomienie na ekranie blokady"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"twarz"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"odcisk palca"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"przyciemnianie ekranu, ekran dotykowy, bateria, inteligentne dostosowanie jasności, dynamiczna jasność"</string>
@@ -3446,7 +3418,7 @@
<string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Brak"</string>
<string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"Codziennie"</string>
<string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"Alarm może zastąpić godzinę zakończenia"</string>
- <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Zatrzymaj o godzinie zakończenia lub przy następnym alarmie, w zależności od tego, co nastąpi wcześniej"</string>
+ <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"Zatrzymaj o godzinie zakończenia lub przy następnym alarmie, w zależności od tego, co nastąpi wcześniej."</string>
<string name="summary_divider_text" msgid="7228986578690919294">", "</string>
<string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> – <xliff:g id="END">%2$s</xliff:g>"</string>
<string name="summary_range_verbal_combination" msgid="8467306662961568656">"Od: <xliff:g id="START">%1$s</xliff:g> do: <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -3558,7 +3530,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Gdy wpiszesz swój kod PIN, by włączyć to urządzenie, usługi ułatwień dostępu takie jak <xliff:g id="SERVICE">%1$s</xliff:g> nie będą jeszcze aktywne."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Gdy narysujesz swój wzór, by włączyć to urządzenie, usługi ułatwień dostępu takie jak <xliff:g id="SERVICE">%1$s</xliff:g> nie będą jeszcze aktywne."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Gdy wpiszesz swoje hasło, by włączyć to urządzenie, usługi ułatwień dostępu takie jak <xliff:g id="SERVICE">%1$s</xliff:g> nie będą jeszcze aktywne."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Uwaga: po restarcie ta aplikacja będzie mogła uruchomić się dopiero po odblokowaniu telefonu"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Uwaga: po ponownym uruchomieniu telefonu z ustawioną blokadą ekranu ta aplikacja będzie mogła uruchomić się dopiero wtedy, gdy odblokujesz telefon"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Numer IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informacje związane z IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Gniazdo <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3620,7 +3592,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Osobiste"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Do pracy"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacje: wszystkie"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacje: wyłączone"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Wyłączono"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorie: pilne"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorie: mało ważne"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorie: wyłączone"</string>
@@ -3683,7 +3655,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alerty o transmisji danych"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Pokaż pełne zużycie przez urządzenie"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Pokaż zużycie przez aplikacje"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Wysokie wykorzystanie"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacje działają nieprawidłowo</item>
<item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacji działa nieprawidłowo</item>
@@ -3855,6 +3826,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Pamięć wewnętrzna: <xliff:g id="PERCENTAGE">%1$s</xliff:g> zajęte – <xliff:g id="FREE_SPACE">%2$s</xliff:g> wolne"</string>
<string name="display_summary" msgid="6737806235882127328">"Uśpienie po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Tapeta, uśpienie, rozmiar czcionki"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Uśpienie po 10 minutach bezczynności"</string>
<string name="memory_summary" msgid="8080825904671961872">"Średnie wykorzystanie pamięci: <xliff:g id="USED_MEMORY">%1$s</xliff:g> z <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Jesteś zalogowany jako <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3870,7 +3843,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Brak uprawnień do wysyłania SMS-ów"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Brak uprawnień do aparatu"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Brak uprawnień do tworzenia zrzutów ekranu"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Nie można wyłączyć kopii zapasowych"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Nie można otworzyć tej aplikacji"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Jeśli masz pytania, skontaktuj się z administratorem"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Więcej szczegółów"</string>
@@ -4044,9 +4016,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Emuluj wyświetlacz z wycięciem"</string>
- <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"wycięcie wyświetlacza, rowek"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Brak"</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>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Ustawienie domyślne urządzenia"</string>
<string name="special_access" msgid="3458780842491881155">"Specjalny dostęp do aplikacji"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacje mogą używać nieograniczonej ilości danych</item>
@@ -4061,7 +4033,7 @@
<string name="notification_suggestion_title" msgid="387052719462473500">"Zarządzaj informacjami wyświetlanymi na ekranie blokady"</string>
<string name="notification_suggestion_summary" msgid="8521159741445416875">"Pokaż lub ukryj informacje w powiadomieniach"</string>
<string name="page_tab_title_summary" msgid="4070309266374993258">"Wszystkie"</string>
- <string name="page_tab_title_support" msgid="4407600495101788249">"Wsparcie i wskazówki"</string>
+ <string name="page_tab_title_support" msgid="4407600495101788249">"Pomoc i wskazówki"</string>
<string name="developer_smallest_width" msgid="7516950434587313360">"Najmniejsza szerokość"</string>
<string name="premium_sms_none" msgid="8268105565738040566">"Żadna z zainstalowanych aplikacji nie prosiła o dostęp do SMS-ów specjalnych"</string>
<string name="premium_sms_warning" msgid="9086859595338944882">"Za SMS-y specjalne może być pobierana dodatkowa, wyższa opłata, która pojawi się na Twoim rachunku telefonicznym. Po włączeniu tego uprawnienia możliwe będzie wysyłanie SMS-ów specjalnych z wybranej aplikacji."</string>
@@ -4070,11 +4042,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Połączono z: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Połączono z wieloma urządzeniami"</string>
<string name="demo_mode" msgid="2798762752209330277">"Tryb demonstracyjny interfejsu"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Tryb nocny"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Ustaw tryb nocny"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Tryb ciemny"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Ustaw tryb ciemny"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Kafelki szybkich ustawień dla programisty"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Śledzenie Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Ustawienia profilu do pracy"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Wyszukiwanie kontaktów"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Zezwalaj na wyszukiwanie kontaktów do identyfikacji rozmówców i kontaktów przez Twoją organizację"</string>
@@ -4121,13 +4092,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Kliknij dwukrotnie, aby sprawdzić telefon"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Kliknij dwukrotnie, by sprawdzić tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Kliknij dwukrotnie, by sprawdzić urządzenie"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Aby sprawdzić godzinę, ikony powiadomień i inne informacje, kliknij ekran dwukrotnie."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Aby sprawdzić godzinę, powiadomienia i inne informacje, kliknij ekran dwukrotnie."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podnieś, by sprawdzić telefon"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podnieś, by sprawdzić tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podnieś, by sprawdzić urządzenie"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Aby sprawdzić godzinę, ikony powiadomień i inne informacje, podnieś telefon."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Aby sprawdzić godzinę, ikony powiadomień i inne informacje, podnieś tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Aby sprawdzić godzinę, ikony powiadomień i inne informacje, podnieś urządzenie."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Wybudź ekran"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Aby sprawdzić godzinę, powiadomienia i inne informacje, podnieś telefon."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Aby sprawdzić godzinę, powiadomienia i inne informacje, podnieś tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Aby sprawdzić godzinę, powiadomienia i inne informacje, podnieś urządzenie."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gest wybudzenia ekranu blokady"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Sprawdzanie powiadomień"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Przesuwanie po czytniku"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Aby sprawdzić powiadomienia, przesuń palcem w dół na czytniku linii papilarnych z tyłu telefonu."</string>
@@ -4215,7 +4190,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> próby</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> próba</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Tworzona jest kopia danych z tego urządzenia"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Tym urządzeniem zarządza Twoja organizacja."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Tym urządzeniem zarządza <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4262,6 +4236,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Usługa autouzupełniania"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatyczne, uzupełnianie, autouzupełnianie"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Sprawdź, czy ta aplikacja jest zaufana</b> <br/> <br/> <xliff:g id=app_name example=Autouzupełnianie Google>%1$s</xliff:g> na podstawie zawartości ekranu określa, co można uzupełnić automatycznie."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Autouzupełnianie"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Poziom rejestrowania"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maksymalna liczba próśb na sesję"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maksymalna liczba widocznych zbiorów danych"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Przywróć wartości domyślne"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Zresetowanie opcje programisty autouzupełniania"</string>
<string name="device_theme" msgid="4571803018917608588">"Motyw urządzenia"</string>
<string name="default_theme" msgid="7085644992078579076">"Wartość domyślna"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nazwa sieci"</string>
@@ -4276,15 +4256,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Uruchom obsługę administracyjną operatora"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Zmień ustawienia trybu Nie przeszkadzać"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Wstrzymaj powiadomienia, by Cię nie rozpraszały"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Co nowego i fajnego?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Poznaj swój nowy telefon"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Poznaj swój nowy tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Poznaj swoje nowe urządzenie"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcja jest niedostępna na tym urządzeniu."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Wymuś pełną procedurę pomiarów GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Śledź wszystkie konstelacje GNSS i częstotliwości bez uwzględniania współczynnika impulsu"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Zawsze pokazuj okno dialogowe z raportem o błędzie"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Pokazuj okno dialogowe przy każdym poważnym błędzie w aplikacji"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Wybierz aplikację obsługującą ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nie ustawiono aplikacji obsługującej ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplikacja obsługująca ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Dostęp do katalogu"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"dostęp do katalogu"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4325,4 +4304,87 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Szczegóły sieci"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Nazwa urządzenia jest widoczna dla aplikacji na telefonie. Mogą ją też zobaczyć inne osoby, gdy łączysz się z urządzeniami przez Bluetooth lub konfigurujesz hotspot Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Urządzenia"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Wszystkie ustawienia"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Sugestie"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dane CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dane CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Wybierz sieć"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Odłączono"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Połączono"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Łączę…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nie udało się połączyć"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nie znaleziono sieci."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nie udało się znaleźć sieci. Spróbuj ponownie."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(dostęp zabroniony)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Brak karty SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Zaawansowane połączenia"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Preferowany tryb sieci: preferowany WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Preferowany tryb sieci: tylko GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Preferowany tryb sieci: tylko WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Preferowany tryb sieci: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Preferowany tryb sieci: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Preferowany tryb sieci: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Preferowany tryb sieci: tylko CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Preferowany tryb sieci: tylko EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferowany tryb sieci: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferowany tryb sieci: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferowany tryb sieci: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferowany tryb sieci: CDMA + LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferowany tryb sieci: globalny"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferowany tryb sieci: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Preferowany tryb sieci: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Preferowany tryb sieci: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferowany tryb sieci: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preferowany tryb sieci: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preferowany tryb sieci: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preferowany tryb sieci: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preferowany tryb sieci: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preferowany tryb sieci: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preferowany tryb sieci: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preferowany tryb sieci: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preferowany tryb sieci: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preferowany tryb sieci: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (zalecana)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (zalecana)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globalna"</string>
+ <string name="label_available" msgid="1731547832803057893">"Dostępne sieci"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Wyszukuję…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Rejestruję w sieci <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Karta SIM nie pozwala na połączenia z tą siecią."</string>
+ <string name="connect_later" msgid="978991102125216741">"Nie można teraz połączyć się z tą siecią. Spróbuj ponownie później."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Zarejestrowano w sieci."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Automatycznie wybieraj sieć"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Ustawienia operatora"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Skonfiguruj transmisję danych"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobilna transmisja danych"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Korzystaj z danych przy użyciu sieci komórkowej"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Preferowany typ sieci"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Zmień tryb działania sieci"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Preferowany typ sieci"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operator"</string>
+ <string name="call_category" msgid="8108654745239563833">"Połączenia"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Rozmowy wideo w sieci operatora"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Wybór systemu"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Zmień tryb roamingu CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Wybór systemu"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Sieć"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Sieć"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Subskrypcja CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Zmiana między RUIM/SIM i NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"subskrypcja"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatyczna rejestracja…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Zezwalać na roaming danych?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Aby poznać ceny, skontaktuj się z operatorem."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Użycie danych przez aplikację"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Nieprawidłowy tryb sieci <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignoruj."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Niedostępne po połączeniu z siecią <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Pokaż więcej"</string>
+ <string name="see_less" msgid="1250265310929558370">"Pokaż mniej"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <item quantity="few"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> połączone urządzenia</item>
+ <item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> połączonych urządzeń</item>
+ <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> połączonego urządzenia</item>
+ <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_0">%1$d</xliff:g> połączone urządzenie</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Brak połączonych urządzeń"</string>
</resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index ef44b13..c5a9295 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tratar como limitada"</item>
<item msgid="2266114985518865625">"Tratar como ilimitada"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Padrão (usar MAC aleatório)"</item>
+ <item msgid="5398461510512959597">"Confiável"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Não"</item>
<item msgid="3863157480502955888">"Sim"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Sempre ativado"</item>
<item msgid="6385301106124765323">"Sempre desativado"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Desativado"</item>
+ <item msgid="2182686878828390312">"Depuração"</item>
+ <item msgid="5286514712714822064">"Detalhado"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Somente doméstica"</item>
+ <item msgid="5034813753274486448">"Automático"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferencial"</item>
+ <item msgid="807926878589867564">"Somente GSM"</item>
+ <item msgid="488474605709912156">"Somente WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automático"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automático"</item>
+ <item msgid="370391313511477301">"CDMA sem EvDo"</item>
+ <item msgid="4678789463133969294">"Somente EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"Somente TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"R-UIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 22c1ad9..f211f49 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Criar"</string>
<string name="allow" msgid="3349662621170855910">"Permitir"</string>
<string name="deny" msgid="6947806159746484865">"Recusar"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Fechar"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
<string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Não é necessário. Você já é um desenvolvedor."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Primeiro, ative as opções do desenvolvedor."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Redes sem fio e outras"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Conexões"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Pessoais"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Acesso"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Ativar conexão de dados"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desativar conexão de dados"</string>
@@ -44,8 +38,8 @@
<string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas por Wi-Fi aprovisionadas"</string>
<string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presença aprovisionados"</string>
<string name="radio_info_radio_power" msgid="7187666084867419643">"Potência do rádio móvel"</string>
- <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver o catálogo de endereços do SIM"</string>
- <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizar números de chamada fixa"</string>
+ <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver o catálogo de endereços do chip"</string>
+ <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizar números de discagem fixa"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Visualizar números de chamada de serviço"</string>
<string name="radioInfo_menu_getIMS" msgid="185171476413967831">"Status de serviço IMS"</string>
<string name="radio_info_ims_reg_status_title" msgid="16971785902696970">"Status IMS"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Endereço Bluetooth do dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmissão"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sem nome"</string>
<string name="progress_scanning" msgid="192587958424295789">"Pesquisar"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nenhum dispositivo Bluetooth encontrado."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Um app quer ativar o Bluetooth e tornar seu smartphone visível para outros dispositivos. É possível alterar esta opção posteriormente nas configurações do Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Ativando Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Desligar o Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexão automática"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitação de conexão Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Toque para conectar-se a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Quer conectar-se ao \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -163,8 +155,8 @@
<string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"Não perguntar novamente"</string>
<string name="bluetooth_map_request" msgid="4595727689513143902">"Solicitação de acesso a mensagens"</string>
<string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
- <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>
- <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+ <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao chip"</string>
+ <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu chip. A concessão de acesso ao chip desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
<string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
<string name="bluetooth_off_footer" msgid="8406865700572772936">"Ative o Bluetooth para se conectar a outros dispositivos."</string>
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de chamada disponíveis"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados no momento"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivos salvos"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Adicionar dispositivo"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"O Bluetooth será ativado para o pareamento"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferências de conexão"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos conectados anteriormente"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectados anteriormente"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth ativado"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Ver tudo"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Selecione o fuso horário"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Pular"</string>
<string name="next_label" msgid="4693520878012668114">"Avançar"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Idiomas"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferências de idioma"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Remover"</string>
<string name="add_a_language" msgid="2330538812283783022">"Adicionar um idioma"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -300,10 +291,9 @@
<string name="done" msgid="6942539184162713160">"Concluído"</string>
<string name="apply" msgid="1577045208487259229">"Aplicar"</string>
<string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
- <string name="settings_label_launcher" msgid="8344735489639482340">"Configurar"</string>
+ <string name="settings_label_launcher" msgid="8344735489639482340">"Configurações"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Modo avião"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Mais"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes sem fio e outras"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Gerenciar Wi-Fi, Bluetooth, modo avião, redes móveis e VPNs"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Dados móveis"</string>
@@ -383,11 +373,12 @@
<string name="decryption_settings_summary" product="tablet" msgid="5794135636155570977">"Dispositivo não criptografado"</string>
<string name="lockscreen_settings_title" msgid="1099738951060387656">"Exibição da tela de bloqueio"</string>
<string name="lockscreen_settings_what_to_show_category" msgid="278055252361575926">"O que mostrar"</string>
- <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
+ <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do chip e do armazenamento de credenciais"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
<string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desativada pelo administrador"</string>
<string name="security_status_title" msgid="5848766673665944640">"Status da segurança"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Bloqueio de tela, desbloqueio facial"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueio de tela, impressão digital"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueio de tela"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Rosto adicionado"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Desbloquear com seu rosto"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Usar seu rosto para autenticar"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use seu rosto para desbloquear o smartphone, autorizar compras ou fazer login em apps."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Use seu rosto"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use seu rosto para desbloquear o smartphone ou aprovar compras.\n\nObservação: não é possível usar seu rosto para desbloquear este dispositivo. Para mais informações, entre em contato com o administrador da organização."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use seu rosto para desbloquear o smartphone, autorizar compras ou fazer login em apps"</string>
- <string name="face_add_max" msgid="2342250989212694454">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centralize seu rosto dentro do círculo"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Mais tarde"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> rostos"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Você adicionou o número máximo de rostos"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Não é possível adicionar mais rostos"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"O registro não foi concluído"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Ok"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Tempo máximo para registro de rostos atingido. Tente novamente."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"O registro de rostos não funcionou."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Tudo pronto. E bonito."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Concluído"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Usar seu rosto para"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Desbloquear o disp."</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Login e pagamentos no app"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Olhos abertos para desbloquear"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Seus olhos precisam estar abertos para usar a autenticação facial"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Remov. dados faciais"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Melhore seus dados faciais"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Use seu rosto para desbloquear o dispositivo e acessar apps. "<annotation id="url">"Saiba mais"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerenciar impressões digitais"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impressão digital para"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Escolha pelo menos uma banda para o ponto de acesso Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Configurações de IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacidade"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Selecione"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Esquecer a rede?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Todas as senhas dessa rede serão excluídas"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Redes salvas"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d rede</item>
<item quantity="other">%d redes</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brilho"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho da tela"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Brilho adaptável"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Ativado"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Desativado"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"O brilho preferencial está muito baixo"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"O brilho preferencial está baixo"</string>
@@ -1141,8 +1147,8 @@
<string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Será desativado automaticamente ao amanhecer"</string>
<string name="night_display_activation_on_manual" msgid="277343561277625826">"Ativar agora"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"Desativar agora"</string>
- <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Ativar até o nascer do sol"</string>
- <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Desativar até o pôr do sol"</string>
+ <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Ativar até o amanhecer"</string>
+ <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Desativar até anoitecer"</string>
<string name="night_display_activation_on_custom" msgid="5472029024427933598">"Ativar até <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"Desativar até <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
@@ -1176,43 +1182,45 @@
<string name="doze_always_on_summary" msgid="6978257596231155345">"Mostrar horário, ícones de notificação e outras informações. Aumento do uso da bateria."</string>
<string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
<string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
- <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
- <string name="sim_lock_settings_category" msgid="6242052161214271091">"Bloqueio do cartão SIM"</string>
+ <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do chip"</string>
+ <string name="sim_lock_settings_category" msgid="6242052161214271091">"Bloqueio do chip"</string>
<string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Desativado"</string>
<string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Bloqueado"</string>
- <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
- <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquear cartão SIM"</string>
+ <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do chip"</string>
+ <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquear chip"</string>
<string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Exigir PIN para usar o tablet"</string>
<string name="sim_lock_on" product="default" msgid="2503536505568814324">"Exigir PIN para usar o telefone"</string>
<string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Exigir PIN para usar o tablet"</string>
<string name="sim_lock_off" product="default" msgid="258981978215428916">"Exigir PIN para usar o telefone"</string>
- <string name="sim_pin_change" msgid="6311414184279932368">"Alterar PIN do SIM"</string>
- <string name="sim_enter_pin" msgid="6608715137008508432">"PIN do SIM"</string>
- <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquear cartão SIM"</string>
- <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Desbloquear o cartão SIM"</string>
- <string name="sim_enter_old" msgid="6074196344494634348">"PIN do SIM antigo"</string>
- <string name="sim_enter_new" msgid="8742727032729243562">"Novo PIN do SIM"</string>
+ <string name="sim_pin_change" msgid="6311414184279932368">"Alterar PIN do chip"</string>
+ <string name="sim_enter_pin" msgid="6608715137008508432">"PIN do chip"</string>
+ <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquear chip"</string>
+ <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Desbloquear o chip"</string>
+ <string name="sim_enter_old" msgid="6074196344494634348">"PIN do chip antigo"</string>
+ <string name="sim_enter_new" msgid="8742727032729243562">"Novo PIN do chip"</string>
<string name="sim_reenter_new" msgid="6523819386793546888">"Digitar novo PIN novamente"</string>
- <string name="sim_change_pin" msgid="7328607264898359112">"PIN do SIM"</string>
+ <string name="sim_change_pin" msgid="7328607264898359112">"PIN do chip"</string>
<string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorreto"</string>
<string name="sim_pins_dont_match" msgid="1695021563878890574">"Os PINs não correspondem"</string>
<string name="sim_change_failed" msgid="3602072380172511475">"Não é possível alterar o PIN.\nPIN possivelmente incorreto."</string>
- <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN do SIM alterado"</string>
- <string name="sim_lock_failed" msgid="2489611099235575984">"Não é possível alterar o estado de bloqueio do cartão SIM.\nPIN possivelmente incorreto."</string>
+ <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN do chip alterado"</string>
+ <string name="sim_lock_failed" msgid="2489611099235575984">"Não é possível alterar o estado de bloqueio do chip.\nPIN possivelmente incorreto."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Não é possível desativar o PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Não é possível ativar o PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Vários SIMs encontrados"</string>
- <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Escolha o SIM preferencial para dados móveis."</string>
- <string name="sim_change_data_title" msgid="294357201685244532">"Alterar SIM de dados?"</string>
+ <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Escolha o chip preferencial para dados móveis."</string>
+ <string name="sim_change_data_title" msgid="294357201685244532">"Alterar Chip de dados?"</string>
<string name="sim_change_data_message" msgid="5854582807996717811">"Usar <xliff:g id="NEW_SIM">%1$s</xliff:g> em vez de <xliff:g id="OLD_SIM">%2$s</xliff:g> para dados móveis?"</string>
- <string name="sim_preferred_title" msgid="5567909634636045268">"Atualiz. cartão SIM preferido?"</string>
- <string name="sim_preferred_message" msgid="8466930554330635780">"O <xliff:g id="NEW_SIM">%1$s</xliff:g> é o único SIM no seu dispositivo. Quer usá-lo para dados móveis, chamadas e mensagens SMS?"</string>
- <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN do SIM incorreto. Entre em contato com a operadora para desbloquear o dispositivo."</string>
+ <string name="sim_preferred_title" msgid="5567909634636045268">"Atualiz. chip preferido?"</string>
+ <string name="sim_preferred_message" msgid="8466930554330635780">"O <xliff:g id="NEW_SIM">%1$s</xliff:g> é o único chip no seu dispositivo. Quer usá-lo para dados móveis, chamadas e mensagens SMS?"</string>
+ <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN do chip incorreto. Entre em contato com a operadora para desbloquear o dispositivo."</string>
<plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
- <item quantity="one">Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
- <item quantity="other">Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
+ <item quantity="one">Código PIN do chip incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
+ <item quantity="other">Código PIN do chip incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
</plurals>
- <string name="pin_failed" msgid="1848423634948587645">"Falha na operação de PIN do SIM."</string>
+ <string name="pin_failed" msgid="1848423634948587645">"Falha na operação de PIN do chip."</string>
<string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Atualizações do sistema"</string>
<string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
<string name="firmware_version" msgid="4801135784886859972">"Versão do Android"</string>
@@ -1241,8 +1249,8 @@
<string name="status_number" product="default" msgid="5948892105546651296">"Número de telefone"</string>
<string name="status_number_sim_slot" product="tablet" msgid="2755592991367858860">"MDN (slot para SIM %1$d)"</string>
<string name="status_number_sim_slot" product="default" msgid="1898212200138025729">"Número de tel. (slot SIM %1$d)"</string>
- <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"MDN no SIM"</string>
- <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"Número de telefone no SIM"</string>
+ <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"MDN no chip"</string>
+ <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"Número de telefone no chip"</string>
<string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
<string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
<string name="status_prl_version" msgid="1007470446618081441">"Versão do PRL"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"É necessário que o cartão <xliff:g id="NAME_0">^1</xliff:g> seja formatado. \n\n"<b>"A formatação limpa todos os dados armazenados atualmente no cartão <xliff:g id="NAME_1">^1</xliff:g>."</b>" Para evitar perder os dados, faça backup deles."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Limpar e formatar"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatando <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Não remova o <xliff:g id="NAME">^1</xliff:g> enquanto ele estiver sendo formatado."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Não remova o <xliff:g id="NAME">^1</xliff:g> enquanto ele estiver sendo formatado."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mover dados para novo armazenamento"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"É possível mover suas fotos, arquivos e alguns apps para esse novo <xliff:g id="NAME">^1</xliff:g>. \n\nA transferência demora aproximadamente <xliff:g id="TIME">^2</xliff:g> e liberará <xliff:g id="SIZE">^3</xliff:g> no armazenamento interno. Alguns apps não funcionarão enquanto ela estiver em andamento."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mover agora"</string>
@@ -1544,9 +1552,9 @@
<string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Alterar o Assistente de Wi-Fi?"</string>
<string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Usar <xliff:g id="NEW_APP">%1$s</xliff:g> em vez de <xliff:g id="CURRENT_APP">%2$s</xliff:g> para gerenciar suas conexões de rede?"</string>
<string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Usar <xliff:g id="NEW_APP">%s</xliff:g> para gerenciar suas conexões de rede?"</string>
- <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operadora do SIM desconhecida"</string>
+ <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operadora do chip desconhecida"</string>
<string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> não tem um website de aprovisionamento conhecido"</string>
- <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
+ <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o chip e reinicie"</string>
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conecte-se à Internet"</string>
<string name="location_title" msgid="1029961368397484576">"Meu Local"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Local do perfil de trabalho"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Instalado"</string>
<string name="no_applications" msgid="7336588977497084921">"Nenhum app."</string>
<string name="internal_storage" msgid="1584700623164275282">"Espaço interno"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"armazenamento interno"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Armaz. USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Cartão SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Recalculando o tamanho…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Excluir os dados do app?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Todos os dados deste app serão excluídos permanentemente. Isso inclui todos os arquivos, configurações, contas, bancos de dados e outros."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"O app não foi encontrado na lista de apps instalados."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Não foi possível limpar o armazenamento do app."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Este app pode acessar os seguintes itens em seu tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Este app pode acessar os seguintes itens em seu telefone:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Este app pode acessar os itens a seguir em seu tablet. Para melhorar o desempenho e reduzir o uso de memória, algumas destas permissões estão disponíveis para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, pois tal app é executado no mesmo processo que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Este app pode acessar os itens a seguir em seu telefone. Para melhorar o desempenho e reduzir o uso de memória, algumas destas permissões estão disponíveis para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, pois tal app é executado no mesmo processo que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> e <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Este app pode cobrar dinheiro:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Enviar SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"Calculando…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Não foi possível calcular o tamanho do pacote."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Você não tem apps de terceiros instalados."</string>
<string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Mover"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover para o tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover para telefone"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover para USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover para cartão SD"</string>
- <string name="moving" msgid="6431016143218876491">"Movendo"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Outra migração já está em andamento."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Não há espaço de armazenamento suficiente."</string>
<string name="does_not_exist" msgid="1501243985586067053">"O app não existe."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Não é possível instalar o administrador do dispositivo em uma mídia externa"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Forçar parada?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Se você forçar a parada de um app, ele pode apresentar mau funcionamento."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Não foi possível mover o app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Local de instalação preferido"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Alterar o local de instalação preferido para novos apps"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desativar app integrado?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Desativar app"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Se você desativar esse app, o Android e outros apps poderão deixar de funcionar como deveriam."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Excluir os dados e desativar o app?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Se você desativar esse app, o Android e outros apps poderão deixar de funcionar como deveriam. Seus dados também serão excluídos."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Desativar notificações?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se você desativar as notificações para este app, poderá perder alertas e atualizações importantes."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Loja"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detalhes do app"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App instalado a partir da <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Usar serviço"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Usar correção de cor"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Usar legendas"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continuar"</string>
<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="6371077608778830020">"Adicionar aparelho auditivo"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Se você limitar as atividades em segundo plano de um app, ele poderá apresentar mau funcionamento"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Como o app não está configurado para otimizar bateria, não é possível restringi-lo.\n\nPara restringir, ative a otimização."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Uso da tela desde a carga completa"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da tela"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Uso da bateria desde a carga completa"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Por quanto tempo a tela ficou ativada desde a carga completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Detalhes de uso"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Ajustar uso de energia"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps que descarregam a bateria"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantendo o dispositivo ativado"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativando o dispositivo em segundo plano"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando localização com frequência"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps não estão funcionando bem"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Os apps estão sendo executados normalmente"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"O smartphone tem um consumo normal de bateria em segundo plano"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"O tablet tem um consumo normal de bateria em segundo plano"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">Limitando o uso da bateria para %1$d app</item>
<item quantity="other">Limitando o uso da bateria para %1$d apps</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restringido <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Esses apps estão usando a bateria em segundo plano. Os apps com restrição podem não funcionar corretamente, e é possível que as notificações sejam entregues com atraso."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Usar o Gerenciador de bateria"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detectar quando apps estiverem descarregando a bateria"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancelar"</string>
<string name="tts_reset" msgid="2661752909256313270">"Redefinir"</string>
<string name="tts_play" msgid="2628469503798633884">"Reproduzir"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Controle de energia"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Atualizando configuração de Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizando configuração Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ativado"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"desativado"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ativando"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"desativando"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Localização"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sincronização"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brilho <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"máximo"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"médio"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"desativado"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar do armazenamento"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso de dados do app"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Dados móveis e Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Uso de apps"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMAÇÕES DE APPS"</string>
@@ -2603,7 +2574,7 @@
<string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"Ocultar uso da ethernet"</string>
<string name="data_usage_menu_metered" msgid="6235119991372755026">"Restrições de rede"</string>
<string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizar dados automaticamente"</string>
- <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"Cartões SIM"</string>
+ <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"Chips"</string>
<string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"Pausa no limite"</string>
<string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincron. dados automaticamente"</string>
<string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Sinc. autom. dados pessoais"</string>
@@ -2893,7 +2864,7 @@
<string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Use dados em LTE para melhorar recursos de voz e comunicações (recomendado)"</string>
<string name="preferred_network_type_title" msgid="3431041717309776341">"Tipo de rede preferencial"</string>
<string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (recomendado)"</string>
- <string name="work_sim_title" msgid="4843322164662606891">"SIM de trabalho"</string>
+ <string name="work_sim_title" msgid="4843322164662606891">"Chip de trabalho"</string>
<string name="user_restrictions_title" msgid="5794473784343434273">"Acesso a apps e conteúdo"</string>
<string name="user_rename" msgid="8523499513614655279">"RENOMEAR"</string>
<string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restrições do app"</string>
@@ -2917,52 +2888,51 @@
<string name="user_image_choose_photo" msgid="7940990613897477057">"Escolher foto da Galeria"</string>
<string name="user_image_photo_selector" msgid="5492565707299454873">"Selecionar foto"</string>
<string name="regulatory_info_text" msgid="5623087902354026557"></string>
- <string name="sim_setup_wizard_title" msgid="1732682852692274928">"Cartões SIM"</string>
- <string name="sim_settings_title" msgid="6822745211458959756">"Cartões SIM"</string>
+ <string name="sim_setup_wizard_title" msgid="1732682852692274928">"Chips"</string>
+ <string name="sim_settings_title" msgid="6822745211458959756">"Chips"</string>
<string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
- <string name="sim_cards_changed_message" msgid="7900721153345139783">"Os cartões SIM foram alterados"</string>
+ <string name="sim_cards_changed_message" msgid="7900721153345139783">"Os chips foram alterados"</string>
<string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Toque para configurar atividades"</string>
<string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Os dados móveis estão indisponíveis"</string>
- <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Toque para selecionar um SIM de dados"</string>
+ <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Toque para selecionar um chip de dados"</string>
<string name="sim_calls_always_use" msgid="7936774751250119715">"Sempre usar esta opção para chamadas"</string>
- <string name="select_sim_for_data" msgid="2366081042162853044">"Selecionar um SIM de dados"</string>
- <string name="data_switch_started" msgid="2040761479817166311">"Trocando SIM de dados. Isso pode demorar um pouco..."</string>
+ <string name="select_sim_for_data" msgid="2366081042162853044">"Selecionar um chip de dados"</string>
+ <string name="data_switch_started" msgid="2040761479817166311">"Trocando chip de dados. Isso pode demorar um pouco..."</string>
<string name="select_sim_for_calls" msgid="3503094771801109334">"Ligar com"</string>
- <string name="sim_select_card" msgid="211285163525563293">"Selecionar um cartão SIM"</string>
- <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
- <string name="sim_slot_empty" msgid="8964505511911854688">"SIM vazio"</string>
- <string name="sim_editor_name" msgid="1722945976676142029">"Nome do SIM"</string>
- <string name="sim_name_hint" msgid="7038643345238968930">"Inserir nome do SIM"</string>
- <string name="sim_editor_title" msgid="4034301817366627870">"Slot para SIM %1$d"</string>
+ <string name="sim_select_card" msgid="211285163525563293">"Selecionar um chip"</string>
+ <string name="sim_card_number_title" msgid="7845379943474336488">"Chip <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
+ <string name="sim_slot_empty" msgid="8964505511911854688">"Chip vazio"</string>
+ <string name="sim_editor_name" msgid="1722945976676142029">"Nome do chip"</string>
+ <string name="sim_name_hint" msgid="7038643345238968930">"Inserir nome do chip"</string>
+ <string name="sim_editor_title" msgid="4034301817366627870">"Slot para chip %1$d"</string>
<string name="sim_editor_carrier" msgid="5684523444677746573">"Operadora"</string>
<string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
- <string name="sim_editor_color" msgid="2542605938562414355">"Cor do SIM"</string>
- <string name="sim_card_select_title" msgid="6668492557519243456">"Selecionar cartão SIM"</string>
+ <string name="sim_editor_color" msgid="2542605938562414355">"Cor do chip"</string>
+ <string name="sim_card_select_title" msgid="6668492557519243456">"Selecionar chip"</string>
<string name="color_orange" msgid="4417567658855022517">"Laranja"</string>
<string name="color_purple" msgid="3888532466427762504">"Roxo"</string>
- <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nenhum cartão SIM inserido"</string>
- <string name="sim_status_title" msgid="6744870675182447160">"Status do SIM"</string>
- <string name="sim_status_title_sim_slot" msgid="5725659316463979194">"Status do SIM (slot para SIM %1$d)"</string>
- <string name="sim_call_back_title" msgid="5181549885999280334">"Retornar chamada com o SIM padrão"</string>
- <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM para chamadas de saída"</string>
+ <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nenhum chip inserido"</string>
+ <string name="sim_status_title" msgid="6744870675182447160">"Status do chip"</string>
+ <string name="sim_status_title_sim_slot" msgid="5725659316463979194">"Status do chip (slot para SIM %1$d)"</string>
+ <string name="sim_call_back_title" msgid="5181549885999280334">"Retornar chamada com o chip padrão"</string>
+ <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Chip para fazer chamadas"</string>
<string name="sim_other_call_settings" msgid="8247802316114482477">"Outras configurações de chamada"</string>
<string name="preferred_network_offload_title" msgid="1605829724169550275">"Rede pref. p/ descarreg."</string>
<string name="preferred_network_offload_header" msgid="2321173571529106767">"Des. transm. nome de rede"</string>
<string name="preferred_network_offload_footer" msgid="5857279426054744020">"A opção \"Des. transm. nome de rede\" protege contra o acesso de terceiros a suas informações de rede."</string>
<string name="preferred_network_offload_popup" msgid="2252915199889604600">"A desativação da transmissão de nome de rede impedirá uma conexão automática a redes ocultas."</string>
<string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
- <string name="sim_notification_title" msgid="6272913297433198340">"Alteração em cartões SIM."</string>
+ <string name="sim_notification_title" msgid="6272913297433198340">"Alteração em chips."</string>
<string name="sim_notification_summary" msgid="8858043655706669772">"Toque para configurar"</string>
- <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferido para"</string>
+ <string name="sim_pref_divider" msgid="6778907671867621874">"Chip preferido para"</string>
<string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Perguntar sempre"</string>
<string name="sim_selection_required_pref" msgid="3446721423206414652">"Seleção necessária"</string>
- <string name="sim_selection_channel_title" msgid="2760909074892782589">"Seleção de SIM"</string>
+ <string name="sim_selection_channel_title" msgid="2760909074892782589">"Seleção de chip"</string>
<string name="dashboard_title" msgid="5453710313046681820">"Configurações"</string>
<plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
<item quantity="one">Mostrar %d item oculto</item>
<item quantity="other">Mostrar %d itens ocultos</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Recolher"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Rede e internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rede móvel"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de dados"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissões, apps padrão"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"O acesso às notificações não está disponível para apps no perfil de trabalho."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Contas"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nenhuma conta adicionada"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Apps padrão"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, horário, backup, atualizações"</string>
<string name="search_results_title" msgid="1796252422574886932">"Configurações"</string>
- <string name="search_menu" msgid="6283419262313758339">"Procurar nas configurações"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, Wi-Fi, conexão de rede, Internet, sem fio, dados, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, alternar, controle"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"mensagem de texto, envio de mensagens, mensagens, troca de mensagens, padrão"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"desbloqueio, facial, autenticação, login"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versão prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"rede, estado da rede móvel, estado do serviço, potência do sinal, tipo de rede móvel, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de série, versão do hardware"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema escuro"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Exibição ambiente, exibição de tela de bloqueio"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notificação na tela de bloqueio"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"rosto"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"impressão digital"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"escurecer tela, touchscreen, bateria, brilho inteligente, brilho dinâmico"</string>
@@ -3074,7 +3046,7 @@
<string name="alarm_ringtone_title" msgid="6344025478514311386">"Som de alarme padrão"</string>
<string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Também vibrar para chamadas"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
- <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons do teclado"</string>
+ <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons de discagem"</string>
<string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons de bloqueio de tela"</string>
<string name="charging_sounds_title" msgid="1132272552057504251">"Sons de carga"</string>
<string name="docking_sounds_title" msgid="155236288949940607">"Sons da dock"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Ao inserir seu PIN para iniciar o dispositivo, serviços de disponibilidade como o <xliff:g id="SERVICE">%1$s</xliff:g> ainda não estarão disponíveis."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Ao inserir seu padrão para iniciar o dispositivo, serviços de disponibilidade como o <xliff:g id="SERVICE">%1$s</xliff:g> ainda não estarão disponíveis."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Ao inserir sua senha para iniciar o dispositivo, serviços de disponibilidade como o <xliff:g id="SERVICE">%1$s</xliff:g> ainda não estarão disponíveis."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Observação: após uma reinicialização, não é possível iniciar este app até que você desbloqueie seu smartphone"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Observação: se você reiniciar o smartphone e tiver um bloqueio de tela definido, não será possível iniciar este app até que você desbloqueie o smartphone"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informações de IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas de IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Trabalho"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: desativadas"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Desativado"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorias: importância urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorias: importância baixa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorias: desativadas"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total do dispositivo"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> app está com comportamento anormal</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps estão com comportamento anormal</item>
@@ -3666,8 +3637,8 @@
<string name="running_frequency" msgid="6622624669948277693">"Frequência"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Uso máximo"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Nenhum dado usado"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Permitir acesso a \"Não perturbe\" para <xliff:g id="APP">%1$s</xliff:g>?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"O app poderá ativar/desativar \"Não perturbe\" e fazer alterações nas configurações relacionadas."</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Permitir que <xliff:g id="APP">%1$s</xliff:g> acesse o recurso \"Não perturbe\"?"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"O app poderá ativar/desativar o recurso \"Não perturbe\" e fazer alterações nas configurações relacionadas."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Deve permanecer ativado, pois o acesso a notificações está ativado"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Revogar acesso a \"Não perturbe\" para <xliff:g id="APP">%1$s</xliff:g>?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Todas as regras \"Não perturbe\" criadas por esse app serão removidas."</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Armazenamento interno: <xliff:g id="PERCENTAGE">%1$s</xliff:g> de utilização - <xliff:g id="FREE_SPACE">%2$s</xliff:g> livres"</string>
<string name="display_summary" msgid="6737806235882127328">"Entrar no modo de suspensão após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Plano de fundo, suspensão, tamanho da fonte"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Entrar no modo de suspensão após 10 minutos de inatividade"</string>
<string name="memory_summary" msgid="8080825904671961872">"Média de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de memória usados"</string>
<string name="users_summary" msgid="1674864467098487328">"Conectado como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS não permitido"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Câmera não permitida"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Captura de tela não permitida"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Não é possível desativar os backups"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Não é possível abrir este app"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Se você tiver perguntas, entre em contato com o administrador de TI"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Mais detalhes"</string>
@@ -3788,7 +3760,7 @@
<string name="condition_device_vibrate_title" product="default" msgid="1087633233379991925">"O smartphone está configurado para vibrar"</string>
<string name="condition_device_vibrate_summary" product="tablet" msgid="433514444618164607">"Chamadas e notificações farão o dispositivo vibrar"</string>
<string name="condition_device_vibrate_summary" product="default" msgid="5877034997839162763">"Chamadas e notificações farão o smartphone vibrar"</string>
- <string name="night_display_suggestion_title" msgid="6602129097059325291">"Definir programação do Modo noturno"</string>
+ <string name="night_display_suggestion_title" msgid="6602129097059325291">"Definir horário do Modo noturno"</string>
<string name="night_display_suggestion_summary" msgid="228346372178218442">"Tinge a tela automaticamente todas as noites"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"O modo noturno está ativado"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"A cor da tela muda para âmbar. Isso pode ajudar você a adormecer."</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simular uma tela com corte"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nenhuma"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Padrão do dispositivo"</string>
<string name="special_access" msgid="3458780842491881155">"Acesso especial a apps"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados irrestritos</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a vários dispositivos"</string>
<string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Modo noturno"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Definir modo noturno"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Modo escuro"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Definir modo escuro"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Blocos de desenvolvedor para configurações rápidas"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Rastreamento do Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Configurações do perfil de trabalho"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contatos"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que sua organização pesquise contatos para identificar autores de chamadas e contatos"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar duas vezes na tela para verificar o smartphone"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar duas vezes na tela para verificar o tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar duas vezes na tela para verificar o dispositivo"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Para verificar a hora, ícones de notificação e outras informações, toque duas vezes na tela."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Para verificar a hora, as notificações e outras informações, toque duas vezes na tela."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar o smartphone para verificá-lo"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar o tablet para verificá-lo"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar o dispositivo para verificá-lo"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para verificar a hora, ícones de notificação e outras informações, pegue o smartphone."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para verificar a hora, ícones de notificação e outras informações, pegue o tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para verificar a hora, ícones de notificação e outras informações, pegue o dispositivo."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Ativar a tela"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Para verificar a hora, as notificações e outras informações, pegue o smartphone."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Para verificar a hora, as notificações e outras informações, pegue o tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Para verificar a hora, as notificações e outras informações, pegue o dispositivo."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gesto de tela para wake lock"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Usar impressão digital para ver as notificações"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Usar impressão digital"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> tentativa</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativas</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Os dados deste dispositivo estão sendo salvos em backup"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Este dispositivo é gerenciado pela sua organização."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerenciado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Preenchimento automático"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automático, preenchimento, preenchimento automático"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Você precisa confiar nesse app</b> <br/> <br/> <xliff:g id=app_name example=O Preenchimento automático do Google>%1$s</xliff:g> usa o que está na sua tela para determinar o que pode ser preenchido automaticamente."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Preenchimento automático"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Nível de registro"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Máximo de solicitações por sessão"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Máximo de conjuntos de dados visíveis"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Redefinir para valores padrão"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"As opções do desenvolvedor de preenchimento automático foram redefinidas"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
<string name="default_theme" msgid="7085644992078579076">"Padrão"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nome da rede"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Atualizar o modo Não perturbe"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausar notificações para manter o foco"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"O que há de novo e empolgante?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça um tour pelo seu novo smartphone"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça um tour pelo seu novo dispositivo"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forçar medições completas de GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Sempre mostrar a caixa de diálogo de falha"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Mostra a caixa de diálogo sempre que um app falha"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Selecionar app ativado para ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nenhum conjunto de aplicativos ativados para ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplicativo ativado para ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Acesso ao diretório"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"acesso ao diretório"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalhes da rede"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"O nome do seu dispositivo está visível para os apps no seu smartphone. Ele também pode ser visto por outras pessoas quando você se conecta a dispositivos Bluetooth ou configura um ponto de acesso Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Todas as configurações"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Sugestões"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dados CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dados CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Escolher rede"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desconectado"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Conectado"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Conectando…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Não foi possível conectar"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nenhuma rede encontrada."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Não foi possível encontrar redes. Tente novamente."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(proibida)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Sem chip"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Chamada avançada"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Modo de rede preferencial: WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Modo de rede preferencial: somente GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Modo de rede preferencial: somente WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Modo de rede preferencial: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Modo de rede preferencial: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Modo de rede preferencial: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Modo de rede preferencial: somente CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Modo de rede preferencial: somente EvDO"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Modo de rede preferencial: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Modo de rede preferencial: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Modo de rede preferencial: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Modo de rede preferencial: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Modo de rede preferencial: global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Modo de rede preferencial: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Modo de rede preferencial: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Modo de rede preferencial: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Modo de rede preferencial: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Modo de rede preferencial: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Modo de rede preferencial: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Modo de rede preferencial: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Modo de rede preferencial: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Modo de rede preferencial: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Modo de rede preferencial: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Modo de rede preferencial: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Modo de rede preferencial: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Modo de rede preferencial: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recomendado)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recomendado)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Redes disponíveis"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Pesquisando…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registrando na rede <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Seu chip não permite uma conexão com esta rede."</string>
+ <string name="connect_later" msgid="978991102125216741">"Não é possível se conectar a esta rede no momento. Tente novamente mais tarde."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registrado na rede."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Selecionar a rede automaticamente"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Config. da operadora"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Configurar serviço de dados"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Dados móveis"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Acessar os dados pela rede móvel"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tipo de rede preferencial"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Alterar o modo de operação de rede"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tipo de rede preferencial"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operadora"</string>
+ <string name="call_category" msgid="8108654745239563833">"Chamadas"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videochamadas pela operadora"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Seleção de sistema"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Alterar o modo de roaming CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Seleção de sistema"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Rede"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Rede"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Inscrição CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Alterar entre R-UIM/SIM e NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"inscrição"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Registro automático…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Permitir roaming de dados?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Consulte os preços com seu provedor de rede."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Uso de dados do app"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Modo de rede <xliff:g id="NETWORKMODEID">%1$d</xliff:g> inválido. Ignorar."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Indisponível quando conectado à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Ver mais"</string>
+ <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nenhum dispositivo conectado"</string>
</resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 1d1d9aa..420f876 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -266,7 +266,7 @@
<item msgid="4547883971364273343">"orientação do áudio"</item>
<item msgid="2603878814882344450">"volume principal"</item>
<item msgid="7136963238377062018">"volume de voz"</item>
- <item msgid="4270236897655923007">"volume de toque"</item>
+ <item msgid="4270236897655923007">"volume do toque"</item>
<item msgid="6325739889222559394">"volume de multimédia"</item>
<item msgid="5762123934816216821">"volume de alarme"</item>
<item msgid="785049718065337473">"volume de notificação"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tratar como acesso limitado"</item>
<item msgid="2266114985518865625">"Tratar como acesso ilimitado"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Predefinição (utilizar MAC aleatório)"</item>
+ <item msgid="5398461510512959597">"Fidedigno"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Não"</item>
<item msgid="3863157480502955888">"Sim"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Sempre ativado"</item>
<item msgid="6385301106124765323">"Sempre desativado"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Desativado"</item>
+ <item msgid="2182686878828390312">"Depuração"</item>
+ <item msgid="5286514712714822064">"Verboso"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Apenas redes domésticas"</item>
+ <item msgid="5034813753274486448">"Automático"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferido"</item>
+ <item msgid="807926878589867564">"Apenas GSM"</item>
+ <item msgid="488474605709912156">"Apenas WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automático"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automático"</item>
+ <item msgid="370391313511477301">"CDMA sem EvDo"</item>
+ <item msgid="4678789463133969294">"Apenas EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Apenas TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3fc7302..c807afe 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Criar"</string>
<string name="allow" msgid="3349662621170855910">"Permitir"</string>
<string name="deny" msgid="6947806159746484865">"Recusar"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Fechar"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
<string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Está agora a <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> passos de se tornar um programador.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Não é necessário, já é um programador."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Ative primeiro as Opções de programador."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Redes sem fios e outras"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Ligações"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Pessoal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Acesso"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Ativar ligação de dados"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desativar ligação de dados"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Endereço Bluetooth do dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Desligar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Difusão"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Aparelho Bluetooth sem nome"</string>
<string name="progress_scanning" msgid="192587958424295789">"A pesquisar"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nenhum aparelho Bluetooth nas proximid."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Uma aplicação pretende ativar o Bluetooth e tornar o seu telemóvel visível para outros dispositivos. Pode alterar esta opção mais tarde nas definições de Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"A ligar o Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Desativar o Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Ligação automática"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Pedido de ligação Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Toque para ligar a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Pretende ligar-se a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de chamada disponíveis"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Ligado atualmente"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivos guardados"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Adicionar dispositivo"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"O Bluetooth será ativado para a sincronização."</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferências de ligação"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos ligados anteriormente"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Ligados anteriormente"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth ativado"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Ver todos"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Escolher o fuso horário"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Ignorar"</string>
<string name="next_label" msgid="4693520878012668114">"Seguinte"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Idiomas"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferências idioma"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Remover"</string>
<string name="add_a_language" msgid="2330538812283783022">"Adicionar um idioma"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Definições"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Atalho das definições"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Modo de voo"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Mais"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes sem fios e outras"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Gerir Wi-Fi, Bluetooth, modo de avião, redes móveis e VPNs"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Dados móveis"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desativada pelo gestor"</string>
<string name="security_status_title" msgid="5848766673665944640">"Estado de segurança"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Bloqueio de ecrã, Desbloqueio Através do Rosto"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueio de ecrã, impressão digital"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueio de ecrã"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Rosto adicionado."</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Desbloquear com o rosto"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Utilizar o rosto para autenticação"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Utilize o seu rosto para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Utilizar o seu rosto"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Utilize o seu rosto para desbloquear o telemóvel ou autorizar compras.\n\nNota: não pode utilizar o seu rosto para desbloquear este dispositivo. Para mais informações, contacte o administrador da sua entidade."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Utilize o seu rosto para desbloquear o telemóvel, autorizar compras ou iniciar sessão em aplicações."</string>
- <string name="face_add_max" msgid="2342250989212694454">"Pode adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais."</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrar o rosto no círculo"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Fazer mais tarde"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Pode adicionar até <xliff:g id="COUNT">%d</xliff:g> rostos."</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Adicionou o número máximo de rostos."</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Não é possível adicionar mais rostos."</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"A inscrição não foi concluída."</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Atingiu o tempo limite da inscrição de rostos. Tente novamente."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"A inscrição do rosto não funcionou."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Tudo definido. Sem problemas."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Concluído"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Utilizar rosto para"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Desbloq. dispositivo"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Início de sessão e pagamentos na aplicação"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Olhos abertos para desbloquear"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Para utilizar a autenticação facial, os olhos têm de estar abertos."</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Remover dados rosto"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Melhorar dados do rosto"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Pode utilizar o seu rosto para desbloquear o dispositivo e aceder a aplicações. "<annotation id="url">"Saiba mais"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerir impressões dig."</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impr. dig. para"</string>
@@ -723,7 +730,7 @@
<string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avançadas"</string>
<string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Avançado"</string>
<string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Com o Bluetooth ativado, o dispositivo pode comunicar com dispositivos próximos."</string>
- <string name="bluetooth_scanning_on_info_message" msgid="824285504325592644">"Quando o Bluetooth está ativado, o dispositivo pode comunicar com outros dispositivos Bluetooth próximos.\n\nPara melhorar a experiência do dispositivo, as aplicações e os serviços podem continuar a procurar dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas "<annotation id="link">"definições de análise"</annotation>"."</string>
+ <string name="bluetooth_scanning_on_info_message" msgid="824285504325592644">"Quando o Bluetooth está ativado, o dispositivo pode comunicar com outros dispositivos Bluetooth próximos.\n\nPara melhorar a experiência do dispositivo, as aplicações e os serviços podem continuar a procurar dispositivos próximos em qualquer altura, mesmo quando o Bluetooth está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas "<annotation id="link">"definições de análise"</annotation>"."</string>
<string name="ble_scan_notify_text" msgid="1295915006005700650">"Para melhorar a precisão da localização, os serviços e as aplicações do sistema podem continuar a detetar dispositivos Bluetooth. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de procura<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="bluetooth_connect_failed" msgid="4500234659813241053">"Não foi possível ligar. Tente novamente."</string>
<string name="device_details_title" msgid="6576953269221085300">"Detalhes do disp."</string>
@@ -813,7 +820,7 @@
<string name="use_open_wifi_automatically_summary_scoring_disabled" msgid="593964217679325831">"Para utilizar, selecionar um fornecedor de classificação de rede"</string>
<string name="use_open_wifi_automatically_summary_scorer_unsupported_disabled" msgid="8472122600853650258">"Para utilizar, selecionar um fornecedor de classificação de rede compatível"</string>
<string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
- <string name="wifi_scan_notify_text" msgid="5544778734762998889">"Para melhorar a precisão da localização, as aplicações e os serviços podem continuar a procurar redes Wi-Fi a qualquer momento, mesmo quando o Wi-Fi está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de análise<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+ <string name="wifi_scan_notify_text" msgid="5544778734762998889">"Para melhorar a precisão da localização, as aplicações e os serviços podem continuar a procurar redes Wi-Fi em qualquer altura, mesmo quando o Wi-Fi está desativado. Pode utilizar esta opção, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização. Pode alterar esta opção nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de análise<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Para melhorar a precisão da localização, ative a procura de redes Wi-Fi nas <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>definições de análise<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
<string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Não mostrar de novo"</string>
<string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi ligada durante suspensão"</string>
@@ -848,7 +855,7 @@
<string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automática (WPS)"</string>
<string name="wifi_settings_scanning_required_title" msgid="3815269816331500375">"Pretende ativar a procura de Wi‑Fi?"</string>
<string name="wifi_settings_scanning_required_summary" msgid="6352918945128328916">"Para ativar o Wi‑Fi automaticamente, primeiro tem de ativar a procura de Wi‑Fi."</string>
- <string name="wifi_settings_scanning_required_info" msgid="3155631874578023647">"A procura de Wi-Fi permite que as aplicações e os serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
+ <string name="wifi_settings_scanning_required_info" msgid="3155631874578023647">"A procura de Wi-Fi permite que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
<string name="wifi_settings_scanning_required_turn_on" msgid="1364287182804820646">"Ativar"</string>
<string name="wifi_settings_scanning_required_enabled" msgid="5527653791584018157">"Procura de Wi-Fi ativada"</string>
<string name="wifi_show_advanced" msgid="3409422789616520979">"Opções avançadas"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Selecione, pelo menos, uma banda para a zona Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Definições de IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacidade"</string>
<string name="wifi_shared" msgid="844142443226926070">"Partilhar com outros utilizadores do dispositivo"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(não alterado)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Selecione"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Esqueceu-se da rede?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Todas as palavras-passe para esta rede serão eliminadas."</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Redes guardadas"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d redes</item>
<item quantity="one">1 rede</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brilho"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho do ecrã"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Luminosidade adaptável"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Ativada"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Desativada"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"A luminosidade preferida é muito baixa"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"A luminosidade preferida é baixa"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Não é possível alterar o PIN.\nPIN possivelmente incorreto."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN do SIM mudado com sucesso"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Não é possível alterar o estado de bloqueio do cartão SIM. \nPIN possivelmente incorreto."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Não é possível desativar o PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Não é possível ativar o PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Vários SIMs encontrados"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Para efetuar esta ação, é necessário formatar <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"A formatação apaga todos os dados atualmente armazenados em <xliff:g id="NAME_1">^1</xliff:g>."</b>" Para evitar perder os dados, considere fazer uma cópia de segurança dos mesmos."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Apagar e formatar"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"A formatar <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Não remova o <xliff:g id="NAME">^1</xliff:g> enquanto estiver a decorrer a formatação."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Não remova o <xliff:g id="NAME">^1</xliff:g> enquanto estiver a decorrer a formatação."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mover dados p/ novo armazenamen."</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Pode mover as fotos, os ficheiros e algumas aplicações para este novo <xliff:g id="NAME">^1</xliff:g>. \n\nA transferência demora cerca de <xliff:g id="TIME">^2</xliff:g> e liberta <xliff:g id="SIZE">^3</xliff:g> na memória de armazenamento interno. Enquanto a ação está a decorrer, algumas aplicações não funcionam."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mover agora"</string>
@@ -1559,9 +1567,9 @@
<string name="location_low_battery_use" msgid="8602232529541903596">"Utilização de bateria baixa"</string>
<string name="location_scanning_screen_title" msgid="4408076862929611554">"A analisar"</string>
<string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Procurar por Wi‑Fi"</string>
- <string name="location_scanning_wifi_always_scanning_description" msgid="2691110218127379249">"Permita que as aplicações e os serviços procurem redes Wi‑Fi a qualquer momento, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
+ <string name="location_scanning_wifi_always_scanning_description" msgid="2691110218127379249">"Permita que as aplicações e os serviços procurem redes Wi‑Fi em qualquer altura, mesmo quando o Wi-Fi estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
<string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Procurar por Bluetooth"</string>
- <string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"Permita que as aplicações e os serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
+ <string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"Permita que as aplicações e os serviços procurem dispositivos próximos em qualquer altura, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
<string name="location_network_based" msgid="9134175479520582215">"Wi-Fi e localização de rede de telemóvel"</string>
<string name="location_neighborhood_level" msgid="5141318121229984788">"Permitir que aplic. usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
<string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
@@ -1711,7 +1719,7 @@
<string name="force_stop" msgid="7435006169872876756">"Forçar paragem"</string>
<string name="total_size_label" msgid="1048676419552557254">"Total"</string>
<string name="application_size_label" msgid="7376689739076506885">"Tamanho da aplicação"</string>
- <string name="external_code_size_label" msgid="3459343140355961335">"Aplic. de armazenamento USB"</string>
+ <string name="external_code_size_label" msgid="3459343140355961335">"Apps de armazenamento USB"</string>
<string name="data_size_label" msgid="6117971066063850416">"Dados do utilizador"</string>
<string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"Dados de armazenamento USB"</string>
<string name="external_data_size_label" product="default" msgid="626414192825329708">"Cartão SD"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Instalada"</string>
<string name="no_applications" msgid="7336588977497084921">"Sem aplicações."</string>
<string name="internal_storage" msgid="1584700623164275282">"Armaz. interno"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"armazenamento interno"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Armaz. USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Arm. cartão SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"A recalcular tamanho..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Eliminar dados da aplicação?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Todos os dados desta aplicação serão eliminados permanentemente. Isto inclui todos os ficheiros, definições, contas, bases de dados, etc."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"A aplicação não foi encontrada na lista de aplicações instaladas."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Não foi possível limpar o armazenamento para a aplicação."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicação pode aceder aos seguintes itens no seu tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Esta aplicação pode aceder aos seguintes itens no telemóvel:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Esta aplicação pode aceder aos itens seguintes no seu tablet. Para melhorar o desempenho e reduzir a utilização da memória, encontram-se disponíveis algumas destas permissões para a aplicação <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, porque esta é executada no mesmo processo que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Esta aplicação pode aceder aos itens seguintes no telemóvel. Para melhorar o desempenho e reduzir a utilização da memória, encontram-se disponíveis algumas destas permissões para a aplicação <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, porque esta é executada no mesmo processo que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> e <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Esta aplicação poderá implicar custos:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Enviar SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"A calcular..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Não foi possível calcular o tamanho do pacote."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Não tem nenhuma aplicação de terceiros instalada."</string>
<string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Mover"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover para tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover para o telefone"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover para armaz. USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover para cartão SD"</string>
- <string name="moving" msgid="6431016143218876491">"A mover"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Já existe outra migração em curso."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Não existe espaço de armazenamento suficiente."</string>
<string name="does_not_exist" msgid="1501243985586067053">"A aplicação não existe."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Não é possível instalar a aplicação de administração do dispositivo em suportes de dados externos"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Forçar paragem?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Se forçar a paragem de uma aplicação, esta poderá apresentar um comportamento anormal."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Não foi possível mover a aplicação. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Localização de instalação preferida"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Alterar a localização de instalação preferida para novas aplicações"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desativar aplicação incorporada?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Desativar aplicação"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Se desativar esta aplicação, o Android e outras aplicações podem deixar de funcionar corretamente."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Eliminar dados e desativar aplicação?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Se desativar esta aplicação, o Android e outras aplicações podem deixar de funcionar corretamente. Os seus dados também são eliminados."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Desativar notificações?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se desativar as notificações para esta aplicação, pode perder alertas e atualizações importantes."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Loja"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detalhes da aplicação"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplicação instalada a partir da <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilizar o serviço"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utilizar a correção da cor"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilizar as legendas"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continuar"</string>
<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="6371077608778830020">"Adicionar aparelho auditivo"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Se limitar a atividade em segundo plano de uma aplicação, esta pode apresentar um comportamento anormal."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"A aplic. não está def. p/ otimizar a bateria, não a pode restringir.\n\nP/ restringir a aplic., ative a otimiz. da bateria."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Utilização do ecrã desde carregamento completo"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo do ecrã"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Procura de redes móveis"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Utilização da bateria ecrã desde o carregamento completo"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tempo durante o qual o ecrã tem estado ativado desde o carregamento completo"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Utilização do dispositivo desde o carregamento completo"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Utilizar detalhes"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Ajustar utilização de energia"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicações a consumir rapidamente a bateria"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantém o dispositivo ativo"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativa o dispositivo em segundo plano"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicita frequentemente a localização"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicações que não estão a funcionar corretamente"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"As aplicações estão a ser executadas normalmente."</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"O telemóvel tem uma utilização normal da bateria em segundo plano."</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"O tablet tem uma utilização normal da bateria em segundo plano."</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Limiar a utilização da bateria para %1$d aplicações</item>
<item quantity="one">Limitar a utilização da bateria para %1$d aplicação</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restrita <xliff:g id="TIME">%1$s</xliff:g>."</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Estas aplicações têm consumido bateria em segundo plano. As aplicações restringidas poderão não funcionar corretamente e as notificações poderão sofrer atrasos."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Utilizar o Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detetar quando as aplicações consomem rapidamente a bateria"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancelar"</string>
<string name="tts_reset" msgid="2661752909256313270">"Repor"</string>
<string name="tts_play" msgid="2628469503798633884">"Reproduzir"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Controlo de energia"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"A atualizar definição de Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizar a definição do Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ativado"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"desativado"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"a ligar"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"a desligar"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Localização"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sincronizar"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brilho <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completo"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"metade"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"desativado"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar do armazenamento"</string>
@@ -2478,7 +2449,7 @@
<string name="remove_device_admin" msgid="9207368982033308173">"Desativar esta aplicação de administração do dispositivo"</string>
<string name="uninstall_device_admin" msgid="271120195128542165">"Desinstalar aplicação"</string>
<string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Desativar e desinstalar"</string>
- <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplic. de gestor do dispositivo"</string>
+ <string name="select_device_admin_msg" msgid="7347389359013278077">"Apps de gestor do dispositivo"</string>
<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>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Utilização de dados"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilização dados da apli."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Dados móveis e Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"A contagem do operador de dados pode diferir do seu dispositivo."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Utilização da aplicação"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFO. DA APLICAÇÃO"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Mostrar %d itens ocultos</item>
<item quantity="one">Mostrar %d item oculto</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Reduzir"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Rede e Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rede móvel"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilização de dados"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicações e notificações"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorizações, aplicações predefinidas"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"O acesso às notificações não está disponível para aplicações no perfil de trabalho."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Contas"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nenhuma conta adicionada."</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicações predefinidas"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, hora, cópia de segurança, atualizações"</string>
<string name="search_results_title" msgid="1796252422574886932">"Definições"</string>
- <string name="search_menu" msgid="6283419262313758339">"Definições de pesquisa"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, Wi-Fi, ligação de rede, Internet, sem fios, dados, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"Wifi, Wi-Fi, ativar/desativar, controlar"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"mensagem de texto, enviar mensagens de texto, mensagens, enviar mensagens, predefinição"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
<string name="keywords_backup" msgid="470070289135403022">"cópia de segurança, fazer uma cópia de segurança"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"rosto, desbloquear, autenticação, iniciar sessão"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versão de prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"rede, estado da rede móvel, estado do serviço, intensidade do sinal, tipo de rede móvel, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de série, versão de hardware"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema escuro"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"erro"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Visualização de ambiente, visualização de ecrã de bloqueio"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notificação no ecrã de bloqueio"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"rosto"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"impressão digital"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"escurecer ecrã, ecrã tátil, bateria, brilho inteligente, brilho dinâmico"</string>
@@ -3067,7 +3039,7 @@
<string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume do alarme"</string>
<string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do toque"</string>
<string name="notification_volume_option_title" msgid="6064656124416882130">"Volume de notificações"</string>
- <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
+ <string name="ringtone_title" msgid="5379026328015343686">"Toque do telemóvel"</string>
<string name="notification_ringtone_title" msgid="4468722874617061231">"Som notif. predefinido"</string>
<string name="notification_unknown_sound_title" msgid="2535027767851838335">"Som fornecido pela aplicação"</string>
<string name="notification_sound_default" msgid="565135733949733766">"Som notif. predefinido"</string>
@@ -3309,7 +3281,7 @@
<string name="notification_content_block_summary" msgid="7746185794438882389">"Nunca mostrar notificações no painel ou nos dispositivos periféricos"</string>
<string name="notification_badge_title" msgid="6370122441168519809">"Permitir ponto de notificação"</string>
<string name="notification_channel_badge_title" msgid="2240827899882847087">"Mostrar ponto de notificação"</string>
- <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Substituir o modo Não incomodar"</string>
+ <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignorar o modo Não incomodar"</string>
<string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"Permitir que estas notificações continuem a interrompê-lo quando o modo Não incomodar estiver ativado"</string>
<string name="app_notification_visibility_override_title" msgid="7821124557634786985">"No ecrã de bloqueio"</string>
<string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueado"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Quando introduzir o seu PIN para iniciar este dispositivo, os serviços de acessibilidade, como o <xliff:g id="SERVICE">%1$s</xliff:g>, ainda não estarão disponíveis."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Quando introduzir a sua sequência para iniciar este dispositivo, os serviços de acessibilidade, como o <xliff:g id="SERVICE">%1$s</xliff:g>, ainda não estarão disponíveis."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Quando introduzir a sua palavra-passe para iniciar este dispositivo, os serviços de acessibilidade, como o <xliff:g id="SERVICE">%1$s</xliff:g>, ainda não estarão disponíveis."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Nota: após reiniciar, só é possível iniciar esta aplicação quando o telemóvel for desbloqueado."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Nota: se reiniciar o telemóvel e tiver um bloqueio de ecrã definido, só é possível iniciar esta aplicação quando o telemóvel for desbloqueado."</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informações do IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas do IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
<string name="filter_work_apps" msgid="24519936790795574">"De trabalho"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplicações: todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplicações: desativadas"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Desativadas"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorias: importância alta"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorias: importância baixa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorias: desativadas"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de utilização"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Mostrar utilização total do dispositivo"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar utilização de aplic."</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Utilização elevada"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplicações estão a apresentar um comportamento anormal</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> aplicação está a apresentar um comportamento anormal</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Memória de armazenamento interno: <xliff:g id="PERCENTAGE">%1$s</xliff:g> utilizado – <xliff:g id="FREE_SPACE">%2$s</xliff:g> livre(s)"</string>
<string name="display_summary" msgid="6737806235882127328">"Suspender após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Imagem de fundo, suspensão, tamanho da letra"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Suspender após 10 minutos de inatividade"</string>
<string name="memory_summary" msgid="8080825904671961872">"Média de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de memória utilizado(s)"</string>
<string name="users_summary" msgid="1674864467098487328">"Sessão iniciada como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Os SMS não são permitidos"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"A câmara não é permitida"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"A captura de ecrã não é permitida"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Impossível desativar cópias de segurança"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Impossível abrir esta aplicação"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Se tiver dúvidas, contacte o seu gestor de TI."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Mais detalhes"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simular um ecrã com recorte"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nenhuma"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predefinição do dispositivo"</string>
<string name="special_access" msgid="3458780842491881155">"Acesso especial a aplic."</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicações podem utilizar dados sem restrições</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ligado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ligado a vários dispositivos"</string>
<string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Modo noturno"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Definir o modo noturno"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Modo escuro"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Definir Modo escuro"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de definições rápidas do programador"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Definições do perfil de trabalho"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contactos"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir pesquisa de contactos por parte da sua entidade para identificar autores das chamadas e contactos"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar duas vezes para verificar o telemóvel"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar duas vezes para verificar o tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar duas vezes para verificar o dispositivo"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Para consultar a hora, os ícones das notificações e outras informações, toque duas vezes no ecrã."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Para consultar a hora, as notificações e outras informações, toque duas vezes no ecrã."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar p/verificar telem."</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar para verificar o tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar para verificar o dispositivo"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para consultar a hora, os ícones das notificações e outras informações, pegue no telemóvel."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para consultar a hora, os ícones das notificações e outras informações, pegue no tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para consultar a hora, os ícones das notificações e outras informações, pegue no dispositivo."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Ativar ecrã"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Para consultar a hora, as notificações e outras informações, pegue no telemóvel."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Para consultar a hora, as notificações e outras informações, pegue no tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Para consultar a hora, as notificações e outras informações, pegue no dispositivo."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gesto de ecrã do wake lock"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Utilizar impressão digital para ver as notificações"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Usar impressão digital"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do telemóvel."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativas</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> tentativa</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Está a ser feita uma cópia de segurança dos dados deste dispositivo."</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Este dispositivo é gerido pela sua entidade."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerido por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Preenchimento automático"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automático, preenchimento, preenchimento automático"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Certifique-se de que confia nesta aplicação</b> <br/> <br/> <xliff:g id=app_name example=O Preenchimento automático do Google>%1$s</xliff:g> utiliza o que está no ecrã para determinar o que pode ser preenchido automaticamente."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Preenchimento automático"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Nível de registo"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Máx. de pedidos por sessão"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Número máx. de conjuntos de dados visíveis"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Repor os valores predefinidos"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"As opções de preenchimento automático do programador foram repostas."</string>
<string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
<string name="default_theme" msgid="7085644992078579076">"Predefinição"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nome da rede"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar fornecimento do operador"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Atualizar o modo Não incomodar"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Coloque as notificações em pausa para se manter concentrado."</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Quais são as grandes novidades?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça uma visita guiada ao seu novo telemóvel"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça uma visita guiada ao seu novo tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça uma visita guiada ao seu novo dispositivo"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Esta funcionalidade não está disponível neste dispositivo."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forçar medições de GNSS completas"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Monitorizar todas as constelações e frequências de GNSS sem ciclos"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Mostrar sempre a caixa de diálogo de falhas"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Mostrar a caixa de diálogo sempre que uma aplicação falhar"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Selecionar aplicação compatível com o ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nenhuma aplicação compatível com o ANGLE definida."</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplicação compatível com o ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Acesso ao diretório"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"acesso ao diretório"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalhes da rede"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"O nome do seu dispositivo é visível para as aplicações do telemóvel. Também pode ser visto por outras pessoas quando se liga a dispositivos Bluetooth ou configura uma zona Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Todas as definições"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Sugestões"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dados de CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dados de CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Escolher rede"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desligada."</string>
+ <string name="network_connected" msgid="4943925032253989621">"Ligada."</string>
+ <string name="network_connecting" msgid="76404590784733557">"A ligar…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Não foi possível estabelecer ligação."</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nenhuma rede encontrada."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Não foi possível encontrar qualquer rede. Tente novamente."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(proibida)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Nenhum cartão SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Chamadas avançadas"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Modo de rede preferido: apenas WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Modo de rede preferido: apenas GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Modo de rede preferido: apenas WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Modo de rede preferido: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Modo de rede preferido: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Modo de rede preferido: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Modo de rede preferido: apenas CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Modo de rede preferido: apenas EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Modo de rede preferido: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Modo de rede preferido: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Modo de rede preferido: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Modo de rede preferido: CDMA+LTE/EvDo"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Modo de rede preferido: global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Modo de rede preferido: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Modo de rede preferido: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Modo de rede preferido: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Modo de rede preferido: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Modo de rede preferido: TDSCDMA/WCDMAA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Modo de rede preferido: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Modo de rede preferido: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Modo de rede preferido: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Modo de rede preferido: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Modo de rede preferido: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Modo de rede preferido: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Modo de rede preferido: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Modo de rede preferido: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recomendado)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recomendado)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Redes disponíveis"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"A pesquisar…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"A registar na rede <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"O cartão SIM não permite uma ligação a esta rede."</string>
+ <string name="connect_later" msgid="978991102125216741">"De momento, não é possível estabelecer ligação a esta rede. Tente novamente mais tarde."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registado na rede."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Selecionar automaticamente a rede"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Definições do operador"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Configurar serviço de dados"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Dados móveis"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Aceder aos dados através de rede móvel"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tipo de rede preferido"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Alterar o modo de funcionamento em rede"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tipo de rede preferido"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operador"</string>
+ <string name="call_category" msgid="8108654745239563833">"Chamadas"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videochamadas do operador"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Selecionar sistema"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Alterar o modo de roaming CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Selecionar sistema"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Rede"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Rede"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Subscrição CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Alternar entre RUIM/SIM e NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"subscrição"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Registo automático…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Pretende permitir roaming de dados?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Consulte o seu fornecedor de serviços de rede para obter preços."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Utilização de dados da aplicação"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Modo de rede inválido: <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignore."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Indisponível quando ligado a <xliff:g id="CARRIER">%1$s</xliff:g>."</string>
+ <string name="see_more" msgid="5953815986207345223">"Ver mais"</string>
+ <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nenhum dispositivo ligado"</string>
</resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index ef44b13..c5a9295 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tratar como limitada"</item>
<item msgid="2266114985518865625">"Tratar como ilimitada"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Padrão (usar MAC aleatório)"</item>
+ <item msgid="5398461510512959597">"Confiável"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Não"</item>
<item msgid="3863157480502955888">"Sim"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Sempre ativado"</item>
<item msgid="6385301106124765323">"Sempre desativado"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Desativado"</item>
+ <item msgid="2182686878828390312">"Depuração"</item>
+ <item msgid="5286514712714822064">"Detalhado"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Somente doméstica"</item>
+ <item msgid="5034813753274486448">"Automático"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferencial"</item>
+ <item msgid="807926878589867564">"Somente GSM"</item>
+ <item msgid="488474605709912156">"Somente WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automático"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automático"</item>
+ <item msgid="370391313511477301">"CDMA sem EvDo"</item>
+ <item msgid="4678789463133969294">"Somente EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"Somente TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"R-UIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 22c1ad9..f211f49 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Criar"</string>
<string name="allow" msgid="3349662621170855910">"Permitir"</string>
<string name="deny" msgid="6947806159746484865">"Recusar"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Fechar"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Alternar"</string>
<string name="device_info_default" msgid="7847265875578739287">"Desconhecido"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Faltam <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> etapas para você se tornar um desenvolvedor.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Não é necessário. Você já é um desenvolvedor."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Primeiro, ative as opções do desenvolvedor."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Redes sem fio e outras"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Conexões"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Pessoais"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Acesso"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Ativar conexão de dados"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Desativar conexão de dados"</string>
@@ -44,8 +38,8 @@
<string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Chamadas por Wi-Fi aprovisionadas"</string>
<string name="eab_provisioned_switch_string" msgid="3482272907448592975">"EAB/Presença aprovisionados"</string>
<string name="radio_info_radio_power" msgid="7187666084867419643">"Potência do rádio móvel"</string>
- <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver o catálogo de endereços do SIM"</string>
- <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizar números de chamada fixa"</string>
+ <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Ver o catálogo de endereços do chip"</string>
+ <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Visualizar números de discagem fixa"</string>
<string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Visualizar números de chamada de serviço"</string>
<string name="radioInfo_menu_getIMS" msgid="185171476413967831">"Status de serviço IMS"</string>
<string name="radio_info_ims_reg_status_title" msgid="16971785902696970">"Status IMS"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Endereço Bluetooth do dispositivo: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmissão"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Dispositivo Bluetooth sem nome"</string>
<string name="progress_scanning" msgid="192587958424295789">"Pesquisar"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nenhum dispositivo Bluetooth encontrado."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Um app quer ativar o Bluetooth e tornar seu smartphone visível para outros dispositivos. É possível alterar esta opção posteriormente nas configurações do Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Ativando Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Desligar o Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexão automática"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitação de conexão Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Toque para conectar-se a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Quer conectar-se ao \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -163,8 +155,8 @@
<string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"Não perguntar novamente"</string>
<string name="bluetooth_map_request" msgid="4595727689513143902">"Solicitação de acesso a mensagens"</string>
<string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s deseja acessar suas mensagens. Conceder acesso a %2$s?"</string>
- <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao cartão SIM"</string>
- <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu cartão SIM. A concessão de acesso ao cartão SIM desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
+ <string name="bluetooth_sap_request" msgid="2669762224045354417">"Solicitação de acesso ao chip"</string>
+ <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"O <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> deseja acessar seu chip. A concessão de acesso ao chip desativará a conectividade de dados no seu dispositivo durante a conexão. Conceda acesso ao <xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>"</string>
<string name="bluetooth_device_name_summary" msgid="522235742194965734">"Visível como \"<xliff:g id="DEVICE_NAME">^1</xliff:g>\" para outros dispositivos"</string>
<string name="bluetooth_off_footer" msgid="8406865700572772936">"Ative o Bluetooth para se conectar a outros dispositivos."</string>
<string name="bluetooth_paired_device_title" msgid="8638994696317952019">"Seus dispositivos"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dispositivos de chamada disponíveis"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Conectados no momento"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Dispositivos salvos"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Adicionar dispositivo"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"O Bluetooth será ativado para o pareamento"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferências de conexão"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispositivos conectados anteriormente"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectados anteriormente"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth ativado"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Ver tudo"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data e hora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Selecione o fuso horário"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Pular"</string>
<string name="next_label" msgid="4693520878012668114">"Avançar"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Idiomas"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferências de idioma"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Remover"</string>
<string name="add_a_language" msgid="2330538812283783022">"Adicionar um idioma"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -300,10 +291,9 @@
<string name="done" msgid="6942539184162713160">"Concluído"</string>
<string name="apply" msgid="1577045208487259229">"Aplicar"</string>
<string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
- <string name="settings_label_launcher" msgid="8344735489639482340">"Configurar"</string>
+ <string name="settings_label_launcher" msgid="8344735489639482340">"Configurações"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Modo avião"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Mais"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes sem fio e outras"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Gerenciar Wi-Fi, Bluetooth, modo avião, redes móveis e VPNs"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Dados móveis"</string>
@@ -383,11 +373,12 @@
<string name="decryption_settings_summary" product="tablet" msgid="5794135636155570977">"Dispositivo não criptografado"</string>
<string name="lockscreen_settings_title" msgid="1099738951060387656">"Exibição da tela de bloqueio"</string>
<string name="lockscreen_settings_what_to_show_category" msgid="278055252361575926">"O que mostrar"</string>
- <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
+ <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do chip e do armazenamento de credenciais"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
<string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desativada pelo administrador"</string>
<string name="security_status_title" msgid="5848766673665944640">"Status da segurança"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Bloqueio de tela, desbloqueio facial"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueio de tela, impressão digital"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueio de tela"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Rosto adicionado"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Desbloquear com seu rosto"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Usar seu rosto para autenticar"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Use seu rosto para desbloquear o smartphone, autorizar compras ou fazer login em apps."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Use seu rosto"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Use seu rosto para desbloquear o smartphone ou aprovar compras.\n\nObservação: não é possível usar seu rosto para desbloquear este dispositivo. Para mais informações, entre em contato com o administrador da organização."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Use seu rosto para desbloquear o smartphone, autorizar compras ou fazer login em apps"</string>
- <string name="face_add_max" msgid="2342250989212694454">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> impressões digitais"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centralize seu rosto dentro do círculo"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Mais tarde"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"É possível adicionar até <xliff:g id="COUNT">%d</xliff:g> rostos"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Você adicionou o número máximo de rostos"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Não é possível adicionar mais rostos"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"O registro não foi concluído"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Ok"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Tempo máximo para registro de rostos atingido. Tente novamente."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"O registro de rostos não funcionou."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Tudo pronto. E bonito."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Concluído"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Usar seu rosto para"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Desbloquear o disp."</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Login e pagamentos no app"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Olhos abertos para desbloquear"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Seus olhos precisam estar abertos para usar a autenticação facial"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Remov. dados faciais"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Melhore seus dados faciais"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Use seu rosto para desbloquear o dispositivo e acessar apps. "<annotation id="url">"Saiba mais"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerenciar impressões digitais"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impressão digital para"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Escolha pelo menos uma banda para o ponto de acesso Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Configurações de IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacidade"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Selecione"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Esquecer a rede?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Todas as senhas dessa rede serão excluídas"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Redes salvas"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d rede</item>
<item quantity="other">%d redes</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brilho"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho da tela"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Brilho adaptável"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Ativado"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Desativado"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"O brilho preferencial está muito baixo"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"O brilho preferencial está baixo"</string>
@@ -1141,8 +1147,8 @@
<string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Será desativado automaticamente ao amanhecer"</string>
<string name="night_display_activation_on_manual" msgid="277343561277625826">"Ativar agora"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"Desativar agora"</string>
- <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Ativar até o nascer do sol"</string>
- <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Desativar até o pôr do sol"</string>
+ <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Ativar até o amanhecer"</string>
+ <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Desativar até anoitecer"</string>
<string name="night_display_activation_on_custom" msgid="5472029024427933598">"Ativar até <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"Desativar até <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
@@ -1176,43 +1182,45 @@
<string name="doze_always_on_summary" msgid="6978257596231155345">"Mostrar horário, ícones de notificação e outras informações. Aumento do uso da bateria."</string>
<string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
<string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
- <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do SIM"</string>
- <string name="sim_lock_settings_category" msgid="6242052161214271091">"Bloqueio do cartão SIM"</string>
+ <string name="sim_lock_settings" msgid="3392331196873564292">"Bloqueio do chip"</string>
+ <string name="sim_lock_settings_category" msgid="6242052161214271091">"Bloqueio do chip"</string>
<string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Desativado"</string>
<string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Bloqueado"</string>
- <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do cartão SIM"</string>
- <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquear cartão SIM"</string>
+ <string name="sim_lock_settings_title" msgid="9018585580955414596">"Bloqueio do chip"</string>
+ <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquear chip"</string>
<string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Exigir PIN para usar o tablet"</string>
<string name="sim_lock_on" product="default" msgid="2503536505568814324">"Exigir PIN para usar o telefone"</string>
<string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Exigir PIN para usar o tablet"</string>
<string name="sim_lock_off" product="default" msgid="258981978215428916">"Exigir PIN para usar o telefone"</string>
- <string name="sim_pin_change" msgid="6311414184279932368">"Alterar PIN do SIM"</string>
- <string name="sim_enter_pin" msgid="6608715137008508432">"PIN do SIM"</string>
- <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquear cartão SIM"</string>
- <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Desbloquear o cartão SIM"</string>
- <string name="sim_enter_old" msgid="6074196344494634348">"PIN do SIM antigo"</string>
- <string name="sim_enter_new" msgid="8742727032729243562">"Novo PIN do SIM"</string>
+ <string name="sim_pin_change" msgid="6311414184279932368">"Alterar PIN do chip"</string>
+ <string name="sim_enter_pin" msgid="6608715137008508432">"PIN do chip"</string>
+ <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquear chip"</string>
+ <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Desbloquear o chip"</string>
+ <string name="sim_enter_old" msgid="6074196344494634348">"PIN do chip antigo"</string>
+ <string name="sim_enter_new" msgid="8742727032729243562">"Novo PIN do chip"</string>
<string name="sim_reenter_new" msgid="6523819386793546888">"Digitar novo PIN novamente"</string>
- <string name="sim_change_pin" msgid="7328607264898359112">"PIN do SIM"</string>
+ <string name="sim_change_pin" msgid="7328607264898359112">"PIN do chip"</string>
<string name="sim_bad_pin" msgid="2345230873496357977">"PIN incorreto"</string>
<string name="sim_pins_dont_match" msgid="1695021563878890574">"Os PINs não correspondem"</string>
<string name="sim_change_failed" msgid="3602072380172511475">"Não é possível alterar o PIN.\nPIN possivelmente incorreto."</string>
- <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN do SIM alterado"</string>
- <string name="sim_lock_failed" msgid="2489611099235575984">"Não é possível alterar o estado de bloqueio do cartão SIM.\nPIN possivelmente incorreto."</string>
+ <string name="sim_change_succeeded" msgid="8556135413096489627">"PIN do chip alterado"</string>
+ <string name="sim_lock_failed" msgid="2489611099235575984">"Não é possível alterar o estado de bloqueio do chip.\nPIN possivelmente incorreto."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Não é possível desativar o PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Não é possível ativar o PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Cancelar"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Vários SIMs encontrados"</string>
- <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Escolha o SIM preferencial para dados móveis."</string>
- <string name="sim_change_data_title" msgid="294357201685244532">"Alterar SIM de dados?"</string>
+ <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Escolha o chip preferencial para dados móveis."</string>
+ <string name="sim_change_data_title" msgid="294357201685244532">"Alterar Chip de dados?"</string>
<string name="sim_change_data_message" msgid="5854582807996717811">"Usar <xliff:g id="NEW_SIM">%1$s</xliff:g> em vez de <xliff:g id="OLD_SIM">%2$s</xliff:g> para dados móveis?"</string>
- <string name="sim_preferred_title" msgid="5567909634636045268">"Atualiz. cartão SIM preferido?"</string>
- <string name="sim_preferred_message" msgid="8466930554330635780">"O <xliff:g id="NEW_SIM">%1$s</xliff:g> é o único SIM no seu dispositivo. Quer usá-lo para dados móveis, chamadas e mensagens SMS?"</string>
- <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN do SIM incorreto. Entre em contato com a operadora para desbloquear o dispositivo."</string>
+ <string name="sim_preferred_title" msgid="5567909634636045268">"Atualiz. chip preferido?"</string>
+ <string name="sim_preferred_message" msgid="8466930554330635780">"O <xliff:g id="NEW_SIM">%1$s</xliff:g> é o único chip no seu dispositivo. Quer usá-lo para dados móveis, chamadas e mensagens SMS?"</string>
+ <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"Código PIN do chip incorreto. Entre em contato com a operadora para desbloquear o dispositivo."</string>
<plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
- <item quantity="one">Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
- <item quantity="other">Código PIN do SIM incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
+ <item quantity="one">Código PIN do chip incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
+ <item quantity="other">Código PIN do chip incorreto. Tentativas restantes: <xliff:g id="NUMBER_1">%d</xliff:g>.</item>
</plurals>
- <string name="pin_failed" msgid="1848423634948587645">"Falha na operação de PIN do SIM."</string>
+ <string name="pin_failed" msgid="1848423634948587645">"Falha na operação de PIN do chip."</string>
<string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Atualizações do sistema"</string>
<string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
<string name="firmware_version" msgid="4801135784886859972">"Versão do Android"</string>
@@ -1241,8 +1249,8 @@
<string name="status_number" product="default" msgid="5948892105546651296">"Número de telefone"</string>
<string name="status_number_sim_slot" product="tablet" msgid="2755592991367858860">"MDN (slot para SIM %1$d)"</string>
<string name="status_number_sim_slot" product="default" msgid="1898212200138025729">"Número de tel. (slot SIM %1$d)"</string>
- <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"MDN no SIM"</string>
- <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"Número de telefone no SIM"</string>
+ <string name="status_number_sim_status" product="tablet" msgid="1367110147304523864">"MDN no chip"</string>
+ <string name="status_number_sim_status" product="default" msgid="9123351360569466330">"Número de telefone no chip"</string>
<string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
<string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
<string name="status_prl_version" msgid="1007470446618081441">"Versão do PRL"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"É necessário que o cartão <xliff:g id="NAME_0">^1</xliff:g> seja formatado. \n\n"<b>"A formatação limpa todos os dados armazenados atualmente no cartão <xliff:g id="NAME_1">^1</xliff:g>."</b>" Para evitar perder os dados, faça backup deles."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Limpar e formatar"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatando <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Não remova o <xliff:g id="NAME">^1</xliff:g> enquanto ele estiver sendo formatado."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Não remova o <xliff:g id="NAME">^1</xliff:g> enquanto ele estiver sendo formatado."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mover dados para novo armazenamento"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"É possível mover suas fotos, arquivos e alguns apps para esse novo <xliff:g id="NAME">^1</xliff:g>. \n\nA transferência demora aproximadamente <xliff:g id="TIME">^2</xliff:g> e liberará <xliff:g id="SIZE">^3</xliff:g> no armazenamento interno. Alguns apps não funcionarão enquanto ela estiver em andamento."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mover agora"</string>
@@ -1544,9 +1552,9 @@
<string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Alterar o Assistente de Wi-Fi?"</string>
<string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Usar <xliff:g id="NEW_APP">%1$s</xliff:g> em vez de <xliff:g id="CURRENT_APP">%2$s</xliff:g> para gerenciar suas conexões de rede?"</string>
<string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Usar <xliff:g id="NEW_APP">%s</xliff:g> para gerenciar suas conexões de rede?"</string>
- <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operadora do SIM desconhecida"</string>
+ <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operadora do chip desconhecida"</string>
<string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> não tem um website de aprovisionamento conhecido"</string>
- <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
+ <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o chip e reinicie"</string>
<string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conecte-se à Internet"</string>
<string name="location_title" msgid="1029961368397484576">"Meu Local"</string>
<string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Local do perfil de trabalho"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Instalado"</string>
<string name="no_applications" msgid="7336588977497084921">"Nenhum app."</string>
<string name="internal_storage" msgid="1584700623164275282">"Espaço interno"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"armazenamento interno"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Armaz. USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Cartão SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Recalculando o tamanho…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Excluir os dados do app?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Todos os dados deste app serão excluídos permanentemente. Isso inclui todos os arquivos, configurações, contas, bancos de dados e outros."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"O app não foi encontrado na lista de apps instalados."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Não foi possível limpar o armazenamento do app."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Este app pode acessar os seguintes itens em seu tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Este app pode acessar os seguintes itens em seu telefone:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Este app pode acessar os itens a seguir em seu tablet. Para melhorar o desempenho e reduzir o uso de memória, algumas destas permissões estão disponíveis para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, pois tal app é executado no mesmo processo que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Este app pode acessar os itens a seguir em seu telefone. Para melhorar o desempenho e reduzir o uso de memória, algumas destas permissões estão disponíveis para <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, pois tal app é executado no mesmo processo que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> e <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Este app pode cobrar dinheiro:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Enviar SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"Calculando…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Não foi possível calcular o tamanho do pacote."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Você não tem apps de terceiros instalados."</string>
<string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Mover"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mover para o tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mover para telefone"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mover para USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mover para cartão SD"</string>
- <string name="moving" msgid="6431016143218876491">"Movendo"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Outra migração já está em andamento."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Não há espaço de armazenamento suficiente."</string>
<string name="does_not_exist" msgid="1501243985586067053">"O app não existe."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Não é possível instalar o administrador do dispositivo em uma mídia externa"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Forçar parada?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Se você forçar a parada de um app, ele pode apresentar mau funcionamento."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Não foi possível mover o app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Local de instalação preferido"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Alterar o local de instalação preferido para novos apps"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Desativar app integrado?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Desativar app"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Se você desativar esse app, o Android e outros apps poderão deixar de funcionar como deveriam."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Excluir os dados e desativar o app?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Se você desativar esse app, o Android e outros apps poderão deixar de funcionar como deveriam. Seus dados também serão excluídos."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Desativar notificações?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se você desativar as notificações para este app, poderá perder alertas e atualizações importantes."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Loja"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detalhes do app"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"App instalado a partir da <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Usar serviço"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Usar correção de cor"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Usar legendas"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continuar"</string>
<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="6371077608778830020">"Adicionar aparelho auditivo"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Se você limitar as atividades em segundo plano de um app, ele poderá apresentar mau funcionamento"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Como o app não está configurado para otimizar bateria, não é possível restringi-lo.\n\nPara restringir, ative a otimização."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Uso da tela desde a carga completa"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da tela"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Uso da bateria desde a carga completa"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Por quanto tempo a tela ficou ativada desde a carga completa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Detalhes de uso"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Ajustar uso de energia"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Apps que descarregam a bateria"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Mantendo o dispositivo ativado"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ativando o dispositivo em segundo plano"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Solicitando localização com frequência"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> apps não estão funcionando bem"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Os apps estão sendo executados normalmente"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"O smartphone tem um consumo normal de bateria em segundo plano"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"O tablet tem um consumo normal de bateria em segundo plano"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">Limitando o uso da bateria para %1$d app</item>
<item quantity="other">Limitando o uso da bateria para %1$d apps</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Restringido <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Esses apps estão usando a bateria em segundo plano. Os apps com restrição podem não funcionar corretamente, e é possível que as notificações sejam entregues com atraso."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Usar o Gerenciador de bateria"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detectar quando apps estiverem descarregando a bateria"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancelar"</string>
<string name="tts_reset" msgid="2661752909256313270">"Redefinir"</string>
<string name="tts_play" msgid="2628469503798633884">"Reproduzir"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Controle de energia"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Atualizando configuração de Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizando configuração Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ativado"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"desativado"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ativando"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"desativando"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Localização"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sincronização"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brilho <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"máximo"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"médio"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"desativado"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Armazenamento de credenciais"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar do armazenamento"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Selecionar tudo"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uso de dados do app"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Dados móveis e Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"O cálculo da operadora poderá ser diferente de seu dispositivo."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Uso de apps"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMAÇÕES DE APPS"</string>
@@ -2603,7 +2574,7 @@
<string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"Ocultar uso da ethernet"</string>
<string name="data_usage_menu_metered" msgid="6235119991372755026">"Restrições de rede"</string>
<string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizar dados automaticamente"</string>
- <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"Cartões SIM"</string>
+ <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"Chips"</string>
<string name="data_usage_cellular_data_summary" msgid="8413357481361268285">"Pausa no limite"</string>
<string name="account_settings_menu_auto_sync" msgid="6243013719753700377">"Sincron. dados automaticamente"</string>
<string name="account_settings_menu_auto_sync_personal" msgid="785541379617346438">"Sinc. autom. dados pessoais"</string>
@@ -2893,7 +2864,7 @@
<string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Use dados em LTE para melhorar recursos de voz e comunicações (recomendado)"</string>
<string name="preferred_network_type_title" msgid="3431041717309776341">"Tipo de rede preferencial"</string>
<string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (recomendado)"</string>
- <string name="work_sim_title" msgid="4843322164662606891">"SIM de trabalho"</string>
+ <string name="work_sim_title" msgid="4843322164662606891">"Chip de trabalho"</string>
<string name="user_restrictions_title" msgid="5794473784343434273">"Acesso a apps e conteúdo"</string>
<string name="user_rename" msgid="8523499513614655279">"RENOMEAR"</string>
<string name="app_restrictions_custom_label" msgid="6160672982086584261">"Definir restrições do app"</string>
@@ -2917,52 +2888,51 @@
<string name="user_image_choose_photo" msgid="7940990613897477057">"Escolher foto da Galeria"</string>
<string name="user_image_photo_selector" msgid="5492565707299454873">"Selecionar foto"</string>
<string name="regulatory_info_text" msgid="5623087902354026557"></string>
- <string name="sim_setup_wizard_title" msgid="1732682852692274928">"Cartões SIM"</string>
- <string name="sim_settings_title" msgid="6822745211458959756">"Cartões SIM"</string>
+ <string name="sim_setup_wizard_title" msgid="1732682852692274928">"Chips"</string>
+ <string name="sim_settings_title" msgid="6822745211458959756">"Chips"</string>
<string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> - <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
- <string name="sim_cards_changed_message" msgid="7900721153345139783">"Os cartões SIM foram alterados"</string>
+ <string name="sim_cards_changed_message" msgid="7900721153345139783">"Os chips foram alterados"</string>
<string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Toque para configurar atividades"</string>
<string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Os dados móveis estão indisponíveis"</string>
- <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Toque para selecionar um SIM de dados"</string>
+ <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Toque para selecionar um chip de dados"</string>
<string name="sim_calls_always_use" msgid="7936774751250119715">"Sempre usar esta opção para chamadas"</string>
- <string name="select_sim_for_data" msgid="2366081042162853044">"Selecionar um SIM de dados"</string>
- <string name="data_switch_started" msgid="2040761479817166311">"Trocando SIM de dados. Isso pode demorar um pouco..."</string>
+ <string name="select_sim_for_data" msgid="2366081042162853044">"Selecionar um chip de dados"</string>
+ <string name="data_switch_started" msgid="2040761479817166311">"Trocando chip de dados. Isso pode demorar um pouco..."</string>
<string name="select_sim_for_calls" msgid="3503094771801109334">"Ligar com"</string>
- <string name="sim_select_card" msgid="211285163525563293">"Selecionar um cartão SIM"</string>
- <string name="sim_card_number_title" msgid="7845379943474336488">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
- <string name="sim_slot_empty" msgid="8964505511911854688">"SIM vazio"</string>
- <string name="sim_editor_name" msgid="1722945976676142029">"Nome do SIM"</string>
- <string name="sim_name_hint" msgid="7038643345238968930">"Inserir nome do SIM"</string>
- <string name="sim_editor_title" msgid="4034301817366627870">"Slot para SIM %1$d"</string>
+ <string name="sim_select_card" msgid="211285163525563293">"Selecionar um chip"</string>
+ <string name="sim_card_number_title" msgid="7845379943474336488">"Chip <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
+ <string name="sim_slot_empty" msgid="8964505511911854688">"Chip vazio"</string>
+ <string name="sim_editor_name" msgid="1722945976676142029">"Nome do chip"</string>
+ <string name="sim_name_hint" msgid="7038643345238968930">"Inserir nome do chip"</string>
+ <string name="sim_editor_title" msgid="4034301817366627870">"Slot para chip %1$d"</string>
<string name="sim_editor_carrier" msgid="5684523444677746573">"Operadora"</string>
<string name="sim_editor_number" msgid="6705955651035440667">"Número"</string>
- <string name="sim_editor_color" msgid="2542605938562414355">"Cor do SIM"</string>
- <string name="sim_card_select_title" msgid="6668492557519243456">"Selecionar cartão SIM"</string>
+ <string name="sim_editor_color" msgid="2542605938562414355">"Cor do chip"</string>
+ <string name="sim_card_select_title" msgid="6668492557519243456">"Selecionar chip"</string>
<string name="color_orange" msgid="4417567658855022517">"Laranja"</string>
<string name="color_purple" msgid="3888532466427762504">"Roxo"</string>
- <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nenhum cartão SIM inserido"</string>
- <string name="sim_status_title" msgid="6744870675182447160">"Status do SIM"</string>
- <string name="sim_status_title_sim_slot" msgid="5725659316463979194">"Status do SIM (slot para SIM %1$d)"</string>
- <string name="sim_call_back_title" msgid="5181549885999280334">"Retornar chamada com o SIM padrão"</string>
- <string name="sim_outgoing_call_title" msgid="1019763076116874255">"SIM para chamadas de saída"</string>
+ <string name="sim_no_inserted_msg" msgid="210316755353227087">"Nenhum chip inserido"</string>
+ <string name="sim_status_title" msgid="6744870675182447160">"Status do chip"</string>
+ <string name="sim_status_title_sim_slot" msgid="5725659316463979194">"Status do chip (slot para SIM %1$d)"</string>
+ <string name="sim_call_back_title" msgid="5181549885999280334">"Retornar chamada com o chip padrão"</string>
+ <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Chip para fazer chamadas"</string>
<string name="sim_other_call_settings" msgid="8247802316114482477">"Outras configurações de chamada"</string>
<string name="preferred_network_offload_title" msgid="1605829724169550275">"Rede pref. p/ descarreg."</string>
<string name="preferred_network_offload_header" msgid="2321173571529106767">"Des. transm. nome de rede"</string>
<string name="preferred_network_offload_footer" msgid="5857279426054744020">"A opção \"Des. transm. nome de rede\" protege contra o acesso de terceiros a suas informações de rede."</string>
<string name="preferred_network_offload_popup" msgid="2252915199889604600">"A desativação da transmissão de nome de rede impedirá uma conexão automática a redes ocultas."</string>
<string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
- <string name="sim_notification_title" msgid="6272913297433198340">"Alteração em cartões SIM."</string>
+ <string name="sim_notification_title" msgid="6272913297433198340">"Alteração em chips."</string>
<string name="sim_notification_summary" msgid="8858043655706669772">"Toque para configurar"</string>
- <string name="sim_pref_divider" msgid="6778907671867621874">"SIM preferido para"</string>
+ <string name="sim_pref_divider" msgid="6778907671867621874">"Chip preferido para"</string>
<string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Perguntar sempre"</string>
<string name="sim_selection_required_pref" msgid="3446721423206414652">"Seleção necessária"</string>
- <string name="sim_selection_channel_title" msgid="2760909074892782589">"Seleção de SIM"</string>
+ <string name="sim_selection_channel_title" msgid="2760909074892782589">"Seleção de chip"</string>
<string name="dashboard_title" msgid="5453710313046681820">"Configurações"</string>
<plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="5597356221942118048">
<item quantity="one">Mostrar %d item oculto</item>
<item quantity="other">Mostrar %d itens ocultos</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Recolher"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Rede e internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rede móvel"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"uso de dados"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps e notificações"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissões, apps padrão"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"O acesso às notificações não está disponível para apps no perfil de trabalho."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Contas"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nenhuma conta adicionada"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Apps padrão"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Idiomas, horário, backup, atualizações"</string>
<string name="search_results_title" msgid="1796252422574886932">"Configurações"</string>
- <string name="search_menu" msgid="6283419262313758339">"Procurar nas configurações"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, Wi-Fi, conexão de rede, Internet, sem fio, dados, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, alternar, controle"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"mensagem de texto, envio de mensagens, mensagens, troca de mensagens, padrão"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"pagar, tocar, pagamentos"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"desbloqueio, facial, autenticação, login"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versão prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"rede, estado da rede móvel, estado do serviço, potência do sinal, tipo de rede móvel, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"número de série, versão do hardware"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema escuro"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Exibição ambiente, exibição de tela de bloqueio"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notificação na tela de bloqueio"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"rosto"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"impressão digital"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"escurecer tela, touchscreen, bateria, brilho inteligente, brilho dinâmico"</string>
@@ -3074,7 +3046,7 @@
<string name="alarm_ringtone_title" msgid="6344025478514311386">"Som de alarme padrão"</string>
<string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Também vibrar para chamadas"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
- <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons do teclado"</string>
+ <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons de discagem"</string>
<string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons de bloqueio de tela"</string>
<string name="charging_sounds_title" msgid="1132272552057504251">"Sons de carga"</string>
<string name="docking_sounds_title" msgid="155236288949940607">"Sons da dock"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Ao inserir seu PIN para iniciar o dispositivo, serviços de disponibilidade como o <xliff:g id="SERVICE">%1$s</xliff:g> ainda não estarão disponíveis."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Ao inserir seu padrão para iniciar o dispositivo, serviços de disponibilidade como o <xliff:g id="SERVICE">%1$s</xliff:g> ainda não estarão disponíveis."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Ao inserir sua senha para iniciar o dispositivo, serviços de disponibilidade como o <xliff:g id="SERVICE">%1$s</xliff:g> ainda não estarão disponíveis."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Observação: após uma reinicialização, não é possível iniciar este app até que você desbloqueie seu smartphone"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Observação: se você reiniciar o smartphone e tiver um bloqueio de tela definido, não será possível iniciar este app até que você desbloqueie o smartphone"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informações de IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informações relativas de IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Pessoais"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Trabalho"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Apps: todas"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Apps: desativadas"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Desativado"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorias: importância urgente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorias: importância baixa"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorias: desativadas"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alertas de uso"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Mostrar uso total do dispositivo"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Mostrar uso de apps"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Uso elevado"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> app está com comportamento anormal</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> apps estão com comportamento anormal</item>
@@ -3666,8 +3637,8 @@
<string name="running_frequency" msgid="6622624669948277693">"Frequência"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Uso máximo"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Nenhum dado usado"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Permitir acesso a \"Não perturbe\" para <xliff:g id="APP">%1$s</xliff:g>?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"O app poderá ativar/desativar \"Não perturbe\" e fazer alterações nas configurações relacionadas."</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Permitir que <xliff:g id="APP">%1$s</xliff:g> acesse o recurso \"Não perturbe\"?"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"O app poderá ativar/desativar o recurso \"Não perturbe\" e fazer alterações nas configurações relacionadas."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Deve permanecer ativado, pois o acesso a notificações está ativado"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Revogar acesso a \"Não perturbe\" para <xliff:g id="APP">%1$s</xliff:g>?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Todas as regras \"Não perturbe\" criadas por esse app serão removidas."</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Armazenamento interno: <xliff:g id="PERCENTAGE">%1$s</xliff:g> de utilização - <xliff:g id="FREE_SPACE">%2$s</xliff:g> livres"</string>
<string name="display_summary" msgid="6737806235882127328">"Entrar no modo de suspensão após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Plano de fundo, suspensão, tamanho da fonte"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Entrar no modo de suspensão após 10 minutos de inatividade"</string>
<string name="memory_summary" msgid="8080825904671961872">"Média de <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> de memória usados"</string>
<string name="users_summary" msgid="1674864467098487328">"Conectado como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS não permitido"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Câmera não permitida"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Captura de tela não permitida"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Não é possível desativar os backups"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Não é possível abrir este app"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Se você tiver perguntas, entre em contato com o administrador de TI"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Mais detalhes"</string>
@@ -3788,7 +3760,7 @@
<string name="condition_device_vibrate_title" product="default" msgid="1087633233379991925">"O smartphone está configurado para vibrar"</string>
<string name="condition_device_vibrate_summary" product="tablet" msgid="433514444618164607">"Chamadas e notificações farão o dispositivo vibrar"</string>
<string name="condition_device_vibrate_summary" product="default" msgid="5877034997839162763">"Chamadas e notificações farão o smartphone vibrar"</string>
- <string name="night_display_suggestion_title" msgid="6602129097059325291">"Definir programação do Modo noturno"</string>
+ <string name="night_display_suggestion_title" msgid="6602129097059325291">"Definir horário do Modo noturno"</string>
<string name="night_display_suggestion_summary" msgid="228346372178218442">"Tinge a tela automaticamente todas as noites"</string>
<string name="condition_night_display_title" msgid="5599814941976856183">"O modo noturno está ativado"</string>
<string name="condition_night_display_summary" msgid="5443722724310650381">"A cor da tela muda para âmbar. Isso pode ajudar você a adormecer."</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simular uma tela com corte"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Nenhuma"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Padrão do dispositivo"</string>
<string name="special_access" msgid="3458780842491881155">"Acesso especial a apps"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> app pode usar dados irrestritos</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectado a <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectado a vários dispositivos"</string>
<string name="demo_mode" msgid="2798762752209330277">"Modo de demonstração da IU do sistema"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Modo noturno"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Definir modo noturno"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Modo escuro"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Definir modo escuro"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Blocos de desenvolvedor para configurações rápidas"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Rastreamento do Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Configurações do perfil de trabalho"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Pesquisa de contatos"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permitir que sua organização pesquise contatos para identificar autores de chamadas e contatos"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar duas vezes na tela para verificar o smartphone"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar duas vezes na tela para verificar o tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar duas vezes na tela para verificar o dispositivo"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Para verificar a hora, ícones de notificação e outras informações, toque duas vezes na tela."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Para verificar a hora, as notificações e outras informações, toque duas vezes na tela."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar o smartphone para verificá-lo"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar o tablet para verificá-lo"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar o dispositivo para verificá-lo"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Para verificar a hora, ícones de notificação e outras informações, pegue o smartphone."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Para verificar a hora, ícones de notificação e outras informações, pegue o tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Para verificar a hora, ícones de notificação e outras informações, pegue o dispositivo."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Ativar a tela"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Para verificar a hora, as notificações e outras informações, pegue o smartphone."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Para verificar a hora, as notificações e outras informações, pegue o tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Para verificar a hora, as notificações e outras informações, pegue o dispositivo."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gesto de tela para wake lock"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Usar impressão digital para ver as notificações"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Usar impressão digital"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> tentativa</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentativas</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Os dados deste dispositivo estão sendo salvos em backup"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Este dispositivo é gerenciado pela sua organização."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Este dispositivo é gerenciado por <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Preenchimento automático"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automático, preenchimento, preenchimento automático"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Você precisa confiar nesse app</b> <br/> <br/> <xliff:g id=app_name example=O Preenchimento automático do Google>%1$s</xliff:g> usa o que está na sua tela para determinar o que pode ser preenchido automaticamente."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Preenchimento automático"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Nível de registro"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Máximo de solicitações por sessão"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Máximo de conjuntos de dados visíveis"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Redefinir para valores padrão"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"As opções do desenvolvedor de preenchimento automático foram redefinidas"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
<string name="default_theme" msgid="7085644992078579076">"Padrão"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nome da rede"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Acionar aprovisionamento da operadora"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Atualizar o modo Não perturbe"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausar notificações para manter o foco"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"O que há de novo e empolgante?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faça um tour pelo seu novo smartphone"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faça um tour pelo seu novo tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faça um tour pelo seu novo dispositivo"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Este recurso não está disponível neste dispositivo"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forçar medições completas de GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Sempre mostrar a caixa de diálogo de falha"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Mostra a caixa de diálogo sempre que um app falha"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Selecionar app ativado para ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nenhum conjunto de aplicativos ativados para ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplicativo ativado para ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Acesso ao diretório"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"acesso ao diretório"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalhes da rede"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"O nome do seu dispositivo está visível para os apps no seu smartphone. Ele também pode ser visto por outras pessoas quando você se conecta a dispositivos Bluetooth ou configura um ponto de acesso Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Dispositivos"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Todas as configurações"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Sugestões"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dados CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dados CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Escolher rede"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Desconectado"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Conectado"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Conectando…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Não foi possível conectar"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nenhuma rede encontrada."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Não foi possível encontrar redes. Tente novamente."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(proibida)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Sem chip"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Chamada avançada"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Modo de rede preferencial: WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Modo de rede preferencial: somente GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Modo de rede preferencial: somente WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Modo de rede preferencial: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Modo de rede preferencial: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Modo de rede preferencial: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Modo de rede preferencial: somente CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Modo de rede preferencial: somente EvDO"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Modo de rede preferencial: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Modo de rede preferencial: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Modo de rede preferencial: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Modo de rede preferencial: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Modo de rede preferencial: global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Modo de rede preferencial: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Modo de rede preferencial: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Modo de rede preferencial: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Modo de rede preferencial: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Modo de rede preferencial: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Modo de rede preferencial: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Modo de rede preferencial: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Modo de rede preferencial: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Modo de rede preferencial: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Modo de rede preferencial: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Modo de rede preferencial: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Modo de rede preferencial: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Modo de rede preferencial: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recomendado)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recomendado)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Redes disponíveis"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Pesquisando…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registrando na rede <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Seu chip não permite uma conexão com esta rede."</string>
+ <string name="connect_later" msgid="978991102125216741">"Não é possível se conectar a esta rede no momento. Tente novamente mais tarde."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registrado na rede."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Selecionar a rede automaticamente"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Config. da operadora"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Configurar serviço de dados"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Dados móveis"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Acessar os dados pela rede móvel"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tipo de rede preferencial"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Alterar o modo de operação de rede"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tipo de rede preferencial"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operadora"</string>
+ <string name="call_category" msgid="8108654745239563833">"Chamadas"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videochamadas pela operadora"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Seleção de sistema"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Alterar o modo de roaming CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Seleção de sistema"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Rede"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Rede"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Inscrição CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Alterar entre R-UIM/SIM e NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"inscrição"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Registro automático…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Permitir roaming de dados?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Consulte os preços com seu provedor de rede."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Uso de dados do app"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Modo de rede <xliff:g id="NETWORKMODEID">%1$d</xliff:g> inválido. Ignorar."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Indisponível quando conectado à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Ver mais"</string>
+ <string name="see_less" msgid="1250265310929558370">"Ver menos"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nenhum dispositivo conectado"</string>
</resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 498cc23..510bedb 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -67,7 +67,7 @@
</string-array>
<string-array name="wifi_status">
<item msgid="1922181315419294640"></item>
- <item msgid="8934131797783724664">"În curs de scanare..."</item>
+ <item msgid="8934131797783724664">"Se caută..."</item>
<item msgid="8513729475867537913">"Se conectează..."</item>
<item msgid="515055375277271756">"În curs de autentificare…"</item>
<item msgid="1943354004029184381">"Se obține adresa IP..."</item>
@@ -81,7 +81,7 @@
</string-array>
<string-array name="wifi_status_with_ssid">
<item msgid="7714855332363650812"></item>
- <item msgid="8878186979715711006">"În curs de scanare..."</item>
+ <item msgid="8878186979715711006">"Se caută..."</item>
<item msgid="355508996603873860">"Se conectează la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
<item msgid="554971459996405634">"Se autentifică cu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
<item msgid="7928343808033020343">"Se obține adresa IP de la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tratați ca fiind contorizată"</item>
<item msgid="2266114985518865625">"Tratați ca fiind necontorizată"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Standard (folosiți MAC randomizat)"</item>
+ <item msgid="5398461510512959597">"De încredere"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nu"</item>
<item msgid="3863157480502955888">"Da"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Activat permanent"</item>
<item msgid="6385301106124765323">"Dezactivat permanent"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Dezactivat"</item>
+ <item msgid="2182686878828390312">"Remediați erorile"</item>
+ <item msgid="5286514712714822064">"Detaliat"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Doar domiciliu"</item>
+ <item msgid="5034813753274486448">"Automat"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA preferat"</item>
+ <item msgid="807926878589867564">"Numai GSM"</item>
+ <item msgid="488474605709912156">"Numai WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automat"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automat"</item>
+ <item msgid="370391313511477301">"CDMA fără EvDo"</item>
+ <item msgid="4678789463133969294">"Numai EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Numai TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 636fdfc..ab4d0c4 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Creați"</string>
<string name="allow" msgid="3349662621170855910">"Permiteți"</string>
<string name="deny" msgid="6947806159746484865">"Refuzați"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Închideți"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Comutați"</string>
<string name="device_info_default" msgid="7847265875578739287">"Necunoscut"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="few">Mai aveți <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> pași pentru a deveni dezvoltator.</item>
@@ -33,10 +31,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Nu mai este nevoie, sunteți deja dezvoltator."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Mai întâi activați opțiunile pentru dezvoltatori."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless și rețele"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Conexiuni"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Dispozitiv"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Acces"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Activați conexiunea de date"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Dezactivați conexiunea de date"</string>
@@ -122,7 +116,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresa Bluetooth a dispozitivului: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Deconectați <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmitere"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Dispozitiv Bluetooth nedenumit"</string>
<string name="progress_scanning" msgid="192587958424295789">"Se caută dispozitive"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Niciun dispozitiv Bluetooth în apropiere."</string>
@@ -154,7 +147,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"O aplicație încearcă să activeze Bluetooth și să facă telefonul vizibil pentru alte dispozitive. Puteți modifica ulterior acest lucru din setările Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Se activează Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Se dezactivează Bluetooth..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conectare automată"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitare de conectare Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Atingeți pentru a vă conecta la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Doriți să vă conectați la „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”?"</string>
@@ -182,12 +174,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dispozitive de apel disponibile"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Conectat în prezent"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Dispozitive salvate"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Adăugați un dispozitiv"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth se va activa pentru asociere"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferințe pentru conexiune"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Dispozitive conectate anterior"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Conectat anterior"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Funcția Bluetooth activată"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Afișați-le pe toate"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data și ora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Selectați fusul orar"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -270,7 +262,6 @@
<string name="skip_label" msgid="47510779345218297">"Omiteți"</string>
<string name="next_label" msgid="4693520878012668114">"Înainte"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Limbi"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferințe pentru limbă"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Eliminați"</string>
<string name="add_a_language" msgid="2330538812283783022">"Adăugați o limbă"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -305,7 +296,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Setări"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Comandă rapidă pentru setări"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Mod Avion"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Mai multe"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless și rețele"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Gestionați rețelele Wi-Fi, funcția Bluetooth, modul Avion, rețelele mobile și rețelele VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Date mobile"</string>
@@ -365,7 +355,7 @@
<string name="owner_info_settings_title" msgid="5530285568897386122">"Mesaj pe ecranul de blocare"</string>
<string name="security_enable_widgets_title" msgid="2754833397070967846">"Activați widgeturi"</string>
<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"</string>
+ <string name="lockdown_settings_title" msgid="7393790212603280213">"Afișați opțiunea de blocare strictă"</string>
<string name="lockdown_settings_summary" msgid="429230431748285997">"Afișați opțiunea butonului de pornire care dezactivează Smart Lock, deblocarea cu amprentă și notificările pe ecranul de blocare."</string>
<string name="owner_info_settings_summary" msgid="7472393443779227052">"Niciunul"</string>
<string name="owner_info_settings_status" msgid="120407527726476378">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
@@ -390,6 +380,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Confidențialitate"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Dezactivat de administrator"</string>
<string name="security_status_title" msgid="5848766673665944640">"Starea de securitate"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Blocarea ecranului, deblocare facială"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Blocarea ecranului, amprentă"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Blocarea ecranului"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Chip adăugat"</string>
@@ -399,11 +390,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Deblocați folosindu-vă chipul"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Folosiți-vă chipul pentru autentificare"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Folosiți-vă chipul ca să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Folosiți"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Folosiți fața ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: nu vă puteți folosi fața ca să deblocați acest dispozitiv. Pentru informații suplimentare, contactați administratorul organizației."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Folosiți-vă chipul ca să deblocați telefonul, să autorizați achiziții sau să vă conectați la aplicații"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Puteți să adăugați până la <xliff:g id="COUNT">%d</xliff:g> amprente"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrați-vă fața în cerc"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Mai târziu"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Puteți să adăugați până la <xliff:g id="COUNT">%d</xliff:g> fețe"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Ați adăugat numărul maxim de chipuri"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Nu se pot adăuga mai multe chipuri"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Înregistrarea nu a fost finalizată"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Timpul limită pentru înregistrarea feței a expirat. Încercați din nou."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Înregistrarea feței nu a funcționat."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Gata. Arată bine."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Terminat"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Folosiți chipul pt."</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Deblocați dispozit."</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Conectare la aplicații/plăți"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Ochii deschiși pentru deblocare"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Când folosiți autentificarea facială, trebuie să aveți ochii deschiși"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Elim. date chip"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Îmbunătățiți datele chipului"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Vă puteți folosi chipul pentru a vă debloca dispozitivul și a accesa aplicațiile. "<annotation id="url">"Aflați mai multe"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Amprentă"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gestionați amprentele"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Folosiți amprenta la"</string>
@@ -511,7 +518,7 @@
<string name="suggested_fingerprint_lock_settings_summary" product="tablet" msgid="5738274583658668124"></string>
<string name="suggested_fingerprint_lock_settings_summary" product="device" msgid="5738274583658668124"></string>
<string name="suggested_fingerprint_lock_settings_summary" product="default" msgid="5738274583658668124"></string>
- <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeți blocarea ecranului"</string>
+ <string name="lock_settings_picker_title" msgid="1095755849152582712">"Opțiuni blocare ecran"</string>
<string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Alegeți blocarea pentru serviciu"</string>
<string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Protejați tableta"</string>
<string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Protejați dispozitivul"</string>
@@ -899,6 +906,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Alegeți cel puțin o bandă pentru hotspot Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Setări IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Confidențialitate"</string>
<string name="wifi_shared" msgid="844142443226926070">"Permiteți accesul și altor utilizatori ai dispozitivului"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(neschimbate)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Selectați"</string>
@@ -938,7 +946,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Anulați"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Eliminați rețeaua?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Se vor șterge toate parolele pentru rețea"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Rețele salvate"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="few">%d rețele</item>
<item quantity="other">%d de rețele</item>
@@ -1118,8 +1125,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Luminozitate"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ajustați luminozitatea ecranului"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Luminozitate adaptivă"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Activată"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Dezactivat"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Nivelul preferat de luminozitate este foarte scăzut"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Nivelul preferat de luminozitate este scăzut"</string>
@@ -1215,6 +1221,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Nu se poate schimba codul PIN.\nCodul PIN poate fi incorect."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Codul PIN pentru SIM a fost modificat"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Nu se poate modifica starea de blocare a cardului SIM.\nCodul PIN poate fi incorect."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Nu se poate dezactiva codul PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Nu se poate activa codul PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Anulați"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Mai multe carduri SIM găsite"</string>
@@ -1389,7 +1397,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Este necesar ca <xliff:g id="NAME_0">^1</xliff:g> să fie formatat. \n\n"<b>"Dacă îl formatați, toate datele stocate pe <xliff:g id="NAME_1">^1</xliff:g> vor fi șterse."</b>" Pentru a nu pierde datele, faceți backup."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Ștergeți și formatați"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Se formatează <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Nu scoateți <xliff:g id="NAME">^1</xliff:g> în timp ce se formatează."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Nu scoateți <xliff:g id="NAME">^1</xliff:g> în timp ce se formatează."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Mutați datele în noua stocare"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Puteți muta fotografiile, fișierele și câteva aplicații pe acest nou <xliff:g id="NAME">^1</xliff:g>. \n\nMutarea durează aproximativ <xliff:g id="TIME">^2</xliff:g> și astfel veți elibera un spațiu de memorie internă de <xliff:g id="SIZE">^3</xliff:g>. Anumite aplicații nu vor funcționa pe durata acestui proces."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Mutați acum"</string>
@@ -1574,10 +1582,10 @@
<string name="location_category_location_services" msgid="7437150886946685979">"Servicii de localizare"</string>
<string name="location_high_battery_use" msgid="517199943258508020">"Utilizare intensă a bateriei"</string>
<string name="location_low_battery_use" msgid="8602232529541903596">"Utilizare redusă a bateriei"</string>
- <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanare"</string>
- <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Căutare de rețele Wi-Fi"</string>
+ <string name="location_scanning_screen_title" msgid="4408076862929611554">"Căutare"</string>
+ <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Căutare Wi-Fi"</string>
<string name="location_scanning_wifi_always_scanning_description" msgid="2691110218127379249">"Permiteți aplicațiilor și serviciilor să caute permanent rețele Wi-Fi, chiar și atunci când setarea Wi-Fi este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
- <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Căutare de dispozitive Bluetooth"</string>
+ <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Căutare Bluetooth"</string>
<string name="location_scanning_bluetooth_always_scanning_description" msgid="1285526059945206128">"Permiteți aplicațiilor și serviciilor să caute permanent dispozitive din apropiere, chiar și atunci când setarea Bluetooth este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
<string name="location_network_based" msgid="9134175479520582215">"Localizare prin Wi-Fi și mobil"</string>
<string name="location_neighborhood_level" msgid="5141318121229984788">"Aplicațiile estimează mai rapid locația cu serviciul de localizare Google. Se colectează/trimit la Google date anonime de localizare."</string>
@@ -1772,9 +1780,6 @@
<string name="installed" msgid="3070865169422600098">"Instalată"</string>
<string name="no_applications" msgid="7336588977497084921">"Nu există aplicații."</string>
<string name="internal_storage" msgid="1584700623164275282">"Stocare internă"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"memorie internă"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Stocare USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Stocare card SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Se recalculează dimensiunea..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Ștergeți datele aplicației?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Toate datele acestei aplicații vor fi șterse definitiv. Aici sunt incluse toate fișierele, setările, conturile, bazele de date etc."</string>
@@ -1783,24 +1788,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplicația nu a fost găsită în lista de aplicații instalate."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Nu s-au putut șterge datele stocate pentru aplicație."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Această aplicație poate accesa pe tabletă următoarele:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Această aplicație poate accesa următoarele elemente de pe telefonul dvs.:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Această aplicație poate accesa următoarele elemente pe tableta dvs. Pentru a îmbunătăți performanța și a reduce consumul de memorie, unele dintre aceste permisiuni sunt disponibile pentru <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, deoarece aceasta rulează în același proces ca și <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Această aplicație poate accesa următoarele elemente pe telefonul dvs. Pentru a îmbunătăți performanța și a reduce consumul de memorie, unele dintre aceste permisiuni sunt disponibile pentru <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, deoarece aceasta rulează în același proces ca și <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> și <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Această aplicație poate să genereze costuri:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Trimiteți SMS premium"</string>
<string name="computing_size" msgid="1599186977475211186">"În curs de calculare..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Nu s-a putut calcula mărimea pachetului."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Nu aveți instalată nicio aplicație terță parte."</string>
<string name="version_text" msgid="9189073826278676425">"versiunea <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Mutați"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Mutați pe tabletă"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Mutați în telefon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Mutați în stocarea USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Mutați pe cardul SD"</string>
- <string name="moving" msgid="6431016143218876491">"Se deplasează"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Altă migrare este deja în desfășurare."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nu există suficient spațiu de stocare."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplicația nu există."</string>
@@ -1810,17 +1807,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Aplicația pentru administratorul dispozitivului nu poate fi instalată pe un mediu de stocare extern"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Opriți forțat?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Dacă forțați oprirea unei aplicații, aceasta se poate comporta necorespunzător."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Aplicația nu a putut fi mutată. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Locație preferată de instalare"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Schimbați locația preferată de instalare pentru noile aplicații"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Dezactiv. aplic. încorporată?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Dezactivați aplicația"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Dacă dezactivați această aplicație, este posibil ca Android și alte aplicații să nu mai funcționeze corespunzător."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ștergeți datele și dezactivați aplicația?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Dacă dezactivați această aplicație, este posibil ca Android și alte aplicații să nu mai funcționeze corespunzător. În plus, datele dvs. vor fi șterse."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Dezactivați notificările?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Dacă dezactivați notificările pentru această aplicație, puteți pierde alerte și actualizări importante."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Magazin"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detalii aplicație"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplicație instalată din <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2013,6 +2006,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Utilizați serviciul"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Utilizați corecție de culoare"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Utilizați subtitrările"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Continuați"</string>
<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="6371077608778830020">"Adăugați un aparat auditiv"</string>
@@ -2164,8 +2158,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Dacă limitați activitatea de fundal pentru o aplicație, aceasta se poate comporta necorespunzător"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplicația nu optimizează bateria, deci nu o puteți restricționa.\n\nPentru a o restricționa, activați optimizarea bateriei."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Utilizarea ecranului de la încărcare"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Consumul ecranului"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Scanarea rețelei mobile"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Utilizarea bateriei de la încărcarea completă"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Perioada de timp de la încărcarea completă cât a fost pornit ecranul"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Utilizarea dispozitivului de la încărcarea completă"</string>
@@ -2192,11 +2184,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Detalii despre utilizare"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Ajustați utilizarea de energie"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Pachete incluse"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplicații care consumă bateria"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Se păstrează dispozitivul activ"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Se activează dispozitivul în fundal"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Se solicită frecvent locația"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplicații funcționează incorect"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplicațiile rulează normal"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefonul determină o utilizare normală a bateriei în fundal"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tableta determină o utilizare normală a bateriei în fundal"</string>
@@ -2266,6 +2253,7 @@
<item quantity="other">Se limitează utilizarea bateriei pentru %1$d de aplicații</item>
<item quantity="one">Se limitează utilizarea bateriei pentru %1$d aplicație</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Limitat <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Aceste aplicații folosesc bateria în fundal. Este posibil ca aplicațiile restricționate să nu funcționeze corespunzător și ca notificările să fie primite cu întârziere."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Utilizați Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Detectați când aplicațiile consumă bateria"</string>
@@ -2381,11 +2369,11 @@
<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>
- <string name="battery_saver_auto_title" msgid="8368709389419695611">"Activați automat"</string>
+ <string name="battery_saver_auto_title" msgid="8368709389419695611">"Se activează automat"</string>
<string name="battery_saver_seekbar_title" msgid="4705356758573183963">"La <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_saver_seekbar_title_placeholder" msgid="1138980155985636295">"Activați"</string>
<string name="battery_saver_master_switch_title" msgid="622539414546588436">"Utilizați Economisirea bateriei"</string>
- <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Activați automat"</string>
+ <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Se activează automat"</string>
<string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Niciodată"</string>
<string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"la baterie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
<string name="battery_percentage" msgid="723291197508049369">"Procentajul bateriei"</string>
@@ -2444,23 +2432,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Anulați"</string>
<string name="tts_reset" msgid="2661752909256313270">"Resetați"</string>
<string name="tts_play" msgid="2628469503798633884">"Redați"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Comandă alimentare"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Se actualizează setarea Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Se actualizează setarea pentru Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"activat"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"dezactivat"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"se activează"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"se dezactivează"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Locație"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sincronizați"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Luminozitate <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automată"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completă"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"pe jumătate"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"dezactivată"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Stocarea certificatelor"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalați de pe stocare"</string>
@@ -2618,7 +2589,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Selectați-le pe toate"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizarea datelor"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Utilizarea datelor aplic."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Date mobile și Wi-Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Datele pot fi contorizate diferit la operator și pe dispozitiv."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Utilizarea aplicațiilor"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMAȚII DESPRE APLICAȚIE"</string>
@@ -2991,7 +2962,7 @@
<string name="sim_notification_title" msgid="6272913297433198340">"Cardurile SIM au fost schimbate."</string>
<string name="sim_notification_summary" msgid="8858043655706669772">"Atingeți pentru a configura"</string>
<string name="sim_pref_divider" msgid="6778907671867621874">"Cartelă SIM preferată pentru"</string>
- <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Întreabă mereu"</string>
+ <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Întreabă de fiecare dată"</string>
<string name="sim_selection_required_pref" msgid="3446721423206414652">"Selectați o opțiune"</string>
<string name="sim_selection_channel_title" msgid="2760909074892782589">"Selectare SIM"</string>
<string name="dashboard_title" msgid="5453710313046681820">"Setări"</string>
@@ -3000,7 +2971,6 @@
<item quantity="other">Afișați %d de elemente ascunse</item>
<item quantity="one">Afișați %d element ascuns</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Restrângeți"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Rețea și internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"rețeaua mobilă"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"utilizarea datelor"</string>
@@ -3012,12 +2982,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicații și notificări"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisiuni, aplicații prestabilite"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Accesul la notificări nu este disponibil pentru aplicații în profilul de lucru."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Conturi"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nu a fost adăugat niciun cont"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Aplicații prestabilite"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Limbi, oră, backup, actualizări"</string>
<string name="search_results_title" msgid="1796252422574886932">"Setări"</string>
- <string name="search_menu" msgid="6283419262313758339">"Căutați în setări"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, conexiune la rețea, internet, wireless, date, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, comutator, control"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"mesaj text, schimb de mesaje, mesaje, mesagerie, prestabilit"</string>
@@ -3062,6 +3032,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"plată, atingere, plăți"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gest"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"facială, deblocare, autorizare, conectare"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versiune PRL, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"rețea, starea rețelei mobile, starea acoperirii, puterea semnalului, tip de rețea mobilă, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"număr de serie, versiune de hardware"</string>
@@ -3069,6 +3040,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"temă întunecată"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"eroare"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Afișare ambient, Afișare ecran de blocare"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notificare ecran de blocare"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"chip"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"amprentă"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"reduceți luminozitatea ecranului, ecran tactil, luminozitate inteligentă, luminozitate dinamică"</string>
@@ -3363,7 +3335,7 @@
<string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminat"</string>
<string name="app_notification_importance_title" msgid="8002263131149345584">"Importanță"</string>
<string name="notification_show_lights_title" msgid="7671781299688190532">"Lumină intermitentă"</string>
- <string name="notification_vibrate_title" msgid="1646667807969755957">"Vibrații"</string>
+ <string name="notification_vibrate_title" msgid="1646667807969755957">"Vibrează"</string>
<string name="notification_channel_sound_title" msgid="3899212238513507941">"Sunet"</string>
<string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Ștergeți"</string>
<string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"Redenumiți"</string>
@@ -3510,7 +3482,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Când introduceți codul PIN pentru a porni acest dispozitiv, serviciile de accesibilitate, cum ar fi <xliff:g id="SERVICE">%1$s</xliff:g>, nu vor fi disponibile."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Când introduceți modelul pentru a porni acest dispozitiv, serviciile de accesibilitate, cum ar fi <xliff:g id="SERVICE">%1$s</xliff:g>, nu vor fi disponibile."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Când introduceți parola pentru a porni acest dispozitiv, serviciile de accesibilitate, cum ar fi <xliff:g id="SERVICE">%1$s</xliff:g>, nu vor fi disponibile."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Notă: după repornire, această aplicație nu poate porni până nu deblocați telefonul"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Notă: dacă reporniți telefonul și aveți activată blocarea ecranului, această aplicație nu poate porni până nu deblocați telefonul."</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informații despre IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informații referitoare la IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slotul<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3568,7 +3540,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personale"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Serviciu"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplicații: toate"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplicații: dezactivate"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Dezactivate"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Categorii: importanță urgentă"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorii: importanță scăzută"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorii: dezactivate"</string>
@@ -3630,7 +3602,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Alerte privind utilizarea"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Afișați utilizarea completă a dispozitivului"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Afișați utilizarea aplicațiilor"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Utilizare intensă"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplicații care se comportă anormal</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> de aplicații care se comportă anormal</item>
@@ -3798,6 +3769,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Memorie internă: <xliff:g id="PERCENTAGE">%1$s</xliff:g> folosită - <xliff:g id="FREE_SPACE">%2$s</xliff:g> liberă"</string>
<string name="display_summary" msgid="6737806235882127328">"Se dezactivează după <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Imagine de fundal, inactivitate, dimensiunea fontului"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Se dezactivează după 10 minute de inactivitate"</string>
<string name="memory_summary" msgid="8080825904671961872">"Memorie folosită în medie: <xliff:g id="USED_MEMORY">%1$s</xliff:g> din <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"V-ați conectat ca <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3813,7 +3786,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-urile nu au permisiune"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Camera foto nu are permisiune"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Captura de ecran nu are permisiune"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Nu se pot dezactiva backupurile"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Nu se poate deschide aplicația"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Dacă aveți întrebări, contactați administratorul IT"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Mai multe detalii"</string>
@@ -3977,14 +3949,14 @@
<string name="notification_log_details_parcel" msgid="243148037601903212">"dimensiune pachet"</string>
<string name="notification_log_details_ashmem" msgid="7241814108477320636">"ashmem"</string>
<string name="notification_log_details_sound" msgid="5506232879598808099">"sunet"</string>
- <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibrare"</string>
+ <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibrează"</string>
<string name="notification_log_details_default" msgid="2345249399796730861">"prestabilit"</string>
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulați un afișaj cu o decupare"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Decupajul ecranului"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"decupare ecran"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Niciuna"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Prestabilit pentru dispozitiv"</string>
<string name="special_access" msgid="3458780842491881155">"Acces special aplicații"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplicații pot folosi date nerestricționate</item>
@@ -4007,11 +3979,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Conectat la <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Conectat la mai multe dispozitive"</string>
<string name="demo_mode" msgid="2798762752209330277">"Mod demonstrativ pentru IU sistem"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Modul noapte"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Setați Modul noapte"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Modul întunecat"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Setați Modul întunecat"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Casete dezvoltator pentru setări rapide"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Urmă Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Setările profilului de serviciu"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Căutarea persoanelor de contact"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Permiteți căutările persoanelor de contact efectuate de organizația dvs. pentru a identifica apelanții și persoanele de contact"</string>
@@ -4055,13 +4026,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Atingeți de două ori pentru a verifica telefonul"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Atingeți de două ori pentru a verifica tableta"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Atingeți de două ori pentru a verifica dispozitivul"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Ca să verificați ora, pictogramele de notificare și alte informații, atingeți ecranul de două ori."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Ca să verificați ora, notificările și alte informații, atingeți ecranul de două ori."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Ridicați pentru a verifica telefonul"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Ridicați pentru a verifica tableta"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ridicați pentru a verifica dispozitivul"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ca să verificați ora, pictogramele pentru notificări și alte informații, ridicați telefonul."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ca să verificați ora, pictogramele pentru notificări și alte informații, ridicați tableta."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ca să verificați ora, pictogramele pentru notificări și alte informații, ridicați dispozitivul."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Ecran la activare"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Ca să verificați ora, notificările și alte informații, ridicați telefonul."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Ca să verificați ora, notificările și alte informații, ridicați tableta."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Ca să verificați ora, notificările și alte informații, ridicați dispozitivul."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gest pentru activarea ecranului de blocare"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Glisați amprenta digitală pentru notificări"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Glisați amprenta"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pentru a verifica notificările, glisați în jos pe senzorul de amprentă de pe spatele telefonului."</string>
@@ -4145,7 +4120,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> de încercări</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> încercare</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Datelor dispozitivului li se face backup"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Acest dispozitiv este gestionat de organizația dvs."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Acest dispozitiv este gestionat de <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4189,6 +4163,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Serviciu de completare automată"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automată, completare, completare automată"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Asigurați-vă că aveți încredere în această aplicație</b> <br/> <br/> <xliff:g id=app_name example=Completarea automată Google>%1$s</xliff:g> folosește conținutul de pe ecran pentru a stabili ce se poate completa automat."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Completare automată"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Nivel de înregistrare"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Număr maxim de solicitări pe sesiune"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Seturi de date cu vizibilitate maximă"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Resetați la valorile prestabilite"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Opțiunile dezvoltatorului de completare automată au fost resetate"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema dispozitivului"</string>
<string name="default_theme" msgid="7085644992078579076">"Prestabilită"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Numele rețelei"</string>
@@ -4203,15 +4183,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Declanșați provizionarea operatorului"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Actualizați funcția Nu deranja"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Întrerupeți notificările pentru a vă păstra concentrarea"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Ce este nou și interesant?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Faceți un tur al noului dvs. telefon"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Faceți un tur al noii dvs. tablete"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Faceți un tur al noului dvs. dispozitiv"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Această caracteristică nu este disponibilă pe acest dispozitiv"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Forțați măsurători GNSS complete"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Urmăriți toate constelațiile și frecvențele GNSS fără ciclu de funcționare"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Afișați întotdeauna caseta de dialog pentru blocări"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Afișați caseta de dialog de fiecare dată când se blochează o aplicație"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Selectați aplicația compatibilă cu ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nu există niciun set de aplicații compatibile cu ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplicație compatibilă cu ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Acces la director"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"acces la director"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4243,7 +4222,7 @@
<string name="gesture_prevent_ringing_screen_title" msgid="7840226017975251549">"Dezactivați soneria"</string>
<string name="gesture_prevent_ringing_title" msgid="2483159069038138740">"Apăsați în același timp pe butonul de pornire și pe creșterea volumului"</string>
<string name="gesture_prevent_ringing_sound_title" msgid="5724512060316688779">"Comandă rapidă pentru dezactivarea soneriei"</string>
- <string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Vibrații"</string>
+ <string name="prevent_ringing_option_vibrate" msgid="7286821846542822661">"Vibrează"</string>
<string name="prevent_ringing_option_mute" msgid="7551545579059879853">"Dezactivați sunetul"</string>
<string name="prevent_ringing_option_none" msgid="4656046650769569175">"Nicio acțiune"</string>
<string name="prevent_ringing_option_vibrate_summary" msgid="1157524435626890116">"Activată (vibrații)"</string>
@@ -4252,4 +4231,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detalii despre rețea"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Numele dispozitivului este vizibil aplicațiilor de pe telefon. Poate fi văzut și de alte persoane când vă conectați la dispozitivele Bluetooth sau configurați un hotspot Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Dispozitive"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Toate setările"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Sugestii"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Date CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Date CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Alegeți o rețea"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Deconectată"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Conectată"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Se conectează…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nu s-a putut conecta"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nicio rețea găsită."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nu s-au găsit rețele. Încercați din nou."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(interzisă)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Niciun card SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Apelare avansată"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Mod de rețea preferat: de preferat WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Mod de rețea preferat: numai GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Mod de rețea preferat: numai WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Mod de rețea preferat: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Mod de rețea preferat: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Mod de rețea preferat: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Mod de rețea preferat: numai CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Mod de rețea preferat: numai EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Mod de rețea preferat: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Mod de rețea preferat: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Mod de rețea preferat: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Mod de rețea preferat: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Mod de rețea preferat: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Mod de rețea preferat: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Mod de rețea preferat: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Mod de rețea preferat: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Mod de rețea preferat: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Mod de rețea preferat: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Mod de rețea preferat: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Mod de rețea preferat: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Mod de rețea preferat: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Mod de rețea preferat: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Mod de rețea preferat: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Mod de rețea preferat: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Mod de rețea preferat: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Mod de rețea preferat: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (recomandat)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (recomandat)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Rețele disponibile"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Se caută…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Se înregistrează pe <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Cardul dvs. SIM nu permite conexiunea la această rețea."</string>
+ <string name="connect_later" msgid="978991102125216741">"Nu se poate efectua conectarea la această rețea chiar acum. Încercați din nou mai târziu."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Înregistrat în rețea."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Selectați automat rețeaua"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Setări operator"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Configurați serviciul de date"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Date mobile"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Accesați datele folosind rețeaua mobilă"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tipul de rețea preferat"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Schimbați modul de operare a rețelei"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tipul de rețea preferat"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operator"</string>
+ <string name="call_category" msgid="8108654745239563833">"Se apelează"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Apelare video prin operator"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Selectați sistemul"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Schimbați modul de roaming CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Selectați sistemul"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Rețea"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Rețea"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Abonament CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Comutați între RUIM/SIM și NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"abonament"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Înregistrare automată…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Permiteți roamingul de date?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Consultați furnizorul de rețea în privința prețurilor."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Utilizarea datelor în aplicație"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Mod nevalid de rețea <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignoră."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Indisponibil când este conectat la <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Vedeți mai multe"</string>
+ <string name="see_less" msgid="1250265310929558370">"Afișați mai puține"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 100d478..d4f5eee 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"С тарификацией"</item>
<item msgid="2266114985518865625">"Без тарификации"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"По умолчанию (использовать случайный MAC-адрес)"</item>
+ <item msgid="5398461510512959597">"Надежный"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Нет"</item>
<item msgid="3863157480502955888">"Да"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Всегда включен"</item>
<item msgid="6385301106124765323">"Всегда отключен"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Отключено"</item>
+ <item msgid="2182686878828390312">"Сведения об отладке"</item>
+ <item msgid="5286514712714822064">"Подробная информация"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Только домашние сети"</item>
+ <item msgid="5034813753274486448">"Автоматически"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA (предпочтительный режим)"</item>
+ <item msgid="807926878589867564">"Только GSM"</item>
+ <item msgid="488474605709912156">"Только WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA (авторежим)"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo (авторежим)"</item>
+ <item msgid="370391313511477301">"CDMA без EvDo"</item>
+ <item msgid="4678789463133969294">"Только EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA и LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Весь мир"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Только TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Весь мир"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 791c37b..4833b3e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Создать"</string>
<string name="allow" msgid="3349662621170855910">"Разрешить"</string>
<string name="deny" msgid="6947806159746484865">"Отклонить"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Закрыть"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Сменить аккаунт"</string>
<string name="device_info_default" msgid="7847265875578739287">"Неизвестно"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Вы почти у цели. Остался <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> шаг.</item>
@@ -34,10 +32,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Не нужно, вы уже разработчик"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Сначала включите параметры для разработчиков."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Беспроводные сети"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Подключения"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Устройство"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Личные данные"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Доступ"</string>
<string name="header_category_system" msgid="2816866961183068977">"Система"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Включить передачу данных"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Отключить передачу данных"</string>
@@ -123,7 +117,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Адрес Bluetooth для устройства: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Отключить <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Передача данных"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Bluetooth-устройство без названия"</string>
<string name="progress_scanning" msgid="192587958424295789">"Поиск"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Устройства Bluetooth не найдены."</string>
@@ -155,7 +148,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Приложению требуется включить Bluetooth и сделать ваш телефон доступным для поиска на других устройствах. Позже эти настройки можно будет изменить."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Включение Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Отключение Bluetooth..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматическое подключение"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Запрос на подключение по каналу Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Нажмите, чтобы подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Подключиться к устройству \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -183,12 +175,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Доступные устройства для совершения звонков"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Текущие подключения"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Сохраненные устройства"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Добавить устройство"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Будет включен Bluetooth"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Настройки подключения"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Ранее подключенные устройства"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Ранее подключенные устройства"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Модуль Bluetooth включен"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Показать все"</string>
<string name="date_and_time" msgid="9062980487860757694">"Дата и время"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Выбрать часовой пояс"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -271,7 +263,6 @@
<string name="skip_label" msgid="47510779345218297">"Пропустить"</string>
<string name="next_label" msgid="4693520878012668114">"Далее"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Языки"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Выбор языка"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Удалить"</string>
<string name="add_a_language" msgid="2330538812283783022">"Добавить"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -307,7 +298,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Ярлык настроек"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Режим полета"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Ещё"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Беспроводные сети"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, Bluetooth, режим полета, мобильные сети и VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Мобильный Интернет"</string>
@@ -392,6 +382,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Конфиденциальность"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Отключено администратором"</string>
<string name="security_status_title" msgid="5848766673665944640">"Статус защиты"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Блокировка экрана, Фейсконтроль"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Блокировка экрана, цифровой отпечаток"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Блокировка экрана"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Сканирование завершено"</string>
@@ -401,11 +392,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Распознавание лица"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Разблокируйте устройство при помощи распознавания лица"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Используйте распознавание лица для разблокировки телефона, подтверждения покупок и входа в приложения."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Используйте"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Разблокируйте телефон и подтверждайте покупки с помощью распознавания лица.\n\nВнимание! Для разблокировки этого устройства распознавание лица использовать нельзя. За подробной информацией обратитесь к администратору."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Используйте распознавание лица для разблокировки телефона, подтверждения покупок и входа в приложения."</string>
- <string name="face_add_max" msgid="2342250989212694454">"Максимальное количество отпечатков пальцев, которые можно добавить: <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Поместите лицо в центр круга"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Не сейчас"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Максимальное количество лиц, которые можно добавить: <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Вы уже добавили максимальное количество лиц."</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Добавлено максимальное количество лиц."</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Лицо не добавлено"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ОК"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Превышено время ожидания. Повторите попытку."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Не удалось добавить лицо."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Готово!"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"ОК"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Возможности"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Разблокировка устройства"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Вход в приложения и оплата"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Для разблокировки нужно открыть глаза"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Распознавание лиц будет работать, только когда глаза открыты."</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Удалить данные лица"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Улучшить распознавание лица"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Снимайте блокировку экрана и получайте доступ к приложениям с помощью распознавания лица. "<annotation id="url">"Подробнее…"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Отпечатки пальцев"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Управление отпечатками"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Для чего использовать"</string>
@@ -914,6 +921,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 ГГц"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Выберите хотя бы один диапазон частот для точек доступа Wi-Fi."</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Настройки IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Конфиденциальность"</string>
<string name="wifi_shared" msgid="844142443226926070">"Поделиться с другими пользователями устройства"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(без изменений)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Выберите"</string>
@@ -953,7 +961,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Отмена"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Удалить сеть?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Все пароли для этой сети будут удалены."</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Сохраненные сети"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d сеть</item>
<item quantity="few">%d сети</item>
@@ -1134,8 +1141,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Яркость"</string>
<string name="brightness_summary" msgid="838917350127550703">"Настроить яркость экрана"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивная яркость"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Включено"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Отключено"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Уровень яркости: очень низкий"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Уровень яркости: низкий"</string>
@@ -1155,7 +1161,7 @@
<string name="auto_brightness_description" msgid="7310335517128283729">"Яркость экрана будет автоматически регулироваться в зависимости от окружающих условий и ваших действий. Вы можете вручную перемещать ползунок, чтобы помочь адаптивной яркости запомнить ваши предпочтения."</string>
<string name="night_display_title" msgid="2626451512200357686">"Ночной режим"</string>
<string name="night_display_text" msgid="1837277457033025056">"В ночном режиме экран приобретает желтоватый оттенок. Это снижает напряжение глаз при тусклом свете и может помочь вам быстрее заснуть."</string>
- <string name="night_display_auto_mode_title" msgid="6574111412154833409">"По расписанию"</string>
+ <string name="night_display_auto_mode_title" msgid="6574111412154833409">"Расписание"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Никогда"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"В выбранное время"</string>
<string name="night_display_auto_mode_twilight" msgid="589042813708244059">"От заката до рассвета"</string>
@@ -1173,7 +1179,7 @@
<string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Выключится автоматически на рассвете"</string>
<string name="night_display_activation_on_manual" msgid="277343561277625826">"Включить"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"Отключить"</string>
- <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Включить до восхода"</string>
+ <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Включить до рассвета"</string>
<string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Отключить до заката"</string>
<string name="night_display_activation_on_custom" msgid="5472029024427933598">"Включить до <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"Отключить до <xliff:g id="ID_1">%1$s</xliff:g>"</string>
@@ -1231,6 +1237,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Не удается изменить PIN.\nВозможно, код введен неверно."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-код SIM-карты успешно изменен"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Не удалось изменить состояние блокировки SIM-карты.\nВозможно, введен неверный PIN-код."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Не удалось отключить PIN-код"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Не удалось включить PIN-код"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ОК"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Отмена"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Обнаружено более одной SIM-карты"</string>
@@ -1406,7 +1414,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Потребуется отформатировать устройство \"<xliff:g id="NAME_0">^1</xliff:g>\". \n\n"<b>"При этом будут удалены все данные на устройстве \"<xliff:g id="NAME_1">^1</xliff:g>\"."</b>" Чтобы избежать потери данных, используйте резервное копирование."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Очистить и отформатировать"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> форматируется…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Не извлекайте устройство \"<xliff:g id="NAME">^1</xliff:g>\" во время форматирования."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Не извлекайте устройство \"<xliff:g id="NAME">^1</xliff:g>\" во время форматирования."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Перенесите на новое устройство"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Вы можете перенести фотографии, файлы и некоторые приложения на устройство \"<xliff:g id="NAME">^1</xliff:g>\". \n\nНа это уйдет около <xliff:g id="TIME">^2</xliff:g>, после чего освободится <xliff:g id="SIZE">^3</xliff:g> внутренней памяти. Во время этого процесса некоторые приложения не будут работать."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Перенести сейчас"</string>
@@ -1790,9 +1798,6 @@
<string name="installed" msgid="3070865169422600098">"Установлено"</string>
<string name="no_applications" msgid="7336588977497084921">"Нет приложений"</string>
<string name="internal_storage" msgid="1584700623164275282">"Внутр. накопитель"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"внутренний накопитель"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-накопитель"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-карта"</string>
<string name="recompute_size" msgid="7722567982831691718">"Повторное вычисление размера..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Удалить данные приложения?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Все данные этого приложения будут удалены без возможности восстановления, включая все файлы, базы данных, настройки, аккаунты и т. д."</string>
@@ -1801,24 +1806,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Приложение не найдено в списке установленных."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Не удалось очистить хранилище."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"У этого приложения есть доступ к следующей информации на устройстве:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"У этого приложения есть доступ к следующей информации на устройстве:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Этому приложению доступны указанные ниже данные на вашем планшетном ПК. Чтобы повысить производительность и уменьшить объем используемой памяти, приложению <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> предоставлены некоторые из этих разрешений, так как оно выполняется в рамках того же процесса, что и <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Этому приложению доступны указанные ниже данные на вашем телефоне. Чтобы повысить производительность и уменьшить объем используемой памяти, приложению <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> предоставлены некоторые из этих разрешений, так как оно выполняется в рамках того же процесса, что и <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> и <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Это приложение может списывать деньги с вашего счета:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Отправить SMS?"</string>
<string name="computing_size" msgid="1599186977475211186">"Вычисление..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Не удалось определить размер пакета."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Нет приложений сторонних разработчиков."</string>
<string name="version_text" msgid="9189073826278676425">"Версия <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Переместить"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Переместить на планшет"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Перенести на телефон"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Перенести на USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Переместить на SD-карту"</string>
- <string name="moving" msgid="6431016143218876491">"Перенос..."</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Другая операция переноса уже выполняется."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Недостаточно места."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Приложение не установлено."</string>
@@ -1828,17 +1825,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Нельзя установить приложение администратора устройства на внешнем носителе"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Остановить принудительно?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Принудительное закрытие приложения может отразиться на его функциональности."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Не удалось переместить приложение. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Место установки"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Изменить папку для установки приложений"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Отключить приложение?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Отключить приложение"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Если вы отключите это приложение, другие могут работать неправильно."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Отключить?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Если вы отключите это приложение, данные будут удалены, а другие приложения и Android могут работать неправильно."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Отключить уведомления?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Если в настройках этого приложения отключены уведомления, вы можете пропустить важные оповещения и обновления."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Магазин"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"О приложении"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Откуда скачано приложение: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2031,6 +2024,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Использовать сервис"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Использовать коррекцию цвета"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Использовать субтитры"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Далее"</string>
<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="6371077608778830020">"Добавить слуховой аппарат"</string>
@@ -2190,8 +2184,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Это действие может привести к неправильной работе приложения."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Оптимизация расхода заряда батареи для этого приложения не настроена.\n\nВключите ее, чтобы установить ограничения."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Использование экрана с момента полной зарядки"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Потребление энергии экраном"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Сканирование мобильной сети"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Расход заряда батареи с момента полной зарядки"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Время работы экрана с момента полной зарядки"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Использование устройства с момента полной зарядки"</string>
@@ -2218,11 +2210,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Расход батареи"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Режим энергопотребления"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Пакеты"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Приложения, сильно расходующие заряд батареи"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Устройство не переходит в спящий режим"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Спящий режим отключается в фоновом режиме"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Устройство слишком часто запрашивает данные о местоположении"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Количество неправильно работающих приложений: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Приложения работают нормально"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Телефон расходует заряд батареи как обычно"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Планшет расходует заряд батареи как обычно"</string>
@@ -2298,6 +2285,7 @@
<item quantity="many">Потребление энергии ограничено для %1$d приложений</item>
<item quantity="other">Потребление энергии ограничено для %1$d приложения</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Ограничение установлено <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Эти приложения используют батарею в фоновом режиме. Ограничение может снизить их функциональность и вызвать задержку уведомлений."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Использовать Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Выявлять приложения, быстро расходующие заряд батареи"</string>
@@ -2477,23 +2465,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Отмена"</string>
<string name="tts_reset" msgid="2661752909256313270">"Сбросить"</string>
<string name="tts_play" msgid="2628469503798633884">"Воспроизвести"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Энергосбережение"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Обновление настроек Wi-Fi…"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Обновление настроек Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"включено"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"отключено"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"включение…"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"выключение…"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Определение местоположения"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Синхронизация"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Яркость: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"автонастройка"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"максимум"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"средняя"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"минимум"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Хранилище учетных данных"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Установить"</string>
@@ -2518,7 +2489,7 @@
<string name="credentials_not_erased" msgid="7685932772284216097">"Не удалось очистить хранилище."</string>
<string name="credentials_configure_lock_screen_hint" msgid="8058230497337529036">"Чтобы использовать хранилище учетных данных, необходимо сначала настроить блокировку экрана на устройстве."</string>
<string name="credentials_configure_lock_screen_button" msgid="253239765216055321">"НАСТРОИТЬ БЛОКИРОВКУ"</string>
- <string name="usage_access_title" msgid="332333405495457839">"Приложения с доступом к данным"</string>
+ <string name="usage_access_title" msgid="332333405495457839">"Доступ к данным"</string>
<string name="emergency_tone_title" msgid="254495218194925271">"Сигнал набора номера при экстренных вызовах"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"Настроить режим работы при экстренном вызове"</string>
<string name="privacy_settings_title" msgid="2978878794187459190">"Резервное копирование"</string>
@@ -2651,7 +2622,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Выбрать все"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Передача данных"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Трафик приложений"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Мобильный Интернет и Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Статистика вашего оператора связи может отличаться от статистики устройства."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Приложения"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"О ПРИЛОЖЕНИИ"</string>
@@ -3038,7 +3009,6 @@
<item quantity="many">Показать %d скрытых объектов</item>
<item quantity="other">Показать %d скрытых объекта</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Свернуть"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Сеть и Интернет"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"моб. сети"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"передача данных"</string>
@@ -3050,12 +3020,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Приложения и уведомления"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Разрешения, приложения по умолчанию"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Приложениям в рабочем профиле нельзя предоставить доступ к уведомлениям."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Аккаунты"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Аккаунтов нет"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Приложения по умолчанию"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Язык, время, резервное копирование и обновления"</string>
<string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
- <string name="search_menu" msgid="6283419262313758339">"Поиск настроек"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"Wi-Fi, WiFi, сетевое подключение, Интернет, беспроводной, данные, Wi Fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, переключатель, управление"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, текстовое сообщение, сообщения, обмен сообщениями, по умолчанию"</string>
@@ -3100,6 +3070,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"Бесконтактная оплата"</string>
<string name="keywords_backup" msgid="470070289135403022">"создать резервную копию"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"жест"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"лицо, разблокировать, аутентификация, вход"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, версия prl, imeisv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"сеть, подключение к мобильной сети, доступность мобильной сети, уровень сигнала, тип мобильной сети, роуминг, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"серийный номер, версия аппаратного обеспечения"</string>
@@ -3107,6 +3078,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"темная тема"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ошибка"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Автоматическое включение экрана, заблокированный экран"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"уведомление на заблокированном экране"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"лицо"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"отпечаток пальца"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"снижение яркости, сенсорный экран, батарея, умная яркость, динамическая яркость"</string>
@@ -3558,7 +3530,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"При вводе PIN-кода для запуска устройства службы специальных возможностей, такие как <xliff:g id="SERVICE">%1$s</xliff:g>, не будут включаться автоматически."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"При вводе графического ключа для запуска устройства службы специальных возможностей, такие как <xliff:g id="SERVICE">%1$s</xliff:g>, не будут включаться автоматически."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"При вводе пароля для запуска устройства службы специальных возможностей, такие как <xliff:g id="SERVICE">%1$s</xliff:g>, не будут включаться автоматически."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Примечание. Чтобы запустить это приложение после перезагрузки, разблокируйте экран."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Примечание. Если у вас установлена блокировка экрана, после перезагрузки разблокируйте экран, чтобы запустить приложение."</string>
<string name="imei_information_title" msgid="8499085421609752290">"Данные IMEI-кода"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Сведения, касающиеся IMEI-кода"</string>
<string name="slot_number" msgid="3762676044904653577">"(разъем <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3620,7 +3592,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Личные"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Рабочие"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Приложения: все"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Приложения: отключенные"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Уведомления отключены"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категории: крайняя важность"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категории: низкая важность"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категории: отключенные"</string>
@@ -3683,7 +3655,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Предупреждения"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Вся информация об использовании"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Использование приложений"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Большой расход заряда"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> приложение работает неправильно</item>
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> приложения работают неправильно</item>
@@ -3855,6 +3826,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Внутренний накопитель: использовано <xliff:g id="PERCENTAGE">%1$s</xliff:g>, свободно <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Устройство переходит в спящий режим после <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Обои, спящий режим, размер шрифта"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Устройство переходит в спящий режим через 10 минут бездействия"</string>
<string name="memory_summary" msgid="8080825904671961872">"Используется в среднем <xliff:g id="USED_MEMORY">%1$s</xliff:g> из <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Вы вошли как <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3870,7 +3843,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Отправка SMS запрещена"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Доступ к камере запрещен"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Запрещено делать скриншоты"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Невозможно отключить резервное копирование"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Невозможно открыть приложение"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Если у вас есть вопросы, обратитесь к администратору."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Подробнее…"</string>
@@ -4044,9 +4016,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Эмуляция экрана с вырезом"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Вырез на экране"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"вырез на экране, выемка"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Нет"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Вариант по умолчанию"</string>
<string name="special_access" msgid="3458780842491881155">"Специальный доступ"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> приложение без ограничений мобильного Интернета</item>
@@ -4070,11 +4042,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Подключено к устройству <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Подключено к нескольким устройствам"</string>
<string name="demo_mode" msgid="2798762752209330277">"Интерфейс системы: деморежим"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Ночной режим"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Использовать ночной режим"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Темная тема"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Использование темной темы"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Элементы в быстрых настройках"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Трассировка Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Настройки рабочего профиля"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Поиск контактов"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Разрешить поиск контактов в организации для определения вызывающих абонентов"</string>
@@ -4121,13 +4092,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Дважды нажать, чтобы проверить уведомления"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Дважды нажать, чтобы проверить уведомления"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Дважды нажать, чтобы проверить уведомления"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Чтобы увидеть время, значки уведомлений и другую информацию, дважды коснитесь экрана"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Чтобы увидеть время, уведомления и другую информацию, дважды коснитесь экрана."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Поднять, чтобы проверить уведомления"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Просмотр уведомлений в вертикальном положении планшета"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Просмотр уведомлений в вертикальном положении устройства"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите телефон"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите планшет"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Чтобы увидеть время, значки уведомлений и другую информацию, возьмите устройство"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Включить экран"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Чтобы увидеть время, уведомления и другую информацию, возьмите телефон."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Чтобы увидеть время, уведомления и другую информацию, возьмите планшет."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Чтобы увидеть время, уведомления и другую информацию, возьмите устройство."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Показать экран блокировки"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Использовать сканер отпечатков для просмотра уведомлений"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Сканер отпечатков"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Чтобы увидеть уведомления, проведите вниз по сканеру отпечатков пальцев на задней панели телефона"</string>
@@ -4215,7 +4190,6 @@
<item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> попыток</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> попытки</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Для этого устройства включено резервное копирование данных."</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Этим устройством управляет ваша организация."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Этим устройством управляет <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4262,6 +4236,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Автозаполнение"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"автоматически, заполнять, автозаполнение"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Убедитесь, что это приложение безопасно</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> анализирует содержимое экрана и находит поля, которые можно заполнить автоматически."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Автозаполнение"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Ведение журнала"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Лимит запросов за сеанс"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Максимальное количество видимых наборов данных"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Восстановить значения по умолчанию"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Настройки автозаполнения для разработчиков сброшены"</string>
<string name="device_theme" msgid="4571803018917608588">"Тема устройства"</string>
<string name="default_theme" msgid="7085644992078579076">"По умолчанию"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Название сети"</string>
@@ -4276,15 +4256,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Запустить синхронизацию оператора"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Включите режим \"Не беспокоить\""</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Заблокируйте отвлекающие уведомления"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Что нового?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Познакомьтесь со своим новым телефоном"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Познакомьтесь со своим новым планшетом"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Познакомьтесь со своим новым устройством"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Функция недоступна на этом устройстве."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Полное отслеживание измерений GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Отслеживать все выкладки и частоты GNSS без рабочего цикла"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Всегда показывать сообщение об ошибке"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Показывать диалог при каждом сбое приложения"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Выбрать приложение с поддержкой ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Приложение с поддержкой ANGLE не выбрано"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Приложение с поддержкой ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Доступ к каталогам"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"доступ к каталогам"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4325,4 +4304,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Сведения о сети"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"У приложений на телефоне есть доступ к названию устройства. Его могут видеть другие пользователи, когда вы подключаетесь к устройствам по Bluetooth или настраиваете точку доступа Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Устройства"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Все настройки"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Подсказки"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Данные CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Данные CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Выбрать сеть"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Не подключено"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Подключено"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Подключение…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Не удалось подключиться к сети"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Сети не найдены."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Сети не найдены. Повторите попытку."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(доступ запрещен)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Нет SIM-карты."</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Расширенный вызов"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Предпочтительный режим: WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Предпочтительный режим: только GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Предпочтительный режим: только WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Предпочтительный режим: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Предпочтительный режим: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Предпочтительный режим: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Предпочтительный режим: только CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Предпочтительный режим: только EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Предпочтительный режим: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Предпочтительный режим: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Предпочтительный режим: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Предпочтительный режим: CDMA и LTE/EvDo"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Предпочтительный режим: весь мир"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Предпочтительный режим: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Предпочтительный режим: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Предпочтительный режим: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Предпочтительный режим: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Предпочтительный режим: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Предпочтительный режим: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Предпочтительный режим: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Предпочтительный режим: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Предпочтительный режим: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Предпочтительный режим: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Предпочтительный режим: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Предпочтительный режим: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Предпочтительный режим: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (рекомендуется)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (рекомендуется)"</string>
+ <string name="network_global" msgid="959947774831178632">"Весь мир"</string>
+ <string name="label_available" msgid="1731547832803057893">"Доступные сети"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Поиск…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Регистрация в сети \"<xliff:g id="NETWORK">%s</xliff:g>\"…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Ваша SIM-карта не поддерживает подключение к этой сети."</string>
+ <string name="connect_later" msgid="978991102125216741">"Не удалось подключиться к сети. Повторите попытку позже."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Регистрация в сети завершена."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Выбирать сеть автоматически"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Настройки оператора"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Настройка передачи данных"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Мобильный Интернет"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Доступ к Интернету по мобильной сети"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Предпочтительный тип сети"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Изменение режима работы сети"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Предпочтительный тип сети"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Оператор"</string>
+ <string name="call_category" msgid="8108654745239563833">"Вызовы"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Видеозвонки"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Выбор системы"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Изменить режим роуминга CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Выбор системы"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Сеть"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Выбрать сеть"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Подписка на CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Переключение между RUIM/SIM и NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"подписка"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Автоматическая регистрация"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Разрешить интернет-роуминг?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Информацию о тарифах вы можете получить у интернет-провайдера."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Трафик приложений"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Недопустимый режим сети (<xliff:g id="NETWORKMODEID">%1$d</xliff:g>). Не используется."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Недоступны при подключении к <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Ещё"</string>
+ <string name="see_less" msgid="1250265310929558370">"Скрыть"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index 28e1f80..023b55d 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"මනින ලද ලෙස සලකන්න"</item>
<item msgid="2266114985518865625">"නොමනින ලද ලෙස සලකන්න"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"පෙරනිමි (සසම්භාවී MAC භාවිත කරන්න)"</item>
+ <item msgid="5398461510512959597">"විශ්වාසවන්තයි"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"නැත"</item>
<item msgid="3863157480502955888">"ඔව්"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"සැමවිට ක්රියාත්මකයි"</item>
<item msgid="6385301106124765323">"සැමවිට ක්රියාවිරහිතයි"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"ක්රියාවිරහිතයි"</item>
+ <item msgid="2182686878828390312">"නිදොස්කරණය"</item>
+ <item msgid="5286514712714822064">"කථික"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"නිවසේ පමණි"</item>
+ <item msgid="5034813753274486448">"ස්වයංක්රිය"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA කැමතියි"</item>
+ <item msgid="807926878589867564">"GSM පමණි"</item>
+ <item msgid="488474605709912156">"WCDMA පමණි"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA ස්වයංක්රිය"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo ස්වයංක්රිය"</item>
+ <item msgid="370391313511477301">"EvDo රහිත CDMA"</item>
+ <item msgid="4678789463133969294">"EvDo පමණි"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"ගෝලීය"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA පමණි"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"ගෝලීය"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 48a13e9..79e92a4 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"නිර්මාණය කරන්න"</string>
<string name="allow" msgid="3349662621170855910">"අවසර දෙන්න"</string>
<string name="deny" msgid="6947806159746484865">"ප්රතික්ෂේප කරන්න"</string>
- <string name="dlg_close" msgid="7471087791340790015">"වසන්න"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"මාරු වෙන්න"</string>
<string name="device_info_default" msgid="7847265875578739287">"නොදනී"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">ඔබට දැන් සංවර්ධකයකු වීමට ඇත්තේ පියවර <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> කි.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"අවශ්ය නැත, ඔබ දැනටමත් වර්ධකයෙකි."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"කරුණාකර පළමුව සංවර්ධක විකල්ප සබල කරන්න."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"නොරැහැන් සහ ජාල"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"සම්බන්ධතා"</string>
- <string name="header_category_device" msgid="4544026001618307754">"උපාංගය"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"පෞද්ගලික"</string>
- <string name="header_category_access" msgid="7580499097416970962">"ප්රවේශය"</string>
<string name="header_category_system" msgid="2816866961183068977">"පද්ධතිය"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"දත්ත සබැඳුම සබල කරන්න"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"දත්ත සබැඳුම අබල කරන්න"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"උපාංගයේ බ්ලූටූත් ලිපිනය: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> විසන්ධි කරද?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"විකාශනය කරමින්"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"නමක් නොමැති බ්ලූටූත් උපාංගය"</string>
<string name="progress_scanning" msgid="192587958424295789">"සොයමින්"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"අවට බ්ලූටූත් උපාංග සොයාගත්තේ නැත."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"යෙදුමකට බ්ලූටූත් ක්රියාත්මක කර ඔබේ දුරකථනය වෙනත් උපාංගවලට දෘශ්යමාන කිරීමට අවශ්යය. ඔබට මෙය පසුව බ්ලූටූත් සැකසීම්වල වෙනස් කළ හැකිය."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"බ්ලූටූත් සක්රිය කරමින්…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"බ්ලූටූත් අක්රිය කරමින්…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"ස්වයංක්රිය-සම්බන්ධ වීම"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"බ්ලූටූත් සම්බන්ධතා ඉල්ලීම"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" වෙත සම්බන්ධ වීමට තට්ටු කරන්න."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"ඔබට \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" වෙත සම්බන්ධ වීමට අවශ්යද?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"තිබෙන ඇමතුම් උපාංග"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"දැනට සම්බන්ධ වී ඇත"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"සුරැකි උපාංග"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"උපාංගය එක් කිරීම"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"යුගල කිරීමට බ්ලූටූත් ක්රියාත්මක කරනු ඇත"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"සම්බන්ධතා මනාප"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"පෙර සම්බන්ධිත උපාංග"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"පෙර සම්බන්ධිත"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"බ්ලූටූත් ක්රියාත්මක කරන ලදී"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"සියල්ල බලන්න"</string>
<string name="date_and_time" msgid="9062980487860757694">"දිනය සහ වේලාව"</string>
<string name="choose_timezone" msgid="1362834506479536274">"වේලා කලාපය තෝරන්න"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"මඟ හරින්න"</string>
<string name="next_label" msgid="4693520878012668114">"මීලඟ"</string>
<string name="language_picker_title" msgid="3596315202551687690">"භාෂා"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"භාෂා මනාප"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"ඉවත් කරන්න"</string>
<string name="add_a_language" msgid="2330538812283783022">"භාෂාවක් එක් කරන්න"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"සැකසීම්"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"සැකසීම කෙටිමඟ"</string>
<string name="airplane_mode" msgid="8837269988154128601">"අහස්යානා ආකාරය"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"තවත්"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"නොරැහැන් සහ ජාල"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, බ්ලූටූත්, ගුවන්යානා ආකාරය, ජංගම ජාල, සහ VPN කළමනාකරණය"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"ජංගම දත්ත"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"රහස්යතාව"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ඔබගේ පරිපාලක විසින් අබල කර ඇත"</string>
<string name="security_status_title" msgid="5848766673665944640">"ආරක්ෂක තත්ත්වය"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"තිර අගුල, මුහුණු අගුලු හැරීම"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"තිර අගුල, ඇඟිලි සලකුණ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"තිර අගුල"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"මුහුණ එකතු කරන ලදි"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"ඔබේ මුහුණ සමඟ අගුලු හරින්න"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"සත්යාපනය කිරීමට ඔබේ මුහුණ භාවිතා කරන්න"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ඔබේ දුරකථනය අගුලු හැරීමට, මිලදී ගැනීම්වලට අවසර දීමට, හෝ යෙදුම්වලට පිරීමට ඔබේ මුහුණ භාවිත කරන්න."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"ඔබ භාවිතා කරන්න"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ඔබේ දුරකථනය අගුලු හැරීමට, හෝ මිලදී ගැනීම් අනුමත කිරීමට ඔබේ මුහුණ භාවිත කරන්න.\n\nසටහන: ඔබට ඔබේ මුහුණ මෙම උපාංගය අගුලු හැරීමට භාවිත කළ නොහැකිය. තව තොරතුරු සඳහා, ඔබේ සංවිධානයෙහි පරිපාලක අමතන්න."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ඔබේ දුරකථනය අගුලු හැරීමට, මිලදී ගැනීම්වලට අවසර දීමට, හෝ යෙදුම්වලට පිරීමට ඔබේ මුහුණ භාවිත කරන්න."</string>
- <string name="face_add_max" msgid="2342250989212694454">"ඔබට ඇඟිලි සලකුණු <xliff:g id="COUNT">%d</xliff:g> දක්වා එකතු කළ හැකිය"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"රවුමේ ඔබේ මුහුණ කේන්ද්රගත කරන්න"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"පසුව එය කරන්න"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"ඔබට මුහුණු <xliff:g id="COUNT">%d</xliff:g> දක්වා එක් කළ හැකිය"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"ඔබ මුහුණු උපරිම සංඛ්යාව එක් කර ඇත"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"තවත් මුහුණු එක් කළ නොහැකිය"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"බඳවා ගැනීම අවසන් නොකරන ලදී"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"හරි"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"මුහුණු බඳවා ගැනීමේ කාල සීමාව ළඟා විය. නැවත උත්සාහ කරන්න."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"මුහුණු බඳවා ගැනීම ක්රියා කළේ නැත."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"සියල්ල සූදානම්. හොඳයි."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"නිමයි"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"ඔබේ මුහුණ භාවිතා කරන්න"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"ඔබේ උපාංගය අගුලු හරින්න"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"යෙදුම් පිරීම සහ ගෙවීම"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"අගුලු හැරීමට විවෘත ඇස්"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"මුහුණු සත්යාපනය භාවිතා කරන විට, ඔබේ ඇස් විවෘත විය යුතුය"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"මුහුණ දත්ත ඉවත් කරන්න"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"ඔබේ මුහුණු දත්ත වැඩි දියුණු කරන්න"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"ඔබගේ උපාංගය අගුලු හැරීමට සහ යෙදුම් වෙත පිවිසීමට ඔබේ මුහුණ භාවිතා කළ හැකිය. "<annotation id="url">"තව දැන ගන්න"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ඇඟිලි සලකුණ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"ඇඟිලි සලකුණු කළමනාකරණය කරන්න"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"මෙය සඳහා ඇඟිලි සලකුණු භාවිත කරන්න"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi-Fi හොට්ස්පොට් සඳහා අවම වශයෙන් එක් කලාපයක් තෝරන්න:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP සැකසීම්"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"රහස්යතාව"</string>
<string name="wifi_shared" msgid="844142443226926070">"අනෙකුත් උපාංග පරිශීලකයන් සමග බෙදා ගන්න"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(වෙනස් නොකළ)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"කරුණාකර තෝරන්න"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"අවලංගු කරන්න"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"ජාලය අමතක කරන්නද?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"මෙම ජාලය සඳහා සියලු මුරපද මකනු ඇත"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"සුරකින ලද ජාල"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">ජාල %dක්</item>
<item quantity="other">ජාල %dක්</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"දීප්තිමත් බව"</string>
<string name="brightness_summary" msgid="838917350127550703">"තිරයේ දීප්තිය සීරු මාරු කරන්න"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"අනුවර්තක දීප්තිය"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ක්රියාත්මකයි"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ක්රියාවිරහිතයි"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"අභිරුචි දීප්ති මට්ටම ඉතා පහළ වැඩියි"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"අභිරුචි දීප්ති මට්ටම අඩුයි"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN එක වෙනස් කළ නොහැක.\nවැරදි PIN එකක් විය හැක."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN සාර්ථකව වෙනස් කෙරුණි."</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM කාඩ් පතෙහි අඟුළු තත්වය වෙනස් කළ නොහැකි විය.\nබොහෝදුරට වැරදි PIN එකක් විය හැකිය."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN අබල කිරීමට නොහැකිය."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN සබල කිරීමට නොහැකිය."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"හරි"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"අවලංගු කරන්න"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"SIM කිහිපයක් සොයාගන්නා ලදි."</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"මෙයට <xliff:g id="NAME_0">^1</xliff:g> හැඩ ගැන්වීම අවශ්යයි. \n\n"<b>"හැඩ ගැන්වීම දැනට <xliff:g id="NAME_1">^1</xliff:g> හි ගබඩා කර ඇති සියලු දත්ත මකයි."</b>" දත්ත අහිමි වීම වැළැක්වීමට, එය උපස්ථ කිරීමට සලකා බලන්න."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"මැකීම සහ ෆෝමැට්"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ෆෝමැට් කරමින්…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g> හැඩගන්වන අතරතුර ඉවත් නොකරන්න."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g> හැඩගන්වන අතරතුර ඉවත් නොකරන්න."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"නව ආචයනය වෙත දත්ත ගෙන යන්න"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"ඔබට මෙම අලුත් <xliff:g id="NAME">^1</xliff:g> වෙත ඔබේ ඡායාරූප, ගොනු, සහ ඇතැම් යෙදුම් ගෙන යාමට හැකිය. \n\nගෙන යාමට <xliff:g id="TIME">^2</xliff:g> ක් පමණ ගන්නා අතර අභ්යන්තර ගබඩාවෙන් <xliff:g id="SIZE">^3</xliff:g> ක් නිදහස් කරනු ඇත. ගෙන යාම සිදු වන අතරතුර සමහර යෙදුම් ක්රියා නොකළ හැකිය."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"දැන් ගෙන යන්න"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ස්ථාපනය කර ඇත"</string>
<string name="no_applications" msgid="7336588977497084921">"යෙදුම් නොමැත."</string>
<string name="internal_storage" msgid="1584700623164275282">"අභ්යන්තර ආචයනය"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"අභ්යන්තර ගබඩාව"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB ආචයනය"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD කාඩ් ආචයනය"</string>
<string name="recompute_size" msgid="7722567982831691718">"විශාලත්වය නැවත ගණනය කරමින්…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"යෙදුම් දත්ත මකන්නද?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"මෙම යෙදුමේ සියලු දත්ත ස්ථිරව මකා දමනු ඇත. මෙයට සියලු ගොනු, සැකසීම්, ගිණුම්, දත්ත සමූහ සහ තවත් අඩංගුය."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"මෙම යෙදුම ස්ථාපනය කළ යෙදුම් ලැයිස්තුවෙහි සොයා නොගත්තේය."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"යෙදුම සඳහා ගබඩාව හිස් කළ නොහැකිය."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"මෙම යෙදුමට ඔබගේ ටැබ්ලටයේ පහත දේවල් ප්රවේශ කළ හැක:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"මෙම යෙදුමට ඔබගේ දුරකථනයේ පහත දේවල් ප්රවේශ කළ හැක:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"මෙම යෙදුමට ඔබගේ ටැබ්ලටයේ පහත දේ ප්රවේශ කළ හැක. ක්රියාකාරිත්වය වැඩි කිරීම සහ මතක භාවිතය අඩුකිරීම පිණිස, මෙම අවසර වලින් සමහර ඒවා <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> වෙත ලබාගත හැක මක් නිසාද යත් එය <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> හි ක්රියාවලිම ධාවනය කෙරේ:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"මෙම යෙදුමට ඔබගේ දුරකථනයේ පහත දේ ප්රවේශ කළ හැක. ක්රියාකාරිත්වය වැඩි කිරීම සහ මතක භාවිතය අඩුකිරීම පිණිස, මෙම අවසර වලින් සමහර ඒවා <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> වෙත ලබාගත හැක මක් නිසාද යත් එය <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> හි ක්රියාවලිම ධාවනය කෙරේ:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> සහ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"මෙම යෙදුම ඔබගෙන් මුදල් අය කර හැක:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"පාරිතෝෂික SMS යවන්න"</string>
<string name="computing_size" msgid="1599186977475211186">"ගණනය කරමින්…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"පැකේජ විශාලත්වය ගණනය කිරීමට නොහැකි විය."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"ඔබ ළඟ ස්ථාපනය කළ තුන්වන-පාර්ශව යෙදුම් කිසිවක් ස්ථාපනය කර නොමැත."</string>
<string name="version_text" msgid="9189073826278676425">"<xliff:g id="VERSION_NUM">%1$s</xliff:g> අනුවාදය"</string>
<string name="move_app" msgid="5042838441401731346">"මාරු කරන්න"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ටැබ්ලටයට මාරු කරන්න"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"දුරකතනයට මාරු කරන්න"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB ආචයනයට ගෙන යන්න"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD කාඩ් පතට මාරු කරන්න"</string>
- <string name="moving" msgid="6431016143218876491">"චලනය වෙමින්"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"තවත් සංක්රමණයක් දැනටමත් සිදු කරමින් පවතී."</string>
<string name="insufficient_storage" msgid="481763122991093080">"අවශ්යතරම් ආචයන ඉඩ නොමැත."</string>
<string name="does_not_exist" msgid="1501243985586067053">"යෙදුම නොපවතී."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"බාහිර මාධ්යවල උපාංග පරිපාලක ස්ථාපනය කළ නොහැකිය."</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"බලෙන් නවත්වන්නද?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"ඔබ යෙදුමක් බලෙන් නැවත වුවහොත්, එය වැරදි ලෙස ක්රියා කරනු ඇත."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"යෙදුම ගෙන යාමට නොහැක. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"ස්ථාපනය කිරීමට ප්රියකරන ස්ථානය"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"නව යෙදුම් සඳහා කැමති ස්ථාපන ස්ථානය වෙනස් කරන්න"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"තිළැලි යෙදුම අබල කරන්නද?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"යෙදුම අබල කරන්න"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"ඔබ මෙම යෙදුම අබල කළහොත්, Android සහ වෙනත් යෙදුම් බලාපොරොත්තු වන පරිදි ක්රියා නොකරනු ඇත."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"දත්ත මකා යෙදුම අබල කරන්නද?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"ඔබ මෙම යෙදුම අබල කළහොත්, සමහර යෙදුම් බලාපොරොත්තු වන පරිදි ක්රියා නොකරනු ඇත. තවද ඔබගේ දත්ත මැකෙනු ඇත."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"දැනුම්දීම් අක්රිය කරන්නද?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ඔබ මෙම යෙදුම සඳහා දැනුම්දීම් වසා දැමුවහොත්, ඔබට වැදගත් ඇඟවීම් සහ යාවත්කාල කිරීම් මහහැරී යනු ඇත."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"යෙදුම් විස්තර"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> වෙතින් ස්ථාපනය කළ යෙදුම"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"සේවාව භාවිත කරන්න"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"වර්ණ නිවැරදි කිරීම භාවිත කරන්න"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"සිරස්තල භාවිත කරන්න"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"ඉදිරියට යන්න"</string>
<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="6371077608778830020">"ශ්රවණාධාරකය එක් කරන්න"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"ඔබ යෙදුමක පසුබිම් ක්රියාකාරිත්වය සීමා කළහොත්, එය වැරදි ලෙස ක්රියා කරනු ඇත"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"මෙම යෙදුම බැටරිය ප්රශස්ත කිරීමට සකසා නැති නිසා, ඔබට එය සීමා කළ නොහැකිය. \n\nයෙදුම සීමා කිරීම සඳහා, පළමුව බැටරි ප්රශස්තකරණය ක්රියාත්මක කරන්න."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"පූර්ණ ආරෝපණයෙන් පසුව තිර භාවිතය"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"තිර පරිභෝජනය"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"ජංගම ජාල පරිලෝකනය කරමින්"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"සම්පූර්ණ ආරෝපණයෙහි සිට බැටරිය භාවිතය"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"පූර්ණ ආරෝපණය සිට තිරය සක්රියව තිබූ වේලාව"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"පූර්ණ ආරෝපණයෙන් පසුව උපාංග භාවිතය"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"විස්තර භාවිත කරන්න"</string>
<string name="controls_subtitle" msgid="390468421138288702">"බල භාවිතය සීරුමාරු කරන්න"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"ඇතුළත් පැකේජ"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"යෙදුම් බැටරිය බැසීමට හේතු වේ"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"උපාංගය අවදියෙන් තබා ගනිමින්"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"පසුබිමින් උපාංගය අවදි කරමින්"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"නිතර ස්ථානය ඉල්ලා සිටිමින්"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"යෙදුම් <xliff:g id="NUMBER">%1$d</xliff:g>ක් වැරදි ලෙස හැසිරෙමින්"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"යෙදුම් සාමාන්ය පරිදි ධාවනය වේ"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"දුරකථනයට දර්ශීය පසුබිම් බැටරි භාවිතයක් ඇත"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ටැබ්ලට් උපාංගයට දර්ශීය පසුබිම් බැටරි භාවිතයක් ඇත"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">යෙදුම් %1$dක් සඳහා බැටරි භාවිතය සීමා කරමින්</item>
<item quantity="other">යෙදුම් %1$dක් සඳහා බැටරි භාවිතය සීමා කරමින්</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"සීමා කළ <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"මෙම යෙදුම් පසුබිමින් බැටරිය භාවිත කර ඇත. සීමා කළ යෙදුම් නිසියාකාරව ක්රියා නොකළ හැකි අතර දැනුම්දීම් ප්රමාද විය හැකිය."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"බැටරි කළමනාකරු භාවිත කරන්න"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"යෙදුම් බැටරිය අඩු කරන විට හඳුනා ගන්න"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"අවලංගු කරන්න"</string>
<string name="tts_reset" msgid="2661752909256313270">"යළි පිහිටුවන්න"</string>
<string name="tts_play" msgid="2628469503798633884">"ධාවනය කරන්න"</string>
- <string name="gadget_title" msgid="5519037532720577836">"බල පාලනය"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi සැකසීම් යාවත්කාලින වෙමින්"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"බ්ලූටූත් සැකසීම් යාවත්කාලීන කරමින්"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ක්රියාත්මකයි"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"අක්රියයි"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ආරම්භ කරමින්"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"අක්රිය කරමින්"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"බ්ලූටූත්"</string>
- <string name="gadget_location" msgid="2974757497945178165">"ස්ථානය"</string>
- <string name="gadget_sync" msgid="858895763714222152">"සමමුහුර්ත කරන්න"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"දීප්තිය <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ස්වයංක්රීය"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"පූර්ණ"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"බාගයයි"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"අක්රියයි"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"අක්තපත්ර ආචයනය"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ආචයනයේ සිට ස්ථාපනය කරන්න"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> ගෙන් <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"සියල්ල තෝරන්න"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"දත්ත භාවිතය"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"යෙදුම් දත්ත භාවිතය"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"ජංගම දත්ත සහ Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"ඔබගේ උපාංගයේ වාහක දත්ත ගිණුම් ගත කිරීම ඇතැම් විට වැර දේ."</string>
<string name="data_usage_app" msgid="4970478397515423303">"යෙදුම් භාවිතය"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"යෙදුම් තොරතුරු"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">සඟවන ලද අයිතම %dක් පෙන්වන්න</item>
<item quantity="other">සඟවන ලද අයිතම %dක් පෙන්වන්න</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"හකුළන්න"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"ජාලය සහ අන්තර්ජාලය"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"ජංගම"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"දත්ත භාවිතය"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"බ්ලූටූත්"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"යෙදුම් සහ දැනුම්දීම්"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"අවසර, පෙරනිමි යෙදුම්"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"කාර්යාල පැතිකඩ තුළ යෙදුම් සඳහා දැනුම්දීම් ප්රවේශය ලබා ගත නොහැකිය"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"ගිණුම්"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"ගිණුම් එක් නොකරන ලදී"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"පෙරනිමි යෙදුම්"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"භාෂා, වේලාව, උපස්ථය, යාවත්කාලීන"</string>
<string name="search_results_title" msgid="1796252422574886932">"සැකසීම්"</string>
- <string name="search_menu" msgid="6283419262313758339">"සැකසීම් සොයන්න"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, ජාල සම්බන්ධය, අන්තර්ජාලය, රැහැන් රහිත, දත්ත, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, ටොගල කිරීම, පාලනය"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"පෙළ පණිවිඩය, පණිවිඩකරණය, පණිවිඩ, පණිවිඩ යැවීම, පෙරනිමි"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ගෙවීම, තට්ටු කිරීම, ගෙවීම්"</string>
<string name="keywords_backup" msgid="470070289135403022">"උපස්ථ, උපස්ථ"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ඉංගිතය"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"මුහුණ, අගුලු හැරීම, සත්යාපනය, පිරීම"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl version, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"ජාලය, ජංගම ජාල තත්ත්වය, සේවා තත්ත්වය, සංඥා ප්රබලතාව, ජංගම ජාල වර්ගය, රෝමිං, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"අනුක්රමික අංකය, දෘඪාංග අනුවාදය"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"අඳුරු තේමාව"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"දෝෂය"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"පරිසර දර්ශකය, අගුලු තිර දර්ශකය"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"අගුළු තිර දැනුම්දීම"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"මුහුණ"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ඇඟිලි සලකුණ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"අඳුරු තිරය, ස්පර්ශ තිරය, බැටරිය, ස්මාර්ට් දීප්තිය, ගතික දීප්තිය"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"මෙම උපාංගය ආරම්භ කිරීමට ඔබගේ PIN එක ඔබ ඇතුළු කරන විට, ප්රවේශතා සේවාව වැනි <xliff:g id="SERVICE">%1$s</xliff:g> තවම තිබිය නොහැක."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"මෙම උපාංගය ආරම්භ කිරීමට ඔබගේ රටාව ඔබ ඇතුළු කරන විට, ප්රවේශතා සේවාව වැනි <xliff:g id="SERVICE">%1$s</xliff:g> තවම තිබිය නොහැක."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"මෙම උපාංගය ආරම්භ කිරීමට ඔබගේ මුරපදය ඔබ ඇතුළු කරන විට, ප්රවේශතා සේවාව වැනි <xliff:g id="SERVICE">%1$s</xliff:g> තවම තිබිය නොහැක."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"සටහන: නැවත පණ ගැන්වීමකට පසුව, ඔබ ඔබේ දුරකථනය අගුලු හරින තෙක් මෙම යෙදුම ආරම්භ කළ නොහැකිය"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"සටහන: ඔබ ඔබගේ දුරකථනය යළි අරඹා තිර අගුලක් සකසා තිබේ නම්, ඔබ ඔබගේ දුරකථනය අගුලු හරින තෙක් මෙම යෙදුම ආරම්භ කළ නොහැකිය"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI තොරතුරු"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI සාපේක්ෂ තොරතුරු"</string>
<string name="slot_number" msgid="3762676044904653577">"(විවර<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"පුද්ගලික"</string>
<string name="filter_work_apps" msgid="24519936790795574">"කාර්යාලය"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"යෙදුම්: සියල්ල"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"යෙදුම්: අක්රිය කර ඇත"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ක්රියාවිරහිතයි"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ප්රවර්ග: හදිසි වැදගත්කම"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"ප්රවර්ග: අඩු වැදගත්කම"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ප්රවර්ග: අක්රිය කර ඇත"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"භාවිත ඇඟවීම්"</string>
<string name="show_all_apps" msgid="1512506948197818534">"පූර්ණ උපාංග භාවිතය පෙන්වන්න"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"යෙදුම් භාවිතය පෙන්වන්න"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"ඉහළ භාවිතය"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one">යෙදුම් <xliff:g id="NUMBER">%2$d</xliff:g>ක් අසාමාන්ය ලෙස හැසිරෙමින් ඇත</item>
<item quantity="other">යෙදුම් <xliff:g id="NUMBER">%2$d</xliff:g>ක් අසාමාන්ය ලෙස හැසිරෙමින් ඇත</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"අභ්යන්තර ආචයනය: <xliff:g id="PERCENTAGE">%1$s</xliff:g> භාවිතා කර ඇත - <xliff:g id="FREE_SPACE">%2$s</xliff:g> හිස්ය"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>ක අක්රිය කාලයකට පසුව නිදන්න"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"වෝල්පේපරය, නින්ද, ෆොන්ට තරම"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"මිනිත්තු 10ක අක්රිය කාලයකට පසුව නිදන්න"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> මතකයෙන් සාමාන්යයෙන් <xliff:g id="USED_MEMORY">%1$s</xliff:g>ක් භාවිත කෙරේ"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> ලෙස පුරන ලදී"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS සඳහා ඉඩ නොදේ"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"කැමරාවට ඉඩ නොදේ"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"තිර රුවට ඉඩ නොදේ"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"උපස්ථ ක්රියාවිරහිත කළ නොහැකිය"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"මෙම යෙදුම විවෘත කළ නොහැකිය"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"ඔබට ප්රශ්න තිබේ නම්, ඔබේ IT පරිපාලක අමතන්න."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"වැඩි විස්තර"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"කටවුට් එකක් සමගින් සංදර්ශකයක් අනුකරණය කරන්න"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"සංදර්ශක කට්අවුට්"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"සංදර්ශක කටවුට්, නොච්"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"කිසිවක් නැත"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"උපාංගයේ පෙරනිමිය"</string>
<string name="special_access" msgid="3458780842491881155">"විශේෂ යෙදුම් ප්රවේශය"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one">යෙදුම් <xliff:g id="COUNT">%d</xliff:g>කට සීමා නොකළ දත්ත භාවිතා කළ හැක</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> වෙත සම්බන්ධිතයි"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"උපාංග කිහිපයකට සම්බන්ධිතයි"</string>
<string name="demo_mode" msgid="2798762752209330277">"පද්ධති UI ආදර්ශන ප්රකාරය"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"රාත්රී ප්රකාරය"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"රාත්රි ප්රකාරය සකසන්න"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"අඳුරු ප්රකාරය"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"අඳුරු ප්රකාරය සකසන්න"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ඉක්මන් සැකසීම් සංවර්ධක ටයිල්"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope හෝඩුවාව"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"කාර්යාල පැතිකඩ සැකසීම්"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"සම්බන්ධතා සෙවීම"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"අමතන්නන් හා සම්බන්ධතා හඳුනා ගැනීම සඳහා ඔබේ ආයතනයෙන් සම්බන්ධතා සෙවීම් ඉඩ දෙන්න"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"දුරකථනය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ටැබ්ලට් පරිගණකය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"උපාංගය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ තිරය දෙවරක් තට්ටු කරන්න."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"වේලාව, දැනුම්දීම් සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ තිරය දෙවරක් තට්ටු කරන්න."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"දුරකථනය පරීක්ෂාවට ඔසවන්න"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ටැබ්ලට් පරිගණකය පරීක්ෂා කිරීමට ඔසවන්න"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"උපාංගය පරීක්ෂා කිරීමට ඔසවන්න"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ දුරකථනය අතට ගන්න."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ ටැබ්ලට් පරිගණකය අතට ගන්න."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"වේලාව, දැනුම්දීම් නිරූපක, සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ උපාංගය අතට ගන්න."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"සංදර්ශකය අවදි කරන්න"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"වේලාව, දැනුම්දීම් සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ දුරකථනය ඔසවන්න."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"වේලාව, දැනුම්දීම් සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ ටැබ්ලටය ඔසවන්න."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"වේලාව, දැනුම්දීම් සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ උපාංගය ඔසවන්න."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"අගුලු තිරය අවදි කිරීමේ අභිනය"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"දැනුම්දීම් සඳහා ඇඟිලි සලකුණ ස්වයිප් කරන්න"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"ඇඟිලි සලකුණ ස්වයිප් කරන්න"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ඔබේ දැනුම්දීම් පරීක්ෂා කිරීමට, ඔබේ දුරකථනයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one">උත්සහ <xliff:g id="COUNT_1">%d</xliff:g>ක්</item>
<item quantity="other">උත්සහ <xliff:g id="COUNT_1">%d</xliff:g>ක්</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"මෙම උපාංගයේ දත්ත උපස්ථ කරමින් ඇත"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"මෙම උපාංගය ඔබගේ සංවිධානය විසින් කළමනාකරණය කරනු ලැබේ."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"මෙම උපාංගය <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> මගින් කළමනාකරණය කෙරේ"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"ස්වයං පිරවුම් සේවාව"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ස්වයං, පිරවුම, ස්වයං පිරවුම"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ඔබ මෙම යෙදුම විශ්වාස කරන බව සහතික කර ගන්න</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ස්වයං පිරවිය හැකි දේවල් නිර්ණය කිරීමට ඔබේ තිරයෙහි ඇති දේවල් භාවිත කරයි."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"ස්වයං පිරවුම"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"ඇතුළු වීමේ මට්ටම"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"සැසියකට උපරිම ඉල්ලීම්"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"උපරිම දෘශ්යමාන දත්ත කට්ටල"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"පෙරනිමි අගයන්ට යළි සකසන්න"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"ස්වයං පිරවුම් සංවර්ධක විකල්ප යළි සකසා ඇත"</string>
<string name="device_theme" msgid="4571803018917608588">"උපාංග තේමාව"</string>
<string name="default_theme" msgid="7085644992078579076">"පෙරනිමි"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"ජාල නම"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"උත්ප්රේරක වාහක ප්රතිපාදන"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"බාධා නොකරන්න යාවත්කාලීන කරන්න"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"අවධානය යොමු කිරීම සඳහා දැනුම්දීම් විරාම කරන්න"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"අලුත් සහ උද්යෝගිමත් දේවල් මොනවාද?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ඔබගේ නව දුරකථනය ගැන දැන ගන්න"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ඔබගේ නව ටැබ්ලට් පරිගණකය ගැන දැන ගන්න"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ඔබගේ නව උපාංගය ගැන දැන ගන්න"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"මෙම අංගය මෙම උපාංගයේ ලබා ගත නොහැක"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"සම්පූර්ණ GNSS මිනුම් බලාත්මක කරන්න"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"කාර්ය චක්රය රහිත සියලු GNSS සබැඳි තාරකා ගෝල සහ සංඛ්යාත"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"බිඳ වැටීම් සංවාදය සැම විට පෙන්වන්න"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"යෙදුමක් බිඳ වැටෙන සෑම විටම සංවාදය පෙන්වන්න"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE සබල යෙදුමක් තෝරන්න"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE සබල යෙදුමක් සකසා නැත"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE සබල යෙදුම: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"නාමාවලි ප්රවේශය"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"නාමාවලි ප්රවේශය"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"ජාල විස්තර"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"ඔබගේ උපාංගයේ නම ඔබගේ දුරකථනයේ යෙදුම්වලට දෘශ්යමානය. ඔබ බ්ලූටූත්වලට සම්බන්ධ වූ විට හෝ Wi-Fi හොට්ස්පොට් එකක් පිහිට වූ විට වෙනත් පුද්ගලයන්ද එය දැකිය හැකිය."</string>
<string name="devices_title" msgid="7701726109334110391">"උපාංග"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"සියලු සැකසීම්"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"යෝජනා"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS දත්ත"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS දත්ත"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"ජාලය තෝරන්න"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"විසන්ධි විය"</string>
+ <string name="network_connected" msgid="4943925032253989621">"සම්බන්ධයි"</string>
+ <string name="network_connecting" msgid="76404590784733557">"සබැඳෙමින්…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"සම්බන්ධ වීමට නොහැකි විය"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ජාලයක් හමු නොවීය."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ජාල සොයා ගත නොහැකි විය. නැවත උත්සාහ කරන්න."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(තහනම්)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM කාඩ්පතක් නැත"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"උසස් ඇමතුම"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"ප්රිය ජාල ආකාරය: WCDMA කැමතියි"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"ප්රිය ජාල ආකාරය: GSM පමණි"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"ප්රිය ජාල ආකාරය: WCDMA පමණි"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"ප්රියකරන ජාල ආකාරය: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"ප්රිය ජාල ආකාරය: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"ප්රිය ජාල ආකාරය: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"ප්රිය ජාල ආකාරය: CDMA පමණි"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"ප්රියකරන ජාල ආකාරය: EvDo පමණි"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"ප්රිය ජාල ආකාරය: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"ප්රිය ජාල ආකාරය: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"ප්රිය ජාල ආකාරය: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"ප්රිය ජාල ආකාරය: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"ප්රිය ජාල ආකාරය: ගෝලීය"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"ප්රිය ජාල ආකාරය: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"කැමති ජාල ආකාරය: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"ප්රිය ජාල ආකාරය: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"මනාප ජාල ප්රකාරය: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"වඩා කැමති ජාල ප්රකාරය: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"වඩා කැමති ජාල ප්රකාරය: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"වඩා කැමති ජාල ප්රකාරය: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"වඩා කැමති ජාල ප්රකාරය: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"වඩා කැමති ජාල ප්රකාරය: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"වඩා කැමති ජාල ප්රකාරය: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"වඩා කැමති ජාල ප්රකාරය: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"වඩා කැමති ජාල ප්රකාරය: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"වඩා කැමති ජාල ප්රකාරය: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (නිර්දෙශිත)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (නිර්දෙශිත)"</string>
+ <string name="network_global" msgid="959947774831178632">"ගෝලීය"</string>
+ <string name="label_available" msgid="1731547832803057893">"තිබෙන ජාල"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"සොයමින්…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> මත ලියාපදිංචි වෙමින්…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"ඔබගේ SIM කාඩ් පත මෙම ජාලය වෙත සම්බන්ධ වීමට අවසර නොදේ."</string>
+ <string name="connect_later" msgid="978991102125216741">"මෙම අවස්ථාවේදී මෙම ජාලයට සම්බන්ධ විය නොහැක. පසුව යළි උත්සාහ කරන්න."</string>
+ <string name="registration_done" msgid="4573820010512184521">"ජාලය මත ලියාපදිංචි වෙමින්."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"ස්වයංක්රියව ජාලය තෝරන්න"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"වාහකයේ සැකසීම්"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"දත්ත සේවාව සකසන්න"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"ජංගම දත්ත"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"ජංගම ජාලය භාවිතයෙන් දත්ත වෙත ප්රවේශ වන්න"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"ප්රියකරන ජාල වර්ගය"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"ජාල මෙහෙයුම් ආකාරය වෙනස් කරන්න"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"ප්රියකරන ජාල වර්ගය"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"වාහකය"</string>
+ <string name="call_category" msgid="8108654745239563833">"අමතමින්"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"වාහක වීඩියෝ ඇමතීම"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"පද්ධතිය තේරුම"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA රෝමින් ආකාරය වෙනස් කරන්න"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"පද්ධතිය තේරුම"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"ජාලය"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"ජාලය"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA දායකත්වය"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM සහ NV අතර වෙනස් කරන්න"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"දායකත්වය"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ස්වයංක්රීය ලියාපදිංචිය…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"දත්ත රෝමින් සඳහා අවසර දෙන්න ද"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"මිල ගණන් සඳහා ඔබගේ ජාල සැපයුම්කරු සමඟ පරීක්ෂා කරන්න."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"යෙදුම් දත්ත භාවිතය"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"වලංගු නොවන ජාල ප්රකාරය <xliff:g id="NETWORKMODEID">%1$d</xliff:g> . නොසලකා හරින්න."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> වෙත සම්බන්ධ වූ විට නොමැත"</string>
+ <string name="see_more" msgid="5953815986207345223">"තව බලන්න"</string>
+ <string name="see_less" msgid="1250265310929558370">"අඩුවෙන් බලන්න"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 727d228..b6da27a 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Považovať za sieť s meraním dát"</item>
<item msgid="2266114985518865625">"Považovať za sieť bez merania dát"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Predvolené (použiť náhodnú adresu MAC)"</item>
+ <item msgid="5398461510512959597">"Dôveryhodné"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nie"</item>
<item msgid="3863157480502955888">"Áno"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Vždy zapnuté"</item>
<item msgid="6385301106124765323">"Vždy vypnuté"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Vypnuté"</item>
+ <item msgid="2182686878828390312">"Ladenie"</item>
+ <item msgid="5286514712714822064">"Podrobné informácie"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Iba plocha"</item>
+ <item msgid="5034813753274486448">"Automatický"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA – preferované"</item>
+ <item msgid="807926878589867564">"Iba GSM"</item>
+ <item msgid="488474605709912156">"Iba WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA – automaticky"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo – automaticky"</item>
+ <item msgid="370391313511477301">"CDMA bez EvDo"</item>
+ <item msgid="4678789463133969294">"Iba EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globálne"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Iba TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globálne"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f91df5d..75b9e5a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Vytvoriť"</string>
<string name="allow" msgid="3349662621170855910">"Povoliť"</string>
<string name="deny" msgid="6947806159746484865">"Odmietnuť"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Zavrieť"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Prepnúť"</string>
<string name="device_info_default" msgid="7847265875578739287">"Neznáme"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="few">Ešte <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> krok a bude z vás vývojár.</item>
@@ -34,10 +32,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Nie je to potrebné, už ste vývojár."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Najprv povoľte možnosti pre vývojárov"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Bezdrôtové pripojenia a siete"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Pripojenia"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Zariadenie"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Osobné"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Prístup"</string>
<string name="header_category_system" msgid="2816866961183068977">"Systém"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Povoliť dátové pripojenie"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Zakázať dátové pripojenie"</string>
@@ -123,7 +117,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresa Bluetooth zariadenia: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odpojiť zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Vysielanie"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Nepomenované zariadenie s rozhraním Bluetooth"</string>
<string name="progress_scanning" msgid="192587958424295789">"Vyhľadávanie"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"V okolí nie sú žiadne zariadenia Bluetooth."</string>
@@ -155,7 +148,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Aplikácia chce zapnúť Bluetooth a prepnúť telefón do režimu, v ktorom bude viditeľný pre ostatné zariadenia. Môžete to neskôr zmeniť v nastaveniach Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth sa zapína…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth sa vypína…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automaticky pripojiť"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Žiadosť o pripojenie zariadenia Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"K zariadeniu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sa pripojíte klepnutím."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Chcete sa pripojiť k zariadeniu „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
@@ -183,12 +175,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Dostupné telefonické zariadenia"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Aktuálne pripojené"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Uložené zariadenia"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Pridať zariadenie"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Zapne sa Bluetooth s cieľom párovania"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Predvoľby pripojenia"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Predtým pripojené zariadenia"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Predtým pripojené zariadenia"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Rozhranie Bluetooth je zapnuté"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Zobraziť všetky"</string>
<string name="date_and_time" msgid="9062980487860757694">"Dátum a čas"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Zvoľte časové pásmo"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -271,7 +263,6 @@
<string name="skip_label" msgid="47510779345218297">"Preskočiť"</string>
<string name="next_label" msgid="4693520878012668114">"Ďalej"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Jazyky"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Predvoľby jazyka"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Odstrániť"</string>
<string name="add_a_language" msgid="2330538812283783022">"Pridať jazyk"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -307,7 +298,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Nastavenia"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Odkaz na nastavenia"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Režim v lietadle"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Ďalšie"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrôtové pripojenia a siete"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Spravovať Wi‑Fi, Bluetooth, režim v lietadle, mobilné siete a siete VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobilné dáta"</string>
@@ -392,6 +382,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Ochrana súkromia"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Zakázané správcom"</string>
<string name="security_status_title" msgid="5848766673665944640">"Stav zabezpečenia"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Zámka obrazovky, odomknutie tvárou"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Zámka obrazovky, odtlačok prsta"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zámka obrazovky"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Tvár bola pridaná"</string>
@@ -401,11 +392,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Odomykanie pomocou tváre"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Overenie totožnosti pomocou tváre"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Používajte tvár na odomykanie telefónu, schvaľovanie nákupov a prihlasovanie sa do aplikácií."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Použite seba"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Odomykajte telefón a schvaľujte nákupy tvárou.\n\nUpozornenie: Toto zariadenie nemôžete odomykať tvárou. Ďalšie informácie vám poskytne správca organizácie."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Používajte tvár na odomykanie telefónu, schvaľovanie nákupov a prihlasovanie sa do aplikácií"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Maximálny počet odtlačkov, ktoré je možné pridať: <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Umiestnite svoju tvár do kruhu"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Neskôr"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Maximálny počet tvárí, ktoré je možné pridať: <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Pridali ste maximálny počet tvárí"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Nie je možné pridať ďalšie tváre"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registrácia nebola dokončená"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Časový limit registrácie tváre vypršal. Skúste to znova."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Registrácia tváre nefungovala."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Všetko sa podarilo nastaviť."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Hotovo"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Použitie tváre"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Odomknite zariadenie"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Prihlasovanie a platby v aplikáciách"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Odomknutie otvorenými očami"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Keď použijete overenie totožnosti tvárou, musíte mať otvorené oči"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Odstrániť tvár"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Upresnenie údajov o tvári"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Pomocou tváre môžete odomykať zariadenie a používať aplikácie. "<annotation id="url">"Ďalšie informácie"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Odtlačok prsta"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Správa odtlačkov"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Použiť odtlačok na"</string>
@@ -914,6 +921,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Vyberte aspoň jedno pásmo pre hotspot Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavenia adresy IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Ochrana súkromia"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Vyberte"</string>
@@ -953,7 +961,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Zrušiť"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Odstrániť sieť?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Všetky heslá pre túto sieť budú odstránené"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Uložené siete"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="few">%d siete</item>
<item quantity="many">%d siete</item>
@@ -1030,8 +1037,8 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Predvoľby roamingu"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"Uprednostniť Wi‑Fi"</item>
- <item msgid="1335127656328817518">"Preferujem mobilné dáta"</item>
+ <item msgid="2124257075906188844">"Preferovať Wi‑Fi"</item>
+ <item msgid="1335127656328817518">"Preferovať mobilné spojenie"</item>
<item msgid="3132912693346866895">"Len Wi‑Fi"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
@@ -1045,8 +1052,8 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"Uprednostniť Wi‑Fi"</item>
- <item msgid="5074515506087318555">"Preferujem mobilné dáta"</item>
+ <item msgid="5782108782860004851">"Preferovať Wi‑Fi"</item>
+ <item msgid="5074515506087318555">"Preferovať mobilné spojenie"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi‑Fi"</item>
@@ -1134,8 +1141,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Jas"</string>
<string name="brightness_summary" msgid="838917350127550703">"Nastavenia jasu obrazovky"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Prispôsobovať jas"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Zapnuté"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Vypnutý"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Preferovaný jas je veľmi nízky"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Preferovaný jas je nízky"</string>
@@ -1231,6 +1237,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Kód PIN nie je možné zmeniť.\nKód PIN je zrejme nesprávny."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Kód PIN SIM karty bol zmenený."</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Stav zámku SIM karty nie je možné zmeniť.\nZrejme ste zadali nesprávny kód PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Kód PIN sa nedá deaktivovať."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Kód PIN sa nedá aktivovať."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Zrušiť"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Našlo sa viacero SIM kariet"</string>
@@ -1406,7 +1414,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Táto akcia vyžaduje, aby úložisko <xliff:g id="NAME_0">^1</xliff:g> bolo naformátované. \n\n"<b>"Formátovaním vymažete všetky dáta v úložisku <xliff:g id="NAME_1">^1</xliff:g>."</b>" Ak chcete zabrániť strate dát, odporúčame ich zálohovať."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Vymazať a formátovať"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formátuje sa úložisko <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Počas formátovania úložisko <xliff:g id="NAME">^1</xliff:g> neodoberajte."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Počas formátovania úložisko <xliff:g id="NAME">^1</xliff:g> neodoberajte."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Presuňte údaje do nov. úložiska"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Do tohto nového úložiska <xliff:g id="NAME">^1</xliff:g> môžete presunúť fotky, súbory a niektoré aplikácie. \n\nDoba presunu bude zhruba <xliff:g id="TIME">^2</xliff:g> a v internom úložisku sa tak uvoľní <xliff:g id="SIZE">^3</xliff:g>. Počas presunu nebudú niektoré aplikácie fungovať."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Presunúť"</string>
@@ -1790,9 +1798,6 @@
<string name="installed" msgid="3070865169422600098">"Nainštalované"</string>
<string name="no_applications" msgid="7336588977497084921">"Žiadne aplikácie."</string>
<string name="internal_storage" msgid="1584700623164275282">"Interný ukl. priestor"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"interné úložisko"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Ukladací priestor USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Ukl. priestor SD karty"</string>
<string name="recompute_size" msgid="7722567982831691718">"Prebieha prepočítanie veľkosti..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Odstrániť dáta aplikácie?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Všetky dáta tejto aplikácie vrátane súborov, nastavení, účtov, databáz atď. budú navždy odstránené."</string>
@@ -1801,24 +1806,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikáciu sa nepodarilo nájsť v zozname nainštalovaných aplikácií."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Nepodarilo sa vymazať úložisko aplikácie"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Táto aplikácia môže pristupovať k nasledujúcim funkciám tabletu:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Táto aplikácia môže pristupovať k nasledujúcim funkciám telefónu:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Táto aplikácia môže pristupovať k nasledujúcim aplikáciám v tablete. Niektoré z týchto povolení sú s cieľom zlepšenia výkonu a zníženia využívania pamäte k dispozícii aj pre aplikáciu <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, ktorá sa spúšťa v rámci rovnakého procesu ako aplikácia <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Táto aplikácia môže pristupovať k nasledujúcim aplikáciám v telefóne. Niektoré z týchto povolení sú s cieľom zlepšenia výkonu a zníženia využívania pamäte k dispozícii aj pre aplikáciu <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, ktorá sa spúšťa v rámci rovnakého procesu ako aplikácia <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> a <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Táto aplikácia vám môže účtovať poplatky:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Odoslať prémiovú správu SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Prebieha výpočet…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Nepodarilo sa vypočítať veľkosť balíčka."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Nie sú nainštalované žiadne aplikácie tretích strán."</string>
<string name="version_text" msgid="9189073826278676425">"verzia <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Presunúť"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Presunúť do tabletu"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Presunúť do telefónu"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Presun. do ukl. priestoru USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Presunúť na SD kartu"</string>
- <string name="moving" msgid="6431016143218876491">"Presúvanie"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Už prebieha iná migrácia."</string>
<string name="insufficient_storage" msgid="481763122991093080">"V úložisku nie je dostatok miesta."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplikácia neexistuje."</string>
@@ -1828,17 +1825,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Aplikáciu na správu zariadenia nie je možné inštalovať na externé médiá"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Vynútiť zastavenie?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ak vynútite zastavenie aplikácie, môže sa správať zvláštne."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Aplikáciu sa nepodarilo presunúť. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Preferované umiestnenie pre inštaláciu"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Zmena preferovaného umiestnenia pre inštaláciu nových aplikácií"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Chcete deaktivovať vstavanú aplikáciu?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Deaktivovať aplikáciu"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ak aplikáciu deaktivujete, systém a ďalšie aplikácie už nemusia fungovať podľa očakávaní."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Chcete odstrániť dáta a deaktivovať aplikáciu?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ak aplikáciu deaktivujete, systém a ďalšie aplikácie už nemusia fungovať podľa očakávaní. Taktiež sa odstránia vaše dáta."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vypnúť upozornenia?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ak v tejto aplikácii vypnete upozornenia, môžete prísť o dôležité upozornenia a aktuálne informácie."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Obchod"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Podrobnosti o aplikácii"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplikácia bola nainštalovaná z obchodu <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2031,6 +2024,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Používať funkciu"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Používať úpravu farieb"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Používať titulky"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Ďalej"</string>
<string name="accessibility_hearingaid_title" msgid="8312145423610648518">"Načúvacie pomôcky"</string>
<string name="accessibility_hearingaid_not_connected_summary" msgid="6240237523789614599">"Nie sú pripojené žiadne načúvacie pomôcky"</string>
<string name="accessibility_hearingaid_adding_summary" msgid="6371077608778830020">"Pridať načúvaciu pomôcku"</string>
@@ -2190,8 +2184,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ak obmedzíte aktivitu aplikácie na pozadí, nemusí fungovať správne"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Aplikácia nemá nastavenú optimalizáciu batérie, preto ju nemôžete obmedziť.\n\nAk ju chcete obmedziť, zapnite optimalizáciu."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Využitie obrazovky od úplného nabitia"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Spotreba obrazovkou"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Vyhľadávanie mobilnej siete"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Využitie batérie od úplného nabitia"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Ako dlho bola zapnutá obrazovka od úplného dobitia"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Využitie zariadenia od úplného dobitia"</string>
@@ -2218,11 +2210,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Využitie"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Upraviť spotrebu energie"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Zahrnuté balíčky"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikácie vybíjajúce batériu"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Stále prebúdza zariadenie"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Prebúdza zariadenie na pozadí"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Často vyžaduje polohu"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Aplikácie s problémovým správaním: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikácie fungujú normálne"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefón má normálnu spotrebu batérie na pozadí"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablet má normálnu spotrebu batérie na pozadí"</string>
@@ -2298,6 +2285,7 @@
<item quantity="other">Obmedzuje sa využitie batérie %1$d aplikáciami</item>
<item quantity="one">Obmedzuje sa využitie batérie %1$d aplikáciou</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Obmedzené <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Tieto aplikácie používali batériu na pozadí. Obmedzené aplikácie nemusia správne fungovať a upozornenia môžu byť oneskorené."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Použiť správcu batérie"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Zistite, keď aplikácie nadmerne vybíjajú batériu"</string>
@@ -2477,23 +2465,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Zrušiť"</string>
<string name="tts_reset" msgid="2661752909256313270">"Obnoviť"</string>
<string name="tts_play" msgid="2628469503798633884">"Prehrať"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Ovládanie napájania"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Prebieha aktualizácia nastavenia Wi‑Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Prebieha aktualizácia nastavenia Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"zapnuté"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"vypnuté"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"zapínanie"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"vypínanie"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Poloha"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synchronizácia"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Jas <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automaticky"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"plné"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"polovičné"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"vypnuté"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Úložisko poverení"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Inštalovať z úložiska"</string>
@@ -2651,7 +2622,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Vybrať všetko"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Spotreba dát"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Spotreba dát apl."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobilné dáta a Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Účtovanie dát operátorom sa môže líšiť od údajov zariadenia."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Využitie aplikáciami"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"O APLIKÁCII"</string>
@@ -3038,7 +3009,6 @@
<item quantity="other">Zobraziť %d skrytých položiek</item>
<item quantity="one">Zobraziť %d skrytú položku</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Zbaliť"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Sieť a internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilné"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"spotreba dát"</string>
@@ -3050,12 +3020,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikácie a upozornenia"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Povolenia, predvolené aplikácie"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Prístup k upozorneniam nie je k dispozícii pre aplikácie v pracovnom profile."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Účty"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Neboli pridané žiadne účty"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Predvolené aplikácie"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Jazyky, čas, zálohovanie, aktualizácie"</string>
<string name="search_results_title" msgid="1796252422574886932">"Nastavenia"</string>
- <string name="search_menu" msgid="6283419262313758339">"Hľadať v nastaveniach"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, sieťové pripojenie, internet, bezdrôtové, dáta, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, prepínač, ovládanie"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"textová správa, odosielanie textových správ, správy, sms a mms, predvolené"</string>
@@ -3100,6 +3070,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"platiť, klepnutie, platby"</string>
<string name="keywords_backup" msgid="470070289135403022">"záloha, zálohovanie"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gesto"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"tvár, odomknutie, overenie totožnosti, prihlásenie"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, verzia prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"sieť, stav mobilnej siete, stav služby, sila signálu, typ mobilnej siete, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"sériové číslo, hardvérová verzia"</string>
@@ -3107,6 +3078,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tmavý motív"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"chyba"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambientné zobrazenie, zobrazenie uzamknutej obrazovky"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"upozornenie na uzamknutej obrazovke"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"tvár"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"odtlačok prsta"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"stmavenie obrazovky, dotyková obrazovka, batéria, inteligentný jas, dynamický jas"</string>
@@ -3558,7 +3530,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Pri zadávaní kódu PIN na spustenie zariadenia ešte nebudú k dispozícii služby dostupnosti, ako napríklad <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Pri zadávaní vzoru na spustenie zariadenia ešte nebudú k dispozícii služby dostupnosti, ako napríklad <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Pri zadávaní hesla na spustenie zariadenia ešte nebudú k dispozícii služby dostupnosti, ako napríklad <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Poznámka: Po reštartovaní sa táto aplikácia spustí až vtedy, keď odomknete telefón"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Poznámka: Ak reštartujete telefón a máte nastavenú zámku obrazovky, táto aplikácia sa spustí až po odomknutí telefónu"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informácie o kóde IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informácie súvisiace s kódom IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3620,7 +3592,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Osobné"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Pracovné"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikácie: Všetky"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikácie: Vypnuté"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Vypnuté"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategórie: Neodkladná dôležitosť"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategórie: Nízka dôležitosť"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategórie: Vypnuté"</string>
@@ -3683,7 +3655,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Upozornenia o spotrebe"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Zobraziť úplné využitie zariadenia"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Zobraziť využitie aplikácií"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Vysoká spotreba"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> aplikácie sa správajú nezvyčajne</item>
<item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
@@ -3778,8 +3749,8 @@
<string name="running_frequency" msgid="6622624669948277693">"Frekvencia"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Maximálne využitie"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Neboli využité žiadne údaje"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Povoliť prístup k nastaveniu Nerušiť pre aplikáciu <xliff:g id="APP">%1$s</xliff:g>?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikácia bude môcť vypnúť alebo zapnúť nastavenie Nerušiť a meniť súvisiace nastavenia."</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Povoliť aplikácii <xliff:g id="APP">%1$s</xliff:g> prístup k režimu Nerušiť?"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikácia bude môcť vypínať a zapínať režim Nerušiť a meniť súvisiace nastavenia."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Musí zostať zapnuté, pretože je zapnutý prístup k upozorneniam"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Odvolať prístup k nastaveniu Nerušiť pre aplikáciu <xliff:g id="APP">%1$s</xliff:g>?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Všetky pravidlá typu Nerušiť vytvorené touto aplikáciou budú odstránené."</string>
@@ -3855,6 +3826,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Vnútorné úložisko: využité <xliff:g id="PERCENTAGE">%1$s</xliff:g> – voľné <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Režim spánku sa spustí po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Tapeta, režim spánku, veľkosť písma"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Režim spánku sa spustí po 10 minútach nečinnosti"</string>
<string name="memory_summary" msgid="8080825904671961872">"Využíva sa v priemere <xliff:g id="USED_MEMORY">%1$s</xliff:g> z celkovej pamäte <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Prihlásený používateľ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3870,7 +3843,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Správy SMS sú zakázané"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Použitie fotoaparátu je zakázané"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Snímky obrazovky sú zakázané"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Zálohy sa nedajú vypnúť"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Táto aplikácia sa nedá otvoriť"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"V prípade otázok kontaktujte správcu IT."</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Ďalšie podrobnosti"</string>
@@ -4044,9 +4016,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulovať obrazovku s výrezom"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Žiadna"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Predvolené nastavenia zariadenia"</string>
<string name="special_access" msgid="3458780842491881155">"Špeciálny prístup apl."</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="few">Neobmedzené dáta môžu používať <xliff:g id="COUNT">%d</xliff:g> aplikácie</item>
@@ -4070,11 +4042,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Pripojené k zariadeniu <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Pripojené k viacerým zariadeniam"</string>
<string name="demo_mode" msgid="2798762752209330277">"Ukážka používateľského rozhrania systému"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Nočný režim"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Nastaviť nočný režim"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Tmavý režim"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Nastaviť Tmavý režim"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Dlaždice rýchlych nastavení pre vývojárov"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Trasovanie Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Nastavenia pracovného profilu"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Vyhľadávanie kontaktov"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Povoliť vašej organizácii hľadať kontakty na identifikáciu volajúcich a kontaktov"</string>
@@ -4121,13 +4092,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Kontrola telefónu dvojitým klepnutím"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tablet skontrolujete dvojitým klepnutím"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Zariadenie skontrolujete dvojitým klepnutím"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Ak chcete zistiť čas, skontrolovať ikony upozornení a ďalšie informácie, klepnite dvakrát na obrazovku."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Ak chcete zistiť čas, skontrolovať upozornenia a získať ďalšie informácie, klepnite dvakrát na obrazovku."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Kontrola telefónu zdvihnutím"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tablet skontrolujete tak, že ho zodvihnete"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Zariadenie skontrolujete tak, že ho zodvihnete"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ak chcete zistiť čas, skontrolovať ikony upozornení a ďalšie informácie, zdvihnite telefón."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ak chcete zistiť čas, skontrolovať ikony upozornení a ďalšie informácie, zdvihnite tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ak chcete zistiť čas, skontrolovať ikony upozornení a ďalšie informácie, zdvihnite zariadenie."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Prebudiť obrazovku"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Ak chcete zistiť čas, skontrolovať upozornenia a získať ďalšie informácie, zdvihnite telefón."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Ak chcete zistiť čas, skontrolovať upozornenia a získať ďalšie informácie, zdvihnite tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Ak chcete zistiť čas, skontrolovať upozornenia a získať ďalšie informácie, zdvihnite zariadenie."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gesto prebudenia uzamknutej obrazovky"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Upozornenia potiahnutím prsta"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Potiahnite prstom"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Upozornenia zobrazíte potiahnutím nadol po senzore odtlačkov prstov na zadnej strane telefónu."</string>
@@ -4215,7 +4190,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> pokusov</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> pokus</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Zálohujú sa dáta zariadenia"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Toto zariadenie spravuje vaša organizácia."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Toto zariadenie spravuje organizácia <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4262,6 +4236,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Služba automatického dopĺňania"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"automatické, dopĺňanie, automatické dopĺňanie"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Skontrolujte, či ide o dôveryhodnú aplikáciu</b> <br/> <br/> <xliff:g id=app_name example=Automatické dopĺňanie Google>%1$s</xliff:g> určuje na základe obsahu obrazovky, čo je možné automaticky vyplniť."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Automatické dopĺňanie"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Úroveň zaznamenávania"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maximálny počet žiadostí na reláciu"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Max. viditeľných množín dát"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Obnoviť na predvolené hodnoty"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Možnosti automatického dopĺňania pre vývojárov boli obnovené"</string>
<string name="device_theme" msgid="4571803018917608588">"Motív zariadenia"</string>
<string name="default_theme" msgid="7085644992078579076">"Predvolený"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Názov siete"</string>
@@ -4276,15 +4256,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Spustiť poskytovanie služieb operátorom"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Aktualizovať režim Nerušiť"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pozastavte upozornenia, aby ste sa mohli sústrediť"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Aké sú najaktuálnejšie novinky?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Pozrite si prehliadku nového telefónu"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Pozrite si prehliadku nového tabletu"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Pozrite si prehliadku nového zariadenia"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Táto funkcia nie je v zariadení k dispozícii"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Vynútiť úplné meranie GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Sledovať všetky konštelácie a frekvencie GNSS bez cyklického vypínania a zapínania"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Vždy zobrazovať dialógové okno zlyhania"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Zobraziť dialógové okno pri každom zlyhaní aplikácie"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Vybrať aplikáciu podporujúcu ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nie je nastavená žiadna aplikácia podporujúca ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplikácia podporujúca ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Prístup k adresáru"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"prístup k adresáru"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4325,4 +4304,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Podrobnosti siete"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Názov zariadenia je viditeľný pre aplikácie v telefóne. Môže sa zobrazovať aj ostatným používateľom po pripojení k zariadeniu Bluetooth alebo nastavení hotspotu Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Zariadenia"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Všetky nastavenia"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Návrhy"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dáta CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dáta CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Vybrať sieť"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Odpojené"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Pripojené"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Pripája sa…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nepodarilo sa pripojiť"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nebola nájdená žiadna sieť."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Nepodarilo sa nájsť siete. Skúste to znova."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(zakázané)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Žiadna SIM karta"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Rozšírené volanie"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Preferovaný režim siete: preferované WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Preferovaný režim siete: iba GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Preferovaný režim siete: iba WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Preferovaný režim siete: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Preferovaný režim siete: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Preferovaný režim siete: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Preferovaný režim siete: iba CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Preferovaný režim siete: iba EVDO"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Preferovaný režim siete: CDMA / EvDo / GSM / WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Preferovaný režim siete: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Preferovaný režim siete: GSM / WCDMA / LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Preferovaný režim siete: CDMA + LTE / EvDo"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Preferovaný režim siete: globálny"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Preferovaný režim siete: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Uprednostňovaný režim siete: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Preferovaný režim siete: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Preferovaný režim siete: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Preferovaný režim siete: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Preferovaný režim siete: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Preferovaný režim siete: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Preferovaný režim siete: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Preferovaný režim siete: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Preferovaný režim siete: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Preferovaný režim siete: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Preferovaný režim siete: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Preferovaný režim siete: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (odporúčané)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (odporúčané)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globálne"</string>
+ <string name="label_available" msgid="1731547832803057893">"Dostupné siete"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Hľadá sa…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Prebieha registrácia v sieti <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Vaša SIM karta nepovoľuje pripojenie k tejto sieti."</string>
+ <string name="connect_later" msgid="978991102125216741">"V tejto chvíli sa nedá pripojiť k sieti. Skúste to znova neskôr."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Prihlásenie k sieti prebehlo úspešne."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Vybrať sieť automaticky"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Nastavenia operátora"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Nastaviť dátovú službu"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobilné dáta"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Prístup k dátam pomocou mobilnej siete"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Preferovaný typ siete"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Zmeniť prevádzkový režim siete"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Preferovaný typ siete"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operátor"</string>
+ <string name="call_category" msgid="8108654745239563833">"Volanie"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videohovory prostredníctvom operátora"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Výber systému"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Zmeniť režim roamingu CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Výber systému"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Sieť"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Sieť"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Odber CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Prepnúť medzi RUIM/SIM a NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"odber"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatická registrácia…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Chcete povoliť dátový roaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Informácie o cenách získate od svojho poskytovateľa siete."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Spotreba dát aplikácie"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Neplatný režim siete <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorovať."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Nie je k dispozícii pri pripojení k operátorovi <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Zobraziť viac"</string>
+ <string name="see_less" msgid="1250265310929558370">"Zobraziť menej"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index a20d135..4861923 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Obravnavaj kot omrežje z omejeno količino prenosa podatkov"</item>
<item msgid="2266114985518865625">"Obravnavaj kot omrežje z neomejeno količino prenosa podatkov"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Privzeto (uporabi naključno izbran naslov MAC)"</item>
+ <item msgid="5398461510512959597">"Zaupanja vredno"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ne"</item>
<item msgid="3863157480502955888">"Da"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Vedno vklopljeno"</item>
<item msgid="6385301106124765323">"Vedno izklopljeno"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Izklopljeno"</item>
+ <item msgid="2182686878828390312">"Odpravljanje napak"</item>
+ <item msgid="5286514712714822064">"Podrobno"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Samo domače"</item>
+ <item msgid="5034813753274486448">"Samodejno"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Prednostno GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Samo GSM"</item>
+ <item msgid="488474605709912156">"Samo WCDMA"</item>
+ <item msgid="1912421096218750039">"Samodejno GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Samodejno CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA brez EvDo"</item>
+ <item msgid="4678789463133969294">"Samo EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globalno"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Samo TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globalno"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index dba4100..b4c4969 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Ustvari"</string>
<string name="allow" msgid="3349662621170855910">"Dovoli"</string>
<string name="deny" msgid="6947806159746484865">"Zavrni"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Zapri"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Preklopi"</string>
<string name="device_info_default" msgid="7847265875578739287">"Neznano"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> korak vas loči od tega, da postanete razvijalec.</item>
@@ -34,10 +32,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Ni treba, ker ste že razvijalec."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Najprej omogočite možnosti za razvijalce."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Brezžično in omrežja"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Povezave"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Naprava"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Osebno"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Dostop"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Omogočanje podatkovne povezave"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Onemogočanje podatkovne povezave"</string>
@@ -123,7 +117,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Naslov Bluetooth naprave: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ali želite prekiniti povezavo z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Oddajanje"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Neimenovana naprava Bluetooth"</string>
<string name="progress_scanning" msgid="192587958424295789">"Iskanje"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"V bližini ni naprav Bluetooth."</string>
@@ -155,7 +148,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Aplikacija želi vklopiti Bluetooth in omogočiti, da bodo lahko druge naprave videle vaš telefon. To lahko pozneje spremenite v nastavitvah za Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Vklop Bluetootha…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Izklop Bluetootha…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Samodejno poveži"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Zahteva za povezavo Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Dotaknite se, če želite vzpostaviti povezavo z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Se želite povezati z napravo »<xliff:g id="DEVICE_NAME">%1$s</xliff:g>«?"</string>
@@ -183,12 +175,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Razpoložljive naprave za klice"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Trenutno povezano"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Shranjene naprave"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Dodajanje naprave"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth bo vklopljen, da bo omogočeno seznanjanje"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Nastavitve povezave"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Predhodno povezane naprave"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Predhodno povezane naprave"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth je vklopljen"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Pokaži vse"</string>
<string name="date_and_time" msgid="9062980487860757694">"Datum in ura"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Izberite časovni pas"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -271,7 +263,6 @@
<string name="skip_label" msgid="47510779345218297">"Preskoči"</string>
<string name="next_label" msgid="4693520878012668114">"Naprej"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Jeziki"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Jezikovne nastavitve"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Odstrani"</string>
<string name="add_a_language" msgid="2330538812283783022">"Dodaj jezik"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -307,7 +298,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Nastavitve"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Bližnjica do nastavitev"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Način za letalo"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Več"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Brezžično in omrežja"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Upravljajte Wi‑Fi, Bluetooth, način za letalo, mobilna omrežja in omrežja VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Prenos podatkov v mob. omrežju"</string>
@@ -392,6 +382,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Zasebnost"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Onemogočil skrbnik"</string>
<string name="security_status_title" msgid="5848766673665944640">"Stanje varnosti"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Zaklepanje zaslona, odklepanje z obrazom"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Zaklepanje zaslona, prstni odtis"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zaklepanje zaslona"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Obraz je dodan"</string>
@@ -401,11 +392,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Odklepanje z obrazom"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Preverjanje pristnosti z obrazom"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Uporabljajte obraz za odklepanje telefona, odobritev nakupov ali prijavo v aplikacije."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Uporabite"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Z obrazom odklenite telefon ali odobrite nakupe.\n\nOpomba: obraza ne morete uporabiti za odklepanje te naprave. Za več informacij se obrnite na skrbnika v organizaciji."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Uporabljajte obraz za odklepanje telefona, odobritev nakupov ali prijavo v aplikacije"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Dodate lahko do toliko obrazov: <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Obraz poravnajte s krogom"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Pozneje"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Dodate lahko največ toliko obrazov: <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Dodali ste največje dovoljeno število obrazov"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Obrazov ni več mogoče dodati"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Včlanitev ni bila dokončana."</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"V redu"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Dosežena časovna omejitev za včlanitev obraza. Poskusite znova."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Včlanitev obraza ni uspela."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Vse je pravilno nastavljeno."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Končano"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Uporaba obraza za"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Odklepanje naprave"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Prijava v aplikacije in plačila"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Odprte oči za odklepanje"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Pri preverjanju pristnosti z obrazom morate imeti odprte oči"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Odstrani podatke o obrazu"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Izboljšanje podatkov o obrazu"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Z obrazom lahko odklenete napravo in dostopate do aplikacij. "<annotation id="url">"Več o tem"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Prstni odtis"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Upravlj. prst. odtisov"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Upor. prst. odtisa za"</string>
@@ -914,6 +921,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Izberite vsaj en pas za dostopno točko Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Nastavitve naslova IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Zasebnost"</string>
<string name="wifi_shared" msgid="844142443226926070">"Skupna raba z drugimi uporabniki naprave"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(nespremenjeno)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Izberite"</string>
@@ -953,7 +961,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Prekliči"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Želite, da naprava pozabi omrežje?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Vsa gesla za to omrežje bodo izbrisana"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Shranjena omrežja"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d omrežje</item>
<item quantity="two">%d omrežji</item>
@@ -1030,7 +1037,7 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Prednostna izbira za gostovanje"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"Prednostno – Wi-Fi"</item>
+ <item msgid="2124257075906188844">"Prednostno Wi-Fi"</item>
<item msgid="1335127656328817518">"Prednostno mobilno"</item>
<item msgid="3132912693346866895">"Samo Wi-Fi"</item>
</string-array>
@@ -1045,7 +1052,7 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"Prednostno – Wi-Fi"</item>
+ <item msgid="5782108782860004851">"Prednostno Wi-Fi"</item>
<item msgid="5074515506087318555">"Prednostno mobilno"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -1134,8 +1141,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Svetlost"</string>
<string name="brightness_summary" msgid="838917350127550703">"Prilagoditev svetlosti zaslona"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva svetlost"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Vklopljeno"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Izklopljeno"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Prednostna svetlost je zelo nizka"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Prednostna svetlost je nizka"</string>
@@ -1231,6 +1237,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Kode PIN ni mogoče spremeniti.\nKoda PIN je morda napačna."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Sprememba kode PIN za kartico SIM je uspela"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Zaklepanja kartice SIM ni mogoče spremeniti.\nMorda je koda PIN napačna."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Kode PIN ni mogoče onemogočiti."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Kode PIN ni mogoče omogočiti."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"V redu"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Prekliči"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Najdenih je bilo več kartic SIM"</string>
@@ -1406,7 +1414,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Za ta namen morate shrambo <xliff:g id="NAME_0">^1</xliff:g> formatirati. \n\n"<b>"S formatiranjem bodo izbrisani vsi podatki, shranjeni v shrambi <xliff:g id="NAME_1">^1</xliff:g>."</b>" Če se želite izogniti izgubi podatkov, priporočamo, da jih varnostno kopirate."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Izbris in formatiranje"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formatiranje shrambe <xliff:g id="NAME">^1</xliff:g> …"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Med formatiranjem ne odstranite nosilca <xliff:g id="NAME">^1</xliff:g>."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Med formatiranjem ne odstranite nosilca <xliff:g id="NAME">^1</xliff:g>."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Premik podatkov v novo shrambo"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Fotografije, datoteke in nekatere aplikacije lahko premaknete v novo shrambo <xliff:g id="NAME">^1</xliff:g>. \n\nPremik traja približno <xliff:g id="TIME">^2</xliff:g> in bo sprostil <xliff:g id="SIZE">^3</xliff:g> prostora v notranji shrambi. Nekatere aplikacije med premikanjem ne bodo delovale."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Premik zdaj"</string>
@@ -1790,9 +1798,6 @@
<string name="installed" msgid="3070865169422600098">"Nameščeno"</string>
<string name="no_applications" msgid="7336588977497084921">"Ni aplikacij."</string>
<string name="internal_storage" msgid="1584700623164275282">"Notranja shramba"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"notranja shramba"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Pomnilnik USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Shramba na kartici SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Preračunavanje velikosti ..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Želite izbrisati podatke aplikacije?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Vsi podatki te aplikacije bodo trajno izbrisani. To med drugim vključuje vse datoteke, nastavitve, račune in podatkovne zbirke."</string>
@@ -1801,24 +1806,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikacije ni bilo mogoče najti na seznamu nameščenih aplikacij."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Shrambe za aplikacijo ni bilo mogoče počistiti."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ta aplikacija ima v tabličnem računalniku dostop do:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ta aplikacija ima v telefonu dostop do tega:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Aplikacija lahko dostopa do naslednjih elementov v vašem tabličnem računalniku. Da bi izboljšali učinkovitost in zmanjšali porabo pomnilnika, za <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> velja nekaj od teh dovoljenj, saj se izvaja v istem procesu kot <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Aplikacija lahko dostopa do naslednjih elementov v telefonu. Da bi izboljšali učinkovitost in zmanjšali porabo pomnilnika, za <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> velja nekaj od teh dovoljenj, saj se izvaja v istem procesu kot <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> in <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ta aplikacija vam lahko zaračuna stroške:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Pošlji SMS za plačljive storitve"</string>
<string name="computing_size" msgid="1599186977475211186">"Izračunavanje ..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Velikosti paketa ni bilo mogoče izračunati."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Nimate nameščenih aplikacij drugih ponudnikov."</string>
<string name="version_text" msgid="9189073826278676425">"različica <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Premakni"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Premakni v tablični računalnik"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Premakni v telefon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Premakni na pomnilnik USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Premakni na kartico SD"</string>
- <string name="moving" msgid="6431016143218876491">"Premikanje"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Poteka že druga selitev."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Ni dovolj prostora za shranjevanje."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplikacija ne obstaja."</string>
@@ -1828,17 +1825,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Skrbniške aplikacije naprave ni mogoče namestiti na zunanji medij."</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Želite prisilno ustaviti?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Če boste vsilili zaustavitev aplikacije, morda ne bo pravilno delovala."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Aplikacije ni bilo mogoče premakniti. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Prednostno namestitveno mesto"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Spremenite prednostno namestitveno mesto za nove aplikacije."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Želite onemogočiti vgrajeno aplikacijo?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Onemogočanje aplikacije"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Če onemogočite to aplikacijo, Android in druge aplikacije morda ne bodo več delovali, kot bi morali."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ali želite izbrisati podatke in onemogočiti aplikacijo?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Če onemogočite to aplikacijo, Android in druge aplikacije morda ne bodo več delovali, kot bi morali. Poleg tega bodo vaši podatki izbrisani."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Želite izklopiti obvestila?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Če izklopite obvestila za to aplikacijo, boste morda zamudili pomembna opozorila in posodobitve."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Trgovina"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Podrobnosti o aplikaciji"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija nameščena iz trgovine <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -2031,6 +2024,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Uporaba storitve"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Uporaba popravljanja barv"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Uporaba napisov"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Naprej"</string>
<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="6371077608778830020">"Dodajanje slušnega pripomočka"</string>
@@ -2190,8 +2184,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Če boste omejili dejavnost aplikacije v ozadju, morda ne bo pravilno delovala"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Ker za to aplikacijo ni izbrana nastavitev optimiziranja porabe akumulatorja, je ni mogoče omejiti.\n\nČe želite omejiti aplikacijo, najprej vklopite optimizacijo akumulatorja."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Uporaba zaslona od polne napolnjenosti"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Poraba zaslona"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Pregledovanje mobilnih omrežij"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Poraba energije od polne napolnjenosti akumulatorja"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Trajanje vklopljenosti zaslona od polne napolnjenosti akumulatorja"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Poraba naprave od polne napolnjenosti akumulatorja"</string>
@@ -2218,11 +2210,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Podrobnosti uporabe"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Prilagodi porabo energije"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Vključeni paketi"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Energijsko potratne aplikacije"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Ohranjanje prebujene naprave"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Prebujanje naprave iz ozadja"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Pogosto zahtevanje lokacije"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Nepravilno delovanje več aplikacij (<xliff:g id="NUMBER">%1$d</xliff:g>)"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikacije delujejo normalno"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon ima običajno porabo energije akumulatorja v ozadju"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablični računalnik ima običajno porabo energije akumulatorja v ozadju"</string>
@@ -2298,6 +2285,7 @@
<item quantity="few">Omejitev porabe energije akumulatorja za %1$d aplikacije</item>
<item quantity="other">Omejitev porabe energije akumulatorja za %1$d aplikacij</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Omejeno ob <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Te aplikacije so porabljale energijo akumulatorja v ozadju. Omejene aplikacije morda ne bodo delovale pravilno, obvestila pa bodo morda zakasnjena."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Uporaba varčevanja z energijo akumulatorja"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Zaznavanje, ko aplikacije porabljajo energijo akumulatorja"</string>
@@ -2477,23 +2465,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Prekliči"</string>
<string name="tts_reset" msgid="2661752909256313270">"Ponastavi"</string>
<string name="tts_play" msgid="2628469503798633884">"Predvajaj"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Nadzor porabe"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Posodabljanje nastavitve Wi‑Fi-ja"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Posodabljanje nastavitev Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"vklopljeno"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"izklopljeno"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"vklapljanje"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"izklapljanje"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Lokacija"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinhronizacija"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Svetlost <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"samodejno"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"najsvetleje"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"polovično"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"izklopljeno"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Shramba poverilnic"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Namestitev iz shrambe"</string>
@@ -2651,7 +2622,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> od skupaj <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Izberi vse"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Podatkovni promet"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Prenos podatk. aplikacije"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobilni podatki in Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operaterjeve meritve porabe podatkov so morda drugačne kot v napravi."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Uporaba aplikacije"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"PODATKI O APLIKACIJI"</string>
@@ -3038,7 +3009,6 @@
<item quantity="few">Pokaži %d skrite elemente</item>
<item quantity="other">Pokaži %d skritih elementov</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Strni"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Omrežje in internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilno"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"prenesena količina podatkov"</string>
@@ -3050,12 +3020,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplikacije in obvestila"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Dovoljenja, privzete aplikacije"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Dostop do obvestil ni na voljo za aplikacije v delovnem profilu."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Računi"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Dodan ni bil noben račun"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Privzete aplikacije"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Jeziki, čas, varnostno kopiranje, posodobitve"</string>
<string name="search_results_title" msgid="1796252422574886932">"Nastavitve"</string>
- <string name="search_menu" msgid="6283419262313758339">"Preišči nastavitve"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, omrežna povezava, internet, brezžično, podatki, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, preklop, upravljanje"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, pošiljanje sporočil SMS, sporočila, sporočanje, privzeto"</string>
@@ -3100,6 +3070,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"plačaj, dotakni se, plačevanje z dotikom, plačila"</string>
<string name="keywords_backup" msgid="470070289135403022">"varnostna kopija, varnostno kopiranje, varnostno kopirati"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"poteza"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"obraz, odklepanje, preverjanje pristnosti, prijava"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, različica seznama prednostnih omrežij za gostovanje, različica programske opreme za imei"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"omrežje, stanje mobilnega omrežja, stanje storitve, moč signala, vrsta mobilnega omrežja, gostovanje, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serijska številka, različica strojne opreme"</string>
@@ -3107,6 +3078,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"temna tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"napaka"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"prikaz na podlagi okolja, prikaz na zaklenjenem zaslonu"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"obvestilo na zaklenjenem zaslonu"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"obraz"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"prstni odtis"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"zatemnitev zaslona, zaslon na dotik, akumulator, pametna svetlost, dinamična svetlost"</string>
@@ -3558,7 +3530,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Ko vnesete kodo PIN za zagon te naprave, storitve za osebe s posebnimi potrebami, kot je <xliff:g id="SERVICE">%1$s</xliff:g>, še ne bodo na voljo."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Ko vnesete vzorec za zagon te naprave, storitve za osebe s posebnimi potrebami, kot je <xliff:g id="SERVICE">%1$s</xliff:g>, še ne bodo na voljo."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Ko vnesete geslo za zagon te naprave, storitve za osebe s posebnimi potrebami, kot je <xliff:g id="SERVICE">%1$s</xliff:g>, še ne bodo na voljo."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Opomba: po vnovičnem zagonu te aplikacije ni mogoče zagnati, če ne odklenete telefona."</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Opomba: po vnovičnem zagonu telefona z nastavljenim zaklepanjem zaslona se ta aplikacija ne more zagnati, dokler ne odklenete telefona."</string>
<string name="imei_information_title" msgid="8499085421609752290">"Podatki o IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Relativni podatki o IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Reža <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3620,7 +3592,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Osebno"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Služba"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacije: vse"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacije: izklopljeno"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Izklopljeno"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorije: nujna pomembnost"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorije: nizka pomembnost"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorije: izklopljeno"</string>
@@ -3683,7 +3655,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Opozorila o porabi"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Prikaz vseh podatkov o uporabi naprave"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Prikaz uporabe aplikacij"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Visoka poraba energije"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one">Neobičajno delovanje <xliff:g id="NUMBER">%2$d</xliff:g> aplikacije</item>
<item quantity="two">Neobičajno delovanje <xliff:g id="NUMBER">%2$d</xliff:g> aplikacij</item>
@@ -3778,7 +3749,7 @@
<string name="running_frequency" msgid="6622624669948277693">"Frekvenca"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Največja uporaba"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Ni bilo uporabe podatkov"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Želite aplikaciji <xliff:g id="APP">%1$s</xliff:g> dovoliti dostop do načina »ne moti«?"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Dovolite aplikaciji <xliff:g id="APP">%1$s</xliff:g> dostop do funkcije »ne moti«?"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikacija bo lahko vklopila/izklopila način »ne moti« in spreminjala povezane nastavitve."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Mora biti vklopljeno, ker je vklopljen dostop do obvestil"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Želite aplikaciji <xliff:g id="APP">%1$s</xliff:g> preklicati dostop do načina »ne moti«?"</string>
@@ -3855,6 +3826,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Notranji pomnilnik: <xliff:g id="PERCENTAGE">%1$s</xliff:g> uporabljeno – <xliff:g id="FREE_SPACE">%2$s</xliff:g> prosto"</string>
<string name="display_summary" msgid="6737806235882127328">"Stanje pripravljenosti po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Ozadje, stanje pripravljenosti, velikost pisave"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Stanje pripravljenosti po 10 minutah nedejavnosti"</string>
<string name="memory_summary" msgid="8080825904671961872">"Povprečna uporaba pomnilnika: <xliff:g id="USED_MEMORY">%1$s</xliff:g> od <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kot <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3870,7 +3843,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Pošiljanje sporočil SMS ni omogočeno"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Fotoaparat ni omogočen"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Ustvarjanje posnetka zaslona ni omogočeno"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Varnostnega kopiranja ni mogoče izklopiti"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Te aplikacije ni mogoče odpreti"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Če imate vprašanja, se obrnite na skrbnika za IT"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Več podrobnosti"</string>
@@ -4044,9 +4016,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulacija prikaza z izrezom"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Zareza zaslona"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"izrez prikaza"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Brez"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Privzeta nastavitev naprave"</string>
<string name="special_access" msgid="3458780842491881155">"Poseb. dostop za aplik."</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikaciji je dovoljen neomejen prenos podatkov</item>
@@ -4070,11 +4042,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan z napravo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan z več napravami"</string>
<string name="demo_mode" msgid="2798762752209330277">"Predstavitveni način uporabniškega vmesnika sistema"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Nočni način"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Nastavitev nočnega načina"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Temni način"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Nastavi temni način"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ploščice razvijalcev za hitre nastavitve"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Sledenje z apl. Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Nastavitve delovnega profila"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Iskanje po stikih"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Organizaciji dovoli iskanje po stikih zaradi prepoznavanja klicateljev in stikov"</string>
@@ -4114,20 +4085,24 @@
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Obrat fotoaparata"</string>
<string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
<string name="double_twist_for_camera_suggestion_title" msgid="4689410222517954869">"Hitrejši vklop načina za sebke"</string>
- <string name="swipe_up_to_switch_apps_title" msgid="2513907834903543667">"Povlecite navzgor po gumbu za začetni zaslon"</string>
+ <string name="swipe_up_to_switch_apps_title" msgid="2513907834903543667">"Vlečenje navzgor po gumbu za začetni zaslon"</string>
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"Če želite preklopiti med aplikacijami, povlecite navzgor po gumbu za začetni zaslon. Znova povlecite navzgor, da prikažete vse aplikacije. To deluje na katerem koli zaslonu. Gumb »Pregled« ne bo več prikazan v spodnjem desnem delu zaslona."</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"Preskus novega gumba za začetni zaslon"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"Vklop nove poteze za preklop aplikacij"</string>
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Preverjanje telefona z dvojnim dotikom"</string>
- <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dvakrat se dotaknite, da preverite tablični računalnik"</string>
- <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvakrat se dotaknite, da preverite napravo"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Če želite preveriti uro, ikone obvestil in druge informacije, se dvakrat dotaknite zaslona."</string>
+ <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dvakratni dotik za preverjanje tabličnega računalnika"</string>
+ <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvakratni dotik za preverjanje naprave"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Če želite preveriti uro, obvestila in druge informacije, se dvakrat dotaknite zaslona."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Preverjanje telefona z dvigom"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Primite tablični računalnik, da ga preverite"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Primite napravo, da jo preverite"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Če želite preveriti uro, ikone obvestil in druge informacije, dvignite telefon."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Če želite preveriti uro, ikone obvestil in druge informacije, primite tablični računalnik."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Če želite preveriti uro, ikone obvestil in druge informacije, primite napravo."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Preklop zaslona iz stanja pripravljenosti"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Če želite preveriti uro, obvestila in druge informacije, primite telefon."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Če želite preveriti uro, obvestila in druge informacije, primite tablični računalnik."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Če želite preveriti uro, obvestila in druge informacije, primite napravo."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Poteza za preklop zaklenj. zaslona iz stanja pripravljenosti"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Poteg s prstom po tipalu prstnih odtisov za prikaz obvestil"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Poteg po prstnem tipalu"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Če želite preveriti obvestila, povlecite navzdol po tipalu prstnih odtisov na hrbtni strani telefona."</string>
@@ -4215,7 +4190,6 @@
<item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> poskusi</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> poskusov</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Podatki te naprave se varnostno kopirajo"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"To napravo upravlja vaša organizacija."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"To napravo upravlja <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4262,6 +4236,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Storitev samodejnega izpolnjevanja"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"samodejno, izpolnjevanje, samoizpolnjevanje"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Prepričajte se, ali zaupate tej aplikaciji</b> <br/> <br/> <xliff:g id=app_name example=Google Samodejno izpolnjevanje>%1$s</xliff:g> iz elementov na zaslonu ugotovi, kaj je mogoče samodejno izpolniti."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Samodejno izpolnjevanje"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Raven pisanja dnevnika"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Največje dovoljeno število zahtev na sejo"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Največje število prikazanih naborov podatkov"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Ponastavi na privzete vrednosti"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Možnosti samodejnega izpolnjevanja za razvijalce so bile ponastavljene"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema naprave"</string>
<string name="default_theme" msgid="7085644992078579076">"Privzeto"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Ime omrežja"</string>
@@ -4276,15 +4256,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Sproži omogočanje uporabe operaterja"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Posodobitev načina »ne moti«"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Začasno zaustavite prikazovanje obvestil, da ostanete osredotočeni"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Odkrijte zanimive novosti"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Oglejte si predstavitev novega telefona"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Oglejte si predstavitev novega tabličnega računalnika"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Oglejte si predstavitev nove naprave"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ta funkcija ni na voljo v tej napravi."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Vsili popolne meritve GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Spremljaj vse razmestitve in frekvence GNSS brez ciklov"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Vedno pokaži pogovorno okno zrušitve"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Pokaži pogovorno okno ob vsaki zrušitvi aplikacije"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Izbira aplikacije, ki podpira ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Ni nastavljene aplikacije, ki podpira ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplikacija, ki podpira ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Dostop do imenika"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"dostop do imenika"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4325,4 +4304,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"O omrežju"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Ime naprave je vidno aplikacijam v telefonu. Ko vzpostavite povezavo z napravami Bluetooth ali nastavite dostopno točko Wi-Fi, ga bodo morda videle tudi druge osebe."</string>
<string name="devices_title" msgid="7701726109334110391">"Naprave"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Vse nastavitve"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Predlogi"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Podatki CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Podatki CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Izbira omrežja"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Brez povezave"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Povezano"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Povezovanje …"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Povezave ni bilo mogoče vzpostaviti"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Najdeno ni bilo nobeno omrežje."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Omrežij ni bilo mogoče najti. Poskusite znova."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(prepovedano)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Ni kartice SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Napredno klicanje"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Prednostni način omrežja: prednostno WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Prednostni način omrežja: samo GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Prednostni način omrežja: samo WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Prednostni način omrežja: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Želeni način omrežja: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Želeni način omrežja: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Prednostni način omrežja: samo CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Prednostni način omrežja: samo EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Prednostni način omrežja: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Prednostni način omrežja: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Prednostni način omrežja: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Prednostni način omrežja: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Prednostni način omrežja: globalno"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Prednostni način omrežja: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Prednostni omrežni način: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Prednostni način omrežja: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Prednostni način omrežja: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Prednostni način omrežja: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Prednostni način omrežja: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Prednostni način omrežja: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Prednostni način omrežja: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Prednostni način omrežja: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Prednostni način omrežja: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Prednostni način omrežja: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Prednostni način omrežja: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Prednostni način omrežja: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (priporočeno)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (priporočeno)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globalno"</string>
+ <string name="label_available" msgid="1731547832803057893">"Razpoložljiva omrežja"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Iskanje …"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registriranje v omrežje <xliff:g id="NETWORK">%s</xliff:g>"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Kartica SIM ne dovoljuje povezave s tem omrežjem."</string>
+ <string name="connect_later" msgid="978991102125216741">"S tem omrežjem trenutno ni mogoče vzpostaviti povezave. Poskusite znova pozneje."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registrirano v omrežju."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Samodejno izberi omrežje"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Nastavitve operaterja"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Nastavitev podatkovne storitve"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Prenos podatkov v mobilnem omrežju"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Dostop do podatkov prek mobilnega omrežja"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Prednostna vrsta omrežja"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Sprememba načina delovanja omrežja"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Prednostna vrsta omrežja"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operater"</string>
+ <string name="call_category" msgid="8108654745239563833">"Klicanje"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videoklicanje prek operaterja"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Sistemska izbira"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Spremeni način gostovanja CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Sistemska izbira"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Omrežje"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Omrežje"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Naročnina CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Preklopi med RUIM/SIM in NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"naročnina"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Samodejna registracija …"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Želite dovoliti podatkovno gostovanje?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Preverite cene pri operaterju omrežja."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Prenesena količina podatkov aplikacije"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Neveljaven način omrežja: <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Prezri."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Ni na voljo ob vzpostavljeni povezavi z operaterjem <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Pokaži več"</string>
+ <string name="see_less" msgid="1250265310929558370">"Pokaži manj"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index fc9a38e..c6533ac 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Trajto si me matje"</item>
<item msgid="2266114985518865625">"Trajto si pa matje"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"E parazgjedhur (përdor MAC të rastësishëm)"</item>
+ <item msgid="5398461510512959597">"I certifikuar"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Jo"</item>
<item msgid="3863157480502955888">"Po"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Gjithmonë aktiv"</item>
<item msgid="6385301106124765323">"Gjithmonë joaktiv"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Joaktiv"</item>
+ <item msgid="2182686878828390312">"Korrigjo"</item>
+ <item msgid="5286514712714822064">"Me shumë fjalë"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Vetëm rrjeti vendor"</item>
+ <item msgid="5034813753274486448">"Automatik"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA i preferuar"</item>
+ <item msgid="807926878589867564">"Vetëm GSM"</item>
+ <item msgid="488474605709912156">"Vetëm WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA automatik"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo automatik"</item>
+ <item msgid="370391313511477301">"CDMA pa EvDo"</item>
+ <item msgid="4678789463133969294">"Vetëm EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globale"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"Vetëm TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globale"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index cac7594..fbb024f 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Krijo"</string>
<string name="allow" msgid="3349662621170855910">"Lejo"</string>
<string name="deny" msgid="6947806159746484865">"Refuzo"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Mbyll"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Ndërro"</string>
<string name="device_info_default" msgid="7847265875578739287">"I panjohur"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Tani je <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> hapa larg të qenët programues.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Nuk ka nevojë, ti je programues tashmë!"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Aktivizo opsionet e zhvilluesit në fillim."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Rrjetet me valë"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Lidhjet"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Pajisja"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personale"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Qasja"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistemi"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Aktivizo lidhjen e të dhënave"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Çaktivizo lidhjen e të dhënave"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Adresa e Bluetooth-it e pajisjes: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Të shkëputet <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmetimi"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Pajisje me \"Bluetooth\" e paemërtuar"</string>
<string name="progress_scanning" msgid="192587958424295789">"Po kërkon"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Nuk u gjet asnjë pajisje me Bluetooth në afërsi."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Një aplikacion kërkon të aktivizojë Bluetooth-in për ta bërë telefonin tënd të dukshëm ndaj pajisjeve të tjera me Bluetooth. Këtë mund ta ndryshosh më vonë te cilësimet e Bluetooth-it."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Po aktivizon Bluetooth-in…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Po çaktivizon \"Bluetooth-in\"…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Lidh automatikisht"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Kërkesa e lidhjes së Bluetooth-it"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Trokit për t\'u lidhur me \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Dëshiron që të lidhesh me \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Pajisjet e ofruara për telefonata"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Të lidhur aktualisht"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Pajisjet e ruajtura"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Shto pajisje"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth-i do të aktivizohet për çiftimin"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Preferencat e lidhjes"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Pajisjet e lidhura më parë"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Të lidhura më parë"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth-i është i aktivizuar"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Shiko të gjitha"</string>
<string name="date_and_time" msgid="9062980487860757694">"Data dhe ora"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Zgjidh brezin orar"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Kapërce"</string>
<string name="next_label" msgid="4693520878012668114">"Përpara"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Gjuhët"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Preferencat për gjuhën"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Hiqe"</string>
<string name="add_a_language" msgid="2330538812283783022">"Shto gjuhë"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Cilësimet"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Shkurtorja e cilësimeve"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Modaliteti i aeroplanit"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Më shumë"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wi-Fi dhe rrjetet"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Menaxho Wi‑Fi, Bluetooth, modalitetin \"në aeroplan\", rrjetet celulare dhe rrjetet VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Të dhënat celulare"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privatësia"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Çaktivizuar nga administratori"</string>
<string name="security_status_title" msgid="5848766673665944640">"Statusi i sigurisë"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Kyçja e ekranit, shkyçja me fytyrë"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Kyçja e ekranit, gjurma e gishtit"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Kyçja e ekranit"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Fytyra u shtua"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Shkyç me fytyrë"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Përdor fytyrën për të vërtetuar"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Përdor fytyrën për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar në aplikacione"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Përdor veten"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Përdor fytyrën për të shkyçur telefonin ose për të miratuar blerjet.\n\nShënim. Nuk mund ta përdorësh fytyrën tënde për të shkyçur këtë pajisje. Për më shumë informacione, kontakto me administratorin e organizatës sate."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Përdor fytyrën për të shkyçur telefonin, për të autorizuar blerjet ose për t\'u identifikuar në aplikacione"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Mund të shtosh deri në <xliff:g id="COUNT">%d</xliff:g> gjurmë gishtash"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Qendërzoje fytyrën brenda rrethit"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Bëje më vonë"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Mund të shtosh deri në <xliff:g id="COUNT">%d</xliff:g> fytyra"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Ke shtuar numrin maksimal të fytyrave"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Nuk mund të shtohen më shumë fytyra"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Regjistrimi nuk përfundoi"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"U arrit kufiri kohor për regjistrimin e fytyrës. Provo përsëri."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Regjistrimi i fytyrës nuk funksionoi"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Gjithçka gati. Duket mirë."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"U krye"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Përdor fytyrën për të"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Shkyç pajisjen tënde"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Identifikimi dhe pagesat e aplikacionit"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Hap sytë për të shkyçur"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Kur përdor vërtetimin me fytyrë, sytë duhet të jenë të hapur"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Hiq të dhënat e fytyrës"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Përmirëso të dhënat e fytyrës"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Fytyra jote mund të përdoret për të shkyçur pajisjen tënde dhe për të pasur qasje tek aplikacionet. "<annotation id="url">"Mëso më shumë"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Gjurma e gishtit"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Menaxho gjurm. gishtit"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Përdor gjurmën për"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Zgjidh të paktën një brez për zonën e qasjes për internet për Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Cilësimet e IP-së"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privatësia"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Zgjidh"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Anulo"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Dëshiron ta harrosh rrjetin?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Të gjitha fjalëkalimet për këtë rrjet do të fshihen"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Rrjetet e ruajtura"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d rrjete</item>
<item quantity="one">1 rrjet</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Ndriçimi"</string>
<string name="brightness_summary" msgid="838917350127550703">"Rregullo ndriçimin e ekranit"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Ndriçimi i përshtatshëm"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Aktiv"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Joaktiv"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Ndriçimi i preferuar është shumë i ulët"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Ndriçimi i preferuar është i ulët"</string>
@@ -1142,7 +1148,7 @@
<string name="night_display_activation_on_manual" msgid="277343561277625826">"Aktivizo tani"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"Çaktivizo tani"</string>
<string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Aktivizo deri në lindjen e diellit"</string>
- <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Çaktivizo deri në perëndimin e diellit"</string>
+ <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Çaktivizo deri në perëndim të diellit"</string>
<string name="night_display_activation_on_custom" msgid="5472029024427933598">"Çaktivizo deri në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"Çaktivizo deri në <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Në gjendje gjumi"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Kodi PIN nuk ndryshoi.\nKod PIN i gabuar."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN-i i kartës SIM u ndryshua me sukses."</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Karta SIM ende e kyçur.\nKod PIN i gabuar."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Kodi PIN nuk mund të çaktivizohet."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Kodi PIN nuk mund të aktivizohet."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Në rregull"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Anulo"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"U gjetën shumë karta SIM"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Kjo kërkon që <xliff:g id="NAME_0">^1</xliff:g> të formatohet. \n\n"<b>"Formatimi fshin të gjitha të dhënat e ruajtura aktualisht te <xliff:g id="NAME_1">^1</xliff:g>."</b>" Për të shmangur humbjen e të dhënave, rekomandohet rezervimi i tyre."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Fshi dhe formato"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> po formatohet..."</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Mos e hiq <xliff:g id="NAME">^1</xliff:g> gjatë formatimit."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Mos e hiq <xliff:g id="NAME">^1</xliff:g> gjatë formatimit."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Zhvendos të dhënat në hapësirën e re të ruajtjes"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Mund të zhvendosësh fotografitë, skedarët dhe disa aplikacione te kjo <xliff:g id="NAME">^1</xliff:g> e re. \n\nZhvendosja kërkon rreth <xliff:g id="TIME">^2</xliff:g> dhe do të lirojë <xliff:g id="SIZE">^3</xliff:g> në hapësirën e brendshme. Disa aplikacione nuk do të funksionojnë gjatë këtij procesi."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Zhvendos tani"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"I instaluar"</string>
<string name="no_applications" msgid="7336588977497084921">"Asnjë aplikacion."</string>
<string name="internal_storage" msgid="1584700623164275282">"Hapësira e brendshme ruajtëse"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"hapësira e brendshme për ruajtje"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Hapësira USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Hapësira SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Po llogarit përsëri madhësinë…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Të fshihen të dhënat e aplikacionit?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Të gjitha të dhënat e këtij aplikacioni do të fshihen përgjithmonë. Kjo përfshin të gjithë skedarët, cilësimet, llogaritë, bazat e të dhënave etj."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Aplikacioni nuk u gjet në listën e aplikacioneve të instaluara."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Nuk mund të pastrohet hapësira për aplikacionin."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ky aplikacion mund të qaset në tabletin tënd si më poshtë:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ky aplikacion mund të ketë qasje te të mëposhtmet në telefon:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ky aplikacion mund të ketë qasje në tablet, sikurse më poshtë. Për të përmirësuar cilësinë e funksionimit dhe për të zvogëluar përdorimin e memories, disa nga këto leje mundësohen te aplikacioni <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, pasi ai ekzekutohet sipas të njëjtit proces sikurse <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ky aplikacion mund të ketë qasje te të mëposhtmet në telefon. Në mënyrë që të përmirësohet performanca dhe të reduktohet përdorimi i memories, disa nga këto leje ofrohen për <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, sepse punon në të njëjtin proces si <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> dhe <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ky aplikacion mund të shkaktojë tarifa shtesë:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Dërgo SMS \"premium\""</string>
<string name="computing_size" msgid="1599186977475211186">"Po llogarit…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Madhësia e paketës nuk mund të llogaritej."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Nuk ke ndonjë aplikacion të palëve të treta të instaluar."</string>
<string name="version_text" msgid="9189073826278676425">"versioni <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Zhvendos"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Zhvendos te tableti"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Zhvendos te telefoni"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Zhvendose në USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Zhvendos te karta SD"</string>
- <string name="moving" msgid="6431016143218876491">"Po zhvendos"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Një migrim tjetër është tashmë në vazhdim."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nuk ka hapësirë ruajtëse të mjaftueshme."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Aplikacioni nuk ekziston."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Aplikacioni i administratorit të pajisjes nuk mund të instalohet në media të jashtme"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Të ndalohet me forcë?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Nëse e ndalon me forcë një aplikacion, ai mund të përjetojë çrregullime në funksionim."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Nuk mundi të zhvendoste aplikacionin. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Vendndodhja e preferuar e instalimit"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Ndrysho vendndodhjen e preferuar të instalimit për aplikacione të reja"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Të çaktivizohet aplikacioni i integruar?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Çaktivizo aplikacionin"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Nëse e çaktivizon këtë aplikacion, Android dhe aplikacionet e tjera mund të mos funksionojnë më siç pritet."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Të fshihen të dhënat dhe të çaktivizohet aplikacioni?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Nëse e çaktivizon këtë aplikacion, Android dhe aplikacionet e tjera mund të mos funksionojnë më siç pritet. Të dhënat e tua do të fshihen po ashtu."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Të çaktivizohen njoftimet?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Nëse i çaktivizon njoftimet për këtë aplikacion, mund të humbasësh alarme dhe përditësime të rëndësishme."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Dyqani"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Detajet e aplikacioneve"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacioni i instaluar nga <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1946,7 +1939,7 @@
<string name="usage_time_label" msgid="295954901452833058">"Koha e përdorimit"</string>
<string name="accessibility_settings" msgid="3975902491934816215">"Qasshmëria"</string>
<string name="accessibility_settings_title" msgid="2130492524656204459">"Cilësimet e qasjes"</string>
- <string name="accessibility_settings_summary" msgid="981260486011624939">"Lexues ekrani, ekran, kontrolle interaktive"</string>
+ <string name="accessibility_settings_summary" msgid="981260486011624939">"Lexues ekrani, ekran, kontrolle ndërveprimi"</string>
<string name="vision_settings_title" msgid="4204111425716868288">"Cilësimet e shikimit"</string>
<string name="vision_settings_description" msgid="5679491180156408260">"Mund ta personalizosh këtë pajisje për t\'iu përshtatur nevojave të tua. Këto funksione të qasjes mund të ndryshohen më vonë te \"Cilësimet\"."</string>
<string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Ndrysho madhësinë e shkrimit"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Përdor shërbimin"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Përdor korrigjimin e ngjyrave"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Përdor titrat"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Vazhdo"</string>
<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="6371077608778830020">"Shto një aparat dëgjimi"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Nëse e kufizon aktivitetin në sfond për një aplikacion, mund të ketë çrregullime në funksionimin e tij"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Duke qenë se ky aplikacion nuk është caktuar për të optimizuar baterinë, nuk mund ta kufizosh atë.\n\nPër të kufizuar aplikacionin, në fillim aktivizo optimizimin e baterisë."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Përdorimi i ekranit që nga ngarkimi i plotë"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumi i ekranit"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Skanimi i rrjetit celular"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Përdorimi i baterisë që prej ngarkimit të plotë"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Sasia e kohës për të cilën ekrani ka qenë aktiv që nga ngarkimi i plotë"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Përdorimi i pajisjes që nga ngarkimi i plotë"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Përdor detajet"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Rregullo përdorimin e energjisë"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Paketat e përfshira"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Aplikacionet që shkarkojnë baterinë"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Po e mban zgjuar pajisjen"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Po e zgjon pajisjen në sfond"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Po kërkon shpesh vendndodhjen"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> aplikacione kanë sjellje jonormale"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Aplikacionet po funksionojnë normalisht"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefoni ka një përdorim normal të baterisë në sfond"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tableti ka një përdorim normal të baterisë në sfond"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Përdorimi i baterisë po kufizohet për %1$d aplikacione</item>
<item quantity="one">Përdorimi i baterisë po kufizohet për %1$d aplikacion</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Kufizuar <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Këto aplikacione kanë përdorur bateri në sfond. Aplikacionet e kufizuara mund të mos funksionojnë siç duhet dhe njoftimet mund të vonohen."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Përdor \"Menaxherin e baterisë\""</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Zbulo kur aplikacionet shkarkojnë baterinë"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Anulo"</string>
<string name="tts_reset" msgid="2661752909256313270">"Rivendos"</string>
<string name="tts_play" msgid="2628469503798633884">"Luaj"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Kontrolli i energjisë"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Po përditëson cilësimin e Wi‑Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Po përditëson cilësimin e \"Bluetooth-it\""</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"aktivizuar"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"çaktivizuar"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"po aktivizon"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"po çaktivizon"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth-i"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Vendndodhja"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinkronizo"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Ndriçimi <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatike"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"i plotë"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"gjysmë"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"çaktivizuar"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Ruajtja e kredencialeve"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalo nga hapësira ruajtëse"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> nga <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Përzgjidhi të gjtiha"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Përdorimi i të dhënave"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Përdorimi i të dhënave"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Të dhënat celulare dhe Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga ajo e pajisjes tënde."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Përdorimi i aplikacionit"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIONI I APL."</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Shfaq %d artikuj të fshehur</item>
<item quantity="one">Shfaq %d artikull të fshehur</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Palos"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Rrjeti dhe interneti"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"celular"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"përdorimi i të dhënave"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apl. dhe njoftimet"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Lejet, apl. e parazgjedhura"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Qasja te njoftimet nuk ofrohet për aplikacionet në profilin e punës."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Llogaritë"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Nuk u shtua asnjë llogari"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Apl. e parazgjedhura"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Gjuhët, koha, rezervimi, përditësimet"</string>
<string name="search_results_title" msgid="1796252422574886932">"Cilësimet"</string>
- <string name="search_menu" msgid="6283419262313758339">"Kërko \"Cilësimet\""</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, lidhja e rrjetit, internet, pa tel, të dhëna, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, ndrysho, kontrolli"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"mesazh me tekst, dërgim mesazhi me tekst, mesazhe, dërgim mesazhi, i parazgjedhur"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"paguaj, trokit, pagesa"</string>
<string name="keywords_backup" msgid="470070289135403022">"rezervim, rezervo"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"gjesti"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"fytyrë, shkyçje, autorizim, identifikim"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, versioni prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"rrjeti, gjendja e rrjetit celular, gjendja e shërbimit, fuqia e sinjalit, lloji i rrjetit celular, roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"numri i serisë, versioni i harduerit"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tema e errët"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"defekt në kod"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Shfaqja e ambientit, shfaqja e ekranit të kyçjes"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"njoftimi i ekranit të kyçjes"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"fytyrë"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"gjurmë gishti"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"errëso ekranin, ekrani me prekje, bateria, ndriçimi inteligjent, ndriçimi dinamik"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Kur fut kodin PIN për të nisur këtë pajisje, nuk do të ofrohen ende shërbimet e qasshmërisë si <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Kur fut motivin për të nisur këtë pajisje, shërbimet e qasjes si <xliff:g id="SERVICE">%1$s</xliff:g> nuk do të jenë ende të gatshme."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Kur fut fjalëkalimin tënd për të nisur këtë pajisje, shërbimet si <xliff:g id="SERVICE">%1$s</xliff:g> nuk do të jenë ende të disponueshëm."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Shënim: Pas një rinisjeje, ky aplikacion nuk mund të niset derisa të shkyçësh telefonin"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Shënim: Nëse e rinis telefonin dhe ke caktuar një kyçje të ekranit, ky aplikacion nuk mund të niset derisa të shkyçësh telefonin"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Informacioni i IMEI-t"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Informacioni përkatës i IMEI-t"</string>
<string name="slot_number" msgid="3762676044904653577">"(Foleja <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personale"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Punë"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Aplikacionet: Të gjitha"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Aplikacionet: Të çaktivizuara"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Çaktivizuar"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategoritë: Rëndësia urgjente"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategoritë: Përparësia e ulët"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategoritë: Të çaktivizuara"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Sinjalizimet për përdorimin"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Shfaq përdorimin e plotë të pajisjes"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Shfaq përdorimin e aplikacionit"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Përdorim i lartë"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> aplikacione kanë sjellje jonormale</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> ka sjellje jonormale</item>
@@ -3666,7 +3637,7 @@
<string name="running_frequency" msgid="6622624669948277693">"Frekuenca"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Përdorimi maksimal"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Nuk janë përdorur të dhëna"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Të lejohet qasja te \"Mos shqetëso\" për <xliff:g id="APP">%1$s</xliff:g>?"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Të lejohet qasja te \"Mos shqetëso\" për \"<xliff:g id="APP">%1$s</xliff:g>\"?"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Aplikacioni do të jetë në gjendje të aktivizojë/çaktivizojë opsionin \"Mos shqetëso\", si dhe të bëjë ndryshimet në cilësimet përkatëse."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Duhet të qëndrojë e aktivizuar sepse qasja e njoftimeve është e aktivizuar"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Të anulohet qasja te \"Mos shqetëso\" për <xliff:g id="APP">%1$s</xliff:g>?"</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Hapësira ruajtëse e brendshme: <xliff:g id="PERCENTAGE">%1$s</xliff:g> e përdorur - <xliff:g id="FREE_SPACE">%2$s</xliff:g> e lirë"</string>
<string name="display_summary" msgid="6737806235882127328">"Në gjumë pas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> pa aktivitet"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Sfond, fjetje, madhësia e shkrimit"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Në gjumë pas 10 minutash pa aktivitet"</string>
<string name="memory_summary" msgid="8080825904671961872">"Mesatarisht <xliff:g id="USED_MEMORY">%1$s</xliff:g> nga <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> memorie të përdorura"</string>
<string name="users_summary" msgid="1674864467098487328">"Identifikuar si <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Mesazhi SMS nuk lejohet"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kamera nuk lejohet"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Pamja e ekranit nuk lejohet"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Nuk mund çaktivizohen rezervimet"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Ky aplikacion nuk mund të hapet"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Nëse ke pyetje, kontakto me administratorin e TI-së"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Më shumë detaje"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Simulo një ekran me prerje"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Asnjë"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Parazgjedhja e pajisjes"</string>
<string name="special_access" msgid="3458780842491881155">"Qasja e veçantë e apl."</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplikacione mund të përdorin të dhëna të pakufizuara</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Lidhur me <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Lidhur me shumë pajisje"</string>
<string name="demo_mode" msgid="2798762752209330277">"Modaliteti i demonstrimit i ndërfaqes së përdoruesit të sistemit"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Modaliteti \"natë\""</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Cakto modalitetin \"natë\""</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Modaliteti i errët"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Cakto \"Modalitetin e errët\""</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pllakëzat e zhvilluesit të cilësimeve të shpejta"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Gjurma e Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Cilësimet e profilit të punës"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kërkimi i kontakteve"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Lejo kërkimet e kontakteve nga organizata jote për të identifikuar telefonuesit dhe kontaktet"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Trokit dy herë për të kontrolluar telefonin"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Trokit dy herë për të kontrolluar tabletin"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Trokit dy herë për të kontrolluar pajisjen"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, trokit dy herë tek ekrani."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Për të kontrolluar orën, njoftimet dhe informacione të tjera, trokit dy herë tek ekrani."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Ngrije për ta kontrolluar telefonin"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Ngrije për ta kontrolluar tabletin"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ngrije për ta kontrolluar pajisjen"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, merre telefonin në dorë."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, merre në duar tabletin tënd."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Për të kontrolluar orën, ikonat e njoftimeve dhe informacione të tjera, merre në duar pajisjen tënde."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Ekrani i zgjimit"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Për të kontrolluar orën, njoftimet dhe informacione të tjera, merre në duar telefonin tënd."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Për të kontrolluar orën, njoftimet dhe informacione të tjera, merre në duar tabletin tënd."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Për të kontrolluar orën, njoftimet dhe informacione të tjera, merre në duar pajisjen tënde."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Gjesti i shfaqjes së ekranit të kyçjes"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Rrëshqit gjurmën e gishtit për njoftimet"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Rrëshqit gjurmën e gishtit"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Për të kontrolluar njoftimet, rrëshqit poshtë në sensorin e gjurmës së gishtit në pjesën e pasme të telefonit."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> përpjekje</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> përpjekje</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Të dhënat e kësaj pajisjeje po rezervohen"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Kjo pajisje menaxhohet nga organizata jote."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Kjo pajisje menaxhohet nga <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Shërbimi i plotësimit automatik"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"plotësim, automatik, plotësim automatik"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Sigurohu që ke besim te ky aplikacion</b> <br/> <br/> <xliff:g id=app_name example=\"Plotësimi automatik i Google>%1$s</xliff:g> përdor atë që ndodhet në ekranin tënd për të përcaktuar se çfarë mund të plotësohet automatikisht."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Plotësim automatik"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Niveli i identifikimit"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Kërkesat maksimale për seancë"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Setet maksimale të dukshme të të dhënave"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Rivendos në vlerat e parazgjedhura"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Opsionet e plotësimit automatik të zhvilluesit janë rivendosur"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema e pajisjes"</string>
<string name="default_theme" msgid="7085644992078579076">"I parazgjedhur"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Emri i rrjetit"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivizo përgatitjen e operatorit celular"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Përditëso modalitetin \"Mos shqetëso\""</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Vendos njoftimet në pauzë për të qëndruar i fokusuar"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Çfarë ka të reja dhe emocionuese?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Zhvillo një turne të telefonit tënd të ri"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Zhvillo një turne të tabletit tënd të ri"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Zhvillo një turne të pajisjes sate të re"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ky funksion nuk ofrohet në këtë pajisje"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Matjet GNSS me fuqi të plotë"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Gjurmo të gjitha koleksionet dhe frekuencat e GNSS pa ciklim të detyruar"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Gjithmonë shfaq dialogun e ndërprerjes aksidentale"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Shfaq dialogun sa herë që një aplikacion pëson ndërprerje aksidentale"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Zgjidh aplikacionin e aktivizuar për ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Nuk është caktuar aplikacion i aktivizuar për ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Aplikacioni i aktivizuar për ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Qasja në direktori"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"qasja në direktori"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Detajet e rrjetit"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Emri i pajisjes sate është i dukshëm për aplikacionet në telefonin tënd. Ai mund të shikohet po ashtu nga persona të tjerë kur lidhesh me pajisje me Bluetooth ose kur konfiguron një zonë të qasjes për internet me Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Pajisjet"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Të gjitha cilësimet"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Sugjerime"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Të dhënat e CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Të dhënat e CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Zgjidh rrjetin"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"I shkëputur"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Lidhur"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Po lidhet…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Nuk mund të lidhej"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Nuk u gjetën rrjete."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Rrjetet nuk mund të gjendeshin. Provo përsëri."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ndalohet)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Nuk ka kartë SIM"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Telefonatë e përparuar"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Modaliteti i rrjetit të preferuar: preferohet WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Modaliteti i rrjetit të preferuar: vetëm GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Modaliteti i rrjetit të preferuar: vetëm WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Modaliteti i rrjetit të preferuar: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Modaliteti i rrjetit të preferuar: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Modaliteti i rrjetit të preferuar: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Modaliteti i rrjetit të preferuar: vetëm CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Modaliteti i rrjetit të preferuar: vetëm EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Modaliteti i rrjetit të preferuar: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Modaliteti i rrjetit të preferuar: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Modaliteti i rrjetit të preferuar: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Modaliteti i rrjetit të preferuar: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Modaliteti i rrjetit të preferuar: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Modaliteti i rrjetit të preferuar: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Modaliteti i rrjetit të preferuar: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Modaliteti i rrjetit të preferuar: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Modaliteti i rrjetit të preferuar: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Modaliteti i rrjetit të preferuar: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Modaliteti i rrjetit të preferuar: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Modaliteti i rrjetit të preferuar: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Modaliteti i rrjetit të preferuar: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Modaliteti i rrjetit të preferuar: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Modaliteti i rrjetit të preferuar: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Modaliteti i rrjetit të preferuar: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Modaliteti i rrjetit të preferuar: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Modaliteti i rrjetit të preferuar: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (rekomandohet)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (rekomandohet)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globale"</string>
+ <string name="label_available" msgid="1731547832803057893">"Rrjete të arritshme"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Po kërkon…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Po regjistron në <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Karta SIM nuk lejon lidhje me këtë rrjet."</string>
+ <string name="connect_later" msgid="978991102125216741">"Nuk mund të lidhet me këtë rrjet tani. Provo sërish më vonë."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Regjistruar në rrjet."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Zgjidh automatikisht rrjetin"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Cilësimet e operatorit"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Konfiguro shërbimin e të dhënave"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Të dhënat celulare"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Qasu te të dhënat duke përdorur rrjetin celular"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Lloji i rrjetit të preferuar"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Ndrysho modalitetin e operimit të rrjetit"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Lloji i rrjetit të preferuar"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operatori celular"</string>
+ <string name="call_category" msgid="8108654745239563833">"Po telefonon"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Telefonata me video e operatorit celular"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Përzgjedhja e sistemit"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Ndrysho modalitetin CDMA të roaming-ut"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Përzgjedhja e sistemit"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Rrjeti"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Rrjeti"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Abonimi CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Ndrysho mes RUIM/SIM dhe NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"abonimi"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Regjistrim automatik…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Të lejohet shfrytëzimi i roaming-ut?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Kontakto me operatorin celular të rrjetit për çmimin."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Përdorimi i të dhënave të aplikacioneve"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Regjim i pavlefshëm i rrjetit <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Shpërfille."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Nuk ofrohet kur është e lidhur me <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Shiko më shumë"</string>
+ <string name="see_less" msgid="1250265310929558370">"Shiko më pak"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Nuk ka pajisje të lidhura"</string>
</resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index ac1e8e4..25f0c9d 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Третирај као мрежу са ограничењем"</item>
<item msgid="2266114985518865625">"Третирај као мрежу без ограничења"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Подразумевано (користи насумично изабрану MAC адресу)"</item>
+ <item msgid="5398461510512959597">"Поуздано"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Не"</item>
<item msgid="3863157480502955888">"Да"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Увек укључено"</item>
<item msgid="6385301106124765323">"Увек искључено"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Искључи"</item>
+ <item msgid="2182686878828390312">"Отклони грешке"</item>
+ <item msgid="5286514712714822064">"Детаљно"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Само кућна"</item>
+ <item msgid="5034813753274486448">"Аутоматски"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA има предност"</item>
+ <item msgid="807926878589867564">"Само GSM"</item>
+ <item msgid="488474605709912156">"Само WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA аутоматски"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo аутоматски"</item>
+ <item msgid="370391313511477301">"CDMA без EvDo-а"</item>
+ <item msgid="4678789463133969294">"Само EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Глобална"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Само TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Глобална"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 1abc17e..40d3cbb 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Направи"</string>
<string name="allow" msgid="3349662621170855910">"Дозволи"</string>
<string name="deny" msgid="6947806159746484865">"Одбиј"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Затвори"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Пребаци на"</string>
<string name="device_info_default" msgid="7847265875578739287">"Непознато"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Треба да обавите још <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> корак да бисте постали програмер.</item>
@@ -33,10 +31,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Нема потребе, већ сте програмер."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Прво омогућите опције за програмере."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Бежична веза и мреже"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Везе"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Уређај"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Лични"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Приступ"</string>
<string name="header_category_system" msgid="2816866961183068977">"Систем"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Омогући везу за пренос података"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Онемогући везу за пренос података"</string>
@@ -122,7 +116,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth адреса уређаја: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Желите ли да прекинете везу са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Емитовање"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Неименовани Bluetooth уређај"</string>
<string name="progress_scanning" msgid="192587958424295789">"Претражује се"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Нема Bluetooth уређаја у близини."</string>
@@ -154,7 +147,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Апликација жели да укључи Bluetooth и учини телефон видљивим за друге уређаје. Ово можете касније да промените у подешавањима Bluetooth-а."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth се укључује…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Искључивање Bluetooth-а…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Аутоматско повезивање"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Захтев за Bluetooth повезивање"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Додирните да бисте се повезали са уређајем „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Да ли желите да се повежете са уређајем „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
@@ -182,12 +174,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Доступни уређаји за позивање"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Тренутно повезани"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Сачувани уређаји"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Додајте уређај"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth ће се укључити ради упаривања"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Подешавања везе"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Претходно повезани уређаји"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Претходно повезани"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth је укључен"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Прикажи све"</string>
<string name="date_and_time" msgid="9062980487860757694">"Датум и време"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Избор временске зоне"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -270,7 +262,6 @@
<string name="skip_label" msgid="47510779345218297">"Прескочи"</string>
<string name="next_label" msgid="4693520878012668114">"Даље"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Језици"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Подешавања језика"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Уклони"</string>
<string name="add_a_language" msgid="2330538812283783022">"Додајте језик"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -305,7 +296,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Подешавања"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Пречица подешавања"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Режим рада у авиону"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Још"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бежична веза и мреже"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Управљање Wi-Fi мрежом, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-ом"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Мобилни подаци"</string>
@@ -390,6 +380,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Приватност"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Администратор је онемогућио"</string>
<string name="security_status_title" msgid="5848766673665944640">"Безбедносни статус"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Закључавање екрана, откључавање лицем"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Закључавање екрана, отисак прста"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Закључавање екрана"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Лице је додато"</string>
@@ -399,11 +390,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Откључајте помоћу лица"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Потврдите идентитет лицем"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Откључавајте телефон, одобравајте куповине или се пријављујте у апликације помоћу лица."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Употребите своје лице"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Откључавајте телефон или одобравајте куповине помоћу лица.\n\nНапомена: Не можете да откључавате овај уређај помоћу лица. Више информација затражите од администратора организације."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Откључавајте телефон, одобравајте куповине или се пријављујте у апликације помоћу лица"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Максималан број отисака прстију који можете да додате је <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Поставите лице у центар круга"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Урадићу то касније"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Максималан број лица који можете да додате је <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Додали сте максималан број лица"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Не можете да додате још лица"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Регистрација није завршена"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Потврди"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Истекло је време за регистрацију лица. Пробајте поново."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Регистрација лица није успела."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Готово. Изгледа да је све у реду."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Готово"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Користите лице за"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"откључавање уређаја"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Пријава у апликације и плаћања"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Отворене очи ради откључавања"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Када користите потврду идентитета лицем, очи морају да буду отворене."</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Уклоните податке о лицу"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Побољшајте податке о лицу"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Користите лице да бисте откључали уређај и приступили апликацијама. "<annotation id="url">"Сазнајте више"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Отисак прста"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Управљај отис. прстију"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Користи отис. прста за"</string>
@@ -899,6 +906,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Изаберите барем један опсег за Wi‑Fi хотспот:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP подешавања"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Приватност"</string>
<string name="wifi_shared" msgid="844142443226926070">"Дели са другим корисницима уређаја"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(непромењено)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Изаберите"</string>
@@ -938,7 +946,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Откажи"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Желите ли да уређај заборави мрежу?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Све лозинке за ову мрежу ће бити избрисане"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Сачуване мреже"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d мрежа</item>
<item quantity="few">%d мреже</item>
@@ -1118,8 +1125,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Осветљеност"</string>
<string name="brightness_summary" msgid="838917350127550703">"Прилагођавање осветљености екрана"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Прилагодљива осветљеност"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Укључено"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Искључено"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Жељена осветљеност је веома ниска"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Жељена осветљеност је ниска"</string>
@@ -1215,6 +1221,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Није могуће променити PIN.\nМогуће је да је PIN нетачан."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN је успешно промењен"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Није могуће променити стање закључавања SIM картице.\nМогуће је да је PIN нетачан."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Онемогућавање PIN-а није успело."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Омогућавање PIN-а није успело."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Потврди"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Откажи"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Пронађено је више SIM картица"</string>
@@ -1291,7 +1299,7 @@
<string name="memory_media_usage" msgid="3738830697707880405">"Медији"</string>
<string name="memory_downloads_usage" msgid="3755173051677533027">"Преузимања"</string>
<string name="memory_dcim_usage" msgid="558887013613822577">"Слике, видео снимци"</string>
- <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музика, звукови звона, поткастови итд.)"</string>
+ <string name="memory_music_usage" msgid="1363785144783011606">"Аудио (музика, звукови звона, поткасти итд.)"</string>
<string name="memory_media_misc_usage" msgid="6094866738586451683">"Друге датотеке"</string>
<string name="memory_media_cache_usage" msgid="6704293333141177910">"Кеширани подаци"</string>
<string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Искљ. дељене меморије"</string>
@@ -1389,7 +1397,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"То захтева да се <xliff:g id="NAME_0">^1</xliff:g> форматира. \n\n"<b>"Форматирањем се бришу сви подаци које тренутно садржи <xliff:g id="NAME_1">^1</xliff:g>."</b>" Да не бисте изгубили податке, размислите о прављењу резервне копије."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Обриши и форматирај"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> се форматира…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Не уклањајте уређај <xliff:g id="NAME">^1</xliff:g> док се форматира."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Не уклањајте уређај <xliff:g id="NAME">^1</xliff:g> док се форматира."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Пренесите подат. у нову меморију"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Слике, датотеке и неке апликације можете да пренесете на овај нови уређај <xliff:g id="NAME">^1</xliff:g>. \n\nПренос траје <xliff:g id="TIME">^2</xliff:g> чиме се ослобађа <xliff:g id="SIZE">^3</xliff:g> интерне меморије. Неке апликације неће функционисати током преноса."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Пренеси одмах"</string>
@@ -1772,9 +1780,6 @@
<string name="installed" msgid="3070865169422600098">"Инсталирана"</string>
<string name="no_applications" msgid="7336588977497084921">"Нема апликација."</string>
<string name="internal_storage" msgid="1584700623164275282">"Интерно складиште"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"интерна меморија"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB меморија"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD картица"</string>
<string name="recompute_size" msgid="7722567982831691718">"Поновно израчунавање величине..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Желите ли да избришете податке о апликацији?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Сви подаци ове апликације биће трајно избрисани. То обухвата све датотеке, подешавања, налоге, базе података итд."</string>
@@ -1783,24 +1788,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Апликација није пронађена на листи инсталираних апликација."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Брисање меморијског простора за апликацију није успело."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ова апликација може да приступа следећим ставкама на таблету:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ова апликација може да приступа следећим ставкама на телефону:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ова апликација може да приступа следећим информацијама на таблету. Да би се побољшао учинак и смањило коришћење меморије, неке од ових дозвола су доступне апликацији <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> зато што се користи у истом процесу као и апликације <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ова апликација може да приступа следећим информацијама на телефону. Да би се побољшао учинак и смањило коришћење меморије, неке од ових дозвола су доступне апликацији <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> зато што се користи у истом процесу као и апликације <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> и <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ова апликација ће вам можда бити наплаћена:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Слање премијум SMS порука"</string>
<string name="computing_size" msgid="1599186977475211186">"Израчунавање..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Није могуће израчунати величину пакета."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Нисте инсталирали ниједну апликацију независног произвођача."</string>
<string name="version_text" msgid="9189073826278676425">"верзија <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Премести"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Премести на таблет"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Премести у телефон"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Премести у USB меморију"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Премести у SD картицу"</string>
- <string name="moving" msgid="6431016143218876491">"Премештање"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Други пренос је већ у току."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Нема довољно простора у меморији."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Апликација не постоји."</string>
@@ -1810,17 +1807,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Апликација за администратора уређаја не може да се инсталира на спољним медијима"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Желите ли да принудно зауставите?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ако принудно зауставите апликацију, можда ће се понашати неочекивано."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Није могуће преместити апликацију. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Жељена локација инсталације"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Мењање жељене локације за инсталацију нових апликација"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Желите да онемогућите уграђену апл.?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Онемогући апликацију"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ако онемогућите ову апликацију, Android и друге апликације можда више неће функционисати исправно."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Желите ли да избришете податке и онемогућите апликацију?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ако онемогућите ову апликацију, Android и друге апликације можда више неће функционисати исправно. Осим тога, подаци ће бити избрисани."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Желите ли да искљ. обавештења?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ако искључите обавештења за ову апликацију, можете да пропустите важна обавештења и ажурирања."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Продавница"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Детаљи о апликацији"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Апликација је инсталирана из продавнице <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1989,7 +1982,7 @@
<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="1996584694050087161">"Када је увећање укључено, користите дугме за приступачност у дну екрана да бисте брзо увећали приказ.\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_configuration_warning" msgid="70533120652758190">"Дугме за приступачност је подешено на <xliff:g id="SERVICE">%1$s</xliff:g>. Да бисте користили увећање, додирните и задржите дугме за приступачност, па изаберите увећање."</string>
- <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Пречица за тастер за јачину звука"</string>
+ <string name="accessibility_global_gesture_preference_title" msgid="2048884356166982714">"Тастер јачине звука као пречица"</string>
<string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Услуга пречице"</string>
<string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"Омогући на закључаном екрану"</string>
<string name="accessibility_shortcut_description" msgid="1765853731190717372">"Када је пречица укључена, можете да притиснете оба тастера за јачину звука и задржите их 3 секунде да бисте покренули функцију приступачности."</string>
@@ -2013,6 +2006,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Користи услугу"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Користи корекцију боја"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Користи натписе"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Настави"</string>
<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="6371077608778830020">"Додајте слушни апарат"</string>
@@ -2164,8 +2158,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ако ограничите активности апликације у позадини, можда ће се понашати неочекивано."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Апл. није подешена за оптимизацију батерије, па не можете да је ограничите. \n\nЗа огр. апл. укључите оптимизацију батерије."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Коришћење екрана од потпуног пуњења"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Потрошња за екран"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилних мрежа"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Коришћење батерије од потпуног пуњења"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Количина времена током којег је екран био укључен од потпуног пуњења"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Коришћење уређаја од потпуног пуњења"</string>
@@ -2192,11 +2184,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Коришћење детаља"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Прилагођавање коришћења напајања"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Садржани пакети"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Апликације много троше батерију"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Не дозвољавамо да уређај пређе у стање спавања"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Будимо уређај у позадини"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Често тражи локацију"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Неке апликације (<xliff:g id="NUMBER">%1$d</xliff:g>) се чудно понашају"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Апликације раде уобичајено"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Телефон троши типичну количину батерије у позадини"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Таблет троши типичну количину батерије у позадини"</string>
@@ -2266,6 +2253,7 @@
<item quantity="few">Ограничите потрошњу батерије за %1$d апликације</item>
<item quantity="other">Ограничите потрошњу батерије за %1$d апликација</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Ограничена <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Ове апликације су трошиле батерију у позадини. Ограничене апликације можда неће радити како треба и обавештења могу да касне."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Користите менаџер батерије"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Откријте када апликације испразне батерију"</string>
@@ -2444,23 +2432,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Откажи"</string>
<string name="tts_reset" msgid="2661752909256313270">"Ресетуј"</string>
<string name="tts_play" msgid="2628469503798633884">"Пусти"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Контрола напајања"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ажурирање Wi-Fi подешавања"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ажурирање Bluetooth подешавања"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"укључено"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"искључено"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"укључивање"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"искључивање"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Локација"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Синхронизација"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Осветљење: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"аутоматскo"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"пуно"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"половично"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"искључено"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Складиште акредитива"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Инсталирање из меморије"</string>
@@ -2618,7 +2589,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Изабери све"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Коришћење података"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Коришћење података аплик."</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Мобилни подаци и Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Обрачун података код мобилног оператера се можда разликује од вашег уређаја."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Коришћење апликације"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ИНФОРМАЦИЈЕ О АПЛИКАЦИЈИ"</string>
@@ -3000,7 +2971,6 @@
<item quantity="few">Прикажи %d скривене ставке</item>
<item quantity="other">Прикажи %d скривених ставки</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Скупи"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Мрежа и интернет"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобилна мрежа"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"потрошња података"</string>
@@ -3012,12 +2982,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aпликације и обавештења"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дозволе, подразумеване апликације"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Приступ обавештењима није доступан за апликације на радном профилу."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Налози"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Ниједан налог није додат"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Подразумеване апликације"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Језици, време, резервне копије, ажурирања"</string>
<string name="search_results_title" msgid="1796252422574886932">"Подешавања"</string>
- <string name="search_menu" msgid="6283419262313758339">"Претражите подешавања"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, веза са мрежом, интернет, бежично, подаци, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, укључи/искључи, контрола"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, слање SMS-ова, поруке, размена порука, подразумевано"</string>
@@ -3062,6 +3032,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"платите, додирните, плаћања"</string>
<string name="keywords_backup" msgid="470070289135403022">"резервна копија, правити резервну копију"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"покрет"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"лице, откључавање, потврда идентитета, пријављивање"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, мин, верзија prl-a, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"мрежа, стање мобилне мреже, стање услуге, јачина сигнала, тип мобилне мреже, роминг, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"серијски број, верзија хардвера"</string>
@@ -3069,6 +3040,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"тамна тема"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"грешка"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Амбијентални екран, приказ на закључаном екрану"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"обавештење на закључаном екрану"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"лице"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"дигитални отисак"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"затамнити екран, додирни екран, батерија, паметна светлина, динамичка светлина"</string>
@@ -3510,7 +3482,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Када унесете PIN да бисте покренули овај уређај, услуге приступачности, као што је <xliff:g id="SERVICE">%1$s</xliff:g>, неће још увек бити доступне."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Када унесете шаблон да бисте покренули овај уређај, услуге приступачности, као што је <xliff:g id="SERVICE">%1$s</xliff:g>, неће још увек бити доступне."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Када унесете лозинку да бисте покренули овај уређај, услуге приступачности, као што је <xliff:g id="SERVICE">%1$s</xliff:g>, неће још увек бити доступне."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Напомена: После рестартовања ова апликација не може да се покрене док не откључате телефон"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Напомена: Ако рестартујете телефон и подесили сте закључавање екрана, ова апликација не може да се покрене док не откључате телефон"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Информације за IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Релативне информације за IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Отвор <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3568,12 +3540,12 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Личне"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Посао"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Апликације: све"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Апликације: искључено"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Искључено"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категорије: висок приоритет"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категорије: низак приоритет"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категорије: искључено"</string>
<string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Категорије: мења режим „Не узнемиравај“"</string>
- <string name="advanced_apps" msgid="4812975097124803873">"Напредна"</string>
+ <string name="advanced_apps" msgid="4812975097124803873">"Напредно"</string>
<string name="configure_apps" msgid="6685680790825882528">"Конфигуришите апликације"</string>
<string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
<string name="app_permissions" msgid="4148222031991883874">"Дозволе за апликације"</string>
@@ -3630,7 +3602,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Обавештења о коришћењу"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Прикажи коришћење батерије"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Прикажи коришћење апликације"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Интензивно коришћење"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> апликација се понаша на неуобичајен начин</item>
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> апликације се понашају на неуобичајен начин</item>
@@ -3798,6 +3769,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Интерна меморија: <xliff:g id="PERCENTAGE">%1$s</xliff:g> је искоришћено – <xliff:g id="FREE_SPACE">%2$s</xliff:g> је слободно"</string>
<string name="display_summary" msgid="6737806235882127328">"Пређи у режим спавања после <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Позадина, режим спавања, величина фонта"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Прелазак у режим спавања после 10 минута неактивности"</string>
<string name="memory_summary" msgid="8080825904671961872">"У просеку је коришћено <xliff:g id="USED_MEMORY">%1$s</xliff:g> од <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> меморије"</string>
<string name="users_summary" msgid="1674864467098487328">"Пријављени сте као <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3813,7 +3786,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS-ови нису дозвољени"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Камера није дозвољена"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Прављење снимака екрана није дозвољено"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Не можете да искључите резервне копије"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Не можете да отворите ову апликацију"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Ако имате питања, обратите се ИТ администратору"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Још детаља"</string>
@@ -3982,9 +3954,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Симулирај приказ са обрезаном сликом"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Изрез екрана"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"изрезана слика за екран, урез"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Ништа"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Подразумевано подешавање за уређај"</string>
<string name="special_access" msgid="3458780842491881155">"Посебан приступ апликацији"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> апликација може да користи неограничену количину података</item>
@@ -4007,11 +3979,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Повезан је са уређајем <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Повезан је са више уређаја"</string>
<string name="demo_mode" msgid="2798762752209330277">"Режим демонстрације за кориснички интерфејс система"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Ноћни режим"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Подеси Ноћни режим"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Тамни режим"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Подесите тамни режим"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочице програмера за брза подешавања"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope траг"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Подешавања пословног профила"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Претрага контаката"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дозволите да претраживање контаката од стране ваше организације идентификује позиваоце и контакте."</string>
@@ -4055,13 +4026,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двапут додирните тел. да га проверите"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Двапут додирните таблет да бисте га проверили"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Двапут додирните уређај да бисте га проверили"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Да бисте проверили време, иконе обавештења и друге информације, двапут додирните екран."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Да бисте проверили време, обавештења и друге информације, двапут додирните екран."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Подигните телефон да га проверите"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Подигните таблет да бисте га проверили"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Подигните уређај да бисте га проверили"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Да бисте проверили време, иконе обавештења и друге информације, узмите телефон."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Да бисте проверили време, иконе обавештења и друге информације, узмите таблет."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Да бисте проверили време, иконе обавештења и друге информације, узмите уређај."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Пробудите екран"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Да бисте проверили време, обавештења и друге информације, узмите телефон."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Да бисте проверили време, обавештења и друге информације, узмите таблет."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Да бисте проверили време, обавештења и друге информације, узмите уређај."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Покрет за буђење закључаног екрана"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Превуците прстом за обавештења"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Превуците прстом"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Да бисте проверили обавештења, превуците прстом надоле по сензору за отисак прста на задњој страни телефона."</string>
@@ -4145,7 +4120,6 @@
<item quantity="few"><xliff:g id="COUNT_1">%d</xliff:g> покушаја</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> покушаја</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Прави се резервна копија података са овог уређаја"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Овим уређајем управља организација."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Овим уређајем управља <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4189,6 +4163,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Услуга аутоматског попуњавања"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"аутоматски, попуњавање, аутоматско попуњавање"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Уверите се да је ова апликација поуздана</b> <br/> <br/> <xliff:g id=app_name example=Google аутоматско попуњавање>%1$s</xliff:g> користи садржај екрана за утврђивање података који могу аутоматски да се попуне."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Аутоматско попуњавање"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Ниво евидентирања"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Максимални број захтева по сесији"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Максимални број видљивих скупова података"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Ресетуј на подразумеване вредности"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Опције за програмера за аутоматско попуњавање су ресетоване"</string>
<string name="device_theme" msgid="4571803018917608588">"Тема уређаја"</string>
<string name="default_theme" msgid="7085644992078579076">"Подразумевана"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Назив мреже"</string>
@@ -4203,15 +4183,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Покретање доделе мобилног оператера"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Ажурирајте режим Не узнемиравај"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Паузирајте обавештења ради боље концентрације"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Шта је ново и узбудљиво?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Упознајте нови телефон"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Упознајте нови таблет"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Упознајте нови уређај"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ова функција није доступна на овом уређају."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Принудно покрени пуна GNSS мерења"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Прати све GNSS консталације и фреквенције без циклуса рада"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Увек приказуј дијалог о отказивању"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Прикажи дијалог сваки пут када апликација откаже"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Изабери апликацију омогућену за ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Није подешена апликација омогућена за ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Апликација омогућена за ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Приступ директоријумима"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"приступ директоријумима"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4252,4 +4231,86 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Детаљи о мрежи"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Име уређаја виде апликације на телефону. Могу да га виде и други људи кад се повежете са Bluetooth уређајима или подесите Wi-Fi хотспот."</string>
<string name="devices_title" msgid="7701726109334110391">"Уређаји"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Сва подешавања"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Предлози"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS подаци"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS подаци"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Одаберите мрежу"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Веза је прекинута"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Повезано"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Повезује се…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Повезивање није успело"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Није пронађена ниједна мрежа."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Нисмо успели да пронађемо мреже. Пробајте поново."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(забрањено)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Нема SIM картице"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Напредно позивање"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Жељени режим мреже: WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Жељени режим мреже: само GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Жељени режим мреже: само WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Жељени режим мреже: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Жељени режим мреже: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Жељени режим мреже: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Жељени режим мреже: само CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Жељени режим мреже: само EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Жељени режим мреже: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Жељени режим мреже: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Жељени режим мреже: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Жељени режим мреже: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Жељени режим мреже: Глобално"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Жељени режим мреже: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Жељени мрежни режим: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Жељени режим мреже: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Жељени режим мреже: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Жељени режим мреже: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Жељени режим мреже: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Жељени режим мреже: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Жељени режим мреже: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Жељени режим мреже: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Жељени режим мреже: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Жељени режим мреже: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Жељени режим мреже: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Жељени режим мреже: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (препоручено)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (препоручено)"</string>
+ <string name="network_global" msgid="959947774831178632">"Глобална"</string>
+ <string name="label_available" msgid="1731547832803057893">"Доступне мреже"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Претражује се…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Региструјете се на мрежу <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM картица не дозвољава везу са овом мрежом."</string>
+ <string name="connect_later" msgid="978991102125216741">"Тренутно није могуће повезати се са овом мрежом. Пробајте поново касније."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Регистровано на мрежи."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Аутоматски изабери мрежу"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Подешавања оператера"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Подесите усл. преноса података"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Мобилни подаци"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Користи податке преко мобилне мреже"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Жељени тип мреже"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Промена режима рада мреже"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Жељени тип мреже"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Мобилни оператер"</string>
+ <string name="call_category" msgid="8108654745239563833">"Позивање"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Видео позивање преко оператера"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Избор система"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Промена режима CDMA роминга"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Избор система"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Мрежа"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Мрежа"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA пријава"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Промените мрежу са RUIM/SIM на NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"пријава"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Аутоматска регистрација..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Желите ли да дозволите пренос података у ромингу?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Цене проверите код мобилног оператера."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Потрошња података апликације"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Неважећи режим мреже <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Игноришите."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Недоступно када је успостављена веза са оператером <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Прикажи још"</string>
+ <string name="see_less" msgid="1250265310929558370">"Прикажи мање"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ <item quantity="other">Повезано је <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> уређаја</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Нема повезаних уређаја"</string>
</resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index daf320d..06a8686 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Behandla som nätverk med datapriser"</item>
<item msgid="2266114985518865625">"Behandla som nätverk utan datapriser"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Standard (använd slumpgenererad MAC-adress)"</item>
+ <item msgid="5398461510512959597">"Betrodda"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Nej"</item>
<item msgid="3863157480502955888">"Ja"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Alltid på"</item>
<item msgid="6385301106124765323">"Alltid av"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Av"</item>
+ <item msgid="2182686878828390312">"Felsökning"</item>
+ <item msgid="5286514712714822064">"Utförlig"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Endast hemma"</item>
+ <item msgid="5034813753274486448">"Automatisk"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Föredrar GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Endast GSM"</item>
+ <item msgid="488474605709912156">"Endast WCDMA"</item>
+ <item msgid="1912421096218750039">"Automatiskt GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Automatiskt CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA utan EvDo"</item>
+ <item msgid="4678789463133969294">"Endast EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Globalt"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Endast TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Globalt"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8a46c01..d06e5a1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Skapa"</string>
<string name="allow" msgid="3349662621170855910">"Tillåt"</string>
<string name="deny" msgid="6947806159746484865">"Neka"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Stäng"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Byt"</string>
<string name="device_info_default" msgid="7847265875578739287">"Okänd"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Du är nu <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steg från att bli utvecklare.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Det behövs inte. Du är redan utvecklare."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Aktivera utvecklaralternativ först"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Trådlöst och nätverk"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Anslutningar"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Enhet"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personligt"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Åtkomst"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Aktivera dataanslutning"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Inaktivera dataanslutning"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Enhetens Bluetooth-adress: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Vill du koppla från <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Bluetooth-sändning"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Namnlös Bluetooth-enhet"</string>
<string name="progress_scanning" msgid="192587958424295789">"Söker"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Hittade inga Bluetooth-enheter i närheten."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"En app vill aktivera Bluetooth och göra din mobil synlig för andra enheter. Du kan ändra detta senare i inställningarna för Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth aktiveras"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Vill du stänga av Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Automatisk anslutning"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Begäran om Bluetooth-anslutning"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Tryck om du vill ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Vill du ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Tillgängliga telefonenheter"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Anslutna just nu"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Sparade enheter"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Lägg till en enhet"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth aktiveras för parkoppling"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Anslutningsinställningar"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Tidigare anslutna enheter"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Tidigare anslutna enheter"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth har aktiverats"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Visa alla"</string>
<string name="date_and_time" msgid="9062980487860757694">"Datum och tid"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Välj tidszon"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Hoppa över"</string>
<string name="next_label" msgid="4693520878012668114">"Nästa"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Språk"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Språkinställningar"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Ta bort"</string>
<string name="add_a_language" msgid="2330538812283783022">"Lägg till ett språk"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Inställningar"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Genväg för inställningar"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Flygplansläge"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Mer"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådlöst och nätverk"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Hantera Wi-Fi, Bluetooth, flygplansläge, mobilnät och VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobildata"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Sekretess"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Inaktiverad av administratören"</string>
<string name="security_status_title" msgid="5848766673665944640">"Säkerhetsstatus"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Skärmlås, ansiktslås"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Skärmlås, fingeravtryck"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Skärmlås"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Ansikte har lagts till"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Lås upp med ansiktet"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Autentisera med hjälp av ditt ansikte"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Lås upp mobilen, godkänn köp eller logga in i appar med ditt ansikte."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Använd dig"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Lås upp mobilen eller godkänn köp med hjälp av ansiktet.\n\nObs! Du kan inte låsa upp den här enheten med hjälp av ansiktet. Kontakta organisationens administratör om du vill veta mer."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Lås upp mobilen, godkänn köp eller logga in i appar med ditt ansikte"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Du kan lägga till upp till <xliff:g id="COUNT">%d</xliff:g> ansikten"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Centrera ansiktet i cirkeln"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Gör det senare"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Du kan lägga till upp till <xliff:g id="COUNT">%d</xliff:g> ansikten"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Du har lagt till det högsta tillåtna antalet ansikten"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Det går inte att lägga till fler ansikten"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Registreringen slutfördes inte"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Tidsgränsen för ansiktsregistreringen har nåtts. Försök igen."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Det gick inte att registrera ansiktet."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Nu är det klart."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Klar"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Med ansiktet kan du"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Låsa upp enheten"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Inloggning och köp i appar"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Öppna ögon för upplåsning"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Dina ögon måste vara öppna vid användning av ansiktsautentisering"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Ta bort ansiktsdata"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Förbättra ansiktsdata"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Du kan låsa upp enheten och komma åt appar med hjälp av ansiktet. "<annotation id="url">"Läs mer"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeravtryck"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Hantera fingeravtryck"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Använd avtryck för"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Välj minst ett band för Wi‑Fi-surfzon:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP-inställningar"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Sekretess"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Välj"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Avbryt"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Ska nätverket glömmas?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Alla lösenord för nätverket tas bort"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Sparade nätverk"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d nätverk</item>
<item quantity="one">1 nätverk</item>
@@ -999,7 +1006,7 @@
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Inställning för roaming"</string>
<string-array name="wifi_calling_mode_choices">
<item msgid="2124257075906188844">"Wi-Fi i första hand"</item>
- <item msgid="1335127656328817518">"Mobilanpassad"</item>
+ <item msgid="1335127656328817518">"Mobilnät i första hand"</item>
<item msgid="3132912693346866895">"Endast Wi-Fi"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
@@ -1014,7 +1021,7 @@
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
<item msgid="5782108782860004851">"Wi-Fi i första hand"</item>
- <item msgid="5074515506087318555">"Mobilanpassad"</item>
+ <item msgid="5074515506087318555">"Mobilnät i första hand"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Ljusstyrka"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Anpassad ljusstyrka"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"På"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Av"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Önskad ljusstyrka är mycket låg ljusstyrka"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Önskad ljusstyrka är låg ljusstyrka"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Det går inte att ändra PIN-koden.\n Du kan ha angett fel PIN-kod."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-kortets PIN-kod har ändrats"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Det gick inte att ändra SIM-kortets låsstatus.\nDu kan ha angett fel PIN-kod."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Det gick inte att inaktivera pinkoden."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Det gick inte att aktivera pinkoden."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Avbryt"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Flera SIM-kort har hittats"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g> måste formateras. \n\n"<b>"En formatering rensar all data som finns på <xliff:g id="NAME_1">^1</xliff:g> för närvarande."</b>" Säkerhetskopiera data som du inte vill förlora."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Radera och formatera"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Formaterar <xliff:g id="NAME">^1</xliff:g> …"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Ta inte bort <xliff:g id="NAME">^1</xliff:g> under formateringen."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Ta inte bort <xliff:g id="NAME">^1</xliff:g> under formateringen."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Flytta data till ny lagring"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Du kan flytta foton, filer och vissa appar till <xliff:g id="NAME">^1</xliff:g>. \n\nFlytten tar cirka <xliff:g id="TIME">^2</xliff:g> och <xliff:g id="SIZE">^3</xliff:g> internminne kommer att frigöras. Vissa appar fungerar inte medan flytten pågår."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Flytta nu"</string>
@@ -1662,7 +1670,7 @@
<string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Gör grafiskt lösenord synligt"</string>
<string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Gör det grafiska lösenordet för profilen synligt"</string>
<string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Vibrera vid tryck"</string>
- <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Avstängningsknappen låser direkt"</string>
+ <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Strömbrytaren låser direkt"</string>
<string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Utom när den hålls olåst av <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
<string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ange grafiskt lösenord"</string>
<string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Byt grafiskt lösenord"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Installerad"</string>
<string name="no_applications" msgid="7336588977497084921">"Inga appar."</string>
<string name="internal_storage" msgid="1584700623164275282">"Intern lagring"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"lagring"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-lagring"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD-kortslagring"</string>
<string name="recompute_size" msgid="7722567982831691718">"Räknar om storlek…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Vill du ta bort appdata?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Appens samtliga data tas bort permanent. Det inkluderar alla filer, inställningar, konton, databaser och så vidare."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Appen fanns inte i listan över installerade appar."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Rensa inte appens lagringsutrymme."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Appen har åtkomst till följande på surfplattan:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Appen har åtkomst till följande på mobilen:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Den här appen har åtkomst till följande på din surfplatta. För att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> :"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Den här appen har åtkomst till följande på din mobil. För att förbättra prestandan och minska minnesanvändningen är några av dessa behörigheter tillgängliga för <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, eftersom den körs i samma process som <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> och <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Du kan behöva betala för den här appen:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Vill du skicka premium-SMS?"</string>
<string name="computing_size" msgid="1599186977475211186">"Beräknar…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Det gick inte att beräkna paketstorleken."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Du har inte installerat några appar från tredje part."</string>
<string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Flytta"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Flytta till surfplatta"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Flytta till telefon"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Flytta till USB-enhet"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Flytta till SD-kort"</string>
- <string name="moving" msgid="6431016143218876491">"Flyttar"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Det pågår redan en annan migrering."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Inte tillräckligt med lagringsutrymme."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Appen finns inte."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Det går inte att installera appen för enhetsadministration på externa lagringsmedier"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Vill du framtvinga avslutning?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Om du tvingar appen att avslutas kanske den inte fungerar som den ska."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Det gick inte att flytta appen. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Önskad installationsplats"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Ändra önskad installationsplats för nya appar."</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Inaktivera den inbyggda appen?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Inaktivera app"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Om du inaktiverar den här appen kan det påverka Android och andra appar så att de inte längre fungerar som de ska."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vill du radera uppgifterna och inaktivera appen?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Om du inaktiverar den här appen kan det påverka Android och andra appar så att de inte längre fungerar som de ska. Din data raderas också."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Inaktivera meddelanden?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Om du inaktiverar meddelanden för den här appen kanske du missar viktiga meddelanden och uppdateringar."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Butik"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Uppgifter om appen"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Appen har installerats från <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Använd tjänsten"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Använd färgkorrigering"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Använd textning"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Fortsätt"</string>
<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="6371077608778830020">"Lägg till hörapparat"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Om du begränsar bakgrundaktiviteten för en app kanske den inte fungerar som den ska"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Appen kan inte begränsas eftersom batterioptimering inte har angetts.\n\nAktivera batterioptimering för att begränsa appen."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Skärmanvändning sedan fulladdning"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Skärmens förbrukning"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Genomsökning av mobilnätverk"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Batteriförbrukning sedan fulladdning"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Den totala tidsperiod skärmen har varit på sedan den senaste fulladdningen"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Enhetsanvändning sedan batteriet var fulladdat"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Information om användning"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Justera strömförbrukningen"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Inkluderade paket"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Appar som förbrukar batteriet"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Enheten hålls aktiv"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Enheten aktiveras i bakgrunden"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Begär platsinformation för ofta"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> appar beter sig inte som de ska"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Appar körs som vanligt"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Batteriförbrukningen i bakgrunden är normal på mobilen"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Batteriförbrukningen i bakgrunden är normal på surfplattan"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Begränsar batterianvändningen för %1$d appar</item>
<item quantity="one">Begränsar batterianvändningen för %1$d app</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Begränsades <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"De här apparna har dragit batteri i bakgrunden. Begränsade appar kanske inte fungerar som de ska, och aviseringar kan fördröjas."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Använd Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Upptäck när appar drar mycket batteri"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Avbryt"</string>
<string name="tts_reset" msgid="2661752909256313270">"Återställ"</string>
<string name="tts_play" msgid="2628469503798633884">"Spela upp"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Strömkontroll"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi-inställningar uppdateras"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Uppdatera Bluetooth-inställningar"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"på"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"av"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"aktiverar"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"inaktiverar"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Plats"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Synkronisera"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Ljusstyrka <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automatiskt"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"max"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"halvt"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"av"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Uppgiftslagring"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installera från lagringsenhet"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Markera alla"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Dataanvändning"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Appens dataanvändning"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobildata och Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operatörens dataredovisning kan skilja sig från din enhets dataredovisning."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Appanvändning"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"APPINFO"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Visa %d dolda objekt</item>
<item quantity="one">Visa %d dolt objekt</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Komprimera"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Nätverk och internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobilnätverk"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"dataanvändning"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Appar och aviseringar"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Behörigheter, standardappar"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Appar i jobbprofilen har inte åtkomst till aviseringar"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Konton"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Inga konton har lagts till"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Standardappar"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Språk, säkerhetskopiering, uppdateringar"</string>
<string name="search_results_title" msgid="1796252422574886932">"Inställningar"</string>
- <string name="search_menu" msgid="6283419262313758339">"Sök i inställningar"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, nätverksanslutning, internet, trådlös, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, på/av, styra"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"textmeddelande, sms, meddelanden, skicka meddelande, standard"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"betala, tryck, betalningar"</string>
<string name="keywords_backup" msgid="470070289135403022">"säkerhetskopia, säkerhets kopia"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"rörelse"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ansikte, upplåsning, auktorisering, inloggning"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei-kod, meid, min, prl-version, imei-kod sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"nätverk, status för mobilt nätverk, status för tjänst, signalstyrka, mobilt nätverkstyp, roaming, iccid-nummer"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serienummer, maskinvaruversion"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"mörkt tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"fel"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Aktiv låsskärm, visning av låsskärm"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"avisering på låsskärm"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ansikte"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingeravtryck"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"nedtonad skärm, pekskärm, batteri, intelligent ljusstyrka, dynamisk ljusstyrka"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Tillgänglighetstjänster som <xliff:g id="SERVICE">%1$s</xliff:g> kommer inte att vara tillgängliga när du anger pinkoden och startar enheten."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Tillgänglighetstjänster som <xliff:g id="SERVICE">%1$s</xliff:g> kommer inte att vara tillgängliga när du ritar ditt mönster och startar enheten."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Tillgänglighetstjänster som <xliff:g id="SERVICE">%1$s</xliff:g> kommer inte att vara tillgängliga när du anger lösenordet och startar enheten."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Obs! När du har startat om enheten måste du låsa upp mobilen innan du kan starta den här appen"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Obs! Om du startar om mobilen och har ställt in ett skärmlås kan appen inte startas förrän du låser upp mobilen."</string>
<string name="imei_information_title" msgid="8499085421609752290">"Information om IMEI-kod"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Relativ information om IMEI-kod"</string>
<string name="slot_number" msgid="3762676044904653577">"(Plats <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personligt"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Arbetet"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Appar: alla"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Appar: inaktiverade"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Inaktiverade"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategorier: brådskande avisering"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategorier: oviktig avisering"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategorier: inaktiverad"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Aviseringar om användning"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Visa fullständig enhetsanvändning"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Visa appanvändning"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Hög förbrukning"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> appar fungerar inte normalt</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> fungerar inte normalt</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Internt lagringsutrymme: <xliff:g id="PERCENTAGE">%1$s</xliff:g> används, <xliff:g id="FREE_SPACE">%2$s</xliff:g> ledigt"</string>
<string name="display_summary" msgid="6737806235882127328">"Aktivera viloläge efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> av inaktivitet"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Bakgrund, viloläge, teckenstorlek"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Viloläget aktiveras efter tio minuters inaktivitet"</string>
<string name="memory_summary" msgid="8080825904671961872">"Genomsnittlig minnesanvändning: <xliff:g id="USED_MEMORY">%1$s</xliff:g> av <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Inloggad som <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS har inaktiverats"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kameran har inaktiverats"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Skärmdump har inaktiverats"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Det gick inte att inaktivera säkerhetskopiering"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Det gick inte att öppna appen"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Kontakta IT-administratören om du har frågor"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Mer information"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Efterlikna det som visas med ett urklipp"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Inga"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Enhetens standardinställning"</string>
<string name="special_access" msgid="3458780842491881155">"Särskild åtkomst för app"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> appar får använda obegränsad data</item>
@@ -3935,7 +3907,7 @@
<string name="notification_suggestion_title" msgid="387052719462473500">"Kontrolluppgifter på låsskärm"</string>
<string name="notification_suggestion_summary" msgid="8521159741445416875">"Visa eller dölja innehåll i aviseringar"</string>
<string name="page_tab_title_summary" msgid="4070309266374993258">"Alla"</string>
- <string name="page_tab_title_support" msgid="4407600495101788249">"Support och tips"</string>
+ <string name="page_tab_title_support" msgid="4407600495101788249">"Tips och support"</string>
<string name="developer_smallest_width" msgid="7516950434587313360">"Minsta bredd"</string>
<string name="premium_sms_none" msgid="8268105565738040566">"Inga installerade appar har begärt åtkomst till premium-sms"</string>
<string name="premium_sms_warning" msgid="9086859595338944882">"Det kan hända att premium-sms kostar pengar och läggs till på dina fakturor från operatören. Om du ger en app åtkomst kan du skicka premium-sms med den appen."</string>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ansluten till <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ansluten till flera enheter"</string>
<string name="demo_mode" msgid="2798762752209330277">"Demoläge för systemgränssnitt"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Nattläge"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Ställ in nattläge"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Mörkt läge"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Använd mörkt läge"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Utvecklarrutor för snabbinställningar"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscopespårning"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Inställningar för jobbprofilen"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktsökning"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Tillåt att organisationen söker bland kontakter för att identifiera ringande och kontakter"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tryck snabbt två gånger för att kolla mobilen"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tryck snabbt två gånger för att kolla surfplattan"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tryck snabbt två gånger för att kolla enheten"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Visa tid, aviseringsikoner och annan information genom att trycka snabbt två gånger på skärmen."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Visa tid, aviseringar och annan information genom att trycka snabbt två gånger på skärmen."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lyft för att kolla mobilen"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Plocka upp för att kolla surfplattan"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Plocka upp för att kolla enheten"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Visa tid, aviseringsikoner och annan information genom att plocka upp mobilen."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Visa tid, aviseringsikoner och annan information genom att plocka upp surfplattan."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Visa tid, aviseringsikoner och annan information genom att plocka upp enheten."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Skrämväckning"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Visa tid, aviseringar och annan information genom att plocka upp mobilen."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Visa tid, aviseringar och annan information genom att plocka upp surfplattan."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Visa tid, aviseringar och annan information genom att plocka upp enheten."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Skärmrörelse för processlås"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Svep med fingret för aviseringar"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Svep med fingret"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av mobilen."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> försök</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> försök</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Enhetens data säkerhetskopieras"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Den här enheten hanteras av organisationen."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Den här enheten hanteras av <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Tjänsten Autofyll"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"auto, fyll, autofyll"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Kontrollera att du litar på den här appen</b> <br/> <br/> <xliff:g id=app_name example=Google Autofyll>%1$s</xliff:g> identifierar vad som kan fyllas i automatiskt utifrån vad som visas på skärmen."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Autofyll"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Loggningsnivå"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Högsta antal begäranden per session"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Högsta antal synliga datamängder"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Återställ standardvärdena"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Utvecklaralternativen för Autofyll har återställts"</string>
<string name="device_theme" msgid="4571803018917608588">"Enhetstema"</string>
<string name="default_theme" msgid="7085644992078579076">"Standard"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Nätverksnamn"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Aktivera operatörsadministration"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Uppdatera Stör ej"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Pausa aviseringar så du kan behålla ditt fokus"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Vad är nytt?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ta en rundtur på din nya mobil"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ta en rundtur på din nya surfplatta"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ta en rundtur på din nya enhet"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Den här funktionen är inte tillgänglig på den här enheten."</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Framtvinga fullständiga GNSS-mätningar"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Spåra alla konstellationer och frekvenser för GNSS utan arbetscykel"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Visa alltid en dialogruta vid krascher"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Visa alltid en dialogruta när en app kraschar"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Välj en ANGLE-kompatibel app"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Ingen ANGLE-kompatibel app har angetts"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE-kompatibel app: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Katalogåtkomst"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"katalogåtkomst"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Nätverksinformation"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Enhetens namn är synligt för appar i mobilen. Det kan också vara synligt för andra personer när du ansluter till Bluetooth-enheter eller om du skapar en Wi-Fi-surfzon."</string>
<string name="devices_title" msgid="7701726109334110391">"Enheter"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Alla inställningar"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Förslag"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data via CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data via CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Välj nätverk"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Frånkopplad"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Ansluten"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Ansluter …"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Det gick inte att ansluta"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Inga nätverk hittades."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Det gick inte att hitta nätverk. Försök igen."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(förbjudet)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Inget SIM-kort"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Avancerade samtal"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Föredraget nätverksläge: Föredrar WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Föredraget nätverksläge: Endast GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Föredraget nätverksläge: Endast WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Föredraget nätverksläge: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Föredraget nätverksläge: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Föredraget nätverksläge: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Föredraget nätverksläge: Endast CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Föredraget nätverksläge: Endast EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Föredraget nätverksläge: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Föredraget nätverksläge: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Föredraget nätverksläge: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Föredraget nätverksläge: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Föredraget nätverksläge: globalt"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Föredraget nätverksläge: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Föredraget nätverksläge: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Föredraget nätverksläge: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Föredraget nätverksläge: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Föredraget nätverksläge: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Föredraget nätverksläge: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Föredraget nätverksläge: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Föredraget nätverksläge: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Föredraget nätverksläge: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Föredraget nätverksläge: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Föredraget nätverksläge: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Föredraget nätverksläge: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Föredraget nätverksläge: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (rekommenderas)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (rekommenderas)"</string>
+ <string name="network_global" msgid="959947774831178632">"Globalt"</string>
+ <string name="label_available" msgid="1731547832803057893">"Tillgängliga nätverk"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Söker …"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Registrerar på <xliff:g id="NETWORK">%s</xliff:g> …"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Ditt SIM-kort tillåter inte anslutning till detta nätverk."</string>
+ <string name="connect_later" msgid="978991102125216741">"Det går inte att ansluta till det här nätverket just nu. Försök igen senare."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Registrerad på nätverk."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Välj nätverk automatiskt"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operatörsinställningar"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Konfigurera datatjänst"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobildata"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Få åtkomst till data via mobilt nätverk"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Önskad nätverkstyp"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Ändra nätverksläge"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Önskad nätverkstyp"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operatör"</string>
+ <string name="call_category" msgid="8108654745239563833">"Ringer upp"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Videosamtal via operatören"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Systemval"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Ändra CDMA-roamingläge"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Systemval"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Nätverk"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Nätverk"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA-prenumeration"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Växla mellan RUIM/SIM och NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"prenumeration"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Automatisk registrering …"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Vill du tillåta dataroaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Kontakta din nätoperatör för priser."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Appens dataanvändning"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Ogiltigt nätverksläge: <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ignorera."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Inte tillgänglig vid anslutning till <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Visa mer"</string>
+ <string name="see_less" msgid="1250265310929558370">"Visa färre"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 47ccbae..449dac6 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Tumia kama mtandao unaopima data"</item>
<item msgid="2266114985518865625">"Tumia kama mtandao usiopima data"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Chaguomsingi (tumia MAC isiyo na mpangilio)"</item>
+ <item msgid="5398461510512959597">"Anayeaminiwa"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Hapana"</item>
<item msgid="3863157480502955888">"Ndiyo"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Ikae ikiwa imewashwa"</item>
<item msgid="6385301106124765323">"Imezimwa kila wakati"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Imezimwa"</item>
+ <item msgid="2182686878828390312">"Tatua"</item>
+ <item msgid="5286514712714822064">"Maneno mengi"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Nyumbani tu"</item>
+ <item msgid="5034813753274486448">"Otomatiki"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"inapendelea GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"GSM pekee"</item>
+ <item msgid="488474605709912156">"WCDMA pekee"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA otomatiki"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo otomatiki"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo pekee"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Jumla"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA pekee"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Jumla"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 8a7d3ff..9f712c5 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -20,9 +20,7 @@
<string name="no" msgid="6731231425810196216">"Hapana"</string>
<string name="create" msgid="3578857613172647409">"Unda"</string>
<string name="allow" msgid="3349662621170855910">"Ruhusu"</string>
- <string name="deny" msgid="6947806159746484865">"Kana"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Funga"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Swichi"</string>
+ <string name="deny" msgid="6947806159746484865">"Kataa"</string>
<string name="device_info_default" msgid="7847265875578739287">"Haijulikani"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Umebakisha hatua <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ili uwe msanidi programu.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Hakuna haja, tayari wewe ni msanidi programu."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Tafadhali washa chaguo za wasanidi programu kwanza."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Wi-Fi na mitandao mingine"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Miunganisho"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Kifaa"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Ya Kibinafsi"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Ufikiaji"</string>
<string name="header_category_system" msgid="2816866961183068977">"Mfumo"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Washa Muunganisho wa Data"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Zima Muunganisho wa Data"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Anwani ya Bluetooth ya Kifaa chako: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ungependa kuondoa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Inasambaza"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Kifaa cha Bluetooth kisicho na jina"</string>
<string name="progress_scanning" msgid="192587958424295789">"Inatafuta"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Hakuna vifaa vya Bluetooth vilivyopatikana karibu."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Programu fulani inataka kuwasha Bluetooth na kufanya simu yako ionekane kwenye vifaa vingine. Unaweza kubadilisha hali hii katika mipangilio ya Bluetooth baadaye."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Inawasha Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Inazima Bluetooth..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Unganisha-kiotomatiki"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Muunganisho wa Bluetooth umeombwa"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Gusa ili uunganishe kwenye \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Unataka kuunganishwa kwa\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Vifaa vya simu vinavyopatikana"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Ambavyo vimeunganishwa kwa sasa"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Vifaa vilivyohifadhiwa"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Ongeza kifaa"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth itawaka ili ioanishe"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Mapendeleo ya muunganisho"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Vifaa ulivyounganisha awali"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Vilivyounganishwa awali"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Imewasha Bluetooth"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Angalia zote"</string>
<string name="date_and_time" msgid="9062980487860757694">"Tarehe na saa"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Chagua saa za eneo"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -201,7 +193,7 @@
<string name="proxy_port_label" msgid="5655276502233453400">"Poti ya proksi"</string>
<string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Proksi ya Bypass ya"</string>
<string name="proxy_defaultView_text" msgid="6387985519141433291">"Rejesha kwa chaguo misingi"</string>
- <string name="proxy_action_text" msgid="2957063145357903951">"Kwisha"</string>
+ <string name="proxy_action_text" msgid="2957063145357903951">"Nimemaliza"</string>
<string name="proxy_hostname_label" msgid="8490171412999373362">"Jina la mwenyeji wa proksi"</string>
<string name="proxy_error" msgid="8926675299638611451">"Zingatia"</string>
<string name="proxy_error_dismiss" msgid="4993171795485460060">"Sawa"</string>
@@ -269,14 +261,13 @@
<string name="skip_label" msgid="47510779345218297">"Ruka"</string>
<string name="next_label" msgid="4693520878012668114">"Endelea"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Lugha"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Mapendeleo ya lugha"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Ondoa"</string>
<string name="add_a_language" msgid="2330538812283783022">"Ongeza lugha nyingine"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
<item quantity="other">Ungependa kuondoa lugha zilizochaguliwa?</item>
<item quantity="one">Ungependa kuondoa lugha iliyochaguliwa?</item>
</plurals>
- <string name="dlg_remove_locales_message" msgid="1361354927342876114">"Itaonyesha maandishi katika lugha nyingine."</string>
+ <string name="dlg_remove_locales_message" msgid="1361354927342876114">"Maandishi yataonyeshwa katika lugha nyingine."</string>
<string name="dlg_remove_locales_error_title" msgid="2653242337224911425">"Haiwezi kuondoa lugha zote"</string>
<string name="dlg_remove_locales_error_message" msgid="6697381512654262821">"Hifadhi angalau lugha moja unayopendelea"</string>
<string name="locale_not_translated" msgid="516862628177166755">"Huenda isipatikane katika baadhi ya programu"</string>
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Mipangilio"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Mipangilio ya njia ya mkato"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Hali ya ndegeni"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Mengineyo"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Mitandao isiyotumia waya"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Dhibiti Wi-Fi, Bluetooth, hali ya ndegeni, mitandao ya simu za mkononi na VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Data ya mtandao wa simu"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Faragha"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Imezimwa na msimamizi"</string>
<string name="security_status_title" msgid="5848766673665944640">"Hali ya usalama"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Kufunga skrini, kufungua kwa uso"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Kufunga skrini, alama ya kidole"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Kufunga skrini"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Imeongeza utambuzi wa uso"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Fungua ukitumia uso wako"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Tumia uso wako kuthibitisha"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Tumia uso wako kufungua simu yako, kuidhinisha ununuzi, au kuingia katika akaunti za programu."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Tumia uso"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Tumia uso wako kufunga simu yako au kuidhinisha ununuzi.\n\nKumbuka: Huwezi kutumia uso wako kufungua kifaa hiki. Kwa maelezo zaidi, wasiliana na msimamizi wa shirika lako."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Tumia uso wako kufungua simu yako, kuidhinisha ununuzi, au kuingia katika akaunti za programu."</string>
- <string name="face_add_max" msgid="2342250989212694454">"Unaweza kuongeza hadi alama ya vidole <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Weka uso wako katikati ya mduara"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Andikisha uso baadaye"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Unaweza kuongeza hadi nyuso <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Umeongeza idadi ya juu inayoruhusiwa ya nyuso"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Imeshindwa kuongeza nyuso zaidi"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Hukukamilisha kujiandikishaji"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Sawa"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Muda wa kuandikisha uso umefikia kikomo. Jaribu tena."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Imeshindwa kuandikisha uso."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Tayari kabisa. Safi."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Nimemaliza"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Tumia uso wako"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Fungua kifaa chako"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Malipo na kuingia katika programu"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Fungua macho ili ufungue kifaa"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Ni sharti ufungue macho yako ili uweze kutumia uthibitishaji wa uso"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Ondoa data ya uso"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Boresha data yako ya uso"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Unaweza kutumia uso wako kufungua kifaa chako na kufikia programu. "<annotation id="url">"Pata maelezo zaidi"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Kitambulisho"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Dhibiti vitambulisho"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Tumia kitambulisho kwa"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"GHz 5.0"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Chagua angalau bendi moja ya mtandao-hewa wa Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Mipangilio ya IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Faragha"</string>
<string name="wifi_shared" msgid="844142443226926070">"Shiriki na watumiaji wengine wa kifaa"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(haijabadilishwa)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Tafadhali chagua"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Ghairi"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Ungependa kusahau mtandao?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Itafuta manenosiri yote ya mtandao huu"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Mitandao iliyohifadhiwa"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">Mitandao %d</item>
<item quantity="one">Mtandao 1</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Ung\'avu"</string>
<string name="brightness_summary" msgid="838917350127550703">"Rekebisha mwangaza wa skrini"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Mwangaza unaojirekebisha"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Imewashwa"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Kimezimwa"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Kiwango cha ung\'avu ni cha chini zaidi"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Kiwango cha ung\'avu ni cha chini"</string>
@@ -1122,7 +1128,7 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"Imarisha kiwango cha ung\'avu kulingana na mwangaza uliopo. Kipengele hiki kikiwa kimewashwa, bado unaweza kubadilisha ung\'avu kwa muda."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"Itarekebisha mwangaza wa skrini kiotomatiki ili uendane na mazingira na shughuli zako. Unaweza kusogeza kitelezi mwenyewe ili kusaidia kipengele cha mwangaza unaojirekebisha kijifunze mapendeleo yako."</string>
<string name="night_display_title" msgid="2626451512200357686">"Mwanga wa Usiku"</string>
- <string name="night_display_text" msgid="1837277457033025056">"Mwanga wa Usiku hugeuza rangi ya skrini yako kuwa manjano. Hali hii hufanya iwa rahisi kuangalia skrini yako au kusoma katika mwangaza hafifu na inaweza kukusaidia ulale kwa urahisi sana."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"Mwanga wa Usiku hugeuza rangi ya skrini yako kuwa manjano. Hali hii hufanya iwe rahisi kuangalia skrini yako au kusoma katika mwangaza hafifu na inaweza kukusaidia ulale kwa urahisi zaidi."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Ratiba"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Hamna"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Huwashwa wakati maalum"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Hawezi kubadilika PIN. \n Inawezekana PIN si sahihi."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Umefaulu kubadilisha PIN ya SIM"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Hauwezi kubadilisha hali ya kifungio cha SIM kadi. \n Inawezekana PIN si sahihi."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Imeshindwa kuzima PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Imeshindwa kuwasha PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Sawa"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Ghairi"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"SIM nyingi zimepatikana"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Hii inahitaji <xliff:g id="NAME_0">^1</xliff:g> ipangwe upya. \n\n"<b>" Kupanga kutafuta data yote iliyohifadhiwa kwa sasa katika <xliff:g id="NAME_1">^1</xliff:g>. "</b>" Kuepuka kupoteza data, hifadhi nakala rudufu."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Futa data yote na upange upya"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Inapanga <xliff:g id="NAME">^1</xliff:g>..."</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Usiondoe <xliff:g id="NAME">^1</xliff:g> inaporatibu."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Usiondoe <xliff:g id="NAME">^1</xliff:g> inapoumbizwa."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Hamishia data kwenye hifadhi mpya"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Unaweza kuhamisha picha zako, faili, na baadhi ya programu hadi <xliff:g id="NAME">^1</xliff:g> hii mpya. \n\nUtaratibu huu huchukua takribani <xliff:g id="TIME">^2</xliff:g> utakupa <xliff:g id="SIZE">^3</xliff:g> za hifadhi ya ndani. Baadhi ya programu hazitatumika utaratibu huu unapoendelea."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Hamisha sasa"</string>
@@ -1721,7 +1729,7 @@
<string name="disable_text" msgid="6544054052049395202">"Zima"</string>
<string name="enable_text" msgid="9217362512327828987">"Washa"</string>
<string name="clear_user_data_text" msgid="355574089263023363">"Futa hifadhi"</string>
- <string name="app_factory_reset" msgid="6635744722502563022">"Sanidua Masasisho"</string>
+ <string name="app_factory_reset" msgid="6635744722502563022">"Ondoa masasisho"</string>
<string name="auto_launch_enable_text" msgid="4275746249511874845">"Umechagua kuzindua programu hii kwa mbadala kwa baadhi ya vitendo."</string>
<string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"Umechagua kuruhusu programu hii kuunda wijeti na kufikia data yao."</string>
<string name="auto_launch_disable_text" msgid="7800385822185540166">"Hakuna chaguo-misingi zilizowekwa."</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Imesakinishwa"</string>
<string name="no_applications" msgid="7336588977497084921">"Hakuna programu yoyote."</string>
<string name="internal_storage" msgid="1584700623164275282">"Hifadhi ya ndani"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"hifadhi ya mfumo"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Hifadhi ya USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Hifadhi ya kadi ya SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Kiwango cha kukadiria upya"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Ungependa kufuta data ya programu?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Data hii yote ya programu itafutwa kabisa. Hii inajumuisha faili, mipangilio, akaunti, hifadhidata zote na mengineyo."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Programu haikupatikana katika orodha ya programu za kompyuta zilizosakinishwa."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Imeshindwa kufuta hifadhi ya programu."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Programu hii inaweza kufikia yafuatayo kwenye kompyuta kibao yako:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Programu hii inaweza kufikia yafuatayo kwenye simu yako:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Programu hii inaweza kufikia yafuatayo kwenye kompyuta yako kibao. Ili kuboresha utendaji na kupunguza matumizi ya kumbukumbu, baadhi ya vibali hivi vinapatikana katika <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> kwa sababu vinaendeshwa kwa mchakato sawa na <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Programu hii inaweza kufikia yafuatayo kwenye simu yako. Ili kuboresha utendaji na kupunguza matumizi ya kumbukumbu, baadhi ya vibali hivi vinapatikana katika <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> kwa sababu vinaendeshwa kwa mchakato sawa na <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> na <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Huenda programu hii ikakutoza pesa:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Tuma SMS ya ada"</string>
<string name="computing_size" msgid="1599186977475211186">"Inahesabu..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Haikuweza kuhesabu ukubwa wa furushi."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Hauna programu za wahusika wengine zilizosakinishwa."</string>
<string name="version_text" msgid="9189073826278676425">"Toleo <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Songa"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Hamisha hadi kompyuta kibao"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Sogeza kwa simu"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Hamisha kwa hifadhi ya USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Sogeza hadi kwa kadi ya SD"</string>
- <string name="moving" msgid="6431016143218876491">"Inaondoa"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Tayari kuna uhamishaji unaoendelea."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Nafasi ya hifadhi haitoshi."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Programu haipo."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Huwezi kusakinisha programu ya msimamizi wa kifaa kwenye kifaa cha nje"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Ungependa kuilazimisha ikome?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ukiilazimisha programu ikome, huenda ikakosa kufanya kazi vizuri."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Haikuweza kuhamisha programu. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Eneo sakinishwa pendekezwa"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Badilisha usakinishaji wa eneo unalopenda ya programu mpya"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Lemaza programu zilizoundwa-ndani?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Zima programu"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Ukizima programu hii, huenda Android na programu zingine zikakosa kufanya kazi tena kama ilivyokusudiwa."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Futa data na ulemaze programu?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ukizima programu hii, huenda Android na programu zingine zikakosa kufanya kazi tena kama ilivyokusudiwa. Data yako pia itafutwa."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Arifa zilemazwe?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ikiwa utazima arifa za programu hii, unaweza kosa kupata arifa na masasisho muhimu."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Duka"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Maelezo ya programu"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Programu imesakinishwa kutoka <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Tumia huduma"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Tumia usahihishaji wa rangi"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Tumia manukuu"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Endelea"</string>
<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="6371077608778830020">"Ongeza kifaa cha kusaidia kusikia"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Ikiwa utadhibiti shughuli za chini chini za programu, huenda isifanye kazi vizuri"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Kwa kuwa programu hii haiboreshi matumizi ya betri, huwezi kuizuia.\n\nIli uizuie, washa kuboresha matumizi ya betri."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Matumizi ya skrini tangu mwisho ilipokuwa imejaa chaji"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Kutumia skrini"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Kutafuta mitandao ya simu"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Matumizi ya betri tangu ilipojaa chaji"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Muda ambao skrini imekuwa ikiwaka tangu chaji ilipojaa"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Matumizi ya kifaa tangu ilipojaa chaji"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Tumia maelezo"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Rekebisha utumiaji wa nishati"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Furushi zilizojumuishwa"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Programu zinazotumia chaji sana"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Kuweka kifaa kikiwa kimewashwa"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Kuwasha kifaa chini chini"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Inaomba maelezo ya mahali mara kwa mara"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Programu <xliff:g id="NUMBER">%1$d</xliff:g> hazifanyi kazi vizuri"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Programu zinatumia chaji kama kawaida"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Simu inatumia kiwango cha kawaida cha betri chinichini"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Kompyuta kibao inatumia kiwango cha kawaida cha betri chinichini"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Inadhibiti matumizi ya betri kwa programu %1$d</item>
<item quantity="one">Inadhibiti matumizi ya betri kwa programu %1$d</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Muda wa kudhibitiwa <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Programu hizi zimekuwa zikitumia chaji chinichini. Huenda programu ulizozuia zisifanye kazi vizuri na huenda arifa zikachelewa."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Tumia Kidhibiti cha Betri"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Tambua wakati programu zinatumia chaji sana"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Ghairi"</string>
<string name="tts_reset" msgid="2661752909256313270">"Weka upya"</string>
<string name="tts_play" msgid="2628469503798633884">"Cheza"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Kidhibiti nishati"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Inasasisha mpangilio wa Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Inasasisha mpangilio wa Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"Imewashawa"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"Imezimwa"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"Inawasha"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"Inazima"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Eneo"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sawazisha"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Ung`avu <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"otomatiki"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"Imejaa"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"nusu"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"zima"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Hifadhi ya hati-tambulishi"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Sakinisha kutoka kwa hifadhi"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> juu ya <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Chagua zote"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Matumizi ya data"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Matumizi data ya programu"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Wi‑Fi na data ya mtandao wa simu"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Hesabu ya data ya mtoa huduma huenda ikatofautiana na inayofanyika katika kifaa chako."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Matumizi ya programu"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"TAARIFA ZA PROGRAMU"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Onyesha vipengee %d vilivyofichwa</item>
<item quantity="one">Onyesha kipengee %d kilichofichwa</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Kunja"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Mtandao na intaneti"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"kifaa cha mkononi"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"matumizi ya data"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Programu na arifa"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Ruhusa, programu chaguomsingi"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Programu zilizo katika wasifu wa kazini haziwezi kufungua arifa."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Akaunti"</string>
- <string name="account_dashboard_default_summary" msgid="3998347400161811075">"Hakuna akaunti zilizizoongezwa"</string>
+ <string name="account_dashboard_default_summary" msgid="3998347400161811075">"Hakuna akaunti zilizoongezwa"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Programu chaguomsingi"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Lugha, saa, hifadhi rudufu, masasisho"</string>
<string name="search_results_title" msgid="1796252422574886932">"Mipangilio"</string>
- <string name="search_menu" msgid="6283419262313758339">"Tafuta kwenye mipangilio"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, mtandao, muunganisho wa mtandao, intaneti, pasiwaya, data,"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"Wi-Fi, wi-fi, geuza, dhibiti"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"sms, kutuma SMS, ujumbe, kutuma ujumbe, chaguomsingi"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"lipa, gusa, malipo"</string>
<string name="keywords_backup" msgid="470070289135403022">"hifadhi rudufu, hifadhi nakala"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ishara"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"uso, fungua, thibitisha, ingia katika akaunti"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, toleo la prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"mtandao, hali ya mtandao wa simu, hali ya huduma, uthabiti wa mtandao, aina ya mtandao wa simu, matumizi ya mitandao mingine, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"nambari ya ufuatiliaji, toleo la maunzi"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"mandhari meusi"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"hitilafu"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Onyesho tulivu, Skrini iliyofungwa"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"arifa ya skrini iliyofungwa"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"uso"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"alama ya kidole"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"skrini yenye mwanga hafifu, skrini ya kugusa, betri, mwangaza mahiri, ung\'avu maalum"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Unapoweka PIN ili uanzishe kifaa hiki, huduma za ufikiaji kama <xliff:g id="SERVICE">%1$s</xliff:g> hazitapatikana."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Unapoweka mchoro ili uanzishe kifaa hiki, huduma za ufikiaji kama <xliff:g id="SERVICE">%1$s</xliff:g> hazitapatikana."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Unapoweka nenosiri ili uanzishe kifaa hiki, huduma za ufikiaji kama <xliff:g id="SERVICE">%1$s</xliff:g> hazitapatikana."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Kumbuka: Baada ya kuwasha tena programu hii, hutaweza kuitumia hadi utakapofungua simu yako"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Kumbuka: Kama utazima kisha uwashe simu yako na uwe umeweka njia ya kufunga skrini, hutaweza kutumia programu hii hadi utakapofungua simu yako"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Maelezo ya IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Maelezo ya IMEI yanayohusiana"</string>
<string name="slot_number" msgid="3762676044904653577">"(Nafasi<xliff:g id="SLOT_NUM">%1$d</xliff:g> )"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Binafsi"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Kazini"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Programu: Zote"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Programu zilizozimwa"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Zimezimwa"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Aina: Umuhimu wa dharura"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Aina: Umuhimu wa chini"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Aina: Zimezimwa"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Arifa za matumizi"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Onyesha matumizi ya kifaa tangu kilipojaa chaji"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Onyesha matumizi ya programu"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Inatumia chaji nyingi"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other">Programu <xliff:g id="NUMBER">%2$d</xliff:g> hazifanyi kazi vizuri</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> haifanyi kazi vizuri</item>
@@ -3666,7 +3637,7 @@
<string name="running_frequency" msgid="6622624669948277693">"Masafa"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Upeo wa matumizi"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Hakuna data iliyotumika"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Je, ungependa kuruhusu ufikiaji kwa Usinisumbue kwenye <xliff:g id="APP">%1$s</xliff:g>?"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Je, programu ya <xliff:g id="APP">%1$s</xliff:g> ifikie kipengele cha Usinisumbue?"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Programu itaweza kuzima na kuwasha kipengee cha Usinisumbue na kufanya mabadiliko katika mipangilio inayohusiana."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Lazima kiwe kimewashwa kwa sababu kipengele cha ufikiaji wa arifa kimewashwa"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Ungependa kubatilisha idhini ya <xliff:g id="APP">%1$s</xliff:g> ya kufikia kipengele cha Usinisumbue?"</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Hifadhi ya mfumo: <xliff:g id="PERCENTAGE">%1$s</xliff:g> imetumika - imesalia <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Weka katika hali tuli baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ya kutokuwa na shughuli"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Mandhari, hali tuli, ukubwa wa fonti"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Iweke katika hali tuli baada ya dakika 10 za kutokuwa na shughuli"</string>
<string name="memory_summary" msgid="8080825904671961872">"Takriban <xliff:g id="USED_MEMORY">%1$s</xliff:g> kati ya <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> za hifadhi zimetumika"</string>
<string name="users_summary" msgid="1674864467098487328">"Umeingia katika akaunti ukitumia <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Huruhusiwi kutuma SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kamera imezimwa na msimamizi"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Huruhusiwi kupiga picha za skrini"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Huwezi kuzima huduma ya kuhifadhi nakala"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Haiwezi kufungua programu"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Ikiwa una maswali, wasiliana na msimamizi wako wa TEHAMA"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Maelezo zaidi"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Iga mwonekano uliopunguzwa"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Hamna"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Hali chaguomsingi ya kifaa"</string>
<string name="special_access" msgid="3458780842491881155">"Idhini maalum za programu"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other">Programu <xliff:g id="COUNT">%d</xliff:g> zinaweza kutumia data bila kudhibitiwa</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Imeunganishwa kwenye <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Imeunganishwa kwenye vifaa vingi"</string>
<string name="demo_mode" msgid="2798762752209330277">"Hali ya onyesho la kiolesura cha mfumo"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Hali ya usiku"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Weka Hali ya usiku"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Hali nyeusi"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Weka Hali nyeusi"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Vigae vya msanidi programu vya mipangilio ya haraka"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Ufuatiliaji wa Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Mipangilio ya wasifu wa kazini"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Utafutaji wa anwani"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Ruhusu utafutaji wa anwani unaofanywa na shirika lako kutambua anwani na anayepiga simu"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Gusa mara mbili ili uangalie simu"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Gusa mara mbili ili uangalie kompyuta kibao"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Gusa mara mbili ili uangalie kifaa"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Ili uangalie saa, aikoni za arifa na maelezo mengine, gusa skrini yako mara mbili."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Ili uangalie saa, arifa na maelezo mengine, gusa skrini yako mara mbili."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Inua ili uangalie simu"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Inua ili uangalie kompyuta kibao"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Inua ili uangalie kifaa"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ili uangalie saa, aikoni za arifa na maelezo mengine, chukua simu yako."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ili uangalie saa, arifa za aikoni na maelezo mengine, chukua kompyuta yako kibao."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ili uangalie saa, aikoni za arifa na maelezo mengine, chukua kifaa chako."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Onyesho la kuwasha skrini"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Ili uangalie saa, arifa na maelezo mengine, chukua simu yako."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Ili uangalie saa, arifa na maelezo mengine, chukua kompyuta kibao yako."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Ili uangalie saa, arifa na maelezo mengine, chukua kifaa chako."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Ishara ya skrini ya Wake lock"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Telezesha kidole ili upate arifa"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Telezesha kidole"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole kilicho upande wa nyuma wa simu yako."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other">Umejaribu mara <xliff:g id="COUNT_1">%d</xliff:g></item>
<item quantity="one">Umejaribu mara <xliff:g id="COUNT_0">%d</xliff:g></item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Inaweka nakala ya data ya kifaa hiki"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Kifaa hiki kinadhibitiwa na shirika lako."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Kifaa hiki kinasimamiwa na <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Huduma ya kujaza kiotomatiki"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"otomatiki, jaza, kujaza kiotomatiki"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Hakikisha kuwa unaamini programu hii</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> hutumia kilicho kwenye skrini yako kubaini kinachoweza kujazwa kiotomatiki."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Kujaza Kiotomatiki"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Kiwango cha kumbukumbu"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Idadi ya juu zaidi ya maombi kwa kila kipindi"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Idadi ya juu zaidi ya makundi ya data yanayoonekana"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Rejesha thamani chaguomsingi"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Imebadilisha chaguo za wasanidi programu za kujaza kiotomatiki"</string>
<string name="device_theme" msgid="4571803018917608588">"Mandhari ya kifaa"</string>
<string name="default_theme" msgid="7085644992078579076">"Chaguomsingi"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Jina la mtandao"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Anzisha Utaratibu wa Mtoa Huduma"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Sasisha kipengele cha Usinisumbue"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Sitisha arifa ili uendelee kumakinika"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Nini kipya na cha kusisimua?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Kagua simu yako mpya"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Kagua kompyuta yako kibao mpya"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Kagua kifaa chako kipya"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Kipengele hiki hakipatikani kwenye kifaa hiki"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Lazimisha vipimo vya GNSS kamili"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Fuatilia mikusanyiko na mawimbi yote yasiyo na utendakazi wa GNSS"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Onyesha kidirisha cha programu kuacha kufanya kazi kila wakati"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Onyesha kisanduku kila wakati programu inapoacha kufanya kazi"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Chagua programu inayoweza kutumia ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Hujaweka programu yoyote inayoweza kutumia ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Programu inayoweza kutumia ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Kufikia saraka"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"kufikia saraka"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Maelezo ya mtandao"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Jina la kifaa chako litaonekana kwenye programu zilizo katika simu yako. Pia linaweza kuonekana kwa watu wengine wakati unaunganisha vifaa vya Bluetooth au kuweka mtandao hewa wa Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Vifaa"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Mipangilio Yote"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Mapendekezo"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data ya CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data ya CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Chagua mtandao"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Haijaunganishwa"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Imeunganisha"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Inaunganisha…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Imeshindwa kuunganisha"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Hakuna mitandao iliyopatikana."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Imeshindwa kupata mitandao. Jaribu tena."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(hairuhusiwi)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Hakuna SIM kadi"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Upigaji Simu Ulioimarishwa"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Hali ya mtandao inayopendelewa: WCDMA pendekezwa"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Hali ya mtandao inayopendelewa: GSM pekee"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Hali ya mtandao inayopendelewa: WCDMA pekee"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Hali ya mtandao inayopendelewa: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Hali ya mtandao inayopendelewa: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Hali ya mtandao inayopendelewa: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Hali ya mtandao inayopendelewa: CDMA pekee"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Hali ya mtandao inayopendelewa: EvDo pekee"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Hali ya mtandao inayopendelewa: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Hali ya mtandao inayopendelewa: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Hali ya mtandao inayopendelewa: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Hali ya mtandao inayopendelewa: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Hali ya mtandao inayopendelewa: Jumla"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Hali ya mtandao inayopendelewa: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Hali ya mtandao inayopendelewa: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Hali ya mtandao inayopendelewa: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Hali ya mtandao inayopendelewa: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Hali ya mtandao inayopendelewa: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Hali ya mtandao inayopendelewa: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Hali ya mtandao inayopendelewa: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Hali ya mtandao inayopendelewa: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Hali ya mtandao inayopendelewa: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Hali ya mtandao inayopendelewa: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Hali ya mtandao inayopendelewa: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Hali ya mtandao inayopendelewa: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Hali ya mtandao inayopendelewa: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (inapendekezwa)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (inapendekezwa)"</string>
+ <string name="network_global" msgid="959947774831178632">"Jumla"</string>
+ <string name="label_available" msgid="1731547832803057893">"Mitandao inayopatikana"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Inatafuta…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Inasajili kwenye <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM kadi yako hairuhusu muunganisho wa mtandao huu."</string>
+ <string name="connect_later" msgid="978991102125216741">"Imeshindwa kuunganisha na mtandao huu hivi sasa. Jaribu tena baadaye."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Imesajiliwa katika mtandao."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Chagua mtandao kiotomatiki"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Mipangilio ya mtoa huduma"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Weka huduma ya data"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Data ya mtandao wa simu"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Tumia data ya mtandao wa simu"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Aina ya mtandao inayopendelewa"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Badilisha hali ya utendaji wa mtandao"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Aina ya mtandao inayopendelewa"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Mtoa huduma"</string>
+ <string name="call_category" msgid="8108654745239563833">"Kupiga simu"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Kupiga simu ya video kupitia kampuni ya simu"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Chagua mfumo"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Badilisha hali upigaji simu ukiwa nje ya mtandao wa kawaida kwa kutumia CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Chagua mfumo"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Mtandao"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Mtandao"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Usajili wa CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Badilisha kati ya RUIM/SIM na NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"usajili"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Usajili wa kiotomatiki…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Ungependa kuruhusu matumizi ya mitandao ya ng\'ambo?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Wasiliana na mtoa huduma za mtandao kwa maelezo kuhusu bei."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Matumizi ya data ya programu"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Hali ya Mtandao Isiyo sahihi <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Puuza"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Haipatikani inapounganishwa kwenye <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Angalia zaidi"</string>
+ <string name="see_less" msgid="1250265310929558370">"Angalia chache"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index d5ea762..afdcd0e 100755
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -29,4 +29,8 @@
<dimen name="confirm_credentials_top_padding">20dp</dimen>
<dimen name="confirm_credentials_top_margin">24dp</dimen>
+
+ <!-- Padding for screen pinning -->
+ <dimen name="screen_pinning_padding_start">128dp</dimen>
+ <dimen name="screen_pinning_padding_end">128dp</dimen>
</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 58b05d8..241471c 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -24,8 +24,6 @@
<dimen name="content_margin_left">16dip</dimen>
<dimen name="description_margin_top">26dip</dimen>
<dimen name="crypt_clock_size">120sp</dimen>
- <dimen name="appwidget_min_width">325dip</dimen>
- <dimen name="appwidget_min_height">50dip</dimen>
<!-- ActionBar contentInsetStart -->
<dimen name="actionbar_contentInsetStart">24dp</dimen>
@@ -64,4 +62,8 @@
<dimen name="confirm_credentials_top_padding">48dp</dimen>
<dimen name="confirm_credentials_side_margin">0dp</dimen>
<dimen name="confirm_credentials_top_margin">64dp</dimen>
+
+ <!-- Padding for screen pinning -->
+ <dimen name="screen_pinning_padding_start">40dp</dimen>
+ <dimen name="screen_pinning_padding_end">40dp</dimen>
</resources>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index b1ec4c7..7f707d2 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -17,10 +17,6 @@
<resources>
<dimen name="settings_side_margin">112dp</dimen>
- <!-- Dashboard padding in its container -->
- <dimen name="dashboard_padding_start">160dp</dimen>
- <dimen name="dashboard_padding_end">160dp</dimen>
-
<!-- ActionBar contentInsetStart -->
<dimen name="actionbar_contentInsetStart">128dp</dimen>
<dimen name="actionbar_subsettings_contentInsetStart">128dp</dimen>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index ec4e22f..6accad7 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -31,18 +31,6 @@
<dimen name="actionbar_contentInsetStart">80dp</dimen>
<dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>
- <!-- Dashboard margins between each tiles within the layout -->
- <dimen name="dashboard_cell_gap_x">24dp</dimen>
- <dimen name="dashboard_cell_gap_y">0dp</dimen>
-
- <!-- Dashboard padding in its container -->
- <dimen name="dashboard_padding_start">80dp</dimen>
- <dimen name="dashboard_padding_end">80dp</dimen>
-
- <!-- Dashboard category padding start / end -->
- <dimen name="dashboard_category_padding_start">24dp</dimen>
- <dimen name="dashboard_category_padding_end">24dp</dimen>
-
<!-- SwitchBar sub settings margin start / end -->
<dimen name="switchbar_subsettings_margin_start">80dp</dimen>
<dimen name="switchbar_subsettings_margin_end">80dp</dimen>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index cfcc2bc..e60c4b3 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"டேட்டா அளவிடப்பட்டது"</item>
<item msgid="2266114985518865625">"டேட்டா அளவிடப்படாதது"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"இயல்பு (ரேண்டம் MACகைப் பயன்படுத்தும்)"</item>
+ <item msgid="5398461510512959597">"நம்பகமானது"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"வேண்டாம்"</item>
<item msgid="3863157480502955888">"ஆம்"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"எப்போதும் ஆனில் வைத்திரு"</item>
<item msgid="6385301106124765323">"எப்போதும் ஆஃபில் வைத்திரு"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"ஆஃப்"</item>
+ <item msgid="2182686878828390312">"பிழைத்திருத்து"</item>
+ <item msgid="5286514712714822064">"அதிகச் சொற்கள்"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"வீட்டிற்கு மட்டும்"</item>
+ <item msgid="5034813753274486448">"தானியங்கு"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMAக்கு முன்னுரிமை"</item>
+ <item msgid="807926878589867564">"GSM மட்டும்"</item>
+ <item msgid="488474605709912156">"WCDMA மட்டும்"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA தானியங்கு"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo தானியங்கு"</item>
+ <item msgid="370391313511477301">"EvDo இல்லாமல் CDMA"</item>
+ <item msgid="4678789463133969294">"EvDo மட்டும்"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"குளோபல்"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA மட்டும்"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"குளோபல்"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index f53767b..607ccb6 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"உருவாக்கு"</string>
<string name="allow" msgid="3349662621170855910">"அனுமதி"</string>
<string name="deny" msgid="6947806159746484865">"நிராகரி"</string>
- <string name="dlg_close" msgid="7471087791340790015">"மூடு"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"மாறு"</string>
<string name="device_info_default" msgid="7847265875578739287">"தெரியவில்லை"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">டெவெலப்பராவதற்கு இப்போது <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> படிகளே உள்ளன.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"தேவையில்லை, நீங்கள் ஏற்கனவே ஒரு டெவெலப்பர்."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"முதலில் டெவெலப்பர் விருப்பங்களை இயக்கவும்."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"வயர்லெஸ் & நெட்வொர்க்குகள்"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"இணைப்புகள்"</string>
- <string name="header_category_device" msgid="4544026001618307754">"சாதனம்"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"தனிப்பட்டவை"</string>
- <string name="header_category_access" msgid="7580499097416970962">"அணுகல்"</string>
<string name="header_category_system" msgid="2816866961183068977">"சிஸ்டம்"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"தரவு இணைப்பை இயக்கு"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"தரவு இணைப்பை முடக்கு"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"சாதனத்தின் புளூடூத் முகவரி: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ஐ துண்டிக்கவா?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"அலைபரப்புதல்"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"பெயரிடப்படாத புளூடூத் சாதனம்"</string>
<string name="progress_scanning" msgid="192587958424295789">"தேடுகிறது"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"புளூடூத் சாதனங்கள் எதுவும் அருகில் கண்டறியப்படவில்லை."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"புளூடூத்தை இயக்கி, உங்கள் மொபைலைப் பிற சாதனங்களுக்குத் தெரியும்படி வைத்திருக்க பயன்பாடு விரும்புகிறது. புளூடூத் அமைப்புகளுக்குச் சென்று, இதைப் பின்னர் மாற்றிக்கொள்ளலாம்."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"புளூடூத் ஐ இயக்குகிறது…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"புளூடூத் ஐ முடக்குகிறது…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"தானாக இணைத்தல்"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"புளூடூத் இணைப்பு கோரிக்கை"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" உடன் இணைக்க, தட்டவும்."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" உடன் இணைக்கவா?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"அழைப்பு வசதியைக் கொண்ட சாதனங்கள்"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"தற்போது இணைக்கப்பட்டுள்ளது"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"சேமிக்கப்பட்ட சாதனங்கள்"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"சாதனத்தைச் சேர்க்கவும்"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"இணைப்பதற்கு, புளூடூத் ஆன் செய்யப்படும்"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"இணைப்பு விருப்பத்தேர்வுகள்"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"இதற்கு முன்னர் இணைத்த சாதனங்கள்"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ஏற்கனவே இணைத்தவை"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"புளூடூத் ஆன் செய்யப்பட்டது"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"இணைக்கப்பட்ட சாதனங்கள் அனைத்தும்"</string>
<string name="date_and_time" msgid="9062980487860757694">"தேதி & நேரம்"</string>
<string name="choose_timezone" msgid="1362834506479536274">"நேரமண்டலத்தைத் தேர்வுசெய்க"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"தவிர்"</string>
<string name="next_label" msgid="4693520878012668114">"அடுத்து"</string>
<string name="language_picker_title" msgid="3596315202551687690">"மொழிகள்"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"மொழி விருப்பத்தேர்வு"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"அகற்று"</string>
<string name="add_a_language" msgid="2330538812283783022">"மொழியைச் சேர்"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"அமைப்பு"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"அமைப்பு"</string>
<string name="airplane_mode" msgid="8837269988154128601">"விமானப் பயன்முறை"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"மேலும்"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"வயர்லெஸ் & நெட்வொர்க்குகள்"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"வைஃபை, புளூடூத், விமானப் பயன்முறை, மொபைல் நெட்வொர்க்குகள், & VPNகள் ஆகியவற்றை நிர்வகி"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"மொபைல் டேட்டா"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"தனியுரிமை"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"நிர்வாகி முடக்கியுள்ளார்"</string>
<string name="security_status_title" msgid="5848766673665944640">"பாதுகாப்பு நிலை"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"திரைப் பூட்டு, முகம் காட்டித் திறத்தல்"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"ஸ்கிரீன் லாக், கைரேகை"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"திரைப் பூட்டு"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"முகம் சேர்க்கப்பட்டது"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"முகத்தின் மூலம் திறக்கலாம்"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"அங்கீகரிக்க, முகத்தைப் பயன்படுத்தலாம்"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"மொபைலைத் திறக்க, வாங்குதல்களை அங்கீகரிக்க & ஆப்ஸில் உள்நுழைய, உங்கள் முகத்தைப் பயன்படுத்தலாம்."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"முக அங்கீகாரத்தைப் பயன்படுத்தவும்"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"மொபைலைத் திறக்கவோ, பொருட்கள் வாங்குவதை அங்கீகரிக்கவோ, உங்கள் முகத்தைப் பயன்படுத்தவும். \n\nகவனத்திற்கு: இந்தச் சாதனத்தைத் திறப்பதற்கு, உங்கள் முகத்தைப் பயன்படுத்த இயலாது. மேலும் தகவலுக்கு, உங்கள் நிறுவனத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"மொபைலைத் திறக்க, வாங்குதல்களை அங்கீகரிக்க & ஆப்ஸில் உள்நுழைய, உங்கள் முகத்தைப் பயன்படுத்தலாம்"</string>
- <string name="face_add_max" msgid="2342250989212694454">"<xliff:g id="COUNT">%d</xliff:g> கைரேகைகள் வரை சேர்க்கலாம்"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"வட்டத்தின் மையத்தில் முகத்தைக் காட்டவும்"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"பின்னர் செய்"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"<xliff:g id="COUNT">%d</xliff:g> முகங்கள் வரை சேர்க்கலாம்"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"அனுமதிக்கப்பட்ட அதிகபட்ச முகங்களைச் சேர்த்துவிட்டீர்கள்"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"இனி முகங்களைச் சேர்க்க இயலாது"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"பதிவுசெய்தல் நிறைவடையவில்லை"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"சரி"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"முகத்தைப் பதிவுசெய்வதற்கான நேரம் முடிந்தது. மீண்டும் முயலவும்."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"முகத்தைப் பதிவுசெய்ய முடியவில்லை."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"முகப்பதிவு முடிந்தது. சரியாக உள்ளது."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"முடிந்தது"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"முகத்தை உபயோகித்து"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"சாதனத்தைத் திற"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ஆப்ஸ் உள்நுழைவும் பேமெண்ட்டும்"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"தடைநீக்க, கண்களைத் திறத்தல்"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"முக அடையாளத்தைப் பயன்படுத்தும்போது, கண்களைத் திறந்திருக்க வேண்டும்"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"முகங்களை அகற்று"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"தெளிவான முகத்தைப் பதிவுசெய்க"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"சாதனத்தைத் திறப்பதற்கும் ஆப்ஸை அணுகுவதற்கும், உங்கள் முகத்தைப் பயன்படுத்தலாம். "<annotation id="url">"மேலும் அறிக"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"கைரேகை"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"கைரேகைகளை நிர்வகிக்கவும்"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"இதற்குப் பயன்படுத்து:"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"வைஃபை ஹாட்ஸ்பாட்டிற்கு, குறைந்தது ஒரு பேண்ட்டைத் தேர்வுசெய்யவும்:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP அமைப்பு"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"தனியுரிமை"</string>
<string name="wifi_shared" msgid="844142443226926070">"பிற சாதனப் பயனர்களுடன் பகிர்"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(மாற்றப்படவில்லை)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"தேர்ந்தெடுக்கவும்"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"ரத்துசெய்"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"நெட்வொர்க்கை நீக்கவா?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"இந்த நெட்வொர்க்கின் எல்லாக் கடவுச்சொற்களும் நீக்கப்படும்"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"சேமித்த நெட்வொர்க்குகள்"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d நெட்வொர்க்குகள்</item>
<item quantity="one">1 நெட்வொர்க்</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"ஒளிர்வு"</string>
<string name="brightness_summary" msgid="838917350127550703">"திரையின் ஒளிர்வைச் சரிசெய்யவும்"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"ஒளிர்வைத் தானாகச் சரிசெய்தல்"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ஆன்"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ஆஃப்"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"விரும்பும் ஒளிர்வு மிகவும் குறைவாகும்"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"விரும்பும் ஒளிர்வு குறைவாகும்"</string>
@@ -1121,12 +1127,12 @@
<string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"பேட்டரியை அதிகமாகப் பயன்படுத்தும்"</string>
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"கிடைக்கும் ஒளிக்கேற்ப ஒளிர்வை மேம்படுத்து. இதை இயக்கியிருந்தால், தற்காலிகமாக ஒளிர்வைச் சரிசெய்யலாம்."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"நீங்கள் இருக்கும் சூழலுக்கும், செய்யும் வேலைகளுக்கும் ஏற்றவாறு, தானாகவே உங்களின் திரை ஒளிர்வு கூடும், குறையும். நீங்கள் எவ்வளவு வெளிச்சத்தை விரும்புகிறீர்கள் என்பதைச் சூழலுக்கேற்ற ஒளிர்வு தெரிந்துகொள்ள, ஸ்லைடரைக் கைமுறையாக நகர்த்தலாம்."</string>
- <string name="night_display_title" msgid="2626451512200357686">"இரவு ஒளி"</string>
- <string name="night_display_text" msgid="1837277457033025056">"இரவு ஒளி அம்சமானது உங்கள் திரையை மஞ்சளும் ஆரஞ்சும் கலந்த நிறத்திற்கு மாற்றும். இது மங்கலான ஒளியில் திரையைப் பார்ப்பதை அல்லது படிப்பதை எளிதாக்குவதோடு, விரைவாக உறங்க உதவக்கூடும்."</string>
+ <string name="night_display_title" msgid="2626451512200357686">"நைட் லைட்"</string>
+ <string name="night_display_text" msgid="1837277457033025056">"நைட் லைட் அம்சமானது உங்கள் திரையை மஞ்சளும் ஆரஞ்சும் கலந்த நிறத்திற்கு மாற்றும். இது மங்கலான ஒளியில் திரையைப் பார்ப்பதை அல்லது படிப்பதை எளிதாக்குவதோடு, விரைவாக உறங்க உதவக்கூடும்."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"திட்டமிடு"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"ஏதுமில்லை"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"தனிப்பயன் நேரத்தில் இயக்கும்"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"இயக்கும்: சூரிய அஸ்தமனம் - உதயம்"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"மாலை முதல் காலை வரை ஆன் செய்யும்"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"தொடக்க நேரம்"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"முடிவு நேரம்"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"நிலை"</string>
@@ -1141,8 +1147,8 @@
<string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"சூரிய உதயத்தின் போது தானாக முடக்கப்படும்"</string>
<string name="night_display_activation_on_manual" msgid="277343561277625826">"இப்போது ஆன் செய்"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"இப்போது ஆஃப் செய்"</string>
- <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"சூரிய உதயம் வரை ஆன் செய்"</string>
- <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"சூரிய அஸ்தமனம் வரை ஆஃப் செய்"</string>
+ <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"காலை வரை ஆன் செய்"</string>
+ <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"மாலை வரை ஆஃப் செய்"</string>
<string name="night_display_activation_on_custom" msgid="5472029024427933598">"<xliff:g id="ID_1">%1$s</xliff:g> வரை ஆஃப் செய்"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"<xliff:g id="ID_1">%1$s</xliff:g> வரை ஆஃப் செய்"</string>
<string name="screen_timeout" msgid="4351334843529712571">"உறங்கு"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"பின்னை மாற்ற முடியவில்லை.\nதவறான பின்னாக இருக்கலாம்."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"சிம் பின் வெற்றிகரமாக மாற்றப்பட்டது"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"சிம் கார்டின் பூட்டு நிலையை மாற்ற முடியவில்லை.\nதவறான பின்னாக இருக்கலாம்."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"பின்னை முடக்க இயலவில்லை."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"பின்னை இயக்க இயலவில்லை."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"சரி"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"ரத்துசெய்"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"பல SIMகள் உள்ளன"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"இதற்கு <xliff:g id="NAME_0">^1</xliff:g>ஐ மீட்டமைக்க வேண்டும். \n\n"<b>"மீட்டமைப்பதால், <xliff:g id="NAME_1">^1</xliff:g> இல் தற்போது உள்ள எல்லா தரவும் அழிக்கப்படும்."</b>" தரவு இழப்பைத் தடுக்க, அதனை காப்புப் பிரதி எடுத்துக்கொள்ளவும்."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"அழி & மீட்டமை"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> வடிவமைக்கப்படுகிறது"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g> ஃபார்மேட் செய்யப்படுகிறது, தற்போது அகற்ற வேண்டாம்."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g> ஃபார்மேட் செய்யப்படும்போது அகற்ற வேண்டாம்."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"புதிய சேமிப்பகத்திற்கு நகர்த்துக"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"படங்கள், கோப்புகள் மற்றும் சில பயன்பாடுகளை புதிய <xliff:g id="NAME">^1</xliff:g>க்கு நகர்த்தலாம். \n\nநகர்த்துவதற்கு <xliff:g id="TIME">^2</xliff:g> ஆகும், மேலும் அகச் சேமிப்பகத்தில் <xliff:g id="SIZE">^3</xliff:g> இடத்தைக் காலிசெய்யும். இந்தச் செயல்பாட்டின் போது, சில பயன்பாடுகள் இயங்காது."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"இப்போதே நகர்த்தவும்"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"நிறுவப்பட்டது"</string>
<string name="no_applications" msgid="7336588977497084921">"பயன்பாடுகள் இல்லை."</string>
<string name="internal_storage" msgid="1584700623164275282">"அகச் சேமிப்பிடம்"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"அகச் சேமிப்பகம்"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB சேமிப்பிடம்"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD கார்டின் சேமிப்பிடம்"</string>
<string name="recompute_size" msgid="7722567982831691718">"அளவை மீண்டும் கணக்கிடுகிறது…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"ஆப்ஸ் டேட்டாவை நீக்கவா?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"பயன்பாட்டின் எல்லா தகவலும் நிரந்தரமாக நீக்கப்படும். இதில் எல்லா ஃபைல்களும், அமைப்புகளும், கணக்குகளும், தரவுத்தளங்களும், மேலும் பலவும் அடங்கும்."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"நிறுவிய பயன்பாடுகளின் பட்டியலில் பயன்பாடு இல்லை."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"பயன்பாட்டின் தரவை அழிக்க முடியவில்லை."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"உங்கள் டேப்லெடில் பின்வருவனவற்றை இந்தப் பயன்பாடு அணுகலாம்:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"உங்கள் மொபைலில் பின்வருவனவற்றை இந்தப் பயன்பாடு அணுகலாம்:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"இந்தப் பயன்பாடு உங்கள் டேப்லெட்டில் பின்வருபவற்றை அணுகலாம். செயல்திறனை மேம்படுத்த, நினைவகப் பயன்பாட்டைக் குறைக்க, இந்த அனுமதிகளில் சில <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> க்கு கிடைக்கும், ஏனெனில் இவற்றை <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> போலவே இதுவும் அதே செயல்முறைகளில் இயங்குகிறது:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"இந்தப் பயன்பாடு உங்கள் தொலைபேசியில், பின்வருபவற்றை அணுகலாம். செயல்திறனை மேம்படுத்த, நினைவகப் பயன்பாட்டைக் குறைக்க, இந்த அனுமதிகளில் சில <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> க்கு கிடைக்கும், ஏனெனில் <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> போலவே அதே செயல்முறைகளில் இது இயங்குகிறது:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> மற்றும் <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"இந்தப் பயன்பாடு உங்களுக்குக் கட்டணம் விதிக்கலாம்:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"பிரீமியம் SMS ஐ அனுப்பு"</string>
<string name="computing_size" msgid="1599186977475211186">"கணக்கிடுகிறது..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"பேக்கேஜ் அளவைக் கணக்கிட முடியவில்லை."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"நீங்கள் மூன்றாம் தரப்பு பயன்பாடுகள் எதையும் நிறுவவில்லை."</string>
<string name="version_text" msgid="9189073826278676425">"<xliff:g id="VERSION_NUM">%1$s</xliff:g> பதிப்பு"</string>
<string name="move_app" msgid="5042838441401731346">"நகர்த்து"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"டேப்லெட்டிற்கு நகர்த்து"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"மொபைலுக்கு நகர்த்து"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB சேமிப்பிடத்திற்கு நகர்த்து"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD கார்டுக்கு நகர்த்து"</string>
- <string name="moving" msgid="6431016143218876491">"நகர்த்துகிறது"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"ஏற்கனவே ஒரு நகர்த்துதல் செயலில் உள்ளது."</string>
<string name="insufficient_storage" msgid="481763122991093080">"போதுமான சேமிப்பிடம் இல்லை."</string>
<string name="does_not_exist" msgid="1501243985586067053">"பயன்பாடு இல்லை."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"சாதன நிர்வாகிப் பயன்பாட்டை வெளிப்புற மீடியாவில் நிறுவ முடியாது"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"உடனே நிறுத்தவா?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"பயன்பாட்டை உடனே நிறுத்தினால், அது தவறாகச் செயல்படலாம்."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"பயன்பாட்டை நகர்த்த முடியவில்லை. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"தேர்வுசெய்த நிறுவல் இருப்பிடம்"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"புதிய பயன்பாடுகளுக்கான பரிந்துரைக்கப்பட்ட நிறுவல் இடங்களை மாற்றவும்"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"உள்ளமைக்கப்பட்டுள்ள பயன்பாட்டை முடக்கவா?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"பயன்பாட்டை முடக்கு"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"பயன்பாட்டை முடக்கினால், Android மற்றும் பிற பயன்பாடுகள் சரியாகச் செயல்படாமல் போகக்கூடும்."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"தரவை நீக்கிவிட்டு பயன்பாட்டை முடக்கவா?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"இந்தப் பயன்பாட்டை முடக்கினால், Android மற்றும் பிற பயன்பாடுகள் சரியாகச் செயல்படாமல் போகக்கூடும். அத்துடன், உங்கள் தரவும் நீக்கப்படும்."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"அறிவிப்புகளை முடக்கவா?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"பயன்பாட்டிற்கான அறிவிப்புகளை முடக்கினால், முக்கிய விழிப்பூட்டல்கள் மற்றும் புதுப்பிப்புகளை நீங்கள் தவற விடலாம்."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"ஸ்டோர்"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"பயன்பாட்டின் விவரங்கள்"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"பயன்பாடு <xliff:g id="APP_STORE">%1$s</xliff:g> இலிருந்து நிறுவப்பட்டது"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"சேவையைப் பயன்படுத்து"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"வண்ணத் திருத்தத்தைப் பயன்படுத்து"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"தலைப்புகளைப் பயன்படுத்து"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"தொடர்க"</string>
<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="6371077608778830020">"செவித்துணைக் கருவியைச் சேர்"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"பயன்பாட்டின் பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தினால், சரியாக வேலை செய்யாது."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"பேட்டரியை மேம்படுத்த அமைக்கப்படவில்லை, எனவே கட்டுப்படுத்த முடியாது.\n\nஆப்ஸை கட்டுப்படுத்த, பேட்டரி மேம்படுத்தலை ஆன் செய்க."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"திரையின் பயன்பாடு (முழு சார்ஜ் ஆன பிறகு)"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"திரை நுகர்வு"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"மொபைல் நெட்வொர்க்கை ஸ்கேன் செய்தல்"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"முழு சார்ஜ் ஆன பிறகு, பேட்டரி உபயோகம்"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"முழு சார்ஜ் ஆனதிலிருந்து, திரை இயக்கத்தில் இருந்த நேரம்"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"முழு சார்ஜ் ஆனதிலிருந்து சாதன உபயோகம்"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"விவரங்களைப் பயன்படுத்து"</string>
<string name="controls_subtitle" msgid="390468421138288702">"ஆற்றல் பயன்பாட்டைச் சரிசெய்க"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"உள்ளடங்கும் தொகுப்புகள்"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"பேட்டரியை அதிகமாகப் பயன்படுத்தும் பயன்பாடுகள்"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"சாதனத்தைச் செயல்பாட்டில் வைத்திருக்கிறது"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"பின்னணியில் சாதனத்தை எழுப்புகிறது"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"இருப்பிடத்தை அடிக்கடிக் கோருகிறது"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> பயன்பாடுகள், வழக்கத்திற்கு மாறாகச் செயல்படுகின்றன"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"ஆப்ஸ் வழக்கம்போல் இயங்குகின்றன"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"மொபைலில் பின்னணி பேட்டரி உபயோகம் வழக்கமான முறையில் உள்ளது"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"டேப்லெட்டில் பின்னணி பேட்டரி உபயோகம் வழக்கமான முறையில் உள்ளது"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d ஆப்ஸிற்கு, பேட்டரி உபயோகத்தைக் கட்டுப்படுத்துகிறது</item>
<item quantity="one">%1$d பயன்பாட்டிற்கு, பேட்டரி உபயோகத்தைக் கட்டுப்படுத்துகிறது</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"கட்டுப்படுத்தப்பட்டது: <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"இந்த ஆப்ஸ், பின்னணியில் பேட்டரியைப் பயன்படுத்துகின்றன. கட்டுப்படுத்தப்பட்ட ஆப்ஸ் சரியாக வேலைசெய்யாமல் போகலாம். அத்துடன் அவற்றுக்கான அறிவிப்புகளும் தாமதமாக வரலாம்."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"பேட்டரி நிர்வாகியைப் பயன்படுத்து"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"பேட்டரியை ஆப்ஸ் அதிகமாகப் பயன்படுத்தும்போது கண்டறியும்"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"ரத்துசெய்"</string>
<string name="tts_reset" msgid="2661752909256313270">"மீட்டமை"</string>
<string name="tts_play" msgid="2628469503798633884">"இயக்கு"</string>
- <string name="gadget_title" msgid="5519037532720577836">"ஆற்றல் கட்டுப்பாடு"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"வைஃபை அமைப்பைப் புதுப்பிக்கிறது"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"புளூடூத் அமைப்புகளைப் புதுப்பிக்கிறது"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ஆன்"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ஆஃப்"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"இயக்குகிறது"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"முடக்குகிறது"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"வைஃபை"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"புளூடூத்"</string>
- <string name="gadget_location" msgid="2974757497945178165">"இருப்பிடம்"</string>
- <string name="gadget_sync" msgid="858895763714222152">"ஒத்திசை"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"ஒளிர்வு <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"தானியங்கு"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"முழு"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"பாதி"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"ஆஃப்"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"நற்சான்று சேமிப்பிடம்"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"சேமிப்பிடத்திலிருந்து நிறுவு"</string>
@@ -2455,7 +2426,7 @@
<string name="usage_access_title" msgid="332333405495457839">"உபயோக அணுகலுடைய ஆப்ஸ்"</string>
<string name="emergency_tone_title" msgid="254495218194925271">"அவசரகால டயலிங் சிக்னல்"</string>
<string name="emergency_tone_summary" msgid="722259232924572153">"அவசர அழைப்பு இயக்கப்பட்டிருக்கும்போது நடத்தையை அமை"</string>
- <string name="privacy_settings_title" msgid="2978878794187459190">"காப்புப் பிரதி"</string>
+ <string name="privacy_settings_title" msgid="2978878794187459190">"காப்புப்பிரதி"</string>
<string name="backup_summary_state_on" msgid="6407084627816231202">"ஆன் செய்யப்பட்டுள்ளது"</string>
<string name="backup_summary_state_off" msgid="7388321532624105594">"ஆஃப் செய்யப்பட்டுள்ளது"</string>
<string name="backup_section_title" msgid="7952232291452882740">"காப்புப் பிரதி & மீட்டெடுத்தல்"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g> இல் <xliff:g id="NUMBER">%1$s</xliff:g> தேர்ந்தெடுக்கப்பட்டது"</string>
<string name="select_all" msgid="1562774643280376715">"எல்லாவற்றையும் தேர்ந்தெடு"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"டேட்டா உபயோகம்"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"பயன்பாட்டின் டேட்டா உபயோகம்"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"மொபைல் டேட்டா & வைஃபை"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்."</string>
<string name="data_usage_app" msgid="4970478397515423303">"பயன்பாட்டின் பயன்பாடு"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"பயன்பாட்டுத் தகவல்"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">மறைந்துள்ள %d உருப்படிகளைக் காட்டு</item>
<item quantity="one">மறைந்துள்ள %d உருப்படியைக் காட்டு</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"சுருக்கும்"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"நெட்வொர்க் & இன்டர்நெட்"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"மொபைல்"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"டேட்டா உபயோகம்"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"புளூடூத்"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ஆப்ஸ் & அறிவிப்புகள்"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"அனுமதிகள், இயல்பு ஆப்ஸ்"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"பணி விவரத்தில், ஆப்ஸுற்கான அறிவிப்பு அணுகல் இல்லை."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"கணக்குகள்"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"கணக்குகள் எதுவும் சேர்க்கப்படவில்லை"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"இயல்புப் பயன்பாடுகள்"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"மொழிகள், நேரம், காப்புப் பிரதி, புதுப்பிப்புகள்"</string>
<string name="search_results_title" msgid="1796252422574886932">"அமைப்பு"</string>
- <string name="search_menu" msgid="6283419262313758339">"அமைப்புகளில் தேடு"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"வைஃபை, வை-ஃபை, நெட்வொர்க் இணைப்பு, இணையம், வயர்லெஸ், டேட்டா, வை ஃபை"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"வைஃபை, வை-ஃபை, நிலைமாற்றி, கட்டுப்பாடு"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"உரைச் செய்தி, உரைச் செய்தியிடல், செய்திகள், செய்தியிடல், இயல்பு"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"கட்டணம் செலுத்தவும், தட்டவும், கட்டணம் செலுத்துதல்"</string>
<string name="keywords_backup" msgid="470070289135403022">"காப்புப்பிரதி, காப்புப் பிரதி"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"சைகை"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"முகம், தடைநீக்கம், முகம் காட்டித் திறத்தல், அடையாளம், உள்நுழைதல்"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl பதிப்பு, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"நெட்வொர்க், மொபைல் நெட்வொர்க் நிலை, சேவை நிலை, சிக்னலின் வலிமை, மொபைல் நெட்வொர்க் வகை, ரோமிங், iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"வரிசை எண், வன்பொருள் பதிப்பு"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"டார்க் தீம்"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"பிழை"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"சூழல்சார் திரை, லாக் ஸ்கிரீன்"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"பூட்டுத் திரை அறிவிப்பு"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"முகம்"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"கைரேகை"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"மங்கல் திரை, டச்ஸ்கிரீன், பேட்டரி, ஸ்மார்ட் பிரைட்னஸ், சிறப்பு ஒளிர்வு"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"இந்தச் சாதனத்தைத் துவக்க பின்னை நீங்கள் பயன்படுத்தினால், <xliff:g id="SERVICE">%1$s</xliff:g> போன்ற அணுகல்தன்மை சேவைகள் கிடைக்காது."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"இந்தச் சாதனத்தைத் துவக்க வடிவத்தை நீங்கள் பயன்படுத்தினால், <xliff:g id="SERVICE">%1$s</xliff:g> போன்ற அணுகல்தன்மை சேவைகள் கிடைக்காது."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"இந்தச் சாதனத்தைத் துவக்க கடவுச்சொல்லை நீங்கள் பயன்படுத்தினால், <xliff:g id="SERVICE">%1$s</xliff:g> போன்ற அணுகல்தன்மை சேவைகள் கிடைக்காது."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"குறிப்பு: மறுதொடக்கம் செய்த பிறகு, மொபைலைத் திறக்கும் வரை இந்தப் பயன்பாட்டால் தொடங்க முடியாது"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"கவனத்திற்கு: உங்கள் மொபைலை மீண்டும் தொடங்கும்போது அதில் திரைப் பூட்டு அமைக்கப்பட்டிருந்தால், மொபைலைத் திறக்கும் வரை இந்த ஆப்ஸால் செயல்பட முடியாது"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI தகவல்"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI தொடர்புடைய தகவல்"</string>
<string name="slot_number" msgid="3762676044904653577">"(ஸ்லாட்<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"தனிப்பட்டவை"</string>
<string name="filter_work_apps" msgid="24519936790795574">"பணியிடம்"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"பயன்பாடுகள்: எல்லாம்"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ஆப்ஸ்: ஆஃப் செய்தவை"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ஆஃப் செய்யப்பட்டவை"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"வகைகள்: அதிக முக்கியத்துவம்"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"வகைகள்: குறைந்த முக்கியத்துவம்"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"வகைகள்: முடக்கப்பட்டன"</string>
@@ -3561,7 +3533,7 @@
<string name="permit_usage_access" msgid="4012876269445832300">"உபயோக அணுகல் அனுமதி"</string>
<string name="app_usage_preference" msgid="7065701732733134991">"பயன்பாட்டு உபயோக விருப்பத்தேர்வுகள்"</string>
<string name="time_spent_in_app_pref_title" msgid="649419747540933845">"பயன்பாட்டில் செலவிட்ட நேரம்"</string>
- <string name="usage_access_description" msgid="1352111094596416795">"உபயோக அணுகலானது, நீங்கள் பயன்படுத்தும் பிற ஆப்ஸ் மற்றும் அவற்றை எவ்வளவு அடிக்கடி பயன்படுத்துகிறீர்கள் என்பவற்றையும், உங்கள் மொபைல் நிறுவனம், மொழி அமைப்புகள் மற்றும் பிற விவரங்களையும் கண்காணிக்க, பயன்பாட்டை அனுமதிக்கும்."</string>
+ <string name="usage_access_description" msgid="1352111094596416795">"உபயோக அணுகலானது, நீங்கள் வேறு எந்தெந்த ஆப்ஸை எவ்வளவு அடிக்கடி பயன்படுத்துகிறீர்கள் என்று அறியும் அனுமதியை ஒரு ஆப்ஸுக்கு வழங்குகிறது. உங்கள் மொபைல் நிறுவனம், மொழி அமைப்புகள் மற்றும் பிற விவரங்களையும் அறிந்து கொள்ளும் அனுமதியும் இதில் அடங்கும்."</string>
<string name="memory_settings_title" msgid="7490541005204254222">"நினைவகம்"</string>
<string name="memory_details_title" msgid="8542565326053693320">"நினைவக விவரங்கள்"</string>
<string name="always_running" msgid="6042448320077429656">"எப்போதும் இயங்குபவை (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"உபயோகம் குறித்த எச்சரிக்கைகள்"</string>
<string name="show_all_apps" msgid="1512506948197818534">"முழு பயன்பாட்டைக் காட்டு"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"பயன்பாட்டின் உபயோகத்தை காட்டு"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"அதிக உபயோகம்"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other">வழக்கத்திற்கு மாறாக <xliff:g id="NUMBER">%2$d</xliff:g> பயன்பாடுகள் செயல்படுகின்றன</item>
<item quantity="one">வழக்கத்திற்கு மாறாக <xliff:g id="APP">%1$s</xliff:g> செயல்படுகிறது</item>
@@ -3684,7 +3655,7 @@
<string name="system_alert_window_apps_title" msgid="7005760279028569491">"ஆப்ஸ்"</string>
<string name="system_alert_window_access_title" msgid="6297115362542361241">"பிற ஆப்ஸின் மேலே காட்டு"</string>
<string name="permit_draw_overlay" msgid="7456536798718633432">"பிற ஆப்ஸின் மேலே காட்டுவதை அனுமதி"</string>
- <string name="allow_overlay_description" msgid="8961670023925421358">"நீங்கள் பயன்படுத்தும் பிற ஆப்ஸின் மேலே உள்ளடக்கத்தைக் காட்ட, இந்தப் பயன்பாட்டை அனுமதிக்கும். மேலும், அந்த ஆப்ஸை நீங்கள் பயன்படுத்தும் போது இது குறுக்கிடக்கூடும் அல்லது அவை தோன்றும் அல்லது செயல்படும் விதத்தை மாற்றக்கூடும்."</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>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"சாதனச் சேமிப்பகம்: <xliff:g id="PERCENTAGE">%1$s</xliff:g> பயன்படுத்தப்பட்டது - <xliff:g id="FREE_SPACE">%2$s</xliff:g> பயன்படுத்துவதற்கு உள்ளது"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> நிமிடங்களாக எந்தச் செயல்பாடும் இல்லை எனில், உறக்கநிலைக்குச் செல்லும்"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"வால்பேப்பர், உறக்கம், எழுத்தின் அளவு"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 நிமிடங்களாக எந்தச் செயல்பாடும் இல்லை எனில், உறக்கநிலைக்குச் செல்லும்"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> இல் சராசரியாக <xliff:g id="USED_MEMORY">%1$s</xliff:g> நினைவகம் பயன்படுத்தப்பட்டுள்ளது"</string>
<string name="users_summary" msgid="1674864467098487328">"உள்நுழைந்துள்ள முகவரி: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS அனுமதிக்கப்படவில்லை"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"கேமரா அனுமதிக்கப்படவில்லை"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ஸ்கிரீன்ஷாட் அனுமதிக்கப்படவில்லை"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"காப்புப்பிரதிகள் எடுப்பதை ஆஃப் செய்ய முடியாது"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"இந்தப் பயன்பாட்டைத் திறக்க முடியாது"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"கேள்விகள் இருந்தால், IT நிர்வாகியைத் தொடர்புகொள்ளவும்"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"மேலும் விவரங்கள்"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"காட்சியை, கட் அவுட் போலக் காட்டு"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"டிஸ்ப்ளே கட்அவுட்"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"கட்அவுட் காட்சி, நோட்ச்"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ஏதுமில்லை"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"சாதனத்தின் இயல்புநிலை"</string>
<string name="special_access" msgid="3458780842491881155">"பயன்பாட்டின் சிறப்பு அணுகல்"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகளால் எல்லா தகவலையும் பயன்படுத்த முடியும்</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> உடன் இணைக்கப்பட்டுள்ளது"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"பல சாதனங்களுடன் இணைக்கப்பட்டுள்ளது"</string>
<string name="demo_mode" msgid="2798762752209330277">"சிஸ்டம் பயனர் இடைமுக டெமோ பயன்முறை"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"இரவுப் பயன்முறை"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"இரவுப் பயன்முறையை அமை"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"டார்க் பயன்முறை"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"\'டார்க் பயன்முறையை\' அமை"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"விரைவு அமைப்புகளின் டெவெலப்பர் கட்டங்கள்"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"வின்ஸ்கோப் டிரேஸ்"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"பணிச் சுயவிவர அமைப்புகள்"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"தொடர்புகளில் தேடு"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"எனது நிறுவனத்தின்படி அழைப்பாளர்களையும் தொடர்புகளையும் கண்டறிய, ”தொடர்புகளில் தேடு” அம்சத்தை அனுமதி"</string>
@@ -3976,7 +3947,7 @@
<string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"உங்கள் மொபைலைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்"</string>
<string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"டேப்லெட்டைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்"</string>
<string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"சாதனத்தைக் கட்டுப்படுத்துவதற்கான உடனடி சைகைகள்"</string>
- <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"கேமராவிற்குச் செல்"</string>
+ <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"கேமராவிற்குச் செல்லுதல்"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"கேமராவை விரைவாகத் திறக்க, பவர் பட்டனை இருமுறை அழுத்தவும். எந்தத் திரையிலும் கேமரா இயங்கும்."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"கேமராவை உடனடியாகத் திறக்கவும்"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"கேமராவை மாற்றுதல்"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"மொபைல் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"டேப்லெட் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"சாதனத் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைப் பார்க்க, திரையை இருமுறை தட்டவும்."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"நேரம், அறிவிப்புகள் மற்றும் பிற தகவலைப் பார்க்கத் திரையை இருமுறை தட்டவும்."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"திரையில் அறிவிப்புகளைப் பார்க்க, மொபைலைக் கையில் எடுக்கவும்"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"திரையில் அறிவிப்புகளை பார்க்க, டேப்லெட்டை கையில் எடுக்கவும்"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"திரையில் அறிவிப்புகளைப் பார்க்க, சாதனத்தை கையில் எடுக்கவும்"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைப் பார்க்க, மொபைலைக் கையில் எடுக்கவும்."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைப் பார்க்க, டேப்லெட்டைக் கையில் எடுக்கவும்."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"நேரம், அறிவிப்பு ஐகான்கள் மற்றும் பிற தகவலைப் பார்க்க, சாதனத்தைக் கையில் எடுக்கவும்."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"திரையை எழுப்புதல்"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"நேரம், அறிவிப்புகள் மற்றும் பிற தகவலைப் பார்க்க உங்கள் மொபைலைக் கையில் எடுக்கவும்."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"நேரம், அறிவிப்புகள் மற்றும் பிற தகவலைப் பார்க்க உங்கள் டேப்லெட்டைக் கையில் எடுக்கவும்."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"நேரம், அறிவிப்புகள் மற்றும் பிற தகவலைப் பார்க்க உங்கள் சாதனத்தைக் கையில் எடுக்கவும்."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Wake lock திரைச் சைகை"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"அறிவிப்புகளைப் பெற சென்சாரில் ஸ்வைப் செய்தல்"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"கைரேகை ஸ்வைப்"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"அறிவிப்புகளைப் பார்க்க, மொபைலின் பின்புறத்தில் உள்ள கைரேகை சென்சாரில் கீழ் நோக்கி ஸ்வைப் செய்தல்."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g></item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g></item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"இந்தச் சாதனத்தின் தரவு காப்புப் பிரதி எடுக்கப்படுகிறது"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"இந்தச் சாதனத்தை உங்கள் நிறுவனம் நிர்வகிக்கிறது."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"இந்தச் சாதனத்தை நிர்வகிப்பது: <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"தன்னிரப்பிச் சேவை"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"தானாக, நிரப்பு, தானாக நிரப்பு, தன்னிரப்பி"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>இந்தப் பயன்பாட்டை நம்புகிறீர்கள் என்பதை உறுதிப்படுத்திக்கொள்ளவும்</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> உங்கள் திரையில் இருப்பதைப் பயன்படுத்தி, எவற்றையெல்லாம் தன்னிரப்ப முடியும் என்பதைத் தீர்மானிக்கும்."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"தன்னிரப்பி"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Logging நிலை"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"ஒரு அமர்விற்கான அதிகபட்ச கோரிக்கைகள்"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"அதிகபட்சத் தெரியக்கூடிய தரவுத் தொகுப்புகள்"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"இயல்புநிலை மதிப்புகளுக்கு மீட்டமை"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"தன்னிரப்பி டெவெலப்பர் விருப்பங்கள் மீட்டமைக்கப்பட்டன"</string>
<string name="device_theme" msgid="4571803018917608588">"சாதனத்தின் தீம்"</string>
<string name="default_theme" msgid="7085644992078579076">"இயல்பு"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"நெட்வொர்க் பெயர்"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Trigger Carrier Provisioning"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"தொந்தரவு செய்ய வேண்டாம் அமைப்பைப் புதுப்பிக்கவும்"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"கவனம் சிதறாமல் இருக்க, அறிவிப்புகளை இடைநிறுத்தவும்"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"புதியதாகவும் உற்சாகமூட்டும் விதமாகவும் என்ன உள்ளது?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"உங்கள் புதிய மொபைலைப் பற்றி அறிக"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"உங்கள் புதிய டேப்லெட்டைப் பற்றி அறிக"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"உங்கள் புதிய சாதனத்தைப் பற்றி அறிக"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"இந்தச் சாதனத்தில் இந்த அம்சம் இல்லை"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"முழுமையான GNSS அளவீடுகளை அமலாக்கு"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"பணி சுழற்சியை முடக்கி, GNSS வழிசெலுத்துதல்கள் மற்றும் அதிர்வெண்கள் அனைத்தையும் கண்காணித்தல்."</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"சிதைவு அறிவிப்பை எப்போதும் காட்டு"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"பயன்பாடு செயலிழக்கும் போதெல்லாம் சிதைவு அறிவிப்பைக் காட்டு"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE இயக்கப்பட்ட ஆப்ஸைத் தேர்வுசெய்க"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE இயக்கப்பட்ட ஆப்ஸ் எதுவும் இல்லை"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE இயக்கப்பட்ட ஆப்ஸ்: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"கோப்பக அணுகல்"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"கோப்பக அணுகல்"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"நெட்வொர்க் விவரங்கள்"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"உங்களது மொபைலில் உள்ள ஆப்ஸிற்கு, உங்கள் சாதனத்தின் பெயர் தெரியும். புளூடூத் சாதனங்களுடன் இணைக்கும்போது அல்லது வைஃபை ஹாட்ஸ்பாட்டை அமைக்கும்போது, அப்பெயர் பிறருக்குக் காட்டப்படலாம்."</string>
<string name="devices_title" msgid="7701726109334110391">"சாதனங்கள்"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"அனைத்து அமைப்புகளும்"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"பரிந்துரைகள்"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS டேட்டா"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS டேட்டா"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"நெட்வொர்க்கைத் தேர்வுசெய்"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"தொடர்பு துண்டிக்கப்பட்டது"</string>
+ <string name="network_connected" msgid="4943925032253989621">"இணைக்கப்பட்டது"</string>
+ <string name="network_connecting" msgid="76404590784733557">"இணைக்கிறது…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"இணைக்க முடியவில்லை"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"நெட்வொர்க்குகள் இல்லை."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"நெட்வொர்க்குகளைக் கண்டறிய முடியவில்லை. மீண்டும் முயலவும்."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(தடுக்கப்பட்டது)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"சிம் கார்டு இல்லை"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"மேம்பட்ட அழைப்பு"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"விருப்பமான நெட்வொர்க் பயன்முறை: WCDMAக்கு முன்னுரிமை"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"விருப்பமான நெட்வொர்க் பயன்முறை: GSM மட்டும்"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"விருப்பமான நெட்வொர்க் பயன்முறை: WCDMA மட்டும்"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"விருப்பமான நெட்வொர்க் பயன்முறை: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"விருப்பமான நெட்வொர்க் பயன்முறை: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"விருப்பமான நெட்வொர்க் பயன்முறை: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"விருப்பமான நெட்வொர்க் பயன்முறை: CDMA மட்டும்"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"விருப்பமான நெட்வொர்க் பயன்முறை: EvDo மட்டும்"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"விருப்பமான நெட்வொர்க் பயன்முறை: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"விருப்பமான நெட்வொர்க் பயன்முறை: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"விருப்பமான நெட்வொர்க் பயன்முறை: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"விருப்பமான நெட்வொர்க் பயன்முறை: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"விருப்பமான நெட்வொர்க் பயன்முறை: குளோபல்"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"விருப்பமான நெட்வொர்க் பயன்முறை: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"விருப்பமான நெட்வொர்க் பயன்முறை: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"விருப்பமான நெட்வொர்க் பயன்முறை: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"விருப்பமான நெட்வொர்க் பயன்முறை: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"விருப்பமான நெட்வொர்க் பயன்முறை: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"விருப்பமான நெட்வொர்க் பயன்முறை: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"விருப்பமான நெட்வொர்க் பயன்முறை: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"விருப்பமான நெட்வொர்க் பயன்முறை: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"விருப்பமான நெட்வொர்க் பயன்முறை: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"விருப்பமான நெட்வொர்க் பயன்முறை: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"விருப்பமான நெட்வொர்க் பயன்முறை: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"விருப்பமான நெட்வொர்க் பயன்முறை: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"விருப்பமான நெட்வொர்க் பயன்முறை: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (பரிந்துரைக்கப்பட்டது)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (பரிந்துரைக்கப்பட்டது)"</string>
+ <string name="network_global" msgid="959947774831178632">"குளோபல்"</string>
+ <string name="label_available" msgid="1731547832803057893">"கிடைக்கும் நெட்வொர்க்குகள்"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"தேடுகிறது…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> இல் பதிவுசெய்கிறது…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"இந்த நெட்வொர்க்குடன் இணைப்பதை உங்கள் சிம் கார்டு அனுமதிக்கவில்லை."</string>
+ <string name="connect_later" msgid="978991102125216741">"இப்போது இந்த நெட்வொர்க்குடன் இணைக்க இயலவில்லை. மீண்டும் முயலவும்."</string>
+ <string name="registration_done" msgid="4573820010512184521">"நெட்வொர்க்கில் பதிவுசெய்யப்பட்டது."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"தானாகவே நெட்வொர்க்கைத் தேர்ந்தெடு"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"மொபைல் நிறுவன அமைப்புகள்"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"டேட்டா சேவையை அமைத்தல்"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"மொபைல் டேட்டா"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"மொபைல் நெட்வொர்க் மூலம் டேட்டாவைப் பயன்படுத்துதல்"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"விருப்பமான நெட்வொர்க் வகை"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"நெட்வொர்க் இயங்கும் பயன்முறையை மாற்று"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"விருப்பமான நெட்வொர்க் வகை"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"மொபைல் நிறுவனம்"</string>
+ <string name="call_category" msgid="8108654745239563833">"அழைப்பு"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"மொபைல் நிறுவன வீடியோ அழைப்பு"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"சிஸ்டம் தேர்வு"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"\'CDMA ரோமிங்\' பயன்முறையை மாற்று"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"சிஸ்டம் தேர்வு"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"நெட்வொர்க்"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"நெட்வொர்க்"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA சந்தா"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM மற்றும் NVக்கு இடையே மாறலாம்"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"சந்தா"</string>
+ <string name="register_automatically" msgid="518185886971595020">"தானியங்குப் பதிவு…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"டேட்டா ரோமிங்கை அனுமதிக்கவா?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"கட்டணம் பற்றி அறிய நெட்வொர்க் வழங்குநரைத் தொடர்புகொள்ளவும்."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ஆப்ஸின் டேட்டா பயன்பாடு"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"தவறான நெட்வொர்க் பயன்முறை <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. நிராகரி."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> உடன் இணைந்திருக்கும்போது கிடைக்காது"</string>
+ <string name="see_more" msgid="5953815986207345223">"மேலும் காட்டு"</string>
+ <string name="see_less" msgid="1250265310929558370">"குறைவாகக் காட்டு"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 3aa71ff..7404eff 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"గణించబడేదానిగా పరిగణించండి"</item>
<item msgid="2266114985518865625">"గణించబడనిదిగా పరిగణించండి"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"డిఫాల్ట్ (యాదృచ్ఛిక MACను ఉపయోగించండి)"</item>
+ <item msgid="5398461510512959597">"విశ్వసనీయ"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"లేదు"</item>
<item msgid="3863157480502955888">"అవును"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"ఎల్లప్పుడూ ఆన్ చేయి"</item>
<item msgid="6385301106124765323">"ఎల్లప్పుడూ ఆఫ్ చేయి"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"ఆఫ్"</item>
+ <item msgid="2182686878828390312">"డీబగ్"</item>
+ <item msgid="5286514712714822064">"విశదీకృత"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"ఇల్లు మాత్రమే"</item>
+ <item msgid="5034813753274486448">"ఆటోమేటిక్"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"ప్రాధాన్యత ఉన్న నెట్వర్క్ మోడ్లు: GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"GSM మాత్రమే"</item>
+ <item msgid="488474605709912156">"WCDMA మాత్రమే"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA స్వయంచాలకం"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo స్వయంచాలకం"</item>
+ <item msgid="370391313511477301">"CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo మాత్రమే"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"అంతర్జాతీయ"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA మాత్రమే"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"అంతర్జాతీయ"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMT"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 33a4830..ca52cf0 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"సృష్టించు"</string>
<string name="allow" msgid="3349662621170855910">"అనుమతించు"</string>
<string name="deny" msgid="6947806159746484865">"తిరస్కరించు"</string>
- <string name="dlg_close" msgid="7471087791340790015">"మూసివేయి"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"మార్చు"</string>
<string name="device_info_default" msgid="7847265875578739287">"తెలియదు"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">మీరు ఇప్పుడు డెవలపర్ కావడానికి <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> అడుగుల దూరంలో ఉన్నారు.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"అవసరం లేదు, మీరు ఇప్పటికే డెవలపర్గా ఉన్నారు."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"దయచేసి మొదట డెవలపర్ ఎంపికలను ప్రారంభించండి."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"వైర్లెస్ & నెట్వర్క్లు"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"కనెక్షన్లు"</string>
- <string name="header_category_device" msgid="4544026001618307754">"పరికరం"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"వ్యక్తిగతం"</string>
- <string name="header_category_access" msgid="7580499097416970962">"యాక్సెస్"</string>
<string name="header_category_system" msgid="2816866961183068977">"సిస్టమ్"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"డేటా కనెక్షన్ను ప్రారంభించండి"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"డేటా కనెక్షన్ను నిలిపివేయండి"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"పరికరం యొక్క బ్లూటూత్ చిరునామా: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ను డిస్కనెక్ట్ చేయాలా?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"ప్రసారం"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"పేరులేని బ్లూటూత్ పరికరం"</string>
<string name="progress_scanning" msgid="192587958424295789">"శోధించడం"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"సమీపంలో బ్లూటూత్ పరికరాలు ఏవీ కనుగొనబడలేదు."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"యాప్ బ్లూటూత్ను ఆన్ చేసి, మీ ఫోన్ను ఇతర డివైజ్లకు కనిపించేలా చేయాలనుకుంటోంది. మీరు దీన్ని తర్వాత బ్లూటూత్ సెట్టింగ్లలో మార్చవచ్చు."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"బ్లూటూత్ను ఆన్ చేస్తోంది…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"బ్లూటూత్ ఆఫ్ చేస్తోంది..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"స్వీయ-కనెక్ట్"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"బ్లూటూత్ కనెక్షన్ అభ్యర్థన"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"కి కనెక్ట్ చేయడానికి నొక్కండి."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"మీరు \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"కు కనెక్ట్ చేయాలనుకుంటున్నారా?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"అందుబాటులో ఉన్న కాల్ పరికరాలు"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"ప్రస్తుతం కనెక్ట్ చేయబడింది"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"సేవ్ చేసిన పరికరాలు"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"పరికరాన్ని జోడించండి"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"జత చేయడం కోసం బ్లూటూత్ ఆన్ చేయబడుతుంది"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"కనెక్షన్ ప్రాధాన్యతలు"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"మునుపు కనెక్ట్ చేసిన పరికరాలు"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"ఇంతకు మునుపు కనెక్ట్ చేయబడినవి"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"బ్లూటూత్ ఆన్ చేయబడింది"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"అన్నీ చూడండి"</string>
<string name="date_and_time" msgid="9062980487860757694">"తేదీ & సమయం"</string>
<string name="choose_timezone" msgid="1362834506479536274">"సమయ మండలిని ఎంచుకోండి"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"దాటవేయి"</string>
<string name="next_label" msgid="4693520878012668114">"తర్వాత"</string>
<string name="language_picker_title" msgid="3596315202551687690">"భాషలు"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"భాషా ప్రాధాన్యతలు"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"తీసివేయి"</string>
<string name="add_a_language" msgid="2330538812283783022">"భాషను జోడించు"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"సెట్టింగ్లు"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"సెట్టింగ్ల షార్ట్కట్"</string>
<string name="airplane_mode" msgid="8837269988154128601">"ఎయిర్ప్లేన్ మోడ్"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"మరిన్ని"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"వైర్లెస్ & నెట్వర్క్లు"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, బ్లూటూత్, ఎయిర్ప్లేన్ మోడ్, మొబైల్ నెట్వర్క్లు & VPNలను నిర్వహించు"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"మొబైల్ డేటా"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"గోప్యత"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"నిర్వాహకులు నిలిపివేసారు"</string>
<string name="security_status_title" msgid="5848766673665944640">"భద్రత స్థితి"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"స్క్రీన్ లాక్, ముఖం అన్లాక్"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"స్క్రీన్ లాక్, వేలిముద్ర"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"స్క్రీన్ లాక్"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"ముఖం జోడించబడింది"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"మీ ముఖంతో అన్లాక్ చేయండి"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"ప్రమాణీకరించడానికి మీ ముఖాన్ని ఉపయోగించండి"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"మీ ఫోన్ను అన్లాక్ చేయడానికి, కొనుగోళ్లను ప్రమాణీకరించడానికి లేదా యాప్లలోకి సైన్-ఇన్ చేయడానికి మీ ముఖాన్ని ఉపయోగించండి."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"మిమ్మల్ని ఉపయోగించుకోండి"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"మీ ఫోన్ని అన్లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ ముఖాన్ని ఉపయోగించండి.\n\nగమనించండి: మీరు మీ ముఖాన్ని ఉపయోగించి ఈ పరికరాన్ని అన్లాక్ చేయలేరు. మరింత సమాచారం కావాలంటే మీ నిర్వాహకులను సంప్రదించండి."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"మీ ఫోన్ను అన్లాక్ చేయడానికి, కొనుగోళ్లను ప్రమాణీకరించడానికి లేదా యాప్లలోకి సైన్-ఇన్ చేయడానికి మీ ముఖాన్ని ఉపయోగించండి"</string>
- <string name="face_add_max" msgid="2342250989212694454">"మీరు <xliff:g id="COUNT">%d</xliff:g> వరకు వేలిముద్రలను జోడించవచ్చు"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"వృత్తం మధ్యలో వచ్చేలా మీ ముఖాన్ని ఉంచండి"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"దీనిని తర్వాత చేయి"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"మీరు <xliff:g id="COUNT">%d</xliff:g> వరకు ముఖాలను జోడించవచ్చు"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"మీరు గరిష్ట సంఖ్యలో ముఖాలను జోడించారు"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"మరిన్ని ముఖాలను జోడించడం సాధ్యపడదు"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"నమోదు పూర్తి కాలేదు"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"సరే"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"ముఖ నమోదు సమయ పరిమితి చేరుకుంది. మళ్లీ ప్రయత్నించండి."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"ముఖ నమోదు పని చేయలేదు."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"మొత్తం పూర్తయింది. చూడడానికి భాగుంది."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"పూర్తయింది"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"దీని కోసం మీ ముఖాన్ని ఉపయోగించండి"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"మీ పరికరాన్ని అన్లాక్ చేయండి"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"యాప్ సైన్-ఇన్ & చెల్లింపులు"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"అన్లాక్ కోసం మీ కళ్లు తెరిచి ఉండాలి"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"ముఖ ప్రామాణీకరణ ఉపయోగిస్తున్నప్పుడు, మీ కళ్లు తప్పక తెరిచి ఉండాలి"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"ముఖం డేటాను తీసివేయండి"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"మీ ముఖం డేటాను మెరుగుపరచండి"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"మీ పరికరాన్ని అన్లాక్ చేయడానికి మరియు యాప్లను యాక్సెస్ చేయడానికి మీ ముఖాన్ని ఉపయోగించవచ్చు. "<annotation id="url">"మరింత తెలుసుకోండి"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"వేలిముద్ర"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"వేలిముద్రలు నిర్వహిం."</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"దీనికి వేలిముద్రను ఉప."</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi-Fi హాట్స్పాట్ కోసం కనీసం ఒక బ్యాండ్ను ఎంచుకోండి:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP సెట్టింగ్లు"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"గోప్యత"</string>
<string name="wifi_shared" msgid="844142443226926070">"ఇతర పరికర వినియోగదారులతో భాగస్వామ్యం చేయి"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(మారలేదు)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"దయచేసి ఎంచుకోండి"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"రద్దు చేయి"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"నెట్వర్క్ను విస్మరించాలా?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ఈ నెట్వర్క్తో అనుసంధానమైన అన్ని పాస్వర్డ్లు తొలగించబడతాయి"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"సేవ్ చేసిన నెట్వర్క్లు"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d నెట్వర్క్లు</item>
<item quantity="one">1 నెట్వర్క్</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"ప్రకాశం"</string>
<string name="brightness_summary" msgid="838917350127550703">"స్క్రీన్ ప్రకాశాన్ని సర్దుబాటు చేయండి"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"అనుకూల ప్రకాశం"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"ఆన్"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ఆఫ్"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"ప్రాధాన్య ప్రకాశం చాలా తక్కువకు ఉంచబడింది"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"ప్రాధాన్య ప్రకాశం తక్కువకు ఉంచబడింది"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"పిన్ మార్చడం కుదరదు.\nబహుశా పిన్ చెల్లనిది అయ్యి ఉంటుంది."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"సిమ్ పిన్ విజయవంతంగా మార్చబడింది"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"సిమ్ కార్డు లాక్ స్థితిని మార్చడం కుదరదు.\nబహుశా పిన్ చెల్లనిది అయ్యి ఉంటుంది."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PINని నిలిపివేయడం సాధ్యం కాదు."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PINను ఆరంభించడం సాధ్యం కాదు."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"సరే"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"రద్దు చేయి"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"బహుళ SIMలు కనుగొనబడ్డాయి"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"ఇందుకు <xliff:g id="NAME_0">^1</xliff:g>ని ఫార్మాట్ చేయడం అవసరం. \n\n"<b>"ఫార్మాట్ చేయడం వలన ప్రస్తుతం <xliff:g id="NAME_1">^1</xliff:g>లో నిల్వ చేసిన మొత్తం డేటా తీసివేయబడుతుంది."</b>" డేటాను కోల్పోకుండా ఉండటానికి, దాన్ని బ్యాకప్ చేయడానికి ప్రయత్నించండి."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"డేటా తొలగించి, ఫార్మాట్ చేయి"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g>ని ఫార్మాట్ చేస్తోంది…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g>ని ఫార్మాట్ చేసే సమయంలో దీనిని తీసివేయవద్దు."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g>ని ఫార్మాట్ చేసే సమయంలో దీనిని తీసివేయవద్దు."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"డేటాను కొత్త నిల్వకు తరలించండి"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"మీరు మీ ఫోటోలు, ఫైల్లు మరియు కొన్ని అనువర్తనాలను ఈ కొత్త <xliff:g id="NAME">^1</xliff:g>కి తరలించవచ్చు. \n\nతరలించడానికి సుమారు <xliff:g id="TIME">^2</xliff:g> పట్టవచ్చు మరియు దీని వలన అంతర్గత నిల్వలో <xliff:g id="SIZE">^3</xliff:g> ఖాళీ అవుతుంది. ఇది జరుగుతున్నప్పుడు కొన్ని అనువర్తనాలు పని చేయవు."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ఇప్పుడే తరలించు"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ఇన్స్టాల్ చేయబడింది"</string>
<string name="no_applications" msgid="7336588977497084921">"అనువర్తనాలు లేవు."</string>
<string name="internal_storage" msgid="1584700623164275282">"అంతర్గత నిల్వ"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"అంతర్గత నిల్వ"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB నిల్వ"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD కార్డు నిల్వ"</string>
<string name="recompute_size" msgid="7722567982831691718">"పరిమాణాన్ని మళ్లీ గణిస్తోంది…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"అనువర్తన డేటాను తొలగించాలా?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"ఈ అనువర్తన డేటా మొత్తం శాశ్వతంగా తొలగించబడుతుంది. ఇందులో అన్ని ఫైల్లు, సెట్టింగ్లు, ఖాతాలు, డేటాబేస్లు మొ. ఉన్నాయి."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ఇన్స్టాల్ చేసిన యాప్ల జాబితాలో యాప్ కనుగొనబడలేదు."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"యాప్ నిల్వను తీసివేయడం సాధ్యపడలేదు."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ఈ యాప్ మీ టాబ్లెట్లో క్రింది వాటిని యాక్సెస్ చేయగలదు:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"ఈ యాప్ మీ ఫోన్లో క్రింది వాటిని యాక్సెస్ చేయగలదు:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ఈ యాప్ మీ టాబ్లెట్లో క్రింది వాటిని యాక్సెస్ చేయగలదు. పనితీరును మెరుగుపరచడానికి మరియు మెమరీ వినియోగాన్ని తగ్గించడానికి, <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>కి ఈ అనుమతుల్లో కొన్ని అందుబాటులో ఉన్నాయి ఎందుకంటే ఇది <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> వలె అదే ప్రాసెస్లో అమలవుతుంది:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ఈ యాప్ మీ ఫోన్లో క్రింది వాటిని యాక్సెస్ చేయగలదు. పనితీరును మెరుగుపరచడానికి మరియు మెమరీ వినియోగాన్ని తగ్గించడానికి, <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>కి ఈ అనుమతుల్లో కొన్ని అందుబాటులో ఉన్నాయి ఎందుకంటే ఇది <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> వలె అదే ప్రాసెస్లో అమలవుతుంది:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> మరియు <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"ఈ యాప్ మీకు ఛార్జీ విధించబడేలా చేయవచ్చు:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ప్రీమియం SMS పంపండి"</string>
<string name="computing_size" msgid="1599186977475211186">"గణిస్తోంది…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"ప్యాకేజీ పరిమాణాన్ని గణించడం సాధ్యపడలేదు."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"మీరు ఇన్స్టాల్ చేయబడిన మూడవ-పక్ష అనువర్తనాలు ఏవీ కలిగి లేరు."</string>
<string name="version_text" msgid="9189073826278676425">"వెర్షన్ <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"తరలించు"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"టాబ్లెట్కు తరలించు"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ఫోన్కు తరలించు"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB నిల్వకు తరలించు"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD కార్డుకి తరలించు"</string>
- <string name="moving" msgid="6431016143218876491">"తరలించడం"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"ఇప్పటికే మరొక స్థాన మార్పిడి ప్రోగ్రెస్లో ఉంది."</string>
<string name="insufficient_storage" msgid="481763122991093080">"తగినంత నిల్వ స్థలం లేదు."</string>
<string name="does_not_exist" msgid="1501243985586067053">"యాప్ ఉనికిలో లేదు."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"పరికర నిర్వాహకుల అనువర్తనాన్ని బాహ్య మీడియాలో ఇన్స్టాల్ చేయలేరు"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"నిర్బంధంగా ఆపివేయాలా?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"మీరు అనువర్తనాన్ని నిర్బంధంగా ఆపివేస్తే, అది సరిగ్గా పని చేయకపోవచ్చు."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"అనువర్తనాన్ని తరలించడం సాధ్యపడలేదు. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"ప్రాధాన్య ఇన్స్టాల్ స్థానం"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"కొత్త అనువర్తనాల కోసం ప్రాధాన్య ఇన్స్టాలేషన్ స్థానాన్ని మార్చండి"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"అంతర్నిర్మిత అనువర్తనాన్ని నిలిపివేయాలా?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"అనువర్తనాన్ని నిలిపివేయి"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"మీరు ఈ అనువర్తనాన్ని నిలిపివేస్తే, Android మరియు ఇతర అనువర్తనాలు ఇకపై ఉద్దేశించిన రీతిలో పని చేయకపోవచ్చు."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"డేటాను తొలగించి అనువర్తనాన్ని నిలిపివేయాలా?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"మీరు ఈ అనువర్తనాన్ని నిలిపివేస్తే, Android మరియు ఇతర అనువర్తనాలు ఇకపై ఉద్దేశించిన రీతిలో పని చేయకపోవచ్చు. మీ డేటా కూడా తొలగించబడుతుంది."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"నోటిఫికేషన్లను ఆపివేయాలా?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"మీరు ఈ యాప్కు నోటిఫికేషన్లను ఆపివేస్తే, మీరు ముఖ్యమైన హెచ్చరికలు మరియు అప్డేట్లను కోల్పోవడం సంభవించవచ్చు."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"స్టోర్"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"యాప్ వివరాలు"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"యాప్ <xliff:g id="APP_STORE">%1$s</xliff:g> నుండి ఇన్స్టాల్ చేయబడింది"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"సేవని ఉపయోగించండి"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"రంగు సవరణను ఉపయోగించండి"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"శీర్షికలను ఉపయోగించండి"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"కొనసాగించు"</string>
<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="6371077608778830020">"వినికిడి పరికరాన్ని జోడించండి"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"మీరు యాప్ నేపథ్య కార్యకలాపాన్ని పరిమితం చేస్తే, అది సరిగ్గా పని చేయకపోవచ్చు."</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"ఈ యాప్ బ్యాటరీని ఆప్టిమైజ్ చేయికి సెట్ చేయబడలేదు కనుక, దీన్ని మీరు పరిమితం చేయలేరు.\n\nయాప్ను పరిమితం చేయడానికి, మొదట బ్యాటరీ ఆప్టిమైజేషన్ను ఆన్ చేయండి."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి స్క్రీన్ వినియోగం"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"స్క్రీన్ ఉపయోగం"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"మొబైల్ నెట్వర్క్ స్కానింగ్"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"పూర్తి ఛార్జ్ చేసినప్పటి నుండి ఇప్పటి వరకు జరిగిన బ్యాటరీ వినియోగం"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి స్క్రీన్ ఆన్లో ఉన్న మొత్తం సమయం"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి పరికర వినియోగం"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"వినియోగ వివరాలు"</string>
<string name="controls_subtitle" msgid="390468421138288702">"శక్తి వినియోగాన్ని సర్దుబాటు చేయండి"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"చేర్చబడిన ప్యాకేజీలు"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"బ్యాటరీని ఖాళీ చేస్తున్న యాప్లు"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"పరికరాన్ని మేల్కొల్పి ఉంచుతుంది"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"పరికరాన్ని నేపథ్యంలో మేల్కొల్పి ఉంచుతుంది"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"తరచుగా స్థానాన్ని అభ్యర్థిస్తుంది"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> యాప్లు సరిగ్గా ప్రవర్తించడం లేదు"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"యాప్లు సాధారణంగా అమలు అవుతున్నాయి"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"ఫోన్లో సాధారణ నేపథ్య బ్యాటరీ వినియోగం ఉంది"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"టాబ్లెట్లో సాధారణ నేపథ్య బ్యాటరీ వినియోగం ఉంది"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d యాప్ల కోసం బ్యాటరీ వినియోగాన్ని పరిమితం చేయడం</item>
<item quantity="one">%1$d యాప్ కోసం బ్యాటరీ వినియోగాన్ని పరిమితం చేయడం</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> పరిమితం చేయబడింది"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"ఈ యాప్లు నేపథ్యంలో బ్యాటరీని ఉపయోగిస్తున్నాయి. పరిమితం చేయబడిన యాప్లు సరిగా పనిచేయకపోవచ్చు మరియు నోటిఫికేషన్లు రావడానికి ఆలస్యం కావచ్చు."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"బ్యాటరీ మేనేజర్ను ఉపయోగించండి"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"యాప్లు బ్యాటరీ శక్తిని హరిస్తున్నప్పుడు గుర్తించండి"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"రద్దు చేయి"</string>
<string name="tts_reset" msgid="2661752909256313270">"రీసెట్ చేయి"</string>
<string name="tts_play" msgid="2628469503798633884">"ప్లే చేయి"</string>
- <string name="gadget_title" msgid="5519037532720577836">"విద్యుత్ శక్తి నియంత్రణ"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi సెట్టింగ్ను నవీకరిస్తోంది"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"బ్లూటూత్ సెట్టింగ్ను నవీకరించడం"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"ఆన్లో ఉంది"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ఆఫ్లో ఉంది"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"ప్రారంభిస్తోంది"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"ఆపివేస్తోంది"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"బ్లూటూత్"</string>
- <string name="gadget_location" msgid="2974757497945178165">"స్థానం"</string>
- <string name="gadget_sync" msgid="858895763714222152">"సమకాలీకరణ"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"ప్రకాశం <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"స్వయంచాలకం"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"పూర్తిగా"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"సగం"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"ఆఫ్"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ఆధారాల నిల్వ"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"నిల్వ నుండి ఇన్స్టాల్ చేయండి"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>లో <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"అన్నీ ఎంచుకోండి"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"డేటా వినియోగం"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"యాప్ డేటా వినియోగం"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"మొబైల్ డేటా & Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"క్యారియర్ డేటా అకౌంటింగ్ మీ పరికరాన్ని బట్టి మారుతుంది."</string>
<string name="data_usage_app" msgid="4970478397515423303">"యాప్ వినియోగం"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"యాప్ సమాచారం"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">%d దాచబడిన అంశాలను చూపుతుంది</item>
<item quantity="one">%d దాచబడిన అంశాన్ని చూపుతుంది</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"కుదించండి"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"నెట్వర్క్ & ఇంటర్నెట్"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"మొబైల్"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"డేటా వినియోగం"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"బ్లూటూత్"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"యాప్లు & నోటిఫికేషన్లు"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"అనుమతులు, డిఫాల్ట్ యాప్లు"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"కార్యాలయ ప్రొఫైల్లో ఉన్న యాప్లకు సంబంధించి నోటిఫికేషన్ యాక్సెస్ అందుబాటులో లేదు."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"ఖాతాలు"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"ఖాతాలు జోడించబడలేదు"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"డిఫాల్ట్ యాప్లు"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"భాషలు, సమయం, బ్యాకప్, అప్డేట్లు"</string>
<string name="search_results_title" msgid="1796252422574886932">"సెట్టింగ్లు"</string>
- <string name="search_menu" msgid="6283419262313758339">"సెట్టింగ్లను వెతుకు"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, నెట్వర్క్ కనెక్షన్, ఇంటర్నెట్, వైర్లెస్, డేటా, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, టోగుల్, నియంత్రణ"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"వచన సందేశం, వచన సందేశాలు, సందేశాలు, సందేశం, డిఫాల్ట్"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"చెల్లించడం, నొక్కడం, చెల్లింపులు"</string>
<string name="keywords_backup" msgid="470070289135403022">"బ్యాకప్, బ్యాకప్"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"సంజ్ఞ"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ముఖం, అన్లాక్, ప్రామాణీకరణ, సైన్ ఇన్"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl వెర్షన్, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"నెట్వర్క్, మొబైల్ నెట్వర్క్ స్థితి, సేవ స్థితి, సిగ్నల్ సామర్థ్యం, మొబైల్ నెట్వర్క్ రకం, రోమింగ్, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"క్రమ సంఖ్య, హార్డ్వేర్ వెర్షన్"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ముదురు రంగు థీమ్"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"బగ్"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"విస్తార ప్రదర్శన, లాక్ స్క్రీన్ ప్రదర్శన"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"లాక్ స్క్రీన్ నోటిఫికేషన్"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ముఖం"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"వేలిముద్ర"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"కాంతిహీన స్క్రీన్, టచ్స్క్రీన్, బ్యాటరీ, స్మార్ట్ ప్రకాశం, గతిశీల ప్రకాశం"</string>
@@ -3464,7 +3436,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"మీరు ఈ డివైజ్ను ప్రారంభించడానికి మీ పిన్ను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి యాక్సెస్ సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ నమూనాను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి యాక్సెస్ సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"మీరు ఈ పరికరాన్ని ప్రారంభించడానికి మీ పాస్వర్డ్ను నమోదు చేసినప్పుడు, <xliff:g id="SERVICE">%1$s</xliff:g> వంటి యాక్సెస్ సేవలు అప్పటికి అందుబాటులో ఉండవు."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"గమనిక: రీబూట్ చేసాక, మీరు మీ ఫోన్ను అన్లాక్ చేసే వరకు ఈ యాప్ ప్రారంభం కాదు"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"గమనిక: మీరు మీ ఫోన్ని మళ్లీ ప్రారంభించి, దానికి స్క్రీన్ లాక్ సెట్ చేస్తే, మీ ఫోన్ని అన్లాక్ చేసేవరకూ ఈ యాప్ ప్రారంభం కాదు"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI సమాచారం"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI సంబంధిత సమాచారం"</string>
<string name="slot_number" msgid="3762676044904653577">"(స్లాట్<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3518,7 +3490,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"వ్యక్తిగతం"</string>
<string name="filter_work_apps" msgid="24519936790795574">"కార్యాలయం"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"అనువర్తనాలు: అన్నీ"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"యాప్లు: ఆఫ్ చేయబడినవి"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ఆఫ్ చేయబడింది"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"వర్గాలు: అత్యవసర ప్రాధాన్యత"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"వర్గాలు: తక్కువ ప్రాధాన్యత"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"వర్గాలు: ఆఫ్ చేయబడినవి"</string>
@@ -3579,7 +3551,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"వినియోగ హెచ్చరికలు"</string>
<string name="show_all_apps" msgid="1512506948197818534">"పూర్తి పరికర వినియోగాన్నిచూపండి"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"అనువర్తన వినియోగాన్ని చూపండి"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"అధిక వినియోగం"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> యాప్లు అసాధారణంగా ప్రవర్తిస్తున్నాయి</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> యాప్ అసాధారణంగా ప్రవర్తిస్తోంది</item>
@@ -3743,6 +3714,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"అంతర్గత నిల్వ: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ఉపయోగించబడింది - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ఖాళీగా ఉంది"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ఇనాక్టివ్గా ఉన్న తర్వాత నిద్రావస్థకు వెళ్తుంది"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"వాల్పేపర్, నిద్రావస్థ, ఫాంట్ పరిమాణం"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 నిమిషాలు ఇనాక్టివ్గా ఉన్న తర్వాత నిద్రావస్థకు వెళ్తుంది"</string>
<string name="memory_summary" msgid="8080825904671961872">"సగటున <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>లో <xliff:g id="USED_MEMORY">%1$s</xliff:g> మెమరీ వినియోగించబడింది"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g>గా సైన్ ఇన్ చేసారు"</string>
@@ -3758,7 +3731,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS పంపడానికి అనుమతి లేదు"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"కెమెరాకి అనుమతి లేదు"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"స్క్రీన్షాట్ తీయడానికి అనుమతి లేదు"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"బ్యాకప్లను ఆఫ్ చేయడం సాధ్యపడదు"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"ఈ యాప్ని తెరవలేరు"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"మీకు ఏవైనా ప్రశ్నలు ఉంటే, మీ IT నిర్వాహకుడిని సంప్రదించండి"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"మరిన్ని వివరాలు"</string>
@@ -3922,9 +3894,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"కట్అవుట్తో ప్రదర్శనను అనుకరించండి"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"డిస్ప్లే కట్అవుట్"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ప్రదర్శన కట్అవుట్, నాచ్"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ఏదీ కాదు"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"పరికర డిఫాల్ట్"</string>
<string name="special_access" msgid="3458780842491881155">"ప్రత్యేక యాప్ యాక్సెస్"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> యాప్లు అనియంత్రిత డేటాని ఉపయోగించగలవు</item>
@@ -3946,11 +3918,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g>కి కనెక్ట్ చేయబడింది"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"బహుళ పరికరాలకు కనెక్ట్ చేయబడింది"</string>
<string name="demo_mode" msgid="2798762752209330277">"సిస్టమ్ UI డెమో మోడ్"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"రాత్రి మోడ్"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"రాత్రి మోడ్ని సెట్ చేయి"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"డార్క్ మోడ్"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"డార్క్ మోడ్ను సెట్ చేయి"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"త్వరిత సెట్టింగ్ల డెవలపర్ టైల్లు"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"విన్స్కోప్ ట్రేస్"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"కార్యాలయ ప్రొఫైల్ సెట్టింగ్లు"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"పరిచయ శోధన"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"కాలర్లు మరియు పరిచయాలను గుర్తించడానికి మీ సంస్థ ద్వారా పరిచయ శోధనలను చేయడానికి అనుమతిస్తుంది"</string>
@@ -3991,13 +3962,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"స్క్రీన్ను 2 సార్లు నొక్కడం"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"టాబ్లెట్ను తరచి చూడటానికి రెండుసార్లు నొక్కండి"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"పరికరాన్ని తరచి చూడటానికి రెండుసార్లు నొక్కండి"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ స్క్రీన్ని రెండుసార్లు నొక్కండి."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"సమయం, నోటిఫికేషన్లు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ స్క్రీన్ని రెండుసార్లు నొక్కండి."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ఫోన్ను తరచి చూడటానికి పైకి ఎత్తండి"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"టాబ్లెట్ను తరచి చూడటానికి పైకి ఎత్తండి"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"పరికరాన్ని తరచి చూడటానికి పైకి ఎత్తండి"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ ఫోన్ని చేతిలోకి తీసుకోండి."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ టాబ్లెట్ని చేతిలోకి తీసుకోండి."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"సమయం, నోటిఫికేషన్ చిహ్నాలు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ పరికరాన్ని చేతిలోకి తీసుకోండి."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"డిస్ప్లేను సక్రియపరచండి"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"సమయం, నోటిఫికేషన్లు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ ఫోన్ని చేతిలోకి తీసుకోండి."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"సమయం, నోటిఫికేషన్లు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ టాబ్లెట్ని చేతిలోకి తీసుకోండి."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"సమయం, నోటిఫికేషన్లు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ పరికరాన్ని చేతిలోకి తీసుకోండి."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"లాక్ స్క్రీన్ను సక్రియపరిచే సంజ్ఞ"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"నోటిఫికేషన్ల కోసం వేలిముద్రతో స్వైప్ చేయండి"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"వేలిముద్రతో స్వైప్ చేయి"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"మీ నోటిఫికేషన్లను తనిఖీ చేయడానికి, మీ ఫోన్ వెనుకవైపు ఉన్న వేలిముద్ర సెన్సార్పై క్రిందికి స్వైప్ చేయండి."</string>
@@ -4077,7 +4052,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ప్రయత్నాలు</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ప్రయత్నం</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"ఈ పరికర డేటా బ్యాకప్ చేయబడుతోంది"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"ఈ పరికరాన్ని మీ సంస్థ నిర్వహిస్తోంది."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"ఈ పరికరం <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ద్వారా నిర్వహించబడుతోంది."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4118,6 +4092,12 @@
<string name="autofill_app" msgid="7338387238377914374">"స్వీయ పూరింపు సేవ"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"స్వయంచాలకం, పూరించు, స్వీయ పూరింపు"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ఈ యాప్ను మీరు విశ్వసిస్తున్నట్లు నిర్ధారించండి</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> మీ స్క్రీన్పై ఉన్నవాటిని పరిగణనలోకి తీసుకొని వేటిని ఆటోమేటిక్గా పూరించాలో నిశ్చయిస్తుంది."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"స్వీయ పూరింపు"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"లాగింగ్ స్థాయి"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"ఒక్కో సెషన్లో చేయగల గరిష్ట అభ్యర్థనలు"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"కనిపించగల గరిష్ట డేటాసమితులు"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"డిఫాల్ట్ విలువలకు రీసెట్ చేయి"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"స్వీయ పూరింపు డెవలపర్ ఎంపికలు రీసెట్ చేయబడ్డాయి"</string>
<string name="device_theme" msgid="4571803018917608588">"పరికర థీమ్"</string>
<string name="default_theme" msgid="7085644992078579076">"డిఫాల్ట్"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"నెట్వర్క్ పేరు"</string>
@@ -4132,15 +4112,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"క్యారియర్ కేటాయింపు సక్రియం చేయండి"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"అంతరాయం కలిగించవద్దును అప్డేట్ చేయి"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"ఇతర వ్యాపకాలపై దృష్టి మరలకుండా ఉండడానికి నోటిఫికేషన్లను పాజ్ చేయండి"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"కొత్తవి మరియు అద్భుతమైనవి ఏమిటి?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"మీ కొత్త ఫోన్ గురించి తెలుసుకోండి"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"మీ కొత్త టాబ్లెట్ గురించి తెలుసుకోండి"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"మీ కొత్త పరికరం గురించి తెలుసుకోండి"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"ఈ లక్షణం ఈ పరికరంలో అందుబాటులో లేదు"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"శక్తివంతమైన GNSS కొలతలు"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"డ్యూటీ సైక్లింగ్ లేకుండా అన్ని GNSS నక్షత్రరాశులను మరియు ఫ్రీక్వెన్సీలను ట్రాక్ చేయండి"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"ఎల్లప్పుడూ క్రాష్ డైలాగ్ని చూపు"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"యాప్ క్రాష్ అయిన ప్రతిసారి డైలాగ్ని చూపు"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"కోణం ప్రారంభించబడిన యాప్ను ఎంచుకోండి"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"కోణం ప్రారంభించబడిన అప్లికేషన్ సెట్ ఏదీ లేదు"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"కోణం ప్రారంభించబడిన అప్లికేషన్: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"డైరెక్టరీ యాక్సెస్"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"డైరెక్టరీ యాక్సెస్"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4181,4 +4160,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"నెట్వర్క్ వివరాలు"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"మీ ఫోన్లోని యాప్లకు మీ పరికరం పేరు కనిపిస్తుంది. మీరు బ్లూటూత్ పరికరాలకు కనెక్ట్ చేసినప్పుడు లేదా Wi-Fi హాట్స్పాట్ని సెటప్ చేసినప్పుడు ఇతర వ్యక్తులకు కూడా ఇది కనిపించవచ్చు."</string>
<string name="devices_title" msgid="7701726109334110391">"పరికరాలు"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"అన్ని సెట్టింగ్లు"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"సూచనలు"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS డేటా"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS డేటా"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"నెట్వర్క్ను ఎంచుకోండి"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"డిస్కనెక్ట్ అయ్యింది"</string>
+ <string name="network_connected" msgid="4943925032253989621">"కనెక్ట్ అయింది"</string>
+ <string name="network_connecting" msgid="76404590784733557">"కనెక్ట్ అవుతోంది"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"కనెక్ట్ చేయడం సాధ్యపడలేదు"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"నెట్వర్క్లు కనుగొనబడలేదు."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"నెట్వర్క్లను కనుగొనడం సాధ్యపడలేదు. మళ్లీ ప్రయత్నించండి."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(నిషేధించబడింది)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM కార్డ్ లేదు"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"అధునాతన కాలింగ్"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: WCDMAకు ప్రాధాన్యత"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: GSM మాత్రమే"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: WCDMA మాత్రమే"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: CDMA మాత్రమే"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: EvDo మాత్రమే"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"ఎంచుకోబడే నెట్వర్క్ మోడ్: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: గ్లోబల్"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"ప్రాధాన్యత గల నెట్వర్క్ మోడ్: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (సిఫార్సు చేయబడింది)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (సిఫార్సు చేయబడింది)"</string>
+ <string name="network_global" msgid="959947774831178632">"అంతర్జాతీయ"</string>
+ <string name="label_available" msgid="1731547832803057893">"అందుబాటులో ఉన్న నెట్వర్క్లు"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"వెతకబడుతున్నాయి…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g>లో నమోదు చేయబడుతోంది…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"మీ SIM కార్డు ఈ నెట్వర్క్కు కనెక్షన్ను అనుమతించదు."</string>
+ <string name="connect_later" msgid="978991102125216741">"ప్రస్తుతం ఈ నెట్వర్క్కు కనెక్ట్ చేయడం సాధ్యపడదు. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
+ <string name="registration_done" msgid="4573820010512184521">"నెట్వర్క్లో నమోదు చేయబడింది."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"నెట్వర్క్ను ఆటోమేటిక్గా ఎంచుకో"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"క్యారియర్ సెట్టింగ్లు"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"డేటా సేవను సెటప్ చేయండి"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"మొబైల్ డేటా"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"మొబైల్ నెట్వర్క్ను ఉపయోగించి డేటాను యాక్సెస్ చేయండి"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"ప్రాధాన్యత గల నెట్వర్క్ రకం"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"నెట్వర్క్ ఆపరేటింగ్ మోడ్ను మార్చండి"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"ప్రాధాన్యత గల నెట్వర్క్ రకం"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"క్యారియర్"</string>
+ <string name="call_category" msgid="8108654745239563833">"కాల్ చేయడం"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"క్యారియర్ వీడియో కాలింగ్"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"సిస్టమ్ ఎంపిక"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA రోమింగ్ మోడ్ను మార్చండి"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"సిస్టమ్ ఎంపిక"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"నెట్వర్క్"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"నెట్వర్క్"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA సభ్యత్వం"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM మరియు NV మధ్య మారండి"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"సభ్యత్వం"</string>
+ <string name="register_automatically" msgid="518185886971595020">"ఆటోమేటిక్ నమోదు…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"డేటా రోమింగ్ను అనుమతించాలా?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"ధరల కోసం మీ నెట్వర్క్ ప్రదాతను అడగండి."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"యాప్ డేటా వినియోగం"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"చెల్లని నెట్వర్క్ మోడ్<xliff:g id="NETWORKMODEID">%1$d</xliff:g>. విస్మరించు."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g>కి కనెక్ట్ చేసినప్పుడు అందుబాటులో ఉండదు"</string>
+ <string name="see_more" msgid="5953815986207345223">"మరిన్నింటిని చూడండి"</string>
+ <string name="see_less" msgid="1250265310929558370">"తక్కువ చూడండి"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index a37d5c7..65a73b8 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"ถือว่ามีการวัดปริมาณอินเทอร์เน็ต"</item>
<item msgid="2266114985518865625">"ถือว่าไม่มีการวัดปริมาณอินเทอร์เน็ต"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ค่าเริ่มต้น (ใช้ MAC ที่เป็นแบบสุ่ม)"</item>
+ <item msgid="5398461510512959597">"เชื่อถือได้"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"ไม่"</item>
<item msgid="3863157480502955888">"ใช่"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"เปิดอยู่เสมอ"</item>
<item msgid="6385301106124765323">"ปิดอยู่เสมอ"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"ปิด"</item>
+ <item msgid="2182686878828390312">"แก้ไขข้อบกพร่อง"</item>
+ <item msgid="5286514712714822064">"รายละเอียด"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"เครือข่ายบ้านเท่านั้น"</item>
+ <item msgid="5034813753274486448">"อัตโนมัติ"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"ต้องการ GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"GSM เท่านั้น"</item>
+ <item msgid="488474605709912156">"WCDMA เท่านั้น"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA อัตโนมัติ"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo อัตโนมัติ"</item>
+ <item msgid="370391313511477301">"CDMA ที่ไม่มี EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo เท่านั้น"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"ทั่วโลก"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA เท่านั้น"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"ทั่วโลก"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 35750cb..35ef1ff 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"สร้าง"</string>
<string name="allow" msgid="3349662621170855910">"อนุญาต"</string>
<string name="deny" msgid="6947806159746484865">"ปฏิเสธ"</string>
- <string name="dlg_close" msgid="7471087791340790015">"ปิด"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"เปลี่ยน"</string>
<string name="device_info_default" msgid="7847265875578739287">"ไม่ทราบ"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">คุณกำลังจะได้เป็นนักพัฒนาซอฟต์แวร์ในอีก <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ขั้นตอน</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"ไม่จำเป็น คุณเป็นนักพัฒนาซอฟต์แวร์อยู่แล้ว"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"โปรดเปิดใช้ตัวเลือกสำหรับนักพัฒนาซอฟต์แวร์ก่อน"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"ระบบไร้สายและเครือข่าย"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"การเชื่อมต่อ"</string>
- <string name="header_category_device" msgid="4544026001618307754">"อุปกรณ์"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ส่วนตัว"</string>
- <string name="header_category_access" msgid="7580499097416970962">"การเข้าถึง"</string>
<string name="header_category_system" msgid="2816866961183068977">"ระบบ"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"เปิดใช้การเชื่อมต่ออินเทอร์เน็ต"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ปิดใช้การเชื่อมต่ออินเทอร์เน็ต"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"ที่อยู่บลูทูธของอุปกรณ์: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ยกเลิกการเชื่อมต่อ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ใช่ไหม"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"การแพร่สัญญาณ"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"อุปกรณ์บลูทูธที่ไม่มีชื่อ"</string>
<string name="progress_scanning" msgid="192587958424295789">"กำลังค้นหา"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"ไม่พบอุปกรณ์บลูทูธในบริเวณใกล้เคียง"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"แอปต้องการเปิดบลูทูธและทำให้อุปกรณ์อื่นมองเห็นโทรศัพท์ของคุณ คุณสามารถเปลี่ยนการตั้งค่านี้ได้ภายหลังในการตั้งค่า \"บลูทูธ\""</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"กำลังเปิดบลูทูธ..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"กำลังปิดบลูทูธ…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"เชื่อมต่ออัตโนมัติ"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"ขอการเชื่อมต่อบลูทูธ"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"แตะเพื่อเชื่อมต่อ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"คุณต้องการเชื่อมต่อไปยัง \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" หรือไม่"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"อุปกรณ์สำหรับโทรที่ใช้ได้"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"เชื่อมต่ออยู่"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"อุปกรณ์ที่บันทึกไว้"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"เพิ่มอุปกรณ์"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"บลูทูธจะเปิดเพื่อจับคู่อุปกรณ์"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"ค่ากำหนดการเชื่อมต่อ"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"อุปกรณ์ที่เคยเชื่อมต่อ"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"อุปกรณ์ที่เคยเชื่อมต่อ"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"เปิดบลูทูธแล้ว"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"ดูทั้งหมด"</string>
<string name="date_and_time" msgid="9062980487860757694">"วันที่และเวลา"</string>
<string name="choose_timezone" msgid="1362834506479536274">"เลือกเขตเวลา"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"ข้าม"</string>
<string name="next_label" msgid="4693520878012668114">"ถัดไป"</string>
<string name="language_picker_title" msgid="3596315202551687690">"ภาษา"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"ค่ากำหนดภาษา"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"นำออก"</string>
<string name="add_a_language" msgid="2330538812283783022">"เพิ่มภาษา"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"การตั้งค่า"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"ทางลัดการตั้งค่า"</string>
<string name="airplane_mode" msgid="8837269988154128601">"โหมดใช้งานบนเครื่องบิน"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"เพิ่มเติม"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"ระบบไร้สายและเครือข่าย"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"จัดการ WiFi, บลูทูธ, โหมดใช้งานบนเครื่องบิน, เครือข่ายมือถือ และ VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"เน็ตมือถือ"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"ความเป็นส่วนตัว"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ปิดใช้โดยผู้ดูแลระบบ"</string>
<string name="security_status_title" msgid="5848766673665944640">"สถานะความปลอดภัย"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"ล็อกหน้าจอ, Face Unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"ล็อกหน้าจอ ลายนิ้วมือ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"ล็อกหน้าจอ"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"เพิ่มใบหน้าแล้ว"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"ปลดล็อกด้วยใบหน้า"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"ใช้ใบหน้าในการตรวจสอบสิทธิ์"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"ใช้ใบหน้าเพื่อปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอป"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"ใช้"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"ใช้ใบหน้าเพื่อปลดล็อกโทรศัพท์หรืออนุมัติการซื้อ\n\nหมายเหตุ: คุณใช้ใบหน้าเพื่อปลดล็อกอุปกรณ์นี้ไม่ได้ โปรดติดต่อผู้ดูแลระบบขององค์กรสำหรับข้อมูลเพิ่มเติม"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"ใช้ใบหน้าเพื่อปลดล็อกโทรศัพท์ อนุญาตการซื้อ หรือลงชื่อเข้าใช้แอป"</string>
- <string name="face_add_max" msgid="2342250989212694454">"คุณเพิ่มลายนิ้วมือได้สูงสุด <xliff:g id="COUNT">%d</xliff:g> ลายนิ้วมือ"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"จัดใบหน้าของคุณให้อยู่กลางวงกลม"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"ข้ามไปก่อน"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"คุณเพิ่มใบหน้าได้สูงสุด <xliff:g id="COUNT">%d</xliff:g> รายการ"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"คุณเพิ่มใบหน้าครบจำนวนจำกัดสูงสุดแล้ว"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"เพิ่มใบหน้าอีกไม่ได้แล้ว"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"การลงทะเบียนยังไม่เสร็จสมบูรณ์"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ตกลง"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"หมดเวลาลงทะเบียนใบหน้า โปรดลองอีกครั้ง"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"การลงทะเบียนใบหน้าไม่ทำงาน"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"เรียบร้อย ดูดีทีเดียว"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"เสร็จ"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"ใช้ใบหน้าของคุณเพื่อ"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"ปลดล็อกอุปกรณ์ของคุณ"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ลงชื่อเข้าใช้แอปและชำระเงิน"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"ลืมตาเพื่อปลดล็อก"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"คุณต้องลืมตาเมื่อใช้การตรวจสอบสิทธิ์ด้วยใบหน้า"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"นำข้อมูลใบหน้าออก"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"ปรับปรุงข้อมูลใบหน้า"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"ใช้ใบหน้าของคุณเพื่อปลดล็อกอุปกรณ์และเข้าถึงแอปได้ "<annotation id="url">"ดูข้อมูลเพิ่มเติม"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"ลายนิ้วมือ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"จัดการลายนิ้วมือ"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ใช้ลายนิ้วมือเพื่อ"</string>
@@ -456,8 +463,8 @@
<string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"การลงทะเบียนลายนิ้วมือไม่ทำงาน โปรดลองอีกครั้งหรือใช้นิ้วอื่น"</string>
<string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"เพิ่มอีกหนึ่ง"</string>
<string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"ถัดไป"</string>
- <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"นอกเหนือจากการปลดล็อกโทรศัพท์ คุณยังสามารถใช้ลายนิ้วมือเพื่อให้สิทธิ์การซื้อและการเข้าถึงแอปได้"<annotation id="url">"เรียนรู้เพิ่มเติม"</annotation></string>
- <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" ตัวเลือกการล็อกหน้าจอปิดอยู่ หากต้องการเรียนรู้เพิ่มเติม ให้ติดต่อผู้ดูแลระบบขององค์กร "<annotation id="admin_details">"รายละเอียดเพิ่มเติม"</annotation>\n\n"คุณยังสามารถใช้ลายนิ้วมือเพื่ออนุญาตให้ซื้อและเข้าถึงแอป "<annotation id="url">"เรียนรู้เพิ่มเติม"</annotation></string>
+ <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"นอกเหนือจากการปลดล็อกโทรศัพท์ คุณยังสามารถใช้ลายนิ้วมือเพื่อให้สิทธิ์การซื้อและการเข้าถึงแอปได้"<annotation id="url">"ดูข้อมูลเพิ่มเติม"</annotation></string>
+ <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" ตัวเลือกการล็อกหน้าจอปิดอยู่ หากต้องการดูข้อมูลเพิ่มเติม ให้ติดต่อผู้ดูแลระบบขององค์กร "<annotation id="admin_details">"รายละเอียดเพิ่มเติม"</annotation>\n\n"คุณยังสามารถใช้ลายนิ้วมือเพื่ออนุญาตให้ซื้อและเข้าถึงแอป "<annotation id="url">"ดูข้อมูลเพิ่มเติม"</annotation></string>
<string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"ยกนิ้วขึ้น แล้วแตะเซ็นเซอร์อีกครั้ง"</string>
<string name="fingerprint_add_max" msgid="1020927549936895822">"คุณสามารถเพิ่มลายนิ้วมือได้ถึง <xliff:g id="COUNT">%d</xliff:g> ลาย"</string>
<string name="fingerprint_intro_error_max" msgid="6864066984678078441">"คุณได้เพิ่มลายนิ้วมือถึงขีดจำกัดสูงสุดแล้ว"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"เลือกอย่างน้อยหนึ่งย่านความถี่สำหรับฮอตสปอต Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"การตั้งค่า IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"ความเป็นส่วนตัว"</string>
<string name="wifi_shared" msgid="844142443226926070">"แชร์กับผู้ใช้อุปกรณ์คนอื่นๆ"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(ไม่เปลี่ยน)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"โปรดเลือก"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"ยกเลิก"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"ไม่จำเครือข่ายใช่ไหม"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"ระบบจะลบรหัสผ่านทั้งหมดของเครือข่ายนี้"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"เครือข่ายที่บันทึก"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d เครือข่าย</item>
<item quantity="one">1 เครือข่าย</item>
@@ -975,7 +982,7 @@
<string name="wifi_hotspot_name_summary_connected" msgid="3888672084861445362">"อุปกรณ์อื่นๆ สามารถเชื่อมต่อกับ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
<string name="wifi_hotspot_password_title" msgid="8676859981917573801">"รหัสผ่านฮอตสปอต"</string>
<string name="wifi_hotspot_ap_band_title" msgid="1165801173359290681">"ย่านความถี่ AP"</string>
- <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ใช้ฮอตสปอตเพื่อสร้างเครือข่าย Wi‑Fi สำหรับอุปกรณ์อื่นๆ ฮอตสปอตจะแชร์อินเทอร์เน็ตโดยใช้การเชื่อมต่อข้อมูลผ่านมือถือ อาจมีค่าบริการเน็ตมือถือเพิ่มเติม"</string>
+ <string name="wifi_hotspot_footer_info_regular" msgid="4789553667374849566">"ใช้ฮอตสปอตเพื่อสร้างเครือข่าย Wi‑Fi สำหรับอุปกรณ์อื่นๆ ฮอตสปอตจะแชร์อินเทอร์เน็ตโดยใช้การเชื่อมต่อเน็ตมือถือ อาจมีค่าบริการเน็ตมือถือเพิ่มเติม"</string>
<string name="wifi_hotspot_footer_info_local_only" msgid="857988412470694109">"แอปสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้"</string>
<string name="wifi_hotspot_auto_off_title" msgid="1590313508558948079">"ปิดฮอตสปอตโดยอัตโนมัติ"</string>
<string name="wifi_hotspot_auto_off_summary" msgid="5858098059725925084">"ฮอตสปอต Wi‑Fi จะปิดถ้าไม่มีอุปกรณ์ที่เชื่อมต่อ"</string>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"ความสว่าง"</string>
<string name="brightness_summary" msgid="838917350127550703">"ปรับความสว่างหน้าจอ"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"ปรับความสว่างอัตโนมัติ"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"เปิด"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"ปิด"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"ต้องการความสว่างต่ำมาก"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"ต้องการความสว่างต่ำ"</string>
@@ -1126,7 +1132,7 @@
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"กำหนดการ"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"ไม่มี"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"เปิดในเวลาที่กำหนด"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"เปิดจากอาทิตย์ตกจนอาทิตย์ขึ้น"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"เปิดตั้งแต่อาทิตย์ตกจนขึ้น"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"เวลาเริ่มต้น"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"เวลาสิ้นสุด"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"สถานะ"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"ไม่สามารถเปลี่ยน PIN\nPIN อาจไม่ถูกต้อง"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"เปลี่ยนซิม PIN สำเร็จแล้ว"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"เปลี่ยนสถานะการล็อกซิมการ์ดไม่ได้\nPIN อาจไม่ถูกต้อง"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"ปิดใช้ PIN ไม่ได้"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"เปิดใช้ PIN ไม่ได้"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ตกลง"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"ยกเลิก"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"พบหลายซิม"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"การดำเนินการนี้จำเป็นต้องฟอร์แมต <xliff:g id="NAME_0">^1</xliff:g> \n\n"<b>"การฟอร์แมตจะลบข้อมูลทั้งหมดที่จัดเก็บอยู่ใน <xliff:g id="NAME_1">^1</xliff:g> ในขณะนี้"</b>" ขอแนะนำให้คุณสำรองข้อมูลเพื่อหลีกเลี่ยงการสูญหายของข้อมูล"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ลบและฟอร์แมต"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"กำลังฟอร์แมต <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"อย่านำ <xliff:g id="NAME">^1</xliff:g> ออกขณะฟอร์แมต"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"อย่านำ <xliff:g id="NAME">^1</xliff:g> ออกขณะฟอร์แมต"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ย้ายข้อมูลไปที่จัดเก็บข้อมูลใหม่"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"คุณสามารถย้ายรูปภาพ ไฟล์ และแอปบางแอปไปยัง <xliff:g id="NAME">^1</xliff:g> ใหม่นี้ได้ \n\nการย้ายจะใช้เวลาประมาณ <xliff:g id="TIME">^2</xliff:g> และจะเพิ่มที่จัดเก็บข้อมูลภายในขึ้น <xliff:g id="SIZE">^3</xliff:g> แอปบางแอปจะไม่ทำงานขณะดำเนินการ"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ย้ายเลย"</string>
@@ -1531,7 +1539,7 @@
<string name="bluetooth_tethering_off_subtext_config" msgid="376389105752995580">"กำลังแชร์การเชื่อมต่ออินเทอร์เน็ตของ <xliff:g id="DEVICE_NAME">%1$d</xliff:g> นี้ผ่านบลูทูธ"</string>
<string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"ไม่สามารถปล่อยการเชื่อมต่อมากกว่า <xliff:g id="MAXCONNECTION">%1$d</xliff:g> อุปกรณ์"</string>
<string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกยกเลิกการปล่อยสัญญาณ"</string>
- <string name="tethering_footer_info" msgid="7112228674056306147">"ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ เพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจากการเชื่อมต่อข้อมูลผ่านมือถือได้ และแอปยังสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย"</string>
+ <string name="tethering_footer_info" msgid="7112228674056306147">"ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ เพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจากการเชื่อมต่อเน็ตมือถือได้ และแอปยังสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย"</string>
<string name="tethering_help_button_text" msgid="656117495547173630">"ความช่วยเหลือ"</string>
<string name="network_settings_title" msgid="2876509814832830757">"เครือข่ายมือถือ"</string>
<string name="manage_mobile_plan_title" msgid="7630170375010107744">"แพ็กเกจอินเทอร์เน็ต"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"ติดตั้งแล้ว"</string>
<string name="no_applications" msgid="7336588977497084921">"ไม่มีแอปใดๆ"</string>
<string name="internal_storage" msgid="1584700623164275282">"ที่เก็บข้อมูลภายใน"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ที่จัดเก็บข้อมูลภายใน"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"ที่เก็บข้อมูล USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"ที่เก็บข้อมูลการ์ด Sd"</string>
<string name="recompute_size" msgid="7722567982831691718">"กำลังคำนวณขนาดใหม่..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"ลบข้อมูลในแอปพลิเคชันหรือไม่"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"ข้อมูลทั้งหมดของแอปพลิเคชันนี้ จะถูกลบอย่างถาวร ซึ่งรวมถึงไฟล์ การตั้งค่าบัญชี ฐานข้อมูล และอื่นๆ ทั้งหมด"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ไม่พบแอปพลิเคชันนี้ในรายการแอปพลิเคชันที่ติดตั้งไว้"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"ล้างที่จัดเก็บข้อมูลสำหรับแอปไม่ได้"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"แอปพลิเคชันนี้สามารถเข้าถึงสิ่งต่อไปนี้บนแท็บเล็ตของคุณ:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"แอปพลิเคชันนี้สามารถเข้าถึงสิ่งต่อไปนี้บนโทรศัพท์ของคุณ:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"แอปพลิเคชันนี้สามารถเข้าถึงสิ่งต่อไปนี้ในแท็บเล็ตของคุณ เพื่อปรับปรุงประสิทธิภาพและลดปริมาณการใช้หน่วยความจำ การอนุญาตบางอย่างเหล่านี้จะมีอยู่ใน <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> เนื่องจากแอปพลิเคชันนี้ทำงานในลักษณะเดียวกับ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"แอปพลิเคชันนี้สามารถเข้าถึงสิ่งต่อไปนี้ในโทรศัพท์ของคุณ เพื่อปรับปรุงประสิทธิภาพและลดปริมาณการใช้หน่วยความจำ การอนุญาตบางอย่างเหล่านี้จะมีอยู่ใน <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> เนื่องจากแอปพลิเคชันนี้ทำงานในลักษณะเดียวกับ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> และ <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"แอปพลิเคชันนี้อาจมีการเรียกเก็บเงิน:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"ส่ง SMS พรีเมียม"</string>
<string name="computing_size" msgid="1599186977475211186">"กำลังคำนวณ..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"คำนวณขนาดแพ็กเกจไม่ได้"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"คุณไม่ได้ติดตั้งแอปพลิเคชันของบุคคลที่สามไว้เลย"</string>
<string name="version_text" msgid="9189073826278676425">"เวอร์ชัน <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"ย้าย"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ย้ายไปยังแท็บเล็ต"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"ย้ายไปที่โทรศัพท์"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"ย้ายไปยังที่เก็บข้อมูล USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"ย้ายไปยังการ์ด SD"</string>
- <string name="moving" msgid="6431016143218876491">"กำลังย้าย"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"กำลังย้ายข้อมูลอื่นอยู่"</string>
<string name="insufficient_storage" msgid="481763122991093080">"พื้นที่จัดเก็บข้อมูลไม่เพียงพอ"</string>
<string name="does_not_exist" msgid="1501243985586067053">"ไม่มีแอปพลิเคชันนี้"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"ไม่สามารถติดตั้งแอปผู้ดูแลระบบอุปกรณ์ในสื่อภายนอก"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"บังคับให้หยุดหรือไม่"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"หากคุณบังคับปิดแอปพลิเคชัน อาจทำให้การทำงานผิดพลาดได้"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ไม่สามารถย้ายแอปพลิเคชัน <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"ตำแหน่งติดตั้งที่ต้องการ"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"เปลี่ยนตำแหน่งติดตั้งที่ต้องการสำหรับแอปพลิเคชันใหม่"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"ปิดแอปพลิเคชันในตัวหรือไม่"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"ปิดใช้แอป"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"หากคุณปิดใช้แอปนี้ Android และแอปอื่นๆ อาจไม่ทำงานตามที่ควรจะเป็นอีกต่อไป"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ลบข้อมูลและปิดใช้งานแอปพลิเคชันหรือไม่"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"หากคุณปิดใช้แอปนี้ Android และแอปอื่นๆ อาจไม่ทำงานตามที่ควรจะเป็นอีกต่อไป และระบบจะลบข้อมูลของคุณด้วย"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ปิดการแจ้งเตือนหรือไม่"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"หากคุณปิดการแจ้งเตือนสำหรับแอปพลิเคชันนี้ คุณอาจพลาดการแจ้งเตือนและการอัปเดตที่สำคัญ"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"รายละเอียดแอป"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"ติดตั้งแอปจาก <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"ใช้บริการ"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"ใช้การแก้สี"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"ใช้คำอธิบายภาพ"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"ต่อไป"</string>
<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="6371077608778830020">"เพิ่มเครื่องช่วยการได้ยิน"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"แอปอาจทำงานผิดพลาดหากคุณจำกัดกิจกรรมในพื้นหลัง"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"เนื่องจากแอปนี้ไม่ได้ตั้งค่าให้เพิ่มประสิทธิภาพแบตเตอรี่ คุณจึงจำกัดการใช้งานไม่ได้\n\nหากต้องการจำกัด ให้เปิดการเพิ่มประสิทธิภาพแบตเตอรี่ก่อน"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"การใช้งานหน้าจอตั้งแต่ชาร์จจนเต็ม"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"การใช้งานหน้าจอ"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"การสแกนเครือข่ายมือถือ"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"การใช้งานแบตเตอรี่ตั้งแต่ชาร์จจนเต็ม"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"ระยะเวลาที่หน้าจอเปิดตั้งแต่ชาร์จจนเต็ม"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"การใช้งานอุปกรณ์ตั้งแต่ชาร์จจนเต็ม"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"ใช้รายละเอียด"</string>
<string name="controls_subtitle" msgid="390468421138288702">"ปรับการใช้พลังงาน"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"แพ็คเก็จที่รวมมาด้วย"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"แอปทำให้แบตเตอรี่หมดเร็ว"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"ปลุกให้อุปกรณ์ตื่นอยู่เสมอ"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"ปลุกให้อุปกรณ์ตื่นในพื้นหลัง"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"ขอตำแหน่งบ่อย"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"แอป <xliff:g id="NUMBER">%1$d</xliff:g> แอปทำงานผิดปกติ"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"แอปทำงานตามปกติ"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"โทรศัพท์ใช้แบตเตอรี่ในเบื้องหลังตามปกติ"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"แท็บเล็ตใช้แบตเตอรี่ในเบื้องหลังตามปกติ"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">การจำกัดการใช้งานแบตเตอรี่ของแอป %1$d</item>
<item quantity="one">การจำกัดการใช้งานแบตเตอรี่ของแอป %1$d</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"จำกัดเมื่อ <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"แอปเหล่านี้ใช้งานแบตเตอรี่ในพื้นหลัง แอปที่ถูกจำกัดอาจไม่ทำงานตามปกติและการแจ้งเตือนอาจล่าช้า"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"ใช้ตัวจัดการแบตเตอรี่"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"ตรวจจับเมื่อแอปทำให้แบตเตอรี่หมดเร็ว"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"ยกเลิก"</string>
<string name="tts_reset" msgid="2661752909256313270">"รีเซ็ต"</string>
<string name="tts_play" msgid="2628469503798633884">"เล่น"</string>
- <string name="gadget_title" msgid="5519037532720577836">"การควบคุมพลังงาน"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"กำลังอัปเดตการตั้งค่า WiFi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"กำลังอัปเดตการตั้งค่าบลูทูธ"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"เปิด"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"ปิด"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"กำลังเปิด"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"กำลังปิด"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"บลูทูธ"</string>
- <string name="gadget_location" msgid="2974757497945178165">"ตำแหน่ง"</string>
- <string name="gadget_sync" msgid="858895763714222152">"ซิงค์"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"ความสว่าง <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"อัตโนมัติ"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"สูงสุด"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"ครึ่งหนึ่ง"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"ปิด"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"ที่จัดเก็บข้อมูลรับรอง"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"ติดตั้งจากที่เก็บข้อมูล"</string>
@@ -2488,7 +2459,7 @@
<string name="device_admin_add_title" msgid="3140663753671809044">"ผู้ดูแลระบบอุปกรณ์"</string>
<string name="device_admin_warning" msgid="7482834776510188134">"การเปิดใช้งานแอปผู้ดูแลระบบนี้จะอนุญาตให้แอป <xliff:g id="APP_NAME">%1$s</xliff:g> ทำงานต่างๆ ต่อไปนี้"</string>
<string name="device_admin_status" msgid="7234814785374977990">"แอปผู้ดูแลระบบนี้ทำงานอยู่และอนุญาตให้แอป <xliff:g id="APP_NAME">%1$s</xliff:g> ทำงานต่างๆ ต่อไปนี้"</string>
- <string name="profile_owner_add_title" msgid="6249331160676175009">"ต้องการเปิดใช้งานโปรแกรมจัดการโปรไฟล์ไหม"</string>
+ <string name="profile_owner_add_title" msgid="6249331160676175009">"เปิดใช้งานโปรแกรมจัดการโปรไฟล์ไหม"</string>
<string name="adding_profile_owner_warning" msgid="1354474524852805802">"การดำเนินการต่อจะทำให้ผู้ใช้ของคุณได้รับการจัดการโดยผู้ดูแลระบบ ซึ่งอาจจัดเก็บข้อมูลที่เกี่ยวข้องนอกเหนือจากข้อมูลส่วนบุคคลของคุณได้ด้วย\n\nผู้ดูแลระบบสามารถตรวจสอบและจัดการการตั้งค่า การเข้าถึง แอป และข้อมูลที่เชื่อมโยงกับผู้ใช้นี้ รวมถึงกิจกรรมเครือข่ายและข้อมูลตำแหน่งของอุปกรณ์"</string>
<string name="admin_disabled_other_options" msgid="7712694507069054530">"ผู้ดูแลระบบปิดใช้ตัวเลือกอื่นๆ"</string>
<string name="admin_more_details" msgid="7901420667346456102">"รายละเอียดเพิ่มเติม"</string>
@@ -2540,8 +2511,8 @@
<string name="remove_managed_profile_label" msgid="3856519337797285325">"นำโปรไฟล์งานออก"</string>
<string name="background_data" msgid="5779592891375473817">"ข้อมูลพื้นหลัง"</string>
<string name="background_data_summary" msgid="8328521479872763452">"แอปพลิเคชันสามารถซิงค์ ส่ง และรับข้อมูลได้ตลอดเวลา"</string>
- <string name="background_data_dialog_title" msgid="6059217698124786537">"ปิดข้อมูลแบ็กกราวด์"</string>
- <string name="background_data_dialog_message" msgid="6981661606680941633">"การปิดใช้งานข้อมูลแบ็กกราวด์จะทำให้แบตเตอรี่ใช้งานได้ยาวนานขึ้นและลดการใช้ข้อมูลลง แอปพลิเคชันบางอย่างอาจยังคงใช้การเชื่อมต่อข้อมูลแบ็กกราวด์อยู่"</string>
+ <string name="background_data_dialog_title" msgid="6059217698124786537">"ปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
+ <string name="background_data_dialog_message" msgid="6981661606680941633">"การปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังจะทำให้แบตเตอรี่ใช้งานได้ยาวนานขึ้นและลดการใช้ข้อมูลลง แอปพลิเคชันบางอย่างอาจยังคงใช้การเชื่อมต่ออินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังอยู่"</string>
<string name="sync_automatically" msgid="1682730255435062059">"ซิงค์ข้อมูลแอปพลิเคชันโดยอัตโนมัติ"</string>
<string name="sync_enabled" msgid="4551148952179416813">"เปิดใช้การซิงค์"</string>
<string name="sync_disabled" msgid="8511659877596511991">"ปิดการซิงค์"</string>
@@ -2570,7 +2541,7 @@
<string name="really_remove_account_message" product="device" msgid="7507474724882080166">"การนำบัญชีนี้ออกจะเป็นการลบข้อความ รายชื่อติดต่อ และข้อมูลอื่นๆ ทั้งหมดออกจากอุปกรณ์!"</string>
<string name="remove_account_failed" msgid="3901397272647112455">"ผู้ดูแลระบบไม่อนุญาตให้ทำการเปลี่ยนแปลงนี้"</string>
<string name="cant_sync_dialog_title" msgid="2777238588398046285">"ซิงค์ด้วยตนเองไม่ได้"</string>
- <string name="cant_sync_dialog_message" msgid="1938380442159016449">"รายการนี้ถูกปิดใช้งานการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดใช้งานข้อมูลแบ็กกราวด์และการซิงค์อัตโนมัติชั่วคราว"</string>
+ <string name="cant_sync_dialog_message" msgid="1938380442159016449">"รายการนี้ปิดการซิงค์อยู่ หากต้องการเปลี่ยนการตั้งค่า ให้เปิดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังและการซิงค์อัตโนมัติชั่วคราว"</string>
<string name="enter_password" msgid="8035706727471334122">"ป้อนรหัสผ่านเพื่อเริ่มต้นใช้งาน Android"</string>
<string name="enter_pin" msgid="5305333588093263790">"ป้อน PIN เพื่อเริ่มต้นใช้งาน Android"</string>
<string name="enter_pattern" msgid="4187435713036808566">"วาดรูปแบบเพื่อเริ่มต้นใช้งาน Android"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> จาก <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"เลือกทั้งหมด"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"การใช้อินเทอร์เน็ต"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"การใช้อินเทอร์เน็ตของแอป"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"เน็ตมือถือและ Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"การทำบัญชีข้อมูลผู้ให้บริการอาจแตกต่างจากอุปกรณ์ของคุณ"</string>
<string name="data_usage_app" msgid="4970478397515423303">"การใช้งานแอป"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ข้อมูลแอป"</string>
@@ -2594,8 +2565,8 @@
<string name="data_usage_cycle" msgid="5652529796195787949">"รอบการใช้ข้อมูล"</string>
<string name="data_usage_app_items_header_text" msgid="5017850810459372828">"การใช้งานแอป"</string>
<string name="data_usage_menu_roaming" msgid="8042359966835203296">"การโรมมิ่งอินเทอร์เน็ต"</string>
- <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"จำกัดข้อมูลแบ็กกราวด์"</string>
- <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"อนุญาตข้อมูลแบ็กกราวด์"</string>
+ <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"จำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
+ <string name="data_usage_menu_allow_background" msgid="2694761978633359223">"อนุญาตอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
<string name="data_usage_menu_split_4g" msgid="5322857680792601899">"แยกการใช้งาน 4G"</string>
<string name="data_usage_menu_show_wifi" msgid="2296217964873872571">"แสดง Wi-Fi"</string>
<string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"ซ่อน Wi‑Fi"</string>
@@ -2636,8 +2607,8 @@
<string name="data_usage_app_restrict_background" msgid="7359227831562303223">"ข้อมูลพื้นหลัง"</string>
<string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"เปิดใช้อินเทอร์เน็ตมือถือในเบื้องหลัง"</string>
<string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ก่อนอื่นให้ตั้งค่าขีดจำกัดในการใช้เน็ตมือถือก่อน เพื่อจำกัดอินเทอร์เน็ตที่แอปนี้ใช้งานอยู่เบื้องหลัง"</string>
- <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
- <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ฟีเจอร์นี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยข้อมูลแบ็กกราวด์หยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
+ <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ต้องการจำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังหรือไม่"</string>
+ <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ฟีเจอร์นี้อาจทำให้แอปพลิเคชันที่ต้องอาศัยอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังหยุดทำงานเมื่อมีแต่เครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถดูการควบคุมการใช้งานข้อมูลที่เหมาะสมกว่านี้ได้ในการตั้งค่าที่มีอยู่ภายในแอปพลิเคชัน"</string>
<string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"คุณสามารถจำกัดอินเทอร์เน็ตในพื้นหลังได้เมื่อคุณได้ตั้งค่าขีดจำกัดอินเทอร์เน็ตมือถือไว้เท่านั้น"</string>
<string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"เปิดซิงค์ข้อมูลอัตโนมัติหรือไม่"</string>
<string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"การเปลี่ยนแปลงใดๆ ที่คุณทำกับบัญชีของคุณบนเว็บจะมีการคัดลอกไปยังแท็บเล็ตโดยอัตโนมัติ\n\nบางบัญชีอาจคัดลอกการเปลี่ยนแปลงที่คุณทำบนแท็บเล็ตไปยังเว็บโดยอัตโนมัติ นี่คือการทำงานของบัญชี Google"</string>
@@ -2652,7 +2623,7 @@
<string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"การจำกัดการใช้อินเทอร์เน็ต"</string>
<string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"แท็บเล็ตจะปิดอินเทอร์เน็ตมือถือเมื่อถึงขีดจำกัดที่คุณตั้งไว้\n\nเนื่องจากว่าปริมาณการใช้อินเทอร์เน็ตนั้นวัดโดยแท็บเล็ตของคุณ ผู้ให้บริการอาจมีวิธีบันทึกการใช้ที่แตกต่างออกไป ดังนั้น โปรดกำหนดขีดจำกัดอย่างระมัดระวัง"</string>
<string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"โทรศัพท์ของคุณจะปิดอินเทอร์เน็ตมือถือเมื่อถึงขีดจำกัดที่คุณตั้งไว้\n\nเนื่องจากว่าปริมาณการใช้อินเทอร์เน็ตนั้นวัดโดยโทรศัพท์ของคุณ ผู้ให้บริการอาจมีวิธีบันทึกการใช้ที่แตกต่างออกไป ดังนั้น โปรดกำหนดขีดจำกัดอย่างระมัดระวัง"</string>
- <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
+ <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ต้องการจำกัดอินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังหรือไม่"</string>
<string name="data_usage_restrict_background" msgid="434093644726734586">"หากคุณจำกัดอินเทอร์เน็ตมือถือในพื้นหลัง แอปและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อ Wi-Fi"</string>
<string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"หากคุณจำกัดอินเทอร์เน็ตมือถือในพื้นหลัง แอปและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อ Wi-Fi\n\nการตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย"</string>
<string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"หากคุณจำกัดอินเทอร์เน็ตมือถือในพื้นหลัง แอปและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อ Wi-Fi\n\nการตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">แสดงรายการที่ซ่อน %d รายการ</item>
<item quantity="one">แสดงรายการที่ซ่อน %d รายการ</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"ยุบ"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"เครือข่ายและอินเทอร์เน็ต"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"มือถือ"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ปริมาณการใช้อินเทอร์เน็ต"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"บลูทูธ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"แอปและการแจ้งเตือน"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"สิทธิ์ แอปเริ่มต้น"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"การเข้าถึงการแจ้งเตือนไม่พร้อมใช้งานสำหรบแอปในโปรไฟล์งาน"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"บัญชี"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"ไม่ได้เพิ่มบัญชี"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"แอปเริ่มต้น"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"ภาษา เวลา การสำรองข้อมูล การอัปเดต"</string>
<string name="search_results_title" msgid="1796252422574886932">"การตั้งค่า"</string>
- <string name="search_menu" msgid="6283419262313758339">"ค้นหาการตั้งค่า"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, การเชื่อมต่อเครือข่าย, อินเทอร์เน็ต, ไร้สาย, ข้อมูล, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, สลับ, การควบคุม"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"รับส่งข้อความ, การส่งข้อความ, ข้อความ, การรับส่งข้อความ, ค่าเริ่มต้น"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ชำระเงิน แตะ การชำระเงิน"</string>
<string name="keywords_backup" msgid="470070289135403022">"ข้อมูลสำรอง, สำรองข้อมูล"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ท่าทางสัมผัส"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ใบหน้า, ปลดล็อก, การตรวจสอบสิทธิ์, ลงชื่อเข้าใช้"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, เวอร์ชัน prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"เครือข่าย, สถานะเครือข่ายมือถือ, สถานะบริการ, ความแรงของสัญญาณ, ประเภทเครือข่ายมือถือ, โรมมิ่ง, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"หมายเลขซีเรียล, เวอร์ชันฮาร์ดแวร์"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"ธีมสีเข้ม"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"ข้อบกพร่อง"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"หน้าจอแอมเบียนท์ หน้าจอล็อก"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"การแจ้งเตือนในหน้าจอล็อก"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ใบหน้า"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"ลายนิ้วมือ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"หน้าจอสลัว หน้าจอสัมผัส แบตเตอรี่ ความสว่างอัจฉริยะ ความสว่างแบบไดนามิก"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"เมื่อคุณป้อน PIN เพื่อเริ่มใช้งานอุปกรณ์นี้ บริการความสามารถในการเข้าถึงอย่างเช่น <xliff:g id="SERVICE">%1$s</xliff:g> จะยังไม่พร้อมใช้งาน"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"เมื่อคุณป้อนรูปแบบเพื่อเริ่มใช้งานอุปกรณ์นี้ บริการความสามารถในการเข้าถึงอย่างเช่น <xliff:g id="SERVICE">%1$s</xliff:g> จะยังไม่พร้อมใช้งาน"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"เมื่อคุณป้อนรหัสผ่านเพื่อเริ่มใช้งานอุปกรณ์นี้ บริการความสามารถในการเข้าถึงอย่างเช่น <xliff:g id="SERVICE">%1$s</xliff:g> จะยังไม่พร้อมใช้งาน"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"หมายเหตุ: หลังจากเริ่มต้นใหม่ แอปนี้จะไม่สามารถเริ่มการทำงานได้จนกว่าคุณจะปลดล็อกโทรศัพท์"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"หมายเหตุ: หากคุณรีสตาร์ทโทรศัพท์และตั้งการล็อกหน้าจอไว้ แอปนี้จะเริ่มทำงานไม่ได้จนกว่าคุณจะปลดล็อกโทรศัพท์"</string>
<string name="imei_information_title" msgid="8499085421609752290">"ข้อมูล IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"ข้อมูลที่เกี่ยวข้องกับ IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(ช่อง<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ส่วนตัว"</string>
<string name="filter_work_apps" msgid="24519936790795574">"งาน"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"แอป: ทั้งหมด"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"แอป: ปิดแล้ว"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"ปิดอยู่"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"หมวดหมู่: ความสำคัญเร่งด่วน"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"หมวดหมู่: ความสำคัญต่ำ"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"หมวดหมู่: ปิดแล้ว"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"การแจ้งเตือนการใช้งาน"</string>
<string name="show_all_apps" msgid="1512506948197818534">"แสดงการใช้งานอุปกรณ์แบบเต็ม"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"แสดงการใช้งานแอป"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"การใช้งานแบตเตอรี่สูง"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> แอปมีลักษณะการทำงานผิดปกติ</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> มีลักษณะการทำงานผิดปกติ</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"พื้นที่เก็บข้อมูลภายใน: ใช้ไป <xliff:g id="PERCENTAGE">%1$s</xliff:g> - เหลือ <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"เข้าสู่โหมดสลีปหลังจากไม่มีการใช้งาน <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"วอลเปเปอร์ สลีป ขนาดตัวอักษร"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"เข้าโหมดสลีปหลังจากไม่มีการใช้งาน 10 นาที"</string>
<string name="memory_summary" msgid="8080825904671961872">"ใช้หน่วยความจำไป <xliff:g id="USED_MEMORY">%1$s</xliff:g> จาก <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> โดยเฉลี่ย"</string>
<string name="users_summary" msgid="1674864467098487328">"ลงชื่อเข้าใช้เป็น <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"ไม่อนุญาตให้ส่ง SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"ไม่อนุญาตให้ใช้กล้องถ่ายรูป"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"ไม่อนุญาตให้จับภาพหน้าจอ"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"ปิดข้อมูลสำรองไม่ได้"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"เปิดแอปนี้ไม่ได้"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"หากมีคำถาม โปรดติดต่อผู้ดูแลระบบไอที"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"รายละเอียดเพิ่มเติม"</string>
@@ -3777,7 +3749,7 @@
<string name="condition_cellular_title" msgid="1327317003797575735">"อินเทอร์เน็ตมือถือปิดอยู่"</string>
<string name="condition_cellular_summary" msgid="1818046558419658463">"สามารถใช้อินเทอร์เน็ตผ่าน Wi-Fi ได้เท่านั้น"</string>
<string name="condition_bg_data_title" msgid="2483860304802846542">"โปรแกรมประหยัดอินเทอร์เน็ตเปิดอยู่"</string>
- <string name="condition_bg_data_summary" msgid="656957852895282228">"สามารถใช้ข้อมูลแบ็กกราวด์ผ่าน Wi-Fi ได้เท่านั้น ซึ่งอาจส่งผลกระทบต่อแอปหรือบริการบางอย่างเมื่อไม่มี Wi-Fi"</string>
+ <string name="condition_bg_data_summary" msgid="656957852895282228">"สามารถใช้อินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลังผ่าน Wi-Fi ได้เท่านั้น ซึ่งอาจส่งผลกระทบต่อแอปหรือบริการบางอย่างเมื่อไม่มี Wi-Fi"</string>
<string name="condition_work_title" msgid="7293722361184366648">"โปรไฟล์งานปิดอยู่"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"ปิดใช้แอป การซิงค์ในแบ็กกราวด์ และฟีเจอร์อื่นๆ เกี่ยวกับโปรไฟล์งานของคุณอยู่"</string>
<string name="condition_device_muted_action_turn_on_sound" msgid="4930240942726349213">"เปิดเสียง"</string>
@@ -3866,7 +3838,7 @@
<string name="launch_wifi_text" msgid="2311424914664372687">"ดูรายละเอียด"</string>
<string name="data_saver_title" msgid="8034286939200289826">"การประหยัดอินเทอร์เน็ต"</string>
<string name="unrestricted_data_saver" msgid="952796077540228711">"ไม่จำกัดการใช้อินเทอร์เน็ต"</string>
- <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ปิดใช้ข้อมูลแบ็กกราวด์"</string>
+ <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ปิดใช้อินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
<string name="data_saver_on" msgid="6774217590237934709">"เปิด"</string>
<string name="data_saver_off" msgid="6892309031162738794">"ปิด"</string>
<string name="data_saver_switch_title" msgid="836312690356005669">"ใช้โปรแกรมประหยัดอินเทอร์เน็ต"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"จำลองแบบหน้าจอที่มีคัตเอาต์"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"คัตเอาท์ดิสเพลย์"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"คัตเอาท์ดิสเพลย์"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"ไม่มี"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ค่าเริ่มต้นของอุปกรณ์"</string>
<string name="special_access" msgid="3458780842491881155">"สิทธิ์เข้าถึงพิเศษของแอป"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> แอปใช้อินเทอร์เน็ตได้ไม่จำกัด</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"เชื่อมต่อกับ <xliff:g id="ID_1">%1$s</xliff:g> แล้ว"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"เชื่อมต่อหลายอุปกรณ์แล้ว"</string>
<string name="demo_mode" msgid="2798762752209330277">"โหมดสาธิต UI ของระบบ"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"โหมดกลางคืน"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"ตั้งค่าโหมดกลางคืน"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"โหมดมืด"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"ตั้งค่าโหมดมืด"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"ชิ้นส่วนการตั้งค่าด่วนสำหรับนักพัฒนาซอฟต์แวร์"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope Trace"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"การตั้งค่าโปรไฟล์งาน"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ค้นหารายชื่อติดต่อ"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"อนุญาตให้องค์กรของคุณค้นหารายชื่อติดต่อเพื่อระบุผู้โทรและรายชื่อติดต่อ"</string>
@@ -3986,16 +3957,20 @@
<string name="swipe_up_to_switch_apps_summary" msgid="5367798220225997418">"หากต้องการสลับแอป ให้เลื่อนนิ้วขึ้นบนปุ่มหน้าแรก จากนั้นเลื่อนขึ้นอีกครั้งเพื่อดูแอปทั้งหมดจากหน้าจอใดก็ได้ คุณจะไม่มีปุ่มภาพรวมที่ด้านขวาล่างของหน้าจออีกต่อไป"</string>
<string name="swipe_up_to_switch_apps_suggestion_title" msgid="1465200107913259595">"ลองใช้ปุ่มหน้าแรกใหม่"</string>
<string name="swipe_up_to_switch_apps_suggestion_summary" msgid="4825314186907812743">"เปิดท่าทางสัมผัสใหม่เพื่อสลับแอป"</string>
- <string name="ambient_display_title" product="default" msgid="5144814600610448504">"แตะ 2 ครั้งเพื่อตรวจสอบโทรศัพท์"</string>
+ <string name="ambient_display_title" product="default" msgid="5144814600610448504">"แตะ 2 ครั้งเพื่อดูโทรศัพท์"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"แตะ 2 ครั้งเพื่อตรวจสอบแท็บเล็ต"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"แตะ 2 ครั้งเพื่อตรวจสอบอุปกรณ์"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"หากต้องการดูเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ ให้แตะหน้าจอ 2 ครั้ง"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"หากต้องการดูเวลา การแจ้งเตือน และข้อมูลอื่นๆ ให้แตะหน้าจอสองครั้ง"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"ยกขึ้นเพื่อดูโทรศัพท์"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"ยกขึ้นเพื่อตรวจสอบแท็บเล็ต"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"ยกขึ้นเพื่อตรวจสอบอุปกรณ์"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"หากต้องการดูเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ ให้หยิบโทรศัพท์ขึ้นมา"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"หากต้องการดูเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ ให้หยิบแท็บเล็ตขึ้นมา"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"หากต้องการดูเวลา ไอคอนการแจ้งเตือน และข้อมูลอื่นๆ ให้หยิบอุปกรณ์ขึ้นมา"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"ปลุกจอแสดงผล"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"หากต้องการดูเวลา การแจ้งเตือน และข้อมูลอื่นๆ ให้หยิบโทรศัพท์ขึ้นมา"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"หากต้องการดูเวลา การแจ้งเตือน และข้อมูลอื่นๆ ให้หยิบแท็บเล็ตขึ้นมา"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"หากต้องการดูเวลา การแจ้งเตือน และข้อมูลอื่นๆ ให้หยิบอุปกรณ์ขึ้นมา"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"ท่าทางสัมผัสปลุกหน้าจอล็อก"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"ใช้ลายนิ้วมือแสดงการแจ้งเตือน"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"เลื่อนนิ้วสแกนลายนิ้วมือ"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"ในการตรวจสอบการแจ้งเตือน ให้เลื่อนนิ้วลงผ่านเซ็นเซอร์ลายนิ้วมือที่ด้านหลังโทรศัพท์"</string>
@@ -4075,7 +4050,6 @@
<item quantity="other">พยายามแล้ว <xliff:g id="COUNT_1">%d</xliff:g> ครั้ง</item>
<item quantity="one">พยายามแล้ว <xliff:g id="COUNT_0">%d</xliff:g> ครั้ง</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"กำลังสำรองข้อมูลในอุปกรณ์นี้"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"อุปกรณ์นี้จัดการโดยองค์กรของคุณ"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"อุปกรณ์เครื่องนี้จัดการโดย <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4087,8 +4061,8 @@
<string name="default_calendar_app_title" msgid="3545972964391065220">"แอปปฏิทิน"</string>
<string name="default_contacts_app_title" msgid="3497370557378660098">"แอปรายชื่อติดต่อ"</string>
<plurals name="default_email_app_title" formatted="false" msgid="42826975161049245">
- <item quantity="other">แอปโปรแกรมรับส่งเมล</item>
- <item quantity="one">แอปโปรแกรมรับส่งเมล</item>
+ <item quantity="other">แอปโปรแกรมรับส่งอีเมล</item>
+ <item quantity="one">แอปโปรแกรมรับส่งอีเมล</item>
</plurals>
<string name="default_map_app_title" msgid="7560143381633608567">"แอปแผนที่"</string>
<plurals name="default_phone_app_title" formatted="false" msgid="6714041230953195024">
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"บริการป้อนอัตโนมัติ"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"ป้อน, อัตโนมัติ, ป้อนอัตโนมัติ"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>ตรวจดูว่าคุณเชื่อถือแอปนี้ได้</b> <br/> <br/> <xliff:g id=app_name example=Google ป้อนอัตโนมัติ>%1$s</xliff:g> ใช้สิ่งที่อยู่บนหน้าจอเพื่อดูว่าจะป้อนข้อมูลใดโดยอัตโนมัติได้บ้าง"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"ป้อนอัตโนมัติ"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"[LoggingLevel]"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"คำขอสูงสุดต่อเซสชัน"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"ชุดข้อมูลที่ปรากฏสูงสุด"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"รีเซ็ตเป็นค่าเริ่มต้น"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"ตัวเลือกการป้อนอัตโนมัติสำหรับนักพัฒนาซอฟต์แวร์ได้รับการรีเซ็ตแล้ว"</string>
<string name="device_theme" msgid="4571803018917608588">"ธีมอุปกรณ์"</string>
<string name="default_theme" msgid="7085644992078579076">"ค่าเริ่มต้น"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"ชื่อเครือข่าย"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ทริกเกอร์การจัดสรรผู้ให้บริการ"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"อัปเดตโหมดห้ามรบกวน"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"หยุดการแจ้งเตือนชั่วคราวเพื่อไม่ให้มีสิ่งรบกวน"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"มีอะไรใหม่และน่าสนใจบ้าง"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"ทัวร์ชมโทรศัพท์เครื่องใหม่"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"ทัวร์ชมแท็บเล็ตเครื่องใหม่"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"ทัวร์ชมอุปกรณ์ใหม่"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"ฟีเจอร์นี้ไม่สามารถใช้ได้บนอุปกรณ์นี้"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"บังคับใช้การวัด GNSS เต็มรูปแบบ"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ติดตามระบบดาวเทียมและความถี่สัญญาณ GNSS ทั้งหมดโดยไม่มีการปิดพักเพื่อประหยัดพลังงาน"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"แสดงปัญหาที่ขัดข้องเสมอ"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"แสดงกล่องโต้ตอบทุกครั้งที่แอปขัดข้อง"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"เลือกแอปที่พร้อมใช้งาน ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ไม่ได้ตั้งค่าแอปพลิเคชันที่พร้อมใช้งาน ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"แอปพลิเคชันที่พร้อมใช้งาน ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"การเข้าถึงไดเรกทอรี"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"การเข้าถึงไดเรกทอรี"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"รายละเอียดเครือข่าย"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"แอปในโทรศัพท์จะเห็นชื่อของอุปกรณ์ และคนอื่นก็อาจเห็นเช่นกันหากคุณเชื่อมต่อกับอุปกรณ์บลูทูธหรือตั้งค่าฮอตสปอต Wi-Fi"</string>
<string name="devices_title" msgid="7701726109334110391">"อุปกรณ์"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"การตั้งค่าทั้งหมด"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"คำแนะนำ"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"ข้อมูล CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"ข้อมูล CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"เลือกเครือข่าย"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"เลิกเชื่อมต่อแล้ว"</string>
+ <string name="network_connected" msgid="4943925032253989621">"เชื่อมต่อแล้ว"</string>
+ <string name="network_connecting" msgid="76404590784733557">"เชื่อมต่อ…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"เชื่อมต่อไม่ได้"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"ไม่พบเครือข่าย"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"ไม่พบเครือข่าย โปรดลองอีกครั้ง"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ห้ามใช้)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"ไม่มีซิมการ์ด"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"การโทรขั้นสูง"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"โหมดเครือข่ายที่ต้องการ: ต้องการ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"โหมดเครือข่ายที่ต้องการ: GSM เท่านั้น"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"โหมดเครือข่ายที่ต้องการ: WCDMA เท่านั้น"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"โหมดเครือข่ายที่ต้องการ: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"โหมดเครือข่ายที่ต้องการ: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"โหมดเครือข่ายที่ต้องการ: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"โหมดเครือข่ายที่ต้องการ: CDMA เท่านั้น"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"โหมดเครือข่ายที่ต้องการ: EvDo เท่านั้น"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"โหมดเครือข่ายที่ต้องการ: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"โหมดเครือข่ายที่ต้องการ: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"โหมดเครือข่ายที่ต้องการ: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"โหมดเครือข่ายที่ต้องการ: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"โหมดเครือข่ายที่ต้องการ: ทั่วโลก"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"โหมดเครือข่ายที่ต้องการ: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"โหมดเครือข่ายที่ต้องการ: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"โหมดเครือข่ายที่ต้องการ: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"โหมดเครือข่ายที่ต้องการ: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"โหมดเครือข่ายที่ต้องการ: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"โหมดเครือข่ายที่ต้องการ: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"โหมดเครือข่ายที่ต้องการ: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"โหมดเครือข่ายที่ต้องการ: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"โหมดเครือข่ายที่ต้องการ: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"โหมดเครือข่ายที่ต้องการ: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"โหมดเครือข่ายที่ต้องการ: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"โหมดเครือข่ายที่ต้องการ: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"โหมดเครือข่ายที่ต้องการ: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (แนะนำ)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (แนะนำ)"</string>
+ <string name="network_global" msgid="959947774831178632">"ทั่วโลก"</string>
+ <string name="label_available" msgid="1731547832803057893">"เครือข่ายที่ใช้งานได้"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"กำลังค้นหา…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"กำลังลงทะเบียนใน <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"ซิมการ์ดของคุณไม่อนุญาตให้เชื่อมต่อกับเครือข่ายนี้"</string>
+ <string name="connect_later" msgid="978991102125216741">"เชื่อมต่อเครือข่ายนี้ไม่ได้ในขณะนี้ โปรดลองอีกครั้งในภายหลัง"</string>
+ <string name="registration_done" msgid="4573820010512184521">"ลงทะเบียนในเครือข่ายแล้ว"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"เลือกเครือข่ายโดยอัตโนมัติ"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"การตั้งค่าผู้ให้บริการ"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ตั้งค่าบริการข้อมูล"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"เน็ตมือถือ"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"เข้าถึงข้อมูลโดยใช้เครือข่ายมือถือ"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"ประเภทเครือข่ายที่ต้องการ"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"เปลี่ยนโหมดปฏิบัติการของเครือข่าย"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"ประเภทเครือข่ายที่ต้องการ"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"ผู้ให้บริการ"</string>
+ <string name="call_category" msgid="8108654745239563833">"การโทร"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"วิดีโอคอลผ่านผู้ให้บริการ"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"การเลือกระบบ"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"เปลี่ยนโหมดการเชื่อมต่อกับเครือข่าย CDMA อื่น"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"การเลือกระบบ"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"เครือข่าย"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"เครือข่าย"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"การสมัครใช้บริการ CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"เปลี่ยนระหว่าง RUIM/SIM และ NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"การสมัครใช้บริการ"</string>
+ <string name="register_automatically" msgid="518185886971595020">"การลงทะเบียนอัตโนมัติ…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"อนุญาตการโรมมิ่งข้อมูลไหม"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"โปรดสอบถามผู้ให้บริการเครือข่ายสำหรับข้อมูลเกี่ยวกับราคา"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ปริมาณการใช้อินเทอร์เน็ตของแอป"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"โหมดเครือข่ายไม่ถูกต้อง <xliff:g id="NETWORKMODEID">%1$d</xliff:g> ไม่สนใจ"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"ใช้ไม่ได้เมื่อเชื่อมต่อกับ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"ดูเพิ่ม"</string>
+ <string name="see_less" msgid="1250265310929558370">"ดูน้อยลง"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 54053bd..745870d 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Ituring bilang nakametro"</item>
<item msgid="2266114985518865625">"Ituring bilang hindi nakametro"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Default (gumamit ng naka-randomize na MAC)"</item>
+ <item msgid="5398461510512959597">"Pinagkakatiwalaan"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Hindi"</item>
<item msgid="3863157480502955888">"Oo"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Palaging naka-on"</item>
<item msgid="6385301106124765323">"Palaging naka-off"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Naka-off"</item>
+ <item msgid="2182686878828390312">"Debug"</item>
+ <item msgid="5286514712714822064">"Verbose"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Home lang"</item>
+ <item msgid="5034813753274486448">"Awtomatiko"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Mas gusto ang GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"GSM lang"</item>
+ <item msgid="488474605709912156">"WCDMA lang"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA auto"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo auto"</item>
+ <item msgid="370391313511477301">"CDMA na walang EvDo"</item>
+ <item msgid="4678789463133969294">"EvDo lang"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Pangkalahatan"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"TDSCDMA lang"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Pangkalahatan"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0e22b28..806d4af 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Gawin"</string>
<string name="allow" msgid="3349662621170855910">"Payagan"</string>
<string name="deny" msgid="6947806159746484865">"Tanggihan"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Isara"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Lumipat"</string>
<string name="device_info_default" msgid="7847265875578739287">"Hindi Kilala"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one"><xliff:g id="STEP_COUNT_1">%1$d</xliff:g> hakbang na lang, magiging developer ka na.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Hindi na kailangan, isa ka nang developer."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Paki-enable muna ang mga opsyon ng developer."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Wireless at mga network"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Mga Koneksyon"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Access"</string>
<string name="header_category_system" msgid="2816866961183068977">"System"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"I-enable ang Koneksyon sa Data"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"I-disable ang Koneksyon sa Data"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Bluetooth address ng device: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"I-disconnect ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Pagbo-broadcast"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Walang pangalang Bluetooth na device"</string>
<string name="progress_scanning" msgid="192587958424295789">"Naghahanap"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Walang nakitang mga kalapit na Bluetooth device."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Gustong i-on ng isang app ang Bluetooth at gawing nakikita ng iba pang mga device ang iyong telepono. Maaari mo itong baguhin sa ibang pagkakataon sa mga setting ng Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Binubuksan ang Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"I-no-off ang Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Auto-connect"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Kahilingan sa pagkonekta ng Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"I-tap upang kumonekta sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\""</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Nais mo bang kumonekta sa \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Mga available na call device"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Kasalukuyang nakakonekta"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Mga naka-save na device"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Magdagdag ng device"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Mag-o-on ang Bluetooth para magpares"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Mga kagustuhan sa koneksyon"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Mga nakakonektang dating device"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Dating nakakonekta"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Naka-on ang Bluetooth"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Tingnan lahat"</string>
<string name="date_and_time" msgid="9062980487860757694">"Petsa at oras"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Pumili ng time zone"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Laktawan"</string>
<string name="next_label" msgid="4693520878012668114">"Susunod"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Mga Wika"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Mga kagustuhan sa wika"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Alisin"</string>
<string name="add_a_language" msgid="2330538812283783022">"Magdagdag ng wika"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Mga Setting"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Shortcut ng Mga Setting"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Airplane mode"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Higit pa"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless at mga network"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Pamahalaan ang Wi-Fi, Bluetooth, airplane mode, mga mobile network at mga VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobile data"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Na-disable ng admin"</string>
<string name="security_status_title" msgid="5848766673665944640">"Status ng seguridad"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Lock ng screen, face unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Lock ng screen, fingerprint"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Lock ng screen"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Naidagdag ang mukha"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Mag-unlock gamit ang mukha mo"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Gamitin ang mukha mo sa pag-authenticate"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Gamitin ang iyong mukha para i-unlock ang telepono mo, awtorisahan ang mga pagbili, o mag-sign in sa mga app."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Gamitin ang sarili"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Gamitin ang iyong mukha para i-unlock ang telepono mo o aprubahan ang mga pagbili.\n\nTandaan: Hindi mo maaaring gamitin ang iyong mukha para i-unlock ang device na ito. Para sa higit pang impormasyon, makipag-ugnayan sa admin ng iyong organisasyon."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Gamitin ang iyong mukha para i-unlock ang telepono mo, awtorisahan ang mga pagbili, o mag-sign in sa mga app"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Maaari kang magdagdag ng hanggang <xliff:g id="COUNT">%d</xliff:g> (na) fingerprint"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Igitna ang iyong mukha sa bilog"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Gawin ito mamaya"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Maaari kang magdagdag ng hanggang <xliff:g id="COUNT">%d</xliff:g> (na) mukha"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Naidagdag mo na ang maximum na bilang ng mukha"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Hindi na makapagdagdag ng higit pang mukha"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Hindi nakumpleto ang pag-enroll"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Naabot na ang limitasyon sa oras ng pag-enroll ng mukha. Subukang muli."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Hindi gumana ang pag-enroll ng mukha."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Handa na ang lahat. Mukhang maganda."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Tapos na"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Gamitin ang mukha para"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"I-unlock ang device"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Pag-sign in/pagbabayad sa app"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Buksan ang mata para i-unlock"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Kapag ginamit ang pag-authenticate ng mukha, nakabukas dapat ang mata"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Alisin ang face data"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Pahusayin ang data ng mukha mo"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Maaaring gamitin ang iyong mukha para i-unlock ang iyong device at mag-access ng mga app. "<annotation id="url">"Matuto pa"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Pamahalaan fingerprint"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gamit fingerprint para"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Pumili ng kahit isang band para sa Wi‑Fi hotspot:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Mga setting ng IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Privacy"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Mangyaring pumili"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Kanselahin"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Kalimutan ang network?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Made-delete ang lahat ng password para sa network na ito"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Mga naka-save na network"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d network</item>
<item quantity="other">%d na network</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Brightness"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ayusin ang liwanag ng screen"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Naka-on"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Naka-off"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Napakadilim ang gustong liwanag"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Mababa ang gustong liwanag"</string>
@@ -1134,15 +1140,15 @@
<string name="night_display_summary_off" msgid="1792750041697946539">"Naka-off / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Hindi awtomatikong mag-o-on kailanman"</string>
<string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"Awtomatikong mag-o-on nang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Awtomatikong mag-o-on sa paglubog ng araw"</string>
+ <string name="night_display_summary_off_auto_mode_twilight" msgid="3596291693781757392">"Awtomatikong mag-o-on sa sunset"</string>
<string name="night_display_summary_on" msgid="1355713529996456744">"Naka-on / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_summary_on_auto_mode_never" msgid="9117830821363119835">"Hindi awtomatikong mag-o-off kailanman"</string>
<string name="night_display_summary_on_auto_mode_custom" msgid="5510753572245577263">"Awtomatikong mag-o-off nang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Awtomatikong mag-o-off sa pagsikat ng araw"</string>
+ <string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Awtomatikong mag-o-off sa sunrise"</string>
<string name="night_display_activation_on_manual" msgid="277343561277625826">"I-on ngayon"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"I-off ngayon"</string>
- <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"I-on hanggang pagsikat ng araw"</string>
- <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"I-off hanggang paglubog ng araw"</string>
+ <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"I-on hanggang sunrise"</string>
+ <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"I-off hanggang sunset"</string>
<string name="night_display_activation_on_custom" msgid="5472029024427933598">"I-on hanggang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_activation_off_custom" msgid="6169984658293744715">"I-off hanggang <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Hindi mapalitan ang PIN.\nPosibleng maling PIN."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Matagumpay na binago ang PIN ng SIM"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Hindi mabago ang katayuan ng lock ng SIM card.\nPosibleng maling PIN."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Hindi ma-disable ang PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Hindi ma-enable ang PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Kanselahin"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Maraming SIM ang nakita"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Kailangan nitong ma-format ang <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"Binubura ng pagfo-format ang lahat ng data na kasalukuyang nakaimbak sa <xliff:g id="NAME_1">^1</xliff:g>."</b>" Upang maiwasang mawalan ng data, isaalang-alang ang pagba-back up dito."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Burahin at i-format"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Pino-format ang <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Huwag alisin ang <xliff:g id="NAME">^1</xliff:g> habang fino-format ito."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Huwag alisin ang <xliff:g id="NAME">^1</xliff:g> habang fino-format ito."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Maglipat ng data sa bagong storage"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Maaari mong ilipat ang iyong mga larawan, file at ilang app sa bagong <xliff:g id="NAME">^1</xliff:g> na ito. \n\nMagtatagal ng humigit-kumulang <xliff:g id="TIME">^2</xliff:g> ang paglilipat at magbabakante ito ng <xliff:g id="SIZE">^3</xliff:g> sa internal storage. Hindi gagana ang ilang app habang isinasagawa ito."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Maglipat ngayon"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Naka-install"</string>
<string name="no_applications" msgid="7336588977497084921">"Walang app."</string>
<string name="internal_storage" msgid="1584700623164275282">"Panloob na storage"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Storage na USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD card storage"</string>
<string name="recompute_size" msgid="7722567982831691718">"Muling kino-compute ang laki…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"I-delete ang data ng app?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Permanenteng made-delete ang lahat ng data ng app na ito. Kabilang dito ang lahat ng file, setting, account, database, atbp."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Hindi natagpuan ang app sa listahan ng naka-install na apps."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Hindi ma-clear ang storage para sa app."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Maaaring i-access ng app na ito ang sumusunod sa iyong tablet:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Maa-access ng app na ito ang sumusunod sa iyong telepono:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Maaaring i-access ng app na ito ang sumusunod sa iyong tablet. Upang mapabuti ang performance at mabawasan ang paggamit ng memory, available ang ilan sa mga pahintulot na ito sa <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> dahil tumatakbo ito sa parehong proseso tulad ng sa <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Maaaring i-access ng app na ito ang sumusunod sa iyong telepono. Upang mapabuti ang performance at mabawasan ang paggamit ng memory, available ang ilan sa mga pahintulot na ito sa <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> dahil tumatakbo ito sa parehong proseso tulad ng sa <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> at <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Maaari kang singilin ng pera ng app na ito:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Ipadala ang premium na SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Kino-compute…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Hindi makalkula ang laki ng package."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Wala kang anumang naka-install na apps ng third-party."</string>
<string name="version_text" msgid="9189073826278676425">"bersyon <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Ilipat"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Ilipat sa tablet"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Ilipat sa telepono"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Ilipat sa storage na USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Lumipat sa SD card"</string>
- <string name="moving" msgid="6431016143218876491">"Paglilipat"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Mayroon nang kasalukuyang isinasagawang isa pang paglipat."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Hindi sapat na espasyo ng storage."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Hindi umiiral ang app."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Hindi maaaring i-install sa external na media ang app ng admin ng device"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Sapilitang itigil?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Kung sapilitan mong ititigil ang isang app, maaari itong kumilos nang hindi tama."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Hindi mailipat ang app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Ninanais na lokasyon sa pag-install"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Baguhin ang ninanais na lokasyon ng pag-install para sa bagong apps"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"I-disable ang built-in na app?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"I-disable ang app"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Kung idi-disable mo ang app na ito, maaaring hindi na gumana ang Android at iba pang mga app gaya ng inaasahan."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"I-delete ang data at i-disable ang app?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Kung idi-disable mo ang app na ito, maaaring hindi na gumana ang Android at iba pang mga app gaya ng inaasahan. Made-delete din ang iyong data."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"I-off ang mga notification?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Kung i-o-off mo ang mga notification para sa app na ito, maaari mong makaligtaan ang mahahalagang alerto at update."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Mga detalye ng app"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Na-install ang app mula sa <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Gumamit ng serbisyo"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Gumamit ng pagwawasto ng kulay"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Gumamit ng mga caption"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Magpatuloy"</string>
<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="6371077608778830020">"Magdagdag ng hearing aid"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Kung lilimitahan mo ang aktibidad sa background ng app, maaari itong gumana nang hindi tama"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Hindi nakatakda ang app na mag-optimize ng baterya kaya hindi ito malilimitahan.\n\nPara malimitahan, i-on ang battery optimization."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Paggamit ng screen mula noong napuno ang baterya"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Pagkonsumo ng screen"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Pag-scan ng mobile network"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Paggamit ng baterya mula noong punong pag-charge"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Haba ng oras na naka-on ang screen mula noong napuno ang baterya"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Paggamit ng device mula noong napuno ang baterya"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Mga detalye ng paggamit"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Isaayos ang paggamit ng power"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Mga kasamang package"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Mga app na umuubos ng baterya"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Panatilihing aktibo ang device"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Pinapagana ang device sa background"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Madalas humiling ng lokasyon"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> (na) app na hindi normal na gumagana"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Gumagana nang normal ang mga app"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Karaniwan lang ang paggamit ng baterya sa background ng telepono"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Karaniwan lang ang paggamit ng baterya sa background ng tablet"</string>
@@ -2234,6 +2221,7 @@
<item quantity="one">Paglimita sa paggamit ng baterya para sa %1$d app</item>
<item quantity="other">Paglimita sa paggamit ng baterya para sa %1$d na app</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Pinaghigpitan <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Ginagamit ng mga app na ito ang baterya sa background. Maaaring hindi gumana nang maayos ang mga pinaghihigpitang app at maaaring maantala ang mga notification."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Gumamit ng Battery Manager"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Tukuyin kapag umuubos ng baterya ang mga app"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Kanselahin"</string>
<string name="tts_reset" msgid="2661752909256313270">"I-reset"</string>
<string name="tts_play" msgid="2628469503798633884">"I-play"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Kontrol ng power"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ina-update ang setting ng Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Pag-update ng setting ng Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"naka-on"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"naka-off"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"pag-on"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"pag-off"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Lokasyon"</string>
- <string name="gadget_sync" msgid="858895763714222152">"I-sync"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Brightness <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"awtomatiko"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"buo"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"kalahati"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"naka-off"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Storage ng kredensyal"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"I-install mula sa storage"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> sa <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Piliin lahat"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Paggamit ng data"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Paggamit ng data ng app"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobile data at Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Ang accounting ng data ng carrier ay maaaring naiiba sa iyong device."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Paggamit ng app"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"IMPORMASYON NG APP"</string>
@@ -2962,7 +2933,6 @@
<item quantity="one">Ipakita ang %d nakatagong item</item>
<item quantity="other">Ipakita ang %d na nakatagong item</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"I-collapse"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Network at internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobile"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"paggamit ng data"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Mga app at notification"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Mga pahintulot, mga default na app"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Hindi available ang access sa notification para sa mga app sa profile sa trabaho."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Mga Account"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Walang naidagdag na account"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Mga default na app"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Mga wika, oras, backup, update"</string>
<string name="search_results_title" msgid="1796252422574886932">"Mga Setting"</string>
- <string name="search_menu" msgid="6283419262313758339">"Hanapin sa mga setting"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, koneksyon sa network, internet, wireless, data, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, i-toggle, pagkontrol"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"text message, pag-text, mga mensahe, pagmemensahe, default"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"magbayad, mag-tap, mga pagbabayad"</string>
<string name="keywords_backup" msgid="470070289135403022">"backup, i-back up"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"galaw"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"mukha, i-unlock, auth, mag-sign in"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, bersyon ng prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"network, status ng mobile network, status ng serbisyo, lakas ng signal, uri ng mobile network, naka-roaming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"serial number, bersyon ng hardware"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"madilim na tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"bug"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ambient na display, Display ng lock screen"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"notification sa lock screen"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"mukha"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"fingerprint"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"madilim na screen, touchscreen, baterya, smart brightness, dynamic na liwanag"</string>
@@ -3234,7 +3206,7 @@
<string name="notification_importance_blocked" msgid="7938180808339386300">"Huwag kailanman magpakita ng mga notification"</string>
<string name="notification_importance_min" msgid="9054819132085066824">"Ipakita nang tahimik at i-minimize"</string>
<string name="notification_importance_low" msgid="2445139943005315690">"Ipakita nang tahimik"</string>
- <string name="notification_importance_default" msgid="5958338024601957516">"Gumawa ng tunog"</string>
+ <string name="notification_importance_default" msgid="5958338024601957516">"Tumunog"</string>
<string name="notification_importance_high" msgid="2082429479238228527">"Gumawa ng tunog at mag-pop up sa screen"</string>
<string name="notification_importance_high_silent" msgid="2667033773703765252">"Mag-pop sa screen"</string>
<string name="notification_importance_min_title" msgid="6974673091137544803">"Mababa"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Kapag inilagay mo ang PIN upang buksan ang device na ito, hindi pa magiging available ang mga serbisyo sa pagiging naa-access tulad ng <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Kapag inilagay mo ang pattern upang buksan ang device na ito, hindi pa magiging available ang mga serbisyo sa pagiging naa-access tulad ng <xliff:g id="SERVICE">%1$s</xliff:g> ."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Kapag inilagay mo ang iyong password upang buksan ang device na ito, hindi pa magiging available ang mga serbisyo sa pagiging naa-access tulad ng <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Tandaan: Pagkatapos ng pag-reboot, hindi makakapagsimula ang app na ito hangga\'t hindi mo ina-unlock ang iyong telepono"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Tandaan: Kung ire-restart mo ang iyong telepono at may nakatakdang lock ng screen, hindi makakapagsimula ang app na ito hanggang sa i-unlock mo ang telepono mo"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Impormasyon ng IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Kaugnay na impormasyon ng IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Slot<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Personal"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Trabaho"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Mga App: Lahat"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Mga App: Naka-off"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Naka-off"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Mga Kategorya: Mahalagang-mahalaga"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Mga Kategorya: Hindi Mahalaga"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Mga Kategorya: Naka-off"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Mga alerto sa paggamit"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Ipakita ang paggamit ng device"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Ipakita ang paggamit ng app"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Malakas gumamit ng baterya"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one">Hindi gumagana nang maayos ang <xliff:g id="NUMBER">%2$d</xliff:g> app</item>
<item quantity="other">Hindi gumagana nang maayos ang <xliff:g id="NUMBER">%2$d</xliff:g> na app</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Internal storage: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ang ginagamit - <xliff:g id="FREE_SPACE">%2$s</xliff:g> ang bakante"</string>
<string name="display_summary" msgid="6737806235882127328">"Mag-sleep pagkalipas ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> na walang aktibidad"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Wallpaper, sleep, laki ng font"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Mag-sleep pagkalipas ng 10 minuto na walang aktibidad"</string>
<string name="memory_summary" msgid="8080825904671961872">"Avg <xliff:g id="USED_MEMORY">%1$s</xliff:g> ng <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ng ginamit na memory"</string>
<string name="users_summary" msgid="1674864467098487328">"Naka-sign in bilang <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Hindi pinapayagan ang SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Hindi pinapayagan ang camera"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Hindi pinapayagan ang pag-screenshot"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Hindi mao-off ang mga backup"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Hindi mabubuksan ang app na ito"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Kung mayroon kang mga tanong, makipag-ugnayan sa iyong IT admin"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Higit pang mga detalye"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Mag-simulate ng display sa pamamagitan ng cutout"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Wala"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Default ng device"</string>
<string name="special_access" msgid="3458780842491881155">"Espesyal na access ng app"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one">May <xliff:g id="COUNT">%d</xliff:g> app na maaaring gumamit ng walang limitasyong data</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Nakakonekta sa <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Nakakonekta sa maraming device"</string>
<string name="demo_mode" msgid="2798762752209330277">"Demo mode ng System UI"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Night mode"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Itakda ang Night mode"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Dark mode"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Itakda ang Dark mode"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mga tile ng developer para sa mga mabilisang setting"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Trace ng Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Mga setting ng profile sa trabaho"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Paghahanap ng contact"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Payagan ang iyong organisasyon na maghanap ng contact upang makilala ang mga tumatawag at contact"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Mag-double tap para suriin ang telepono"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Mag-double tap upang suriin ang tablet"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Mag-double tap upang suriin ang device"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Upang tingnan ang oras, mga icon ng notification, at iba pang impormasyon, i-double tap ang iyong screen."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Para tingnan ang oras, mga notification, at iba pang impormasyon, i-double tap ang iyong screen."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Hawakan para i-check ang phone"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Kunin upang suriin ang tablet"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Kunin upang suriin ang device"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Upang tingnan ang oras, mga icon ng notification, at iba pang impormasyon, kunin ang iyong telepono."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Upang tingnan ang oras, mga icon ng notification, at iba pang impormasyon, kunin ang iyong tablet."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Upang tingnan ang oras, mga icon ng notification, at iba pang impormasyon, kunin ang iyong device."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"I-wake up ang display"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Para tingnan ang oras, mga notification, at iba pang impormasyon, kunin ang iyong telepono."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Para tingnan ang oras, mga notification, at iba pang impormasyon, kunin ang iyong tablet."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Para tingnan ang oras, mga notification, at iba pang impormasyon, kunin ang iyong device."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Galaw para sa wake lock screen"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"I-swipe ang fingerprint para sa mga notification"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"I-swipe ang fingerprint"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para makita ang iyong mga notification, mag-swipe pababa sa sensor para sa fingerprint sa likod ng telepono mo."</string>
@@ -4075,7 +4050,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> pagsubok</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> na pagsubok</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Bina-back up ang data ng device na ito"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Ang device na ito ay pinamamahalaan ng iyong organisasyon."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Pinamamahalaan ng <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> ang device na ito."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Serbisyo ng autofill"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"awtomatiko, punan, autofill"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Tiyaking pinagkakatiwalaan mo ang app na ito</b> <br/> <br/> Ginagamit ng <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ang nasa iyong screen para matukoy kung ano ang pwedeng i-autofill."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"I-autofill"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Antas ng pag-log"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Maximum na kahilingan sa bawat session"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Max ng mga nakikitang dataset"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"I-reset sa mga default na value"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Na-reset ang mga autofill na opsyon ng developer"</string>
<string name="device_theme" msgid="4571803018917608588">"Tema ng device"</string>
<string name="default_theme" msgid="7085644992078579076">"Default"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Pangalan ng network"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"I-trigger ang Provisioning ng Carrier"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"I-update ang Huwag Istorbohin"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"I-pause ang mga notification para manatiling nakatuon ang pansin"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Ano ang bago at kapana-panabik?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Maglibot sa iyong bagong telepono"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Maglibot sa iyong bagong tablet"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Maglibot sa iyong bagong device"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Hindi available ang feature na ito sa device na ito"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Ipatupad ang kumpletong sukat ng GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Sinusubaybayan ang lahat ng constellation at dalas ng GNSS nang walang duty cycling"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Palaging ipakita ang dialog ng pag-crash"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Magpakita ng dialog sa tuwing magka-crash ang isang app"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Pumili ng app na may naka-enable na ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Walang nakatakdang application na may naka-enable na ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Application na may naka-enable na ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Access sa direktoryo"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"access sa direktoryo"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Mga detalye ng network"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Nakikita ang pangalan ng iyong device sa mga app sa iyong telepono. Maaari rin itong makita ng ibang tao kapag kumonekta ka sa mga Bluetooth device o nag-set up ka ng Wi-Fi hotspot."</string>
<string name="devices_title" msgid="7701726109334110391">"Mga Device"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Lahat ng Setting"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Mga Mungkahi"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Data ng CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Data ng CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Pumili ng network"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Nadiskonekta"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Nakakonekta"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Kumokonekta…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Hindi makakonekta"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Walang nakitang network."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Hindi makahanap ng mga network. Subukang muli."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ipinagbabawal)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Walang SIM card"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Advanced na Pagtawag"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Mas gustong network mode: WCDMA ang mas gusto"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Mas gustong network mode: GSM lang"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Mas gustong network mode: WCDMA lang"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Mas gustong network mode: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Mas gustong network mode: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Mas gustong network mode: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Mas gustong network mode: CDMA lang"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Mas gustong network mode: EvDo lang"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Mas gustong network mode: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Mas gustong network mode: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Mas gustong network mode: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Mas gustong network mode: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Mas gustong network mode: Pangkalahatan"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Mas gustong network mode: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Mas gustong network mode: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Mas gustong network mode: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Mas gustong network mode: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Mas gustong network mode: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Mas gustong network mode: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Mas gustong network mode: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Mas gustong network mode: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Mas gustong network mode: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Mas gustong network mode: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Mas gustong network mode: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Mas gustong network mode: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Mas gustong network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (inirerekomenda)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (inirerekomenda)"</string>
+ <string name="network_global" msgid="959947774831178632">"Pangkalahatan"</string>
+ <string name="label_available" msgid="1731547832803057893">"Mga available na network"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Naghahanap…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Nagpaparehistro sa <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Hindi pinapayagan ng iyong SIM card ang koneksyon sa network na ito."</string>
+ <string name="connect_later" msgid="978991102125216741">"Hindi makakonekta sa network na ito sa ngayon. Subukang muli sa ibang pagkakataon."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Nakarehistro sa network."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Awtomatikong piliin ang network"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Mga setting ng carrier"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"I-set up ang serbisyo ng data"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobile data"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"I-access ang data gamit ang mobile network"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Mas gustong network type"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Baguhin ang network operating mode"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Mas gustong network type"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Carrier"</string>
+ <string name="call_category" msgid="8108654745239563833">"Pagtawag"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Pakikipag-video call gamit ang carrier"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Pagpili ng system"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Baguhin ang CDMA roaming mode"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Pagpili ng system"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Network"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Network"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Subscription ng CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Magpalit sa pagitan ng RUIM/SIM at NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"subscription"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Awtomatikong pagpaparehistro…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Payagan ang data roaming?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Magtanong sa iyong network provider para sa pagpepresyo."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Paggamit ng data ng app"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Invalid ang Network Mode na <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Balewalain."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Hindi available kapag nakakonekta sa <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Tumingin pa"</string>
+ <string name="see_less" msgid="1250265310929558370">"Tumingin nang kaunti"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 301a852..989ed96 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Sınırlı olarak ele al"</item>
<item msgid="2266114985518865625">"Sınırsız olarak ele al"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Varsayılan (rastgele MAC kullan)"</item>
+ <item msgid="5398461510512959597">"Güvenilir"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Hayır"</item>
<item msgid="3863157480502955888">"Evet"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Her zaman açık"</item>
<item msgid="6385301106124765323">"Her zaman kapalı"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Kapalı"</item>
+ <item msgid="2182686878828390312">"Hata ayıklama"</item>
+ <item msgid="5286514712714822064">"Ayrıntılı"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Yalnızca ev"</item>
+ <item msgid="5034813753274486448">"Otomatik"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA tercih edilen"</item>
+ <item msgid="807926878589867564">"Yalnızca GSM"</item>
+ <item msgid="488474605709912156">"Yalnızca WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA otomatik"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo otomatik"</item>
+ <item msgid="370391313511477301">"EvDo olmadan CDMA"</item>
+ <item msgid="4678789463133969294">"Yalnızca EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Genel"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Yalnızca TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Genel"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b2f1cff..0093984 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Oluştur"</string>
<string name="allow" msgid="3349662621170855910">"İzin ver"</string>
<string name="deny" msgid="6947806159746484865">"Reddet"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Kapat"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Değiştir"</string>
<string name="device_info_default" msgid="7847265875578739287">"Bilinmiyor"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Geliştirici olmanıza <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> adım kaldı.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Gerekli değil, siz zaten bir geliştiricisiniz."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Lütfen önce geliştirici seçeneklerini etkinleştirin."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Kablosuz ve ağlar"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Bağlantılar"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Cihaz"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Kişisel"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Erişim"</string>
<string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Veri Bağlantısını Etkinleştir"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Veri Bağlantısını Devre Dışı Bırak"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Cihazın Bluetooth adresi: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bağlantısı kesilsin mi?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Yayınlama"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Adsız Bluetooth cihazı"</string>
<string name="progress_scanning" msgid="192587958424295789">"Arıyor"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Yakınlarda Bluetooth cihazı bulunamadı."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Bir uygulama, Bluetooth\'u açmak ve telefonunuzu diğer cihazlara görünebilir yapmak istiyor. Bunu daha sonra Bluetooth ayarlarından değiştirebilirsiniz."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth açılıyor..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kapatılıyor..."</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Otomatik bağlan"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth bağlantısı isteği"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak için dokunun."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak istiyor musunuz?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Kullanılabilir çağrı cihazları"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Şu anda bağlı"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Kayıtlı cihazlar"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Cihaz ekle"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth, eşleme işlemi için açılır"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Bağlantı tercihleri"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Daha önce bağlanılmış cihazlar"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Daha önce bağlanılmış cihazlar"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth açık"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Tümünü göster"</string>
<string name="date_and_time" msgid="9062980487860757694">"Tarih ve saat"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Saat dilimini seçin"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Atla"</string>
<string name="next_label" msgid="4693520878012668114">"İleri"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Diller"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Dil tercihleri"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Kaldır"</string>
<string name="add_a_language" msgid="2330538812283783022">"Dil ekle"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Ayarlar"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Ayarlar kısayolu"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Uçak modu"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Diğer"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Kablosuz özelliği ve ağlar"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Kablosuz, Bluetooth, uçak modu, mobil ağlar ve VPN\'leri yönet"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobil veri"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Gizlilik"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Yönetici devre dışı bıraktı"</string>
<string name="security_status_title" msgid="5848766673665944640">"Güvenlik durumu"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Ekran kilidi, yüz tanıma kilidi"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Ekran kilidi, parmak izi"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekran kilidi"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Yüz eklendi"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Yüzünüzle kilidi açın"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Kimlik doğrulama için yüzünüzü kullanın"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için yüzünüzü kullanın."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Yüzünüzü kullanma"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Telefonunuzun kilidini açmak veya bir satın alma işlemini onaylamak için yüzünüzü kullanın.\n\nNot: Bu cihazın kilidini açmak için yüzünüzü kullanamazsınız. Daha fazla bilgi için kuruluşunuzun yöneticisine başvurun."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Telefonunuzun kilidini açmak, satın alma işlemlerini yetkilendirmek veya uygulamalarda oturum açmak için yüzünüzü kullanın"</string>
- <string name="face_add_max" msgid="2342250989212694454">"<xliff:g id="COUNT">%d</xliff:g> adede kadar parmak izi ekleyebilirsiniz"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Yüzünüzü çemberin ortasına getirin"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Daha sonra yap"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"<xliff:g id="COUNT">%d</xliff:g> adede kadar yüz ekleyebilirsiniz"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Maksimum sayıda yüz eklediniz"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Başka yüz ekleyemezsiniz"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Kayıt işlemi tamamlanmadı"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"Tamam"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Yüz kayıt işlemi için süre sınırı aşıldı. Tekrar deneyin."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Yüz kaydı yapılamadı."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Ayarlandı. Her şey iyi görünüyor."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Bitti"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Yüzünüzle şunları yapın:"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Cihazınızın kilidini açın"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Uygulamada oturum açma ve ödemeler"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Kilidi açmak için gözler açık"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Yüzle kimlik doğrulamayı kullanırken gözleriniz açık olmalıdır"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Yüz verisini kaldır"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Yüz verinizi iyileştirin"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Yüzünüzü kullanarak cihazınızın kilidini açabilir ve uygulamalara erişebilirsiniz. "<annotation id="url">"Daha fazla bilgi"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Parmak izi"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Parmak izi yönetimi"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Parmak izi kullanımı:"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Kablosuz hotspot için en az bir grup seçin:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ayarları"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Gizlilik"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Lütfen seçin"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"İptal"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Ağ unutulsun mu?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Bu ağ için tüm şifreler silinecek"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Kayıtlı ağlar"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d ağ</item>
<item quantity="one">1 ağ</item>
@@ -998,7 +1005,7 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Dolaşım tercihi"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"Kablosuz bağlantı tercih edildi"</item>
+ <item msgid="2124257075906188844">"Kablosuz bağlantı tercihli"</item>
<item msgid="1335127656328817518">"Mobil tercihli"</item>
<item msgid="3132912693346866895">"Yalnızca kablosuz"</item>
</string-array>
@@ -1013,7 +1020,7 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"Kablosuz bağlantı tercih edildi"</item>
+ <item msgid="5782108782860004851">"Kablosuz bağlantı tercihli"</item>
<item msgid="5074515506087318555">"Mobil tercihli"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Parlaklık"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ekranın parlaklığını ayarla"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Uyarlanan parlaklık"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Açık"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Kapalı"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Tercih ettiğiniz parlaklık çok düşük"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Tercih ettiğiniz parlaklık düşük"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN değiştirilemiyor.\nPIN yanlış olabilir."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN kodu başarıyla değiştirildi"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM kartın kilit durumu değiştirilemiyor.\nPIN yanlış olabilir."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN devre dışı bırakılamıyor."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN etkinleştirilemiyor."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"Tamam"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"İptal"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Birden çok SIM bulundu"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Bu işlem <xliff:g id="NAME_0">^1</xliff:g> biriminin biçimlendirilmesini gerektiriyor. \n\n"<b>"Biçimlendirme işlemi şu anda <xliff:g id="NAME_1">^1</xliff:g> biriminde depolanmış olan tüm verileri siler."</b>" Veri kaybını önlemek için birimi yedeklemeniz önerilir."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Sil ve biçimlendir"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> biçimlendiriliyor…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Biçimlendirilirken <xliff:g id="NAME">^1</xliff:g> birimini çıkarmayın."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Biçimlendirilirken <xliff:g id="NAME">^1</xliff:g> birimini çıkarmayın."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Verileri yeni depol. birim. taşı"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Fotoğraflarınızı, dosyalarınızı ve bazı uygulamaları bu yeni <xliff:g id="NAME">^1</xliff:g> birimine taşıyabilirsiniz. \n\nTaşıma işlemi yaklaşık <xliff:g id="TIME">^2</xliff:g> sürer ve dahili depolama biriminde <xliff:g id="SIZE">^3</xliff:g> yer açar. Bu işlem sürerken bazı uygulamalar çalışmaz."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Şimdi taşı"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Yüklendi"</string>
<string name="no_applications" msgid="7336588977497084921">"Uygulama yok."</string>
<string name="internal_storage" msgid="1584700623164275282">"Dahili Bellek"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"dahili depolama"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB bellek"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD kart dep brm"</string>
<string name="recompute_size" msgid="7722567982831691718">"Boyut yeniden hesaplanıyor…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Uygulama verileri silinsin mi?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Bu uygulamanın tüm verileri kalıcı olarak silinecek. Bu veriler arasında tüm dosyalar, ayarlar, hesaplar, veritabanları vb. yer alıyor."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Uygulama, yüklü uygulamalar listesinde bulunamadı."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Uygulama depolama alanı temizlenemedi."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Bu uygulama tabletinizde şunlara erişebilir:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Bu uygulama telefonunuzda şunlara erişebilir:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Bu uygulama tabletinizde aşağıdakilere erişebilir. Performansı iyileştirmek ve bellek kullanımını azaltmak için bu izinlerden bazıları, <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ile aynı süreçte çalıştığından <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> tarafından kullanılabilir:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Bu uygulama telefonunuzda aşağıdakilere erişebilir. Performansı iyileştirmek ve bellek kullanımını azaltmak için bu izinlerden bazıları, <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ile aynı süreçte çalıştığından <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> tarafından kullanılabilir:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ve <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Bu uygulama sizden ücret alabilir:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Premium SMS gönder"</string>
<string name="computing_size" msgid="1599186977475211186">"Hesaplanıyor…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Paket boyutu hesaplanamadı."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Yüklü üçüncü taraf uygulamanız yok."</string>
<string name="version_text" msgid="9189073826278676425">"sürüm <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Taşı"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Tablete taşı"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Telefona taşı"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB belleğe taşı"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD karta taşı"</string>
- <string name="moving" msgid="6431016143218876491">"Taşınıyor"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Başka bir taşıma işlemi zaten çalışıyor."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Yeterli depolama alanı yok."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Uygulama mevcut değil."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Cihaz yönetimi uygulaması harici medyaya yüklenemez"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Durmaya zorlansın mı?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Uygulamayı zorla durdurursanız, hatalı davranabilir."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Uygulama taşınamıyor. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Tercih edilen yükleme konumu"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Yeni uygulamalar için tercih edilen yükleme konumunu değiştir"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Yerleşik uygulama devre dışı bırakılsın mı?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Uygulamayı devre dışı bırak"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Bu uygulamayı devre dışı bırakırsanız Android ve diğer uygulamalar artık beklendiği gibi çalışmayabilir."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Veriler silinsin ve uygulama devre dışı bırakılsın mı?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Bu uygulamayı devre dışı bırakırsanız Android ve diğer uygulamalar artık beklendiği gibi çalışmayabilir. Ayrıca verileriniz silinir."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Bildirimler kapatılsın mı?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Bu uygulama için bildirimleri kapatırsanız, önemli uyarıları ve güncellemeleri kaçırabilirsiniz."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Mağaza"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Uygulama ayrıntıları"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Uygulama <xliff:g id="APP_STORE">%1$s</xliff:g> üzerinden yüklendi"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Hizmeti kulan"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Renk düzeltme işlevini kullan"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Altyazıları kullan"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Devam"</string>
<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="6371077608778830020">"İşitme cihazı ekleyin"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Uygulama için arka plan etkinliğini sınırlarsanız hatalı davranabilir"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Uygulama, pili optimize etmek için ayarlanmadığından kısıtlanamaz.\n\nUygulamayı kısıtlamak için önce pil optimizasyonunu açın."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Tam şarj sonrası ekran kullanımı"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın pil tüketimi"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobil ağ tarama"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Tam şarjdan beri pil kullanımı"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Tam şarjdan sonra ekranın açık olduğu süre"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Tam şarj sonrası cihaz kullanımı"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Kullanım ayrıntıları"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Pil kullanımını ayarla"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Dahil olan paketler"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Pili tüketen uygulamalar"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Cihazı uyanık tutuyor"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Cihazı arka planda uyku modundan çıkarıyor"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Sık sık konum bilgisi istiyor"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> uygulama hatalı çalışıyor"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Uygulamalar normal şekilde çalışıyor"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefonda arka planda pil kullanımı tipik düzeyde"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Tablette arka planda pil kullanımı tipik düzeyde"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d uygulama için pil kullanımı sınırlanıyor</item>
<item quantity="one">%1$d uygulama için pil kullanımı sınırlanıyor</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"<xliff:g id="TIME">%1$s</xliff:g> kısıtlandı"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Bu uygulamalar arka planda pil kullanıyor. Kısıtlanmış uygulamalar düzgün çalışmayabilir ve bildirimlerde gecikme olabilir."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Pil Yöneticisi\'ni kullan"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Uygulamalar pili çok harcadığında algıla"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"İptal"</string>
<string name="tts_reset" msgid="2661752909256313270">"Sıfırla"</string>
<string name="tts_play" msgid="2628469503798633884">"Çal"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Güç denetimi"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Kablosuz ayarı güncelleniyor"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ayarları güncelleniyor"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"açık"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"kapalı"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"açılıyor"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"kapatılıyor"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Kablosuz"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Konum"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Senkronizasyon"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Parlaklık <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"otomatik"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"tam"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"yarım"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"kapalı"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Kimlik bilgileri deposu"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Depolama biriminden yükle"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Tümünü seç"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Veri kullanımı"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Uygulama veri kullanımı"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobil veri ve Kablosuz"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Operatörünüzün veri hesaplaması, cihazınızınkinden farklı olabilir."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Uygulama kullanımı"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"UYGULAMA BİLGİLERİ"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Gizli %d öğeyi göster</item>
<item quantity="one">Gizli %d öğeyi göster</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Daralt"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Ağ ve İnternet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"veri kullanımı"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Uygulamalar ve bildirimler"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"İzinler, varsayılan uygulamalar"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"İş profilindeki uygulamalar için bildirim erişimi kullanılamaz."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Hesaplar"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Hiçbir hesap eklenmedi"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Varsayılan uygulamalar"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Diller, saat, yedek, güncellemeler"</string>
<string name="search_results_title" msgid="1796252422574886932">"Ayarlar"</string>
- <string name="search_menu" msgid="6283419262313758339">"Ayarlarda arayın"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"kablosuz, ağ bağlantısı, internet, kablosuz bağlantı, veri"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"kablosuz, kablosuz ağ, aç/kapat, kontrol"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"kısa mesaj, kısa mesaj gönderme, mesajlar, mesajlaşma, varsayılan"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ödeme, dokunma, ödemeler"</string>
<string name="keywords_backup" msgid="470070289135403022">"yedek, yedekleme"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"hareket"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"yüz, kilidi açma, kimlik doğrulama, oturum açma"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl sürümü, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"ağ, mobil ağ durumu, hizmet durumu, sinyal gücü, mobil ağ türü, dolaşım, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"seri numarası, donanım sürümü"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"koyu tema"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"hata"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ekran ambiyansı, Ekran kilidi ekranı"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"kilit ekranı bildirimi"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"yüz"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"dijital parmak izi"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"ekranı karartma, dokunmatik ekran, pil, akıllı parlaklık, dinamik parlakık"</string>
@@ -3119,7 +3091,7 @@
<string name="zen_mode_restrict_notifications_mute" msgid="3690261619682396872">"Bildirimlerden sesli uyarı yok"</string>
<string name="zen_mode_restrict_notifications_mute_summary" msgid="5810076116489877312">"Bildirimleri ekranınızda göreceksiniz"</string>
<string name="zen_mode_restrict_notifications_mute_footer" msgid="3465600930732602159">"Bildirim geldiğinde telefonunuz ses çıkartmaz veya titreşmez."</string>
- <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Bildirimlerden görsel veya ses yok"</string>
+ <string name="zen_mode_restrict_notifications_hide" msgid="5305121630186687339">"Bildirimlerden görsel veya sesli uyarı yok"</string>
<string name="zen_mode_restrict_notifications_hide_summary" msgid="7555448406901864904">"Bildirimleri görmeyecek ve duymayacaksınız"</string>
<string name="zen_mode_restrict_notifications_hide_footer" msgid="6559283246372102465">"Telefonunuz yeni veya mevcut bildirimleri göstermez, ses çıkartmaz ve titreşmez. Parmağınızı ekranınızın üst kısmından aşağı doğru kaydırdığınızda bildirimler görünmez.\n\nTelefon işlemleri ve durumu ile ilgili önemli bildirimlerin gösterilmeye devam edeceğini unutmayın."</string>
<string name="zen_mode_restrict_notifications_custom" msgid="7498689167767941034">"Özel"</string>
@@ -3134,7 +3106,7 @@
<string name="zen_mode_block_effect_sound" msgid="7383953383758025895">"Ses ve titreşimi kapat"</string>
<string name="zen_mode_block_effect_intent" msgid="350764335391428447">"Ekranı açma"</string>
<string name="zen_mode_block_effect_light" msgid="8106976110224107316">"Işığı yakıp söndürme"</string>
- <string name="zen_mode_block_effect_peek" msgid="6836997464098657115">"Ekranda bildirimler gösterme"</string>
+ <string name="zen_mode_block_effect_peek" msgid="6836997464098657115">"Ekranda bildirim gösterme"</string>
<string name="zen_mode_block_effect_status" msgid="6642532634292373081">"Durum çubuğu simgelerini gizle"</string>
<string name="zen_mode_block_effect_badge" msgid="4656911773512844243">"Bildirim noktalarını gizle"</string>
<string name="zen_mode_block_effect_ambient" msgid="4704755879961212658">"Bildirimler için uyanma"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Bu cihazı başlatmak için PIN\'inizi girdiğinizde <xliff:g id="SERVICE">%1$s</xliff:g> gibi erişilebilirlik hizmetleri henüz kullanılabilir olmayacaktır."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Bu cihazı başlatmak için deseninizi girdiğinizde <xliff:g id="SERVICE">%1$s</xliff:g> gibi erişilebilirlik hizmetleri henüz kullanılabilir olmayacaktır."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Bu cihazı başlatmak için şifrenizi girdiğinizde <xliff:g id="SERVICE">%1$s</xliff:g> gibi erişilebilirlik hizmetleri henüz kullanılabilir olmayacaktır."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Not: Yeniden başlatma sonrasında, telefonunuzun kilidi açılıncaya kadar bu uygulama başlatılamaz"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Not: Telefonunuzu yeniden başlatırsanız ve ekran kilidi ayarlanmışsa siz telefonunuzun kilidini açana kadar bu uygulama başlayamaz."</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI bilgileri"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI göreli bilgileri"</string>
<string name="slot_number" msgid="3762676044904653577">"(Yuva<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,12 +3488,12 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Kişisel uygulamalar"</string>
<string name="filter_work_apps" msgid="24519936790795574">"İş uygulamaları"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Uygulamalar: Tümü"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Uygulamalar: Kapalı"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Kapatılanlar"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Kategoriler: Önem düzeyi acil"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Kategoriler: Önem düzeyi düşük"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Kategoriler: Kapalı"</string>
<string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Kategoriler: Rahatsız Etmeyin\'i geçersiz kılar"</string>
- <string name="advanced_apps" msgid="4812975097124803873">"İleri düzey"</string>
+ <string name="advanced_apps" msgid="4812975097124803873">"Gelişmiş"</string>
<string name="configure_apps" msgid="6685680790825882528">"Uygulamaları yapılandır"</string>
<string name="unknown_app" msgid="5275921288718717656">"Bilinmeyen uygulama"</string>
<string name="app_permissions" msgid="4148222031991883874">"Uygulama izinleri"</string>
@@ -3561,7 +3533,7 @@
<string name="permit_usage_access" msgid="4012876269445832300">"Kullanım erişimine izin ver"</string>
<string name="app_usage_preference" msgid="7065701732733134991">"Uygulama kullanım tercihleri"</string>
<string name="time_spent_in_app_pref_title" msgid="649419747540933845">"Uygulama içinde geçirilen süre"</string>
- <string name="usage_access_description" msgid="1352111094596416795">"Kullanım erişimi; bir uygulamanın, başka hangi uygulamaları ne sıklıkta kullandığınızı, ayrıca operatörünüzü, dil ayarlarınızı ve diğer ayrıntıları takip etmesine izin verir."</string>
+ <string name="usage_access_description" msgid="1352111094596416795">"Kullanım erişimi vermeniz halinde uygulama, başka hangi uygulamaları ne sıklıkta kullandığınızı, operatörünüzü, dil ayarlarınızı ve diğer ayrıntıları takip edebilir."</string>
<string name="memory_settings_title" msgid="7490541005204254222">"Bellek"</string>
<string name="memory_details_title" msgid="8542565326053693320">"Bellek ayrıntıları"</string>
<string name="always_running" msgid="6042448320077429656">"Her zaman çalışıyor (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Kullanım uyarıları"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Tam cihaz kullanımını göster"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Uygulama kullanımını göster"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Yüksek kullanım"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> uygulama anormal davranıyor</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> anormal davranıyor</item>
@@ -3683,7 +3654,7 @@
<string name="system_alert_window_settings" msgid="8466613169103527868">"Diğer uygulamaların üzerinde göster"</string>
<string name="system_alert_window_apps_title" msgid="7005760279028569491">"Uygulamalar"</string>
<string name="system_alert_window_access_title" msgid="6297115362542361241">"Diğer uygulamaların üzerinde göster"</string>
- <string name="permit_draw_overlay" msgid="7456536798718633432">"Diğer uyg. üstünde gösterime izin ver"</string>
+ <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>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Dahili depolama alanı: <xliff:g id="PERCENTAGE">%1$s</xliff:g> kullanılıyor - <xliff:g id="FREE_SPACE">%2$s</xliff:g> boş"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> süreyle işlem yapılmadığında uyku moduna geç"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Duvar kağıdı, uyku, yazı tipi boyutu"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 dakika işlem yapılmadığında uyku moduna geç"</string>
<string name="memory_summary" msgid="8080825904671961872">"Toplam <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> belleğin ortalama <xliff:g id="USED_MEMORY">%1$s</xliff:g> kadarı kullanılıyor"</string>
<string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> olarak oturum açıldı"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS\'e izin verilmiyor"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kameraya izin verilmiyor"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Ekran görüntüsüne izin verilmiyor"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Yedekler kapatılamaz"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Bu uygulama açılamaz"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Sorularınız olursa BT yöneticinizle iletişime geçin"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Diğer ayrıntılar"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Ekran girintisi simule et"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Ekran kesimi"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekran kesimi, çentik"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Yok"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Cihaz varsayılanı"</string>
<string name="special_access" msgid="3458780842491881155">"Özel uygulama erişimi"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> uygulama sınırsız veri kullanabilir</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> cihazına bağlı"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Birden çok cihaza bağlı"</string>
<string name="demo_mode" msgid="2798762752209330277">"Sistem Kullanıcı Arayüzü demo modu"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Gece modu"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Gece modunu ayarla"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Koyu mod"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Koyu modu ayarla"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Hızlı ayarlar geliştirici blokları"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope İzleme"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"İş profili ayarları"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kişi arama"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Arayanların ve kişilerin kimliğini belirlemek için kuruluşunuz tarafından yapılan kişi aramalarına izin verin"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefonu kontrol etmek için iki kez dokunun"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tableti kontrol etmek için iki kez dokunun"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Cihazı kontrol etmek için iki kez dokunun"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için ekranınıza iki kez dokunun."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için ekranınıza iki kez dokunun."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Bakmak için telefonu kaldır"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tableti kontrol etmek için kaldırın"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Cihazı kontrol etmek için kaldırın"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için telefonunuzu elinize alın."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için tabletinizi elinize alın."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Saati, bildirim simgelerini ve diğer bilgileri kontrol etmek için cihazınızı elinize alın."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Ekranı uyandır"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için telefonunuzu elinize alın."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için tabletinizi elinize alın."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için cihazınızı elinize alın."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Uyanık kalma kilidi ekran hareketi"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Bildirimler için parmak izini kaydırın"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Parmak izini kaydırın"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirimlerinizi kontrol etmek için telefonunuzun arkasındaki parmak izi sensöründe parmağınızı hızlıca aşağı kaydırın."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> deneme</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> deneme</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Bu cihazın verileri yedekleniyor"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Bu cihaz kuruluşunuz tarafından yönetiliyor."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Bu cihaz <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tarafından yönetiliyor."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Otomatik doldurma hizmeti"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"otomatik, doldur, otomatik doldur"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Bu uygulamaya güvendiğinizden emin olun</b> <br/> <br/> <xliff:g id=app_name example=Google Otomatik Doldurma>%1$s</xliff:g> otomatik doldurulabilecek öğeleri belirlemek için ekranınızdaki bilgileri kullanır."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Otomatik doldur"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Günlük kaydı düzeyi"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Oturum başına maksimum istek"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maks. görünür veri kümesi"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Varsayılan değerlere sıfırla"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Otomatik doldurma geliştirici seçenekleri sıfırlandı"</string>
<string name="device_theme" msgid="4571803018917608588">"Cihaz teması"</string>
<string name="default_theme" msgid="7085644992078579076">"Varsayılan"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Ağ adı"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Tetikleyici Operatör Temel Hazırlığı"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Rahatsız Etmeyin özelliğini güncelleyin"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Konsantrasyonunuzu bozmamak için bildirimleri duraklatın"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Yeni ve heyecan verici neler var?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yeni telefonunuzu tanıyın"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yeni tabletinizi tanıyın"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yeni cihazınızı tanıyın"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu özellik bu cihazda kullanılamıyor"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Tam GNSS ölçümlerini zorla"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Tüm GNSS takımyıldızlarını ve görev döngüsü olmayan frekansları takip et"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Kilitlenme iletişim kutusunu her zaman göster"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Her uygulama kilitlendiğinde iletişim kutusunu göster"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE özellikli uygulamayı seçin"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE özellikli uygulama ayarlanmadı"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE özellikli uygulama: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Dizin erişimi"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"dizin erişimi"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Ağ ayrıntıları"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Telefonunuzdaki uygulamalar cihazınızın adını görür. Bluetooth cihazlarına bağlandığınızda veya bir kablosuz hotspot ayarladığınızda başka kişiler de bu adı görebilir."</string>
<string name="devices_title" msgid="7701726109334110391">"Cihazlar"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Tüm Ayarlar"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Öneriler"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS Verileri"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS Verileri"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Ağ seç"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Bağlı değil"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Bağlı"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Bağlanıyor…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Bağlanılamadı"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Hiçbir ağ bulunamadı."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Ağ bulunamadı. Tekrar deneyin."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(yasak)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM kart yok"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Gelişmiş Arama"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Tercih edilen ağ modu: WCDMA tercih edilir"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Tercih edilen ağ modu: Yalnızca GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Tercih edilen ağ modu: Yalnızca WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Tercih edilen ağ modu: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Tercih edilen ağ modu: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Tercih edilen ağ modu: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Tercih edilen ağ modu: Yalnızca CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Tercih edilen ağ modu: Yalnızca EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Tercih edilen ağ modu: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Tercih edilen ağ modu: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Tercih edilen ağ modu: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Tercih edilen ağ modu: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Tercih edilen ağ modu: Dünya Genelinde"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Tercih edilen ağ modu: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Tercih edilen ağ modu: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Tercih edilen ağ modu: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Tercih edilen ağ modu: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Tercih edilen ağ modu: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Tercih edilen ağ modu: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Tercih edilen ağ modu: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Tercih edilen ağ modu: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Tercih edilen ağ modu: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Tercih edilen ağ modu: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Tercih edilen ağ modu: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Tercih edilen ağ modu: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Tercih edilen ağ modu: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (önerilir)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (önerilir)"</string>
+ <string name="network_global" msgid="959947774831178632">"Küresel"</string>
+ <string name="label_available" msgid="1731547832803057893">"Kullanılabilir ağlar"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Aranıyor…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> ağına kaydediliyor..."</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM kartınız bu ağa bağlanmaya izin vermiyor."</string>
+ <string name="connect_later" msgid="978991102125216741">"Bu ağa şu an bağlanılamıyor. Daha sonra tekrar deneyin."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Ağa kaydedildi."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Ağı otomatik seç"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operatör ayarları"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Veri hizmetini kurun"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobil veri"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Verilere mobil ağ üzerinden erişim"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tercih edilen ağ türü"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Ağın çalışma modunu değiştir"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tercih edilen ağ türü"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Operatör"</string>
+ <string name="call_category" msgid="8108654745239563833">"Çağrı"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operatör görüntülü görüşmesi"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Sistem seç"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA dolaşım modunu değiştir"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Sistem seç"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Ağ"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Ağ"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA aboneliği"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM ve NV arasında değiştir"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"abonelik"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Otomatik kayıt..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Veri dolaşımına izin verilsin mi?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Fiyat bilgisi için ağ sağlayıcınıza başvurun."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Uygulama veri kullanımı"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"<xliff:g id="NETWORKMODEID">%1$d</xliff:g> Geçersiz Ağ Modu. Yoksayın."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> operatörüne bağlıyken kullanılamaz"</string>
+ <string name="see_more" msgid="5953815986207345223">"Daha fazla"</string>
+ <string name="see_less" msgid="1250265310929558370">"Daha az göster"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 929294e..d4e332b 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Вважати тарифікованою"</item>
<item msgid="2266114985518865625">"Вважати нетарифікованою"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"За умовчанням (використовувати довільну MAC-адресу)"</item>
+ <item msgid="5398461510512959597">"Довірений"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Ні"</item>
<item msgid="3863157480502955888">"Так"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Завжди ввімкнено"</item>
<item msgid="6385301106124765323">"Завжди вимкнено"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Вимкнено"</item>
+ <item msgid="2182686878828390312">"Налагодження"</item>
+ <item msgid="5286514712714822064">"Докладно"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Лише домашні мережі"</item>
+ <item msgid="5034813753274486448">"Автоматично"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Рекомендовано GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"Лише GSM"</item>
+ <item msgid="488474605709912156">"Лише WCDMA"</item>
+ <item msgid="1912421096218750039">"Авто GSM/WCDMA"</item>
+ <item msgid="5072198667819683600">"Авто CDMA/EvDo"</item>
+ <item msgid="370391313511477301">"CDMA без EvDo"</item>
+ <item msgid="4678789463133969294">"Лише EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Загальний"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Лише TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Загальний"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 048ef7c..c7faeb1 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Створити"</string>
<string name="allow" msgid="3349662621170855910">"Дозволити"</string>
<string name="deny" msgid="6947806159746484865">"Заборонити"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Закрити"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Змінити користувача"</string>
<string name="device_info_default" msgid="7847265875578739287">"Невідомо"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Щоб стати розробником, залишився ще <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> крок.</item>
@@ -34,10 +32,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Немає потреби, ви вже розробник."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Спершу ввімкніть параметри розробника."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Бездротові та дротові мережі"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"З’єднання"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Пристрій"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Особисте"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Доступ"</string>
<string name="header_category_system" msgid="2816866961183068977">"Система"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Увімкнути передавання даних"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Вимкнути передавання даних"</string>
@@ -123,7 +117,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Адреса Bluetooth пристрою: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Відключити пристрій <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Трансляція"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Пристрій Bluetooth без імені"</string>
<string name="progress_scanning" msgid="192587958424295789">"Пошук"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Пристрої Bluetooth поблизу не знайдено."</string>
@@ -155,7 +148,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Додаток хоче ввімкнути Bluetooth і зробити ваш телефон видимим для інших пристроїв. Ви можете пізніше змінити цей параметр у налаштуваннях Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Увімкнення Bluetooth..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Вимкнення Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Автоматичне з’єднання"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Запит на з’єднання Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Торкніться, щоб під’єднатися до пристрою <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Підключитися до пристрою \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
@@ -183,12 +175,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Доступні пристрої для дзвінків"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Під’єднані пристрої"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Збережені пристрої"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Додати пристрій"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth увімкнеться, щоб створити пару"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Параметри підключення"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Підключені раніше пристрої"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Підключені раніше"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth увімкнено"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Показати всі"</string>
<string name="date_and_time" msgid="9062980487860757694">"Дата й час"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Вибрати часовий пояс"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -271,7 +263,6 @@
<string name="skip_label" msgid="47510779345218297">"Пропустити"</string>
<string name="next_label" msgid="4693520878012668114">"Далі"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Мови"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Налаштування мови"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Видалити"</string>
<string name="add_a_language" msgid="2330538812283783022">"Додати мову"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -307,7 +298,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Налаштування"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Ярлик налаштувань"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Режим польоту"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Більше"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бездротовий зв\'язок і мережі"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Керуйте Wi-Fi, Bluetooth, режимом польоту, мережами мобільного зв’язку та VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Мобільний трафік"</string>
@@ -392,6 +382,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Конфіденційність"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Вимкнено адміністратором"</string>
<string name="security_status_title" msgid="5848766673665944640">"Статус безпеки"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Блокування екрана, фейсконтроль"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Блокування екрана, відбиток пальця"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Блокування екрана"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Обличчя додано"</string>
@@ -401,11 +392,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Розблоковуйте обличчям"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Використовуйте обличчя для автентифікації"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Розблоковуйте телефон, робіть покупки та входьте в додатки за допомогою розпізнавання облич."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Використовуйте"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Розблоковуйте телефон або схвалюйте покупки за допомогою зображення обличчя.\n\nПримітка. Цей пристрій не можна розблокувати таким чином. Щоб дізнатися більше, зв’яжіться з адміністратором своєї організації."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Розблоковуйте телефон, робіть покупки та входьте в додатки за допомогою розпізнавання облич"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Можна додати максимум стільки облич: <xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Розташуйте обличчя в колі"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Пізніше"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Можна додати максимум стільки облич: <xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Ви додали максимальну кількість облич"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Неможливо додати більше облич"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Реєстрацію не завершено"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Час реєстрації обличчя минув. Повторіть спробу."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Обличчя не зареєстровано."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Готово."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Готово"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"За допомогою обличчя"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Розблоковувати"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Вхід у додатки та платежі"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Розблоковувати, коли очі відкриті"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Використовуючи автентифікацію облич, відкрийте очі"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Видалити обличчя"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Оновити дані про обличчя"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Ви можете розблоковувати пристрій і відкривати додатки за допомогою даних про обличчя. "<annotation id="url">"Докладніше"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Цифровий відбиток"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Керування відбитками"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Використ. відбиток для"</string>
@@ -914,6 +921,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 ГГц"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Виберіть принаймні один діапазон для точки доступу Wi-Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Налаштування IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Конфіденційність"</string>
<string name="wifi_shared" msgid="844142443226926070">"Надати доступ іншим користувачам пристрою"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(без змін)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Виберіть"</string>
@@ -953,7 +961,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Скасувати"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Забути мережу?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Усі паролі для мережі буде видалено"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Збережені мережі"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d мережа</item>
<item quantity="few">%d мережі</item>
@@ -1030,8 +1037,8 @@
<skip />
<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Параметри роумінгу"</string>
<string-array name="wifi_calling_mode_choices">
- <item msgid="2124257075906188844">"Wi-Fi за умовчанням"</item>
- <item msgid="1335127656328817518">"Мобільна мережа за умовчанням"</item>
+ <item msgid="2124257075906188844">"Пріоритет Wi-Fi"</item>
+ <item msgid="1335127656328817518">"Пріоритет мобільної мережі"</item>
<item msgid="3132912693346866895">"Лише Wi-Fi"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2">
@@ -1045,8 +1052,8 @@
<item msgid="3194458950573886239">"0"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_without_wifi_only">
- <item msgid="5782108782860004851">"Wi-Fi за умовчанням"</item>
- <item msgid="5074515506087318555">"Мобільна мережа за умовчанням"</item>
+ <item msgid="5782108782860004851">"Пріоритет Wi-Fi"</item>
+ <item msgid="5074515506087318555">"Пріоритет мобільної мережі"</item>
</string-array>
<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
<item msgid="6132150507201243768">"Wi-Fi"</item>
@@ -1134,8 +1141,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Яскравість"</string>
<string name="brightness_summary" msgid="838917350127550703">"Налаштуйте яскравість екрана"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивна яскравість"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Увімкнено"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Вимкнено"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Вибрано дуже низьку яскравість"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Вибрано низьку яскравість"</string>
@@ -1154,7 +1160,7 @@
<string name="auto_brightness_disclaimer" msgid="871436423746343406">"Оптимізація яскравості з урахуванням освітлення. Якщо цю функцію ввімкнено, ви все одно можете тимчасово змінювати яскравість."</string>
<string name="auto_brightness_description" msgid="7310335517128283729">"Яскравість екрана автоматично пристосовується до середовища й ваших дій. Ви можете пересунути повзунок вручну, щоб ваш вибір зберігся в налаштуваннях адаптивної яскравості."</string>
<string name="night_display_title" msgid="2626451512200357686">"Нічний режим"</string>
- <string name="night_display_text" msgid="1837277457033025056">"Коли ввімкнено Нічний режим, екран набуває бурштинового відтінку. Так зручніше дивитися на екран при тьмяному освітленні та легше заснути."</string>
+ <string name="night_display_text" msgid="1837277457033025056">"У нічному режимі екран набуває бурштинового відтінку. Це знімає напруження очей при тьмяному освітленні та допомагає легше заснути."</string>
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Розклад"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Ніколи"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Вмикається в установлений час"</string>
@@ -1231,6 +1237,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Неможливо змінити PIN-код.\nМожливо, неправильний PIN-код."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"PIN SIM-карти успішно змінено"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Неможливо змінити стан блокування SIM-карти.\nМожливо, неправильний PIN-код."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Не вдається вимкнути PIN-код."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Не вдається ввімкнути PIN-код."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Скасувати"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Виявлено декілька SIM-карт"</string>
@@ -1406,7 +1414,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Потрібно відформатувати карту \"<xliff:g id="NAME_0">^1</xliff:g>\". \n\n"<b>"Під час форматування буде стерто всі дані, які зберігаються на карті \"<xliff:g id="NAME_1">^1</xliff:g>\"."</b>" Щоб не втратити дані, створіть резервну копію."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Очистити й відформатувати"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> форматується…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Під час форматування <xliff:g id="NAME">^1</xliff:g> має залишатися в пристрої."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Під час форматування <xliff:g id="NAME">^1</xliff:g> має залишатися в пристрої."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Перемістити дані в нове сховище"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Ви можете перемістити фотографії, файли та деякі додатки на новий носій (<xliff:g id="NAME">^1</xliff:g>). \n\nЦе займе близько <xliff:g id="TIME">^2</xliff:g> і звільнить <xliff:g id="SIZE">^3</xliff:g> внутрішньої пам’яті. Під час переміщення деякі додатки не працюватимуть."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Перемістити"</string>
@@ -1790,9 +1798,6 @@
<string name="installed" msgid="3070865169422600098">"Установлено"</string>
<string name="no_applications" msgid="7336588977497084921">"Додатків немає."</string>
<string name="internal_storage" msgid="1584700623164275282">"Внутр. пам\'ять"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"внутрішня пам’ять"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Носій USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Пам\'ять карти SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Повт. обчисл. розм…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Видалити дані додатка?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Усі дані цього додатка буде видалено назавжди: файли, налаштування, облікові записи, бази даних тощо."</string>
@@ -1801,24 +1806,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Програму не знайдено в списку встановлених програм."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Не вдалося очистити пам’ять для додатка."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ця програма може отримати у вашому планшетному ПК такі доступи:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ця програма може отримати у вашому телефоні такі доступи:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ця програма може на вашому планшетному ПК отримати доступ до вказаного нижче. Для покращення роботи та зменшення використання пам’яті деякі з цих дозволів доступні для програми <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, оскільки вона працює в тому ж процесі, що й програми <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ця програма може на вашому телефоні отримати доступ до вказаного нижче. Для покращення роботи та зменшення використання пам’яті деякі з цих дозволів доступні для програми <xliff:g id="BASE_APP_NAME">%1$s</xliff:g>, оскільки вона працює в тому ж процесі, що й програми <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> і <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Користування програмою може бути платним:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Надсилати платні SMS"</string>
<string name="computing_size" msgid="1599186977475211186">"Обчислення..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Не вдалось обчислити розмір пакета."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"У вас не встановлено жодних програм сторонніх розробників."</string>
<string name="version_text" msgid="9189073826278676425">"версія <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Перем."</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Перем. на пристр."</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Перем. на тел."</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Перемістити на носій USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Перем. на карту SD"</string>
- <string name="moving" msgid="6431016143218876491">"Переміщ."</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Триває ще одне переміщення."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Недостатньо пам’яті."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Програма не існує."</string>
@@ -1828,17 +1825,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Додаток адміністратора пристрою не можна встановити на зовнішньому носії"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Примусово припинити?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Примусове вимкнення додатка може призвести до збою в його роботі."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Не вдалося перемістити програму. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Бажане місце встановлення"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Змінити потрібне місце для встановлення нових програм"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Вимкнути вбудовану програму?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Вимкнути додаток"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Якщо вимкнути цей додаток, додатки Android та інші додатки можуть працювати неналежним чином."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Видалити дані й вимкнути додаток?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Якщо вимкнути цей додаток, додатки Android та інші додатки можуть працювати неналежним чином. Також буде видалено ваші дані."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Вимкнути сповіщення?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Якщо вимкнути сповіщення для цієї програми, можна пропустити важливі повідомлення й оновлення."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Магазин"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Про додаток"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Додаток установлено з <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1982,7 +1975,7 @@
<string name="usage_time_label" msgid="295954901452833058">"Час використ."</string>
<string name="accessibility_settings" msgid="3975902491934816215">"Спеціальні можливості"</string>
<string name="accessibility_settings_title" msgid="2130492524656204459">"Налаштування доступності"</string>
- <string name="accessibility_settings_summary" msgid="981260486011624939">"Програма зчитування з екрана, дисплей і елементи керування взаємодією"</string>
+ <string name="accessibility_settings_summary" msgid="981260486011624939">"Програми зчитування з екрана, екран, елементи керування взаємодією"</string>
<string name="vision_settings_title" msgid="4204111425716868288">"Спеціальні можливості"</string>
<string name="vision_settings_description" msgid="5679491180156408260">"Ви можете налаштувати цей пристрій для своїх потреб. Ці спеціальні можливості можна пізніше змінити в налаштуваннях."</string>
<string name="vision_settings_suggestion_title" msgid="8058794060304707004">"Змінити розмір шрифту"</string>
@@ -2031,6 +2024,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Використовувати сервіс"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Використовувати корекцію кольорів"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Використовувати субтитри"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Продовжити"</string>
<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="6371077608778830020">"Додати слуховий апарат"</string>
@@ -2190,8 +2184,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Якщо обмежити фонову активність, додаток може працювати неналежним чином"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Оскільки в додатку не передбачено економію заряду акумулятора, його не можна обмежити.\n\nУвімкніть оптимізацію споживання заряду."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Використання екрана після повного заряджання"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Споживання заряду екраном"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Сканування мобільної мережі"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Використання акумулятора після повного заряджання"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Час з увімкненим екраном після повного заряджання"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Викор. пристроєм після повного заряджання"</string>
@@ -2218,11 +2210,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Вжиток"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Режим енергоспоживання"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Уключені пакети"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Додатки, які розряджають акумулятор"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Пристрій не переходить у режим сну"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Виводить пристрій із режиму сну у фоновому режимі"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Часто запитує геодані"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"Кількість додатків, які працюють неналежним чином: <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Додатки працюють звичайно"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Телефон використовує звичайний обсяг заряду акумулятора у фоновому режимі"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Планшет використовує звичайний обсяг заряду акумулятора у фоновому режимі"</string>
@@ -2298,6 +2285,7 @@
<item quantity="many">Обмежується споживання заряду акумулятора для %1$d додатків</item>
<item quantity="other">Обмежується споживання заряду акумулятора для %1$d додатка</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Максимальний час: <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Ці додатки споживали заряд акумулятора у фоновому режимі. Якщо ви їх обмежите, можливо, вони працюватимуть неналежним чином, а сповіщення надходитимуть із затримкою."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Використовувати диспетчер заряду акумулятора"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Виявляти, коли додатки швидко розряджають акумулятор"</string>
@@ -2477,23 +2465,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Скасувати"</string>
<string name="tts_reset" msgid="2661752909256313270">"Скинути"</string>
<string name="tts_play" msgid="2628469503798633884">"Відтворити"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Контроль живлення"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Оновлення налаштувань Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Оновлення налашт. Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"увімкнено"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"вимкнено"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"увімкнення"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"вимкнення"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Місцезнаходження"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Синхронізація"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Яскравість <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"авто"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"максимум"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"часткова"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"вимкнено"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Сховище облікових даних"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Установити з носія"</string>
@@ -2651,7 +2622,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Вибрати всі"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Використання даних"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Використ. даних додатком"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Мобільні дані та Wi-Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Ваш оператор може по-іншому облікувати дані."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Використання додатка"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ПРО ДОДАТОК"</string>
@@ -3038,7 +3009,6 @@
<item quantity="many">Показати %d схованих елементів</item>
<item quantity="other">Показати %d схованого елемента</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Згорнути"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Мережа й Інтернет"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"мобільна мережа"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"використання трафіку"</string>
@@ -3050,12 +3020,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Додатки та сповіщення"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Дозволи та додатки за умовчанням"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Додатки в робочому профілі не мають доступу до сповіщень."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Облікові записи"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Облікових записів не додано"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Додатки за умовчанням"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Мови, час, резервне копіювання й оновлення"</string>
<string name="search_results_title" msgid="1796252422574886932">"Налаштування"</string>
- <string name="search_menu" msgid="6283419262313758339">"Пошук налаштувань"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, мережеве з’єднання, інтернет, бездротовий, дані, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, перемкнути, керувати"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"текстове повідомлення, обмін повідомленнями, повідомлення, надсилання повідомлень, за умовчанням"</string>
@@ -3100,6 +3070,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"оплатити, торкнутися, платежі"</string>
<string name="keywords_backup" msgid="470070289135403022">"резервна копія, резервне копіювання"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"жест"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"обличчя, розблокувати, автентифікація, увійти"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, версія prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"мережа, стан мобільної мережі, стан служби, потужність сигналу, тип мобільної мережі, роумінг, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"серійний номер, версія апаратного забезпечення"</string>
@@ -3107,6 +3078,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"темна тема"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"помилка"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Активний екран, заблокований екран"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"сповіщення на заблокованому екрані"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"обличчя"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"відбиток пальця"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"затемнений екран, сенсорний екран, акумулятор, розумна яскравість, динамічна яскравість"</string>
@@ -3399,7 +3371,7 @@
<string name="notification_content_block_summary" msgid="7746185794438882389">"Ніколи не показувати сповіщення на панелі та периферійних пристроях"</string>
<string name="notification_badge_title" msgid="6370122441168519809">"Дозволити значок сповіщення"</string>
<string name="notification_channel_badge_title" msgid="2240827899882847087">"Показувати значок сповіщення"</string>
- <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Заміна режиму \"Не турбувати\""</string>
+ <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Дозволити в режимі \"Не турбувати\""</string>
<string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"Показувати ці сповіщення, коли ввімкнено режим \"Не турбувати\""</string>
<string name="app_notification_visibility_override_title" msgid="7821124557634786985">"На заблокованому екрані"</string>
<string name="app_notification_row_banned" msgid="5983655258784814773">"Заблоковано"</string>
@@ -3558,7 +3530,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Коли ви введете PIN-код і запустите пристрій, служби доступності (як-от <xliff:g id="SERVICE">%1$s</xliff:g>) ще не ввімкнуться."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Коли ви введете ключ і запустите пристрій, служби доступності (як-от <xliff:g id="SERVICE">%1$s</xliff:g>) ще не ввімкнуться."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Коли ви введете пароль і запустите пристрій, служби доступності (як-от <xliff:g id="SERVICE">%1$s</xliff:g>) ще не ввімкнуться."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Примітка: щоб запустити цей додаток після перезавантаження, спершу потрібно буде розблокувати телефон"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Примітка. Якщо ви перезапустите телефон, коли налаштовано блокування екрана, додаток не відкриється, доки ви не розблокуєте його"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Інформація про IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Інформація про IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Гніздо <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3620,7 +3592,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Особисті"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Робочі"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Додатки: усі"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Додатки: вимкнені"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Вимкнено"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Категорії: терміново"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Категорії: низький пріоритет"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Категорії: вимкнені"</string>
@@ -3683,7 +3655,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Сповіщення про використання"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Показати повне використання пристрою"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Показати використання додатка"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Високе споживання заряду"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> додаток працює неправильно</item>
<item quantity="few"><xliff:g id="NUMBER">%2$d</xliff:g> додатки працюють неправильно</item>
@@ -3855,6 +3826,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Внутрішня пам’ять: використано <xliff:g id="PERCENTAGE">%1$s</xliff:g>, вільно <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Перейти в режим сну після <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Фоновий малюнок, режим сну та розмір шрифту"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Перейти в режим сну після 10 хвилин бездіяльності"</string>
<string name="memory_summary" msgid="8080825904671961872">"У середньому використовується <xliff:g id="USED_MEMORY">%1$s</xliff:g> пам’яті з <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Ви ввійшли як <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3870,7 +3843,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Надсилати SMS заборонено"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Користуватися камерою заборонено"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Робити знімки екрана заборонено"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Резервне копіювання не можна вимкнути"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Цей додаток не можна відкрити"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Якщо у вас є запитання, зв’яжіться з ІТ-адміністратором"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Докладніше"</string>
@@ -4044,9 +4016,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Імітувати відключення дисплея"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Відрізання екрана"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"відключення дисплея, переривання"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Немає"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Налаштування пристрою за умовчанням"</string>
<string name="special_access" msgid="3458780842491881155">"Спеціальний доступ"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> додаток може без обмежень передавати дані</item>
@@ -4070,11 +4042,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Під’єднано до пристрою <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Під’єднано до кількох пристроїв"</string>
<string name="demo_mode" msgid="2798762752209330277">"Демо-режим інтерфейсу системи"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Нічний режим"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Налаштувати нічний режим"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Темний режим"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Установити темний режим"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Швидкі налаштування блоку розробника"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Трасування Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Налаштування робочого профілю"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Пошук контактів"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Дозволити вашій організації шукати контакти, щоб визначати абонентів і контактних осіб"</string>
@@ -4121,13 +4092,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Двічі торкніться, щоб перевірити телефон"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Двічі торкніться, щоб перевірити планшет"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Двічі торкніться, щоб перевірити пристрій"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Щоб переглянути час, значки сповіщень тощо, двічі торкніться екрана."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Щоб перевірити час, сповіщення та іншу інформацію, двічі торкніться екрана."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Підняти телефон, щоб перевірити сповіщення"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Підніміть планшет, щоб перевірити його"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Підніміть пристрій, щоб перевірити його"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Щоб переглянути час, значки сповіщень тощо, підніміть телефон."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Щоб переглянути час, значки сповіщень тощо, підніміть планшет."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Щоб переглянути час, значки сповіщень тощо, підніміть пристрій."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Вивести дисплей із режиму сну"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Щоб перевірити час, сповіщення й іншу інформацію, підніміть телефон."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Щоб перевірити час, сповіщення й іншу інформацію, підніміть планшет."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Щоб перевірити час, сповіщення й іншу інформацію, підніміть пристрій."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Жест для виведення заблокованого екрана з режиму сну"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Використати відбиток, щоб переглянути сповіщення"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Сканувати відбиток"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Щоб переглянути сповіщення, проведіть пальцем униз по сканеру відбитків на задній панелі телефона."</string>
@@ -4215,7 +4190,6 @@
<item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> спроб</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> спроби</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Створюється резервна копія даних пристрою"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Цим пристроєм керує адміністратор вашої організації."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Цим пристроєм керує <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4262,6 +4236,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Автозаповнення"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"автоматично, заповнювати, автозаповнення"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Переконайтеся, що додаток надійний</b> <br/> <br/> <xliff:g id=app_name example=Функція Автозаповнення Google>%1$s</xliff:g> використовує інформацію на екрані, щоб визначати поля для автозаповнення."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Автоматично заповнити"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Рівень реєстрації"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Максимальна кількість запитів на сеанс"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Максимальні видимі набори даних"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Відновити значення за умовчанням"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Скинуто параметри автозаповнення, які вказав розробник"</string>
<string name="device_theme" msgid="4571803018917608588">"Тема пристрою"</string>
<string name="default_theme" msgid="7085644992078579076">"За умовчанням"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Назва мережі"</string>
@@ -4276,15 +4256,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Активатор ініціалізації оператора"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Оновити режим \"Не турбувати\""</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Призупинити сповіщення, щоб не відволікатися"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Що нового та цікавого?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Ознайомтеся зі своїм новим телефоном"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Ознайомтеся зі своїм новим планшетом"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Ознайомтеся зі своїм новим пристроєм"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Ця функція недоступна на цьому пристрої"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Увімкнути повне вимірювання GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Відстежувати всі фотосхеми й частоти GNSS без застосування циклічного режиму"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Завжди показувати вікно збоїв"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Показувати вікно під час кожного збою додатка"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Виберіть додаток із підтримкою ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Немає встановлених додатків із підтримкою ANGLE"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Додаток із підтримкою ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Доступ до каталогу"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"доступ до каталогу"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4325,4 +4304,87 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Дані мережі"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Додатки на телефоні бачать назву пристрою. Її також можуть бачити інші люди, коли ви під’єднуєтеся до пристроїв Bluetooth або налаштовуєте точку доступу Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Пристрої"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Усі налаштування"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Пропозиції"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Дані CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Дані CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Вибрати мережу"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Від’єднано"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Під’єднано"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Під’єднання…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Не вдалося під’єднати"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Мереж не знайдено"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Не вдалося знайти мережу. Повторіть спробу."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(заборонено)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Немає SIM-карти"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Виклики з розширеними можливостями"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Рекомендований режим мережі: бажано WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Рекомендований режим мережі: лише GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Рекомендований режим мережі: лише WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Рекомендований режим мережі: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Рекомендований режим мережі: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Рекомендований режим мережі: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Рекомендований режим мережі: лише CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Рекомендований режим мережі: лише EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Рекомендований режим мережі: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Рекомендований режим мережі: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Рекомендований режим мережі: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Рекомендований режим мережі: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Рекомендований режим мережі: загальний"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Рекомендований режим мережі: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Рекомендований режим мережі: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Рекомендований режим мережі: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Рекомендований режим мережі: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Рекомендований режим мережі: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Рекомендований режим мережі: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Рекомендований режим мережі: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Рекомендований режим мережі: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Рекомендований режим мережі: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Рекомендований режим мережі: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Рекомендований режим мережі: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Рекомендований режим мережі: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Рекомендований режим мережі: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (рекомендовано)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (рекомендовано)"</string>
+ <string name="network_global" msgid="959947774831178632">"Загальний"</string>
+ <string name="label_available" msgid="1731547832803057893">"Доступні мережі"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Пошук…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Реєстрація в мережі <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Вашій SIM-карті заборонено підключатися до цієї мережі."</string>
+ <string name="connect_later" msgid="978991102125216741">"Зараз не вдається підключитися до цієї мережі. Повторіть спробу пізніше."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Зареєстровано в мережі"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Вибирати мережу автоматично"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Налаштування оператора"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Налаштувати мобільний Інтернет"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Мобільне передавання даних"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Доступ до Інтернету через мобільну мережу"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Рекомендований тип мережі"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Змінити режим роботи мережі"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Рекомендований тип мережі"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Оператор"</string>
+ <string name="call_category" msgid="8108654745239563833">"Виклики"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Відеовиклики в мережі оператора"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Вибір системи"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Змінити режим CDMA-роумінгу"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Вибір системи"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Мережа"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Мережа"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Підписка CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Змінити RUIM/SIM-карту на NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"підписка"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Автоматична реєстрація…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Дозволити роумінг даних?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Докладніше про ціни можна дізнатися в оператора мережі."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Використання трафіку додатків"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Недійсний режим мережі: <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ігнорувати."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Недоступно, коли підключено до оператора <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Докладніше"</string>
+ <string name="see_less" msgid="1250265310929558370">"Показати менше"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ <item quantity="many">Підключено <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> пристроїв</item>
+ <item quantity="other">Підключено <xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> пристрою</item>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Немає підключених пристроїв"</string>
</resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index e3f28f9..f822f0f 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"میٹر شدہ کے بطور خیال کریں"</item>
<item msgid="2266114985518865625">"غیر میٹر شدہ کے بطور خیال کریں"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"ڈیفالٹ (بے ترتیب MAC استعمال کریں)"</item>
+ <item msgid="5398461510512959597">"قابل اعتماد"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"نہیں"</item>
<item msgid="3863157480502955888">"ہاں"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"ہمیشہ آن"</item>
<item msgid="6385301106124765323">"ہمیشہ آف"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"آف"</item>
+ <item msgid="2182686878828390312">"ڈیبگ کریں"</item>
+ <item msgid="5286514712714822064">"وربوس"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"صرف ہوم"</item>
+ <item msgid="5034813753274486448">"خودکار"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA ترجیحی"</item>
+ <item msgid="807926878589867564">"صرف GSM"</item>
+ <item msgid="488474605709912156">"صرف WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA خودکار"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo خودکار"</item>
+ <item msgid="370391313511477301">"EvDo کے بغیر CDMA"</item>
+ <item msgid="4678789463133969294">"صرف EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"عالمی"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"صرف TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"عالمی"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 1b2fb22..a1b47aa 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"بنائیں"</string>
<string name="allow" msgid="3349662621170855910">"اجازت دیں"</string>
<string name="deny" msgid="6947806159746484865">"رد کریں"</string>
- <string name="dlg_close" msgid="7471087791340790015">"بند کریں"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"تبدیل کریں"</string>
<string name="device_info_default" msgid="7847265875578739287">"نامعلوم"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">اب آپ ایک ڈویلپر بننے سے <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> قدم دور ہیں۔</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"کوئی ضرورت نہیں ہے، آپ پہلے سے ہی ایک ڈیولپر ہیں۔"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"براہ کرم پہلے ڈیولپر کے اختیارات فعال کریں"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"وائرلیس اور نیٹ ورکس"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"کنکشنز"</string>
- <string name="header_category_device" msgid="4544026001618307754">"آلہ"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"ذاتی"</string>
- <string name="header_category_access" msgid="7580499097416970962">"رسائی"</string>
<string name="header_category_system" msgid="2816866961183068977">"سسٹم"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"ڈیٹا کنکشن فعال کریں"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"ڈیٹا کنکشن غیر فعال کریں"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"آلے کا بلوٹوتھ پتہ: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کو منقطع کریں؟"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"نشریات"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"بلا نام بلوٹوتھ آلہ"</string>
<string name="progress_scanning" msgid="192587958424295789">"تلاش کر رہا ہے"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"کوئی قریبی بلوٹوتھ آلات نہیں ملے۔"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"ایک ایپ بلوٹوتھ آن کرنا اور آپ کے فون کو دیگر آلات پر مرئی بنانا چاہتی ہے۔ آپ اسے بعد میں بلوٹوتھ کی ترتیبات میں تبدیل کر سکتے ہیں۔"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"بلوٹوتھ آن ہو رہا ہے…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"بلوٹوتھ آف ہو رہا ہے…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"خود کار طور پر مربوط ہوں"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"بلوٹوتھ کنکشن کی درخواست"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" سے مربوط ہونے کیلئے تھپتھپائیں۔"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"کیا آپ \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" سے مربوط ہونا چاہتے ہیں؟"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"دستیاب کال آلات"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"فی الحال منسلک ہے"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"محفوظ کردہ آلات"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"آلہ شامل کریں"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"جوڑا بنانے کے لیے بلوٹوتھ آن ہو جائے گا"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"کنکشن کی ترجیحات"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"پہلے منسلک کردہ آلات"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"پہلے سے منسلک کردہ"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"بلوٹوتھ کو آن کر دیا گیا"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"سبھی دیکھیں"</string>
<string name="date_and_time" msgid="9062980487860757694">"تاریخ اور وقت"</string>
<string name="choose_timezone" msgid="1362834506479536274">"ٹائم زون منتخب کریں"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"نظر انداز کریں"</string>
<string name="next_label" msgid="4693520878012668114">"اگلا"</string>
<string name="language_picker_title" msgid="3596315202551687690">"زبانیں"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"زبان کی ترجیحات"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"ہٹائیں"</string>
<string name="add_a_language" msgid="2330538812283783022">"ایک زبان شامل کریں"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"ترتیبات"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"ترتیبات کا شارٹ کٹ"</string>
<string name="airplane_mode" msgid="8837269988154128601">"ہوائی جہاز وضع"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"مزید"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"وائرلیس اور نیٹ ورکس"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi، بلوٹوتھ، ہوائی جہاز وضع، موبائل نیٹ ورکس اور VPNs کا نظم کریں"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"موبائل ڈیٹا"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"رازداری"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"منتظم کی طرف سے غیر فعال کردہ"</string>
<string name="security_status_title" msgid="5848766673665944640">"سیکیورٹی کی صورتحال"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"اسکرین لاک، چہرے کے ذریعے غیر مقفل کرنا"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"اسکرین لاک، فنگر پرنٹ"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"اسکرین لاک"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"چہرہ شامل کر دیا گیا"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"اپنے چہرے سے غیر مقفل کریں"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"تصدیق کرنے کیلئے اپنا چہرہ استعمال کریں"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"اپنے فون کو غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے اپنے چہرے کا استعمال کریں۔"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"اپنا چہرہ استعمال کریں"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"اپنا فون غیرمقفل کرنے یا خریداریاں منظور کرنے کے لیے اپنے چہرے کا استعمال کریں۔\n\nنوٹ: آپ اس آلہ کو غیرمقفل کرنے کے لیے اپنا چہرا استعمال نہیں کر سکتے۔ مزید معلومات کے لیے، اپنی تنظیم کے منتظم سے رابطہ کریں۔"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"اپنے فون کو غیر مقفل کرنے، خریداریوں کی اجازت دینے یا ایپس میں سائن ان کرنے کیلئے اپنے چہرے کا استعمال کریں"</string>
- <string name="face_add_max" msgid="2342250989212694454">"آپ <xliff:g id="COUNT">%d</xliff:g> تک فنگر پرنٹس شامل کر سکتے ہیں"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"حلقے کے مرکز میں اپنا چہرہ رکھیں"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"اسے بعد میں کریں"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"آپ <xliff:g id="COUNT">%d</xliff:g> چہروں تک شامل کر سکتے ہیں"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"آپ چہروں کی زیادہ سے زیادہ تعداد شامل کر چکے ہیں"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"مزید چہرے شامل نہیں کر سکتے"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"اندراج مکمل نہیں ہوا تھا"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"ٹھیک ہے"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"چہرے کے اندراج کی حدِ وقت پوری ہو گئی۔ دوبارہ کوشش کریں۔"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"چہرے کا اندراج نہیں ہوا۔"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"سب کچھ ہو گیا ہے۔ اچھا لگ رہا ہے۔"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"ہو گیا"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"چہرے کے استعمال سے"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"اپنے آلہ کو غیر مقفل کریں"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"ایپ سائن ان اور ادائیگی"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"غیر مقفل کرنے کیلئے آنکھیں کھلی ہونا"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"چہرے کی شناخت کرتے وقت، آپ کی آنکھیں کھلی ہونی چاہئیں"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"چہرے کا ڈیتا ہٹائیں"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"اپنے چہرے کا ڈیٹا بہتر بنائیں"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"آپ کے چہرے کے استعمال سے آپ آلہ غیر مقفل کیا جا سکتا ہے اور ایپس تک رسائی حاصل کی جا سکتی ہے۔ "<annotation id="url">"مزید جانیں"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"فنگر پرنٹ"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"فنگر پرنٹس کا نظم کریں"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"فنگر پرنٹ استعمال کریں برائے"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi‑Fi ہاٹ اسپاٹ کیلئے کم از کم ایک بینڈ منتخب کریں:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP ترتیبات"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"رازداری"</string>
<string name="wifi_shared" msgid="844142443226926070">"دوسرے آلہ صارفین کے ساتھ اشتراک کریں"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(غیر تبدیل شدہ)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"براہ مہربانی منتخب کریں"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"منسوخ کریں"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"نیٹ ورک بھول جائیں؟"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"اس نیٹ ورک کے سبھی پاس ورڈز حذف کر دیے جائیں گے"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"محفوظ کردہ نیٹ ورکس"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d نیٹ ورکس</item>
<item quantity="one">1 نیٹ ورک</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"چمک"</string>
<string name="brightness_summary" msgid="838917350127550703">"اسکرین کی چمک کو ایڈجسٹ کریں"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"تغیر پذیر چمک"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"آن"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"آف"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"ترجیحی چمک بہت کم ہے"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"ترجیحی چمک کم ہے"</string>
@@ -1143,8 +1149,8 @@
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"ابھی آف کریں"</string>
<string name="night_display_activation_on_twilight" msgid="6976051971534953845">"طلوع آفتاب تک آن کریں"</string>
<string name="night_display_activation_off_twilight" msgid="7196227685059907233">"غروب آفتاب تک بند کریں"</string>
- <string name="night_display_activation_on_custom" msgid="5472029024427933598">"<xliff:g id="ID_1">%1$s</xliff:g> تک آن کریں"</string>
- <string name="night_display_activation_off_custom" msgid="6169984658293744715">"<xliff:g id="ID_1">%1$s</xliff:g> تک بند کریں"</string>
+ <string name="night_display_activation_on_custom" msgid="5472029024427933598">"<xliff:g id="ID_1">%1$s</xliff:g> تک آن کریں"</string>
+ <string name="night_display_activation_off_custom" msgid="6169984658293744715">"<xliff:g id="ID_1">%1$s</xliff:g> تک بند کریں"</string>
<string name="screen_timeout" msgid="4351334843529712571">"سلیپ"</string>
<string name="screen_timeout_title" msgid="5130038655092628247">"اسکرین آف ہوجاتی ہے"</string>
<string name="screen_timeout_summary" msgid="327761329263064327">"غیر فعالیت کے <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> بعد"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN تبدیل نہیں کر سکتے ہیں۔\nممکنہ طور پر غلط PIN۔"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM PIN کامیابی کے ساتھ تبدیل ہو گیا"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM کارڈ لاک کی حالت کو تبدیل نہيں کر سکتے ہیں۔\nممکنہ طور پر غلط PIN۔"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN کو غیر فعال نہیں کیا جا سکتا۔"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN کو فعال نہیں کیا جا سکتا۔"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"ٹھیک ہے"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"منسوخ کریں"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"متعدد SIMs ملے"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"یہ تقاضہ کرتا ہے کہ <xliff:g id="NAME_0">^1</xliff:g> کو فارمیٹ کیا جائے۔ \n\n"<b>"فارمیٹنگ سے <xliff:g id="NAME_1">^1</xliff:g> پر فی الحال اسٹور کردہ سبھی ڈیٹا مٹ جاتا ہے۔"</b>" ڈیٹا سے محروم ہونے سے بچنے کیلئے اس کا بیک اپ لینے پر غور کریں۔"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"مٹائیں اور فارمیٹ کریں"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> کو فارمیٹ کیا جا رہا ہے…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g> کو فارمیٹ کیے جانے کے وقت اسے نہ ہٹائیں۔"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g> کو فارمیٹ کیے جانے کے وقت اسے نہ ہٹائیں۔"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ڈیٹا نئے اسٹوریج میں منتقل کریں"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"آپ اپنی تصاویر، فائلیں اور کچھ ایپس اس نئے <xliff:g id="NAME">^1</xliff:g> میں منتقل کر سکتے ہیں۔ \n\nمنتقلی میں تقریباً <xliff:g id="TIME">^2</xliff:g> لگتا ہے اور اس سے داخلی اسٹوریج پر <xliff:g id="SIZE">^3</xliff:g> جگہ خالی ہو جائے گی۔ اس کے جاری رہتے ہوئے کچھ ایپس کام نہیں کریں گی۔"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"ابھی منتقل کریں"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"انسٹال کردہ"</string>
<string name="no_applications" msgid="7336588977497084921">"کوئی ایپس ہیں۔"</string>
<string name="internal_storage" msgid="1584700623164275282">"داخلی اسٹوریج"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"داخلی اسٹوریج"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB اسٹوریج"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD کارڈ اسٹوریج"</string>
<string name="recompute_size" msgid="7722567982831691718">"سائز کو دوبارہ شمار کر رہا ہے…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"ایپ کا ڈیٹا حذف کریں؟"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"اس ایپ کا سبھی ڈیٹا مستقل طور پر حذف ہو جائے گا۔ اس میں سبھی فائلیں، ترتیبات، اکاؤنٹس، ڈیٹا بیسز وغیرہ شامل ہیں۔"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"ایپ انسٹال کردہ ایپس کی فہرست میں نہیں ملی۔"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"ایپ کیلئے اسٹوریج صاف نہيں کر سکا۔"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"یہ ایپ آپ کے ٹیبلٹ پر مندرجہ ذیل تک رسائی حاصل کر سکتی ہے:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"یہ ایپ آپ کے فون پر مندرجہ ذیل تک رسائی حاصل کر سکتی ہے:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"یہ ایپ آپ کے ٹیبلٹ پر درج ذیل تک رسائی حاصل کرسکتی ہے۔ کارکردگی کو بہتر بنانے اور میموری کے استعمال کو کم کرنے کیلئے، ان اجازتوں میں سے کچھ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> پر دستیاب ہیں کیونکہ یہ اسی پروسیس میں چلتی ہے جس میں <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> چلتی ہیں:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"یہ ایپ آپ کے فون پر مندرجہ ذیل تک رسائی حاصل کر سکتی ہے۔ کارکردگی کو بہتر بنانے اور میموری کے استعمال کو کم کرنے کیلئے، ان اجازتوں میں سے کچھ <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> پر دستیاب ہیں کیونکہ یہ اسی پروسیس میں چلتی ہے جس میں <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> چلتی ہیں:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> اور <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>، <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"یہ ایپ آپ سے رقم چارج کر سکتی ہے:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"پریمیم SMS بھیجیں"</string>
<string name="computing_size" msgid="1599186977475211186">"حساب کتاب کر رہا ہے…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"پیکیج سائز کا حساب نہیں لگایا جا سکا۔"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"آپ کے پاس فریق ثالث کی کوئی ایپس انسٹال نہیں ہیں۔"</string>
<string name="version_text" msgid="9189073826278676425">"ورژن <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"منتقل کریں"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"ٹیبلٹ پر منتقل کریں"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"فون پر منتقل کریں"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB اسٹوریج پر منتقل ہوں"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD کارڈ پر منتقل ہوں"</string>
- <string name="moving" msgid="6431016143218876491">"منتقل ہو رہا ہے"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"ایک منتقلی پہلے سے پیشرفت میں ہے۔"</string>
<string name="insufficient_storage" msgid="481763122991093080">"اسٹوریج کی کافی جگہ نہیں ہے۔"</string>
<string name="does_not_exist" msgid="1501243985586067053">"ایپ موجود نہیں ہے۔"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"آلہ کے منتظم کی ایپ بیرونی میڈیا پر انسٹال نہیں کی جا سکتی"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"زبردستی روکیں؟"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"اگر آپ کسی ایپ کو زبردستی روک دیتے ہیں تو یہ غلط برتاؤ کر سکتی ہے۔"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ایپ کو منتقل نہيں کر سکا۔ <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"انسٹال کا ترجیحی مقام"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"نئی ایپس کیلئے ترجیحی انسٹالیشن مقام تبدیل کریں"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"پہلے سے شامل ایپ غیر فعال کریں؟"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"ایپ کو غیر فعال کریں"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"اگر آپ اس ایپ کو غیر فعال کرتے ہیں تو ہو سکتا ہے Android اور دیگر ایپس ٹھیک طرح سے کام نہ کریں۔"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"ڈیٹا حذف کرکے ایپ غیر فعال کریں؟"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"اگر آپ اس ایپ کو غیر فعال کرتے ہیں تو ہو سکتا ہے Android اور دیگر ایپس ٹھیک طرح سے کام نہ کریں۔ آپ کا ڈیٹا بھی حذف ہو جائے گا۔"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"اطلاعات آف کریں؟"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"اگر آپ اس ایپ کیلئے اطلاعات آف کر دیتے ہیں تو ہو سکتا ہے کہ آپ سے اہم الرٹس اور اپ ڈیٹس چھوٹ جائیں۔"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"اسٹور"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"ایپ کی تفصیلات"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> سے ایپ انسٹال ہو گئی"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"سروس استعمال کریں"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"رنگ کی اصلاح استعمال کریں"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"کیپشنز استعمال کریں"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"جاری رکھیں"</string>
<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="6371077608778830020">"سماعتی آلہ شامل کریں"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"اگر آپ کسی ایپ کی پس منظر کی سرگرمی کو محدود کرتے ہیں تو یہ غلط برتاؤ کر سکتی ہے"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"چونکہ یہ ایپ بیٹری کی کارکردگی کو بہتر بنانے کیلئے نہیں ہے، لہذا آپ اسے محدود نہیں کر سکتے ہیں۔\n\nایپ کو محدود کرنے کیلئے، پہلے بیٹری کی کارکردگی کو بہتر بنانے کو آن کریں۔"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"مکمل چارج کے بعد سے اسکرین کا استعمال"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"اسکرین کی کھپت"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"موبائل نیٹ ورک اسکیننگ"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"مکمل چارج کے بعد سے بیٹری کا استعمال"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"مکمل چارج کے بعد سے اسکرین آن ہونے کے وقت کی مقدار"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"مکمل چارج کے بعد سے آلہ کا استعمال"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"استعمال کی تفصیلات"</string>
<string name="controls_subtitle" msgid="390468421138288702">"پاور کا استعمال ایڈجسٹ کریں"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"شامل کردہ پیکیجز"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"ایپس بیٹری کو تیزی سے ختم کر رہی ہیں"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"آلہ کو بیدار موڈ میں رکھا جا رہا ہے"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"پس منظر مییں آلہ چل رہا ہے"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"کثرت سے مقام کی درخواست کی جا رہی ہے"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ایپس صحیح سے کام نہیں کر رہی ہیں"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"ایپس حسب معمول چل رہی ہیں"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"فون پس منظر میں حسب معمول بیٹری استعمال کر رہا ہے"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"ٹیبلیٹ پس منظر میں حسب معمول بیٹری استعمال کر رہا ہے"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">%1$d ایپس کیلئے بیٹری کا استعمال محدود ہے</item>
<item quantity="one">%1$d ایپ کیلئے بیٹری کا استعمال محدود ہے</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"محدود کردہ بوقت <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"یہ ایپس پس منظر میں بیٹری استعمال کر رہی ہیں۔ ہو سکتا ہے محدود کردہ ایپس ٹھیک طرح سے کام نہ کریں اور اطلاعات میں تاخیر ہو سکتی ہے۔"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"بیٹری مینیجر استعمال کریں"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"ایپس کے بیٹری ختم کرنے پر اس کا پتہ لگائیں"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"منسوخ کریں"</string>
<string name="tts_reset" msgid="2661752909256313270">"ری سیٹ کریں"</string>
<string name="tts_play" msgid="2628469503798633884">"چلائیں"</string>
- <string name="gadget_title" msgid="5519037532720577836">"پاور کنٹرول"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi‑Fi ترتیب اپ ڈیٹ ہو رہی ہے"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"بلوٹوتھ کی ترتیب کو اپ ڈیٹ کرنا"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"آن"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"آف"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"آن ہو رہا ہے"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"آف ہو رہا ہے"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"بلوٹوتھ"</string>
- <string name="gadget_location" msgid="2974757497945178165">"مقام"</string>
- <string name="gadget_sync" msgid="858895763714222152">"مطابقت پذیر بنائیں"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"چمک <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"خودکار"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"مکمل"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"آدھی"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"آف"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"اسناد اسٹوریج"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"اسٹوریج سے انسٹال کریں"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> از <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"سبھی کو منتخب کریں"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"ڈیٹا کا استعمال"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"ایپ ڈیٹا کا استعمال"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"موبائل ڈیٹا اور Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"کیریئر ڈیٹا کا حساب آپ کے آلہ سے مختلف ہو سکتا ہے۔"</string>
<string name="data_usage_app" msgid="4970478397515423303">"ایپ کا استعمال"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ایپ کی معلومات"</string>
@@ -2960,7 +2931,6 @@
<string name="dashboard_title" msgid="5453710313046681820">"ترتیبات"</string>
<!-- String.format failed for translation -->
<!-- no translation found for settings_suggestion_header_summary_hidden_items (5597356221942118048) -->
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"سکیڑیں"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"نیٹ ورک اور انٹرنیٹ"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"موبائل"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ڈیٹا کا استعمال"</string>
@@ -2972,12 +2942,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"بلوٹوتھ"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ایپس اور اطلاعات"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"اجازتیں، ڈیفالٹ ایپس"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"دفتری پروفائل میں ایپس کو اطلاع تک رسائی حاصل نہیں ہے۔"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"اکاؤنٹس"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"کوئی اکاؤنٹ شامل نہیں ہے"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"ڈیفالٹ ایپس"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"زبانیں، وقت، بیک اپ، اپ ڈیٹس"</string>
<string name="search_results_title" msgid="1796252422574886932">"ترتیبات"</string>
- <string name="search_menu" msgid="6283419262313758339">"ترتیبات تلاش کریں"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi، wi-fi، نیٹ ورک کنکشن، انٹرنیٹ، وائر لیس، ڈیٹا، wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi ٹوگل، کنٹرول"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"ٹیکسٹ پیغام، ٹیکسٹنگ، پیغامات، پیغام رسانی، ڈیفالٹ"</string>
@@ -3022,6 +2992,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"ادائیگی کریں، تھپتھپائیں، ادائیگیاں"</string>
<string name="keywords_backup" msgid="470070289135403022">"بیک اپ، بیک اپ لیں"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"اشارہ"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"چہرہ، غیر مقفل کرنا، اجازت دینا، سائن ان"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl ورژن، imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"نیٹ ورک، موبائل نیٹ ورک کی صورت حال، سروس کی صورت حال، سگنل کی قوت، موبائل نیٹ ورک کی قسم، رومنگ، iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"نمبر شمار، ہارڈ ویئر کا ورژن"</string>
@@ -3029,6 +3000,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"گہری تھیم"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"بگ"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"ايمبيئنٹ ڈسپلے، لاک اسکرین ڈسپلے"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"مقفل اسکرین کی اطلاع"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"چہرہ"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"فنگر پرنٹ"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"مدھم اسکرین، ٹچ اسکرین، بیٹری، اسمارٹ چمک، ڈائنیمک چمک"</string>
@@ -3460,7 +3432,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"جب آپ یہ آلہ شروع کرنے کیلئے اپنا PIN داخل کریں گے تو <xliff:g id="SERVICE">%1$s</xliff:g> جیسی ایکسیسبیلٹی سروسز اس وقت ابھی دستیاب نہیں ہوں گی۔"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"یہ آلہ شروع کرنے کیلئے جب آپ اپنا پیٹرن داخل کریں گے تو <xliff:g id="SERVICE">%1$s</xliff:g> جیسی ایکسیسبیلٹی سروسز اس وقت ابھی دستیاب نہیں ہوں گی۔"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"اس آلہ کو شروع کرنے کیلئے جب آپ اپنا پاس ورڈ درج کریں گے تو <xliff:g id="SERVICE">%1$s</xliff:g> جیسی ایکسیسبیلٹی سروسز اس وقت ابھی دستیاب نہیں ہوں گی۔"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"نوٹ: ریبوٹ کرنے کے بعد یہ ایپ تب تک شروع نہیں ہو سکتی جب تک آپ اپنا فون غیر مقفل نہ کر لیں"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"نوٹ: اگر آپ اپنے فون کو دوبارہ شروع کرتے ہیں اور آپ کے پاس اسکرین لاک کا سیٹ ہے تو یہ ایپ تب تک شروع نہیں ہو سکتی جب تک آپ اپنا فون غیر مقفل نہ کر لیں"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI کی معلومات"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI سے متعلق معلومات"</string>
<string name="slot_number" msgid="3762676044904653577">"(سلاٹ<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3514,7 +3486,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"ذاتی"</string>
<string name="filter_work_apps" msgid="24519936790795574">"دفتری"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"ایپس: سبھی"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ایپس: آف کردہ"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"آف ہیں"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"زمرے: فوری اہمیت"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"زمرے: کم اہمیت"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"زمرے: آف کردہ"</string>
@@ -3575,7 +3547,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"استعمال سے متعلق الرٹس"</string>
<string name="show_all_apps" msgid="1512506948197818534">"آلہ کا مکمل استعمال دکھائیں"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"ایپ کا استعمال دکھائیں"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"بہت زیادہ استعمال"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ایپس معمول کے خلاف برتاؤ کر رہی ہیں</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> معمول کے خلاف برتاؤ کر رہی ہے</item>
@@ -3739,6 +3710,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"داخلی اسٹوریج: <xliff:g id="PERCENTAGE">%1$s</xliff:g> استعمال کردہ - <xliff:g id="FREE_SPACE">%2$s</xliff:g> خالی"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> کی غیر فعالیت کے بعد سلیپ وضع میں بھیج دیں"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"وال پیپر، سلیپ وضع، فونٹ سائز"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"غیر فعالیت کے 10 منٹ بعد سلیپ وضع میں بھیج دیں"</string>
<string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> میں سے اوسط <xliff:g id="USED_MEMORY">%1$s</xliff:g> میموری استعمال ہوئی"</string>
<string name="users_summary" msgid="1674864467098487328">"بطور <xliff:g id="USER_NAME">%1$s</xliff:g> سائن ان ہے"</string>
@@ -3754,7 +3727,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS کی اجازت نہیں ہے"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"کیمرے کی اجازت نہیں ہے"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"اسکرین شاٹ کی اجازت نہیں ہے"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"بیک اپس کو آف نہیں کر سکتے"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"اس ایپ کو نہیں کھولا جا سکتا"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"اگر آپ کے پاس سوالات ہیں تو اپنے IT منتظم سے رابطہ کریں"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"مزید تفصیلات"</string>
@@ -3918,9 +3890,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"کٹ آؤٹ کے ساتھ ڈسپلے کو تحریک دیں"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"ڈسپلے کٹ آؤٹ"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ڈسپلے کٹ آؤٹ، نشان"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"کوئی نہیں"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"آلہ ڈیفالٹ"</string>
<string name="special_access" msgid="3458780842491881155">"ایپ کی خاص رسائی"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ایپس غیر محدود ڈیٹا کا استعمال کر سکتی ہیں</item>
@@ -3942,11 +3914,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> سے منسلک کردہ"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"متعدد آلات سے منسلک کردہ"</string>
<string name="demo_mode" msgid="2798762752209330277">"سسٹم UI ڈیمو موڈ"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"نائٹ موڈ"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"نائٹ موڈ سیٹ کریں"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"گہری وضع"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"گہری وضع سیٹ کریں"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"فوری ترتیبات کے ڈیولپر ٹائلز"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope ٹریس"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"دفتری پروفائل کی ترتیبات"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"رابطہ تلاش"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"کالرز اور رابطوں کی شناخت کیلئے اپنی تنظیم کی جانب سے رابطہ تلاشیوں کی اجازت دیں"</string>
@@ -3987,13 +3958,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"فون کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"ٹیبلیٹ کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"آلہ کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"وقت، اطلاعاتی آئیکنز، اور دیگر معلومات چیک کرنے کے لیے، اپنی اسکرین کو دو بار تھپتھپائیں۔"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"وقت، اطلاعات، اور دیگر معلومات چیک کرنے کے لیے اپنی اسکرین کو دو بار تھپتھپائیں۔"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"چیک کرنے کیلئے فون کو اٹھائیں"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"چیک کرنے کیلئے ٹیبلیٹ کو اٹھائیں"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"چیک کرنے کیلئے آلہ کو اٹھائیں"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"وقت، اطلاعاتی آئیکنز، اور دیگر معلومات چیک کرنے کے لیے، اپنا فون اٹھائیں۔"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"وقت، اطلاعاتی آئیکنز، اور دیگر معلومات چیک کرنے کے لیے، اپنا ٹیبلیٹ اٹھائیں۔"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"وقت، اطلاعاتی آئیکنز، اور دیگر معلومات چیک کرنے کے لیے، اپنا آلہ اٹھائیں۔"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"بیداری کا ڈسپلے"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"وقت، اطلاعات، اور دیگر معلومات چیک کرنے کے لیے اپنا فون اٹھائیں۔"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"وقت، اطلاعات، اور دیگر معلومات چیک کرنے کے لیے اپنا ٹیبلیٹ اٹھائیں۔"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"وقت، اطلاعات، اور دیگر معلومات چیک کرنے کے لیے اپنا آلہ اٹھائیں۔"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"بیداری کے قفل کی اسکرین کا اشارہ"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"اطلاعات کیلئے فنگر پرنٹ سوائپ"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"فنگر پرنٹ سوائپ کریں"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"اپنی اطلاعات چیک کرنے کیلئے اپنے فون کی پشت پر فنگر پرنٹ سینسر پر نیچے سوائپ کریں۔"</string>
@@ -4073,7 +4048,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> کوششیں</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> کوشش</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"اس آلہ کے ڈیٹا کا بیک اپ لیا جا رہا ہے"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"یہ آلہ آپ کی تنظیم کے زیر انتظام ہے۔"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"یہ آلہ <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> کے زیر انتظام ہے۔"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4114,6 +4088,12 @@
<string name="autofill_app" msgid="7338387238377914374">"آٹو فل سروس"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"آٹو، فل، آٹو فل"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>یہ یقینی بنائیں کہ آپ کو اس ایپ پر اعتماد ہے</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> آٹو فل کی جانے والی چیزوں کی تعیین کرنے کیلئے آپ کی اسکرین پر موجود چیزوں کو استعمال کرتا ہے۔"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"آٹو فل"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"لاگنگ کی سطح"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"فی سیشن زیادہ سے زیادہ درخواستیں"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"زیادہ سے زیادہ مرئی ڈیٹا سیٹس"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"ڈیفالٹ اقدار پر دوبارہ ری سیٹ کریں"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"آٹو فل ڈویلپر کے اختیارات کو دوبارہ ترتیب دے دیا گیا ہے"</string>
<string name="device_theme" msgid="4571803018917608588">"آلہ کا تھیم"</string>
<string name="default_theme" msgid="7085644992078579076">"ڈیفالٹ"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"نیٹ ورک کا نام"</string>
@@ -4128,15 +4108,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"ٹرگر کیرئیر فراہمی"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"\'ڈسٹرب نہ کریں\' کو اپ ڈیٹ کریں"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"متوجہ رہنے کے لیے اطلاعات موقوف کریں"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"نیا اور دلچسپ کیا ہے؟"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"اپنے نئے فون کا ایک ٹؤر لیں"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"اپنے نئے ٹیبلیٹ کا ایک ٹؤر لیں"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"اپنے نئے آلے کا ایک ٹؤر لیں"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"یہ خصوصیت اس آلہ میں دستیاب نہیں ہے"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"مکمل GNSS پیمائشوں کو زبردستی لاگو کریں"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"ڈیوٹی سائیکلنگ کے بغیر سبھی GNSS مجموعوں اور کثرتوں کو ٹریک کریں"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"ہمیشہ ناکامی کا ڈائیلاگ دکھائیں"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"جب بھی ایپ ناکام ہو تو ڈائیلاگ دکھائیں"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE کے لیے فعال ایپ منتخب کریں"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE کے لیے فعال کردہ کوئی ایپلیکیشن سیٹ نہیں ہے"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE کے لیے فعال ایپلیکیشن: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"ڈائرکٹری تک رسائی"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ڈائرکٹری تک رسائی"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4177,4 +4156,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"نیٹ ورک کی تفصیلات"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"آپ کے آلہ کا نام آپ کے فون پر موجود ایپس میں مرئی ہوتا ہے۔ جب آپ بلوٹوتھ آلات سے منسلک ہوتے ہیں یا Wi-Fi ہاٹ اسپاٹ سیٹ اپ کرتے ہیں تو دوسرے لوگ بھی اسے دیکھ سکتے ہیں۔"</string>
<string name="devices_title" msgid="7701726109334110391">"آلات"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"تمام ترتیبات"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"تجاویز"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS ڈیٹا"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS ڈیٹا"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"نیٹ ورک کا انتخاب کریں"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"غیر منسلک"</string>
+ <string name="network_connected" msgid="4943925032253989621">"منسلک"</string>
+ <string name="network_connecting" msgid="76404590784733557">"منسلک ہو رہا ہے…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"منسلک نہیں کیا جا سکا"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"کوئی نیٹ ورک نہیں ملا۔"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"نیٹ ورکس نہیں مل سکے۔ دوبارہ کوشش کریں۔"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(ممنوع)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"کوئی SIM کارڈ نہیں ہے"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"اعلی درجے کی کالنگ"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"ترجیحی نیٹ ورک کی وضع: WCDMA ترجیحی"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"ترجیحی نیٹ ورک کی وضع: صرف GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"ترجیحی نیٹ ورک کی وضع: صرف WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"ترجیحی نیٹ ورک کی وضع: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"ترجیحی نیٹ ورک کی وضع: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"ترجیحی نیٹ ورک کی وضع: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"ترجیحی نیٹ ورک کی وضع: صرف CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"ترجیحی نیٹ ورک کی وضع: صرف EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"ترجیحی نیٹ ورک کی وضع: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"ترجیحی نیٹ ورک کی وضع: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"ترجیحی نیٹ ورک کی وضع: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"ترجیحی نیٹ ورک کی وضع: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"ترجیحی نیٹ ورک کی وضع: عالمی"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"ترجیحی نیٹ ورک کی وضع: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"ترجیحی نیٹ ورک کی وضع: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"ترجیحی نیٹ ورک کی وضع: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"ترجیحی نیٹ ورک کی وضع: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"ترجیحی نیٹ ورک کی وضع: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"ترجیحی نیٹ ورک کی وضع: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"ترجیحی نیٹ ورک کی وضع: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"ترجیحی نیٹ ورک کی وضع: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"ترجیحی نیٹ ورک کی وضع: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"ترجیحی نیٹ ورک کی وضع: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"ترجیحی نیٹ ورک کی وضع: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"ترجیحی نیٹ ورک کی وضع: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"ترجیحی نیٹ ورک کی وضع: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (تجویز کردہ)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (تجویز کردہ)"</string>
+ <string name="network_global" msgid="959947774831178632">"عالمی"</string>
+ <string name="label_available" msgid="1731547832803057893">"دستیاب نیٹ ورکس"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"تلاش کیا جا رہا ہے…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> پر رجسٹر کیا جا رہا ہے…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"آپ کے SIM کارڈ کو اس نیٹ ورک سے منسلک ہونے کی اجازت نہیں ہے۔"</string>
+ <string name="connect_later" msgid="978991102125216741">"ابھی اس نیٹ ورک سے منسلک نہیں ہو سکتا۔ بعد میں دوبارہ کوشش کریں۔"</string>
+ <string name="registration_done" msgid="4573820010512184521">"نیٹ ورک پر رجسٹرڈ ہو گیا۔"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"خودکار طور پر نیٹ ورک منتخب کریں"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"کیریئر کی ترتیبات"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"ڈیٹا سروس سیٹ اپ کریں"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"موبائل ڈیٹا"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"موبائل نیٹ ورک استعمال کر کے ڈیٹا تک رسائی حاصل کریں"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"ترجیحی نیٹ ورک کی قسم"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"نیٹ ورک آپریٹ کرنے کی وضع تبدیل کریں"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"ترجیحی نیٹ ورک کی قسم"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"کیریئر"</string>
+ <string name="call_category" msgid="8108654745239563833">"کالنگ"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"کیرئیر ویڈیو کالنگ"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"سسٹم کا انتخاب"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA رومنگ وضع تبدیل کریں"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"سسٹم کا انتخاب"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"نیٹ ورک"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"نیٹ ورک"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA سبسکرپشن"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM اور NV کے درمیان تبدیل کریں"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"سبسکرپشن"</string>
+ <string name="register_automatically" msgid="518185886971595020">"خود کار رجسٹریشن…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"ڈیٹا رومنگ کی اجازت دیں؟"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"اپنے نیٹ ورک فراہم کنندہ سے قیمت معلوم کریں۔"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"ایپ ڈیٹا کا استعمال"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"غلط نیٹ ورک موڈ <xliff:g id="NETWORKMODEID">%1$d</xliff:g>۔ نظر انداز کریں۔"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> سے منسلک ہونے پر دستیاب نہیں ہے"</string>
+ <string name="see_more" msgid="5953815986207345223">"مزید دیکھیں"</string>
+ <string name="see_less" msgid="1250265310929558370">"کم دیکھیں"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 4123e0a..007df73 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -267,7 +267,7 @@
<item msgid="2603878814882344450">"umumiy tovush balandligi"</item>
<item msgid="7136963238377062018">"ovoz balandligi"</item>
<item msgid="4270236897655923007">"qo‘ng‘iroq ovozi"</item>
- <item msgid="6325739889222559394">"multimedia ovozi"</item>
+ <item msgid="6325739889222559394">"multimedia tovushi"</item>
<item msgid="5762123934816216821">"Signal tovushi balandligi"</item>
<item msgid="785049718065337473">"xabarnoma tovush balandligi"</item>
<item msgid="6700305533746877052">"bluetooth tovush balandligi"</item>
@@ -334,7 +334,7 @@
<item msgid="2098976479485046797">"Umumiy tovush balandligi"</item>
<item msgid="5660213838861789350">"Ovoz balandligi"</item>
<item msgid="7983336752371254444">"Qo‘ng‘iroq ovozi"</item>
- <item msgid="7878027809189330917">"Multimedia ovozi"</item>
+ <item msgid="7878027809189330917">"Multimedia tovushi"</item>
<item msgid="7260546305036218513">"Signal tovushi balandligi"</item>
<item msgid="9103719301075748925">"Xabarnoma tovush balandligi"</item>
<item msgid="7025966722295861512">"Bluetooth tovush balandligi"</item>
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Bu – pulli tarmoq"</item>
<item msgid="2266114985518865625">"Bu – bepul tarmoq"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Standart (ixtiyoriy MAC)"</item>
+ <item msgid="5398461510512959597">"Ishonchli"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Yo‘q"</item>
<item msgid="3863157480502955888">"Ha"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Har doim yoniq"</item>
<item msgid="6385301106124765323">"Har doim o‘chiq"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Yoqilmagan"</item>
+ <item msgid="2182686878828390312">"Tuzatish"</item>
+ <item msgid="5286514712714822064">"Batafsil"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Faqat uy"</item>
+ <item msgid="5034813753274486448">"Avtomatik"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA (afzal)"</item>
+ <item msgid="807926878589867564">"Faqat GSM"</item>
+ <item msgid="488474605709912156">"Faqat WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA (avtomatik)"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo (avtomatik)"</item>
+ <item msgid="370391313511477301">"CDMA (EvDo imkoniyatisiz)"</item>
+ <item msgid="4678789463133969294">"Faqat EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA va LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Global"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Faqat TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Global"</item>
+ <item msgid="817971827645657949">"LTE / CDMA"</item>
+ <item msgid="519208953133334357">"LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 357dbb0..88c93b7 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Yaratish"</string>
<string name="allow" msgid="3349662621170855910">"Ruxsat berish"</string>
<string name="deny" msgid="6947806159746484865">"Rad etish"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Yopish"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Almashtirish"</string>
<string name="device_info_default" msgid="7847265875578739287">"Noma’lum"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Dasturchi sifatida ro‘yxatdan o‘tishni yakunlashga <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> qadam qoldi.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Shart emas, siz allaqachon dasturchi rejimiga o‘tgansiz."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Avval dasturchi sozlamalarini yoqing."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Simsiz tarmoqlar"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Ulanishlar"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Qurilma"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Shaxsiy"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Kirish huquqi"</string>
<string name="header_category_system" msgid="2816866961183068977">"Tizim"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Mobil internetni yoqish"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Mobil internetni o‘chirish"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Qurilmaning Bluetooth manzili: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan aloqa uzilsinmi?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Signal uzatish"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Nomsiz bluetooth qurilma"</string>
<string name="progress_scanning" msgid="192587958424295789">"Qidirilmoqda"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Bluetooth qurilmalar topilmadi."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Ilova telefoningizda Bluethooth xizmatini yoqib, uni boshqa qurilmalarga ko‘rinarli qilmoqchi. Siz buni keyinroq Bluetooth sozlamalari orqali o‘zgartirishingiz mumkin."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Bluetooth yoqilmoqda…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth o‘chirilyapti…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Avtoulanish"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth ulanish so‘rovi"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” qurilmasiga ulanish uchun bosing."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" qurilmasiga ulanmoqchimisiz?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Mavjud chaqiruv qurilmalari"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Hozirda ulangan"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Saqlangan qurilmalar"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Qurilma qo‘shish"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Ulanish uchun Bluetooth yoqiladi"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Ulanish parametrlari"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Avval ulangan qurilmalar"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Avval ulangan qurilmalar"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Bluetooth yoqildi"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Hammasi"</string>
<string name="date_and_time" msgid="9062980487860757694">"Sana va vaqt"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Vaqt zonasini tanlang"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Tashlab ketish"</string>
<string name="next_label" msgid="4693520878012668114">"Keyingisi"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Tillar"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Til sozlamalari"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"O‘chirish"</string>
<string name="add_a_language" msgid="2330538812283783022">"Til qo‘shish"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Sozlamalar"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Sozlamalar yorlig‘i"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Parvoz rejimi"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Yana"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Simsiz tarmoqlar"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, parvoz rejimi, uyali tarmoqlar, & VPN‘larni boshqarish"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Mobil internet"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Maxfiylik"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Administrator tomonidan o‘chirilgan"</string>
<string name="security_status_title" msgid="5848766673665944640">"Xavfsizlik holati"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Ekran qulfi, qulfni yuzni tanitib ochish"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Ekran qulfi, barmoq izi"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekran qulfi"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Yuz kiritildi"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Yuzingiz bilan oching"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Qurilma qulfini yuzingiz bilan oching"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Telefoningizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun yuzingizdan foydalaning."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Foydalaning"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Telefonni qulfdan chiqarish yoki xaridlarni tasdiqlash uchun barmoq izingizdan foydalaning.\n\nEslatma: barmoq izi orqali bu qurilmani qulfdan chiqara olmaysiz. Batafsil axborot olish uchun tashkilot administratoriga murojaat qiling."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Telefoningizni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun yuzingizdan foydalaning"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Maksimal <xliff:g id="COUNT">%d</xliff:g> ta barmoq izini kiritish mumkin"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Yuzingizni aylana markaziga moslang"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Keyinroq"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Maksimal <xliff:g id="COUNT">%d</xliff:g> ta yuzni kiritish mumkin"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Yuzlar maksimal miqdorda kiritildi"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Boshqa yuz kiritish imkonsiz"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Yuz qayd qilinmadi"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Yuzni qayd qilish vaqti tugab qoldi. Qayta urining."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Yuzni qayd qilish funksiyasi ishlamadi."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Hammasi tayyor."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Tayyor"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Yuz yordamida"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Qulfni ochish"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Ilovaga kirish va to‘lov"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Qulfdan chiqarish uchun ko‘zlarni ochish kerak"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Yuz tekshiruvi faqat ko‘zlar ochiqligida ishlaydi"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Yuzni olib tashlash"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Yuzga oid axborotni yangilang"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Qurilmani ochish va ilovalarga kirishda yuzingizdan foydalanishingiz mumkin. "<annotation id="url">"Batafsil"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Barmoq izi"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Barmoq izlari"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Barmoq izi sozlamalari"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GGs"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Wi‑Fi hotspot uchun kamida bitta chastota tanlang:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP sozlamalari"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Maxfiylik"</string>
<string name="wifi_shared" msgid="844142443226926070">"Qurilmaning boshqa foydalanuvchilari bilan ulashish"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(o‘zgartirilmagan)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Tanlang"</string>
@@ -908,7 +916,7 @@
<string name="wifi_hotspot_connect" msgid="5065506390164939225">"ULANISH"</string>
<string name="no_internet_access_text" msgid="5926979351959279577">"Bu tarmoqda internet aloqasi yo‘q. Shu tarmoqda qolasizmi?"</string>
<string name="no_internet_access_remember" msgid="4697314331614625075">"Bu tarmoq uchun boshqa so‘ralmasin"</string>
- <string name="lost_internet_access_title" msgid="5779478650636392426">"Wi-Fi aloqasi bor, lekin Internetga ulanmagan"</string>
+ <string name="lost_internet_access_title" msgid="5779478650636392426">"Wi-Fi aloqasi bor, lekin Internetga ulanmagansiz"</string>
<string name="lost_internet_access_text" msgid="9029649339816197345">"Agar Wi-Fi signali yomon bo‘lsa, istalgan vaqtda mobil internetga o‘tishingiz mumkin. Sarflangan trafik uchun haq olinishi mumkin."</string>
<string name="lost_internet_access_switch" msgid="2262459569601190039">"Mobil internetni yoqish"</string>
<string name="lost_internet_access_cancel" msgid="338273139419871110">"Wi-Fi tarmog‘ida qoling"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Bekor qilish"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Tarmoq unutilsinmi?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Bu tarmoqdagi barcha parollar o‘chirib tashlanadi"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Saqlangan tarmoqlar"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d ta tarmoq</item>
<item quantity="one">1 ta tarmoq</item>
@@ -991,8 +998,8 @@
<string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi qo‘ng‘iroq"</string>
<string name="wifi_calling_suggestion_title" msgid="5702964371483390024">"Wi‑Fi orqali chaqiruv qamrovini kengaytiring"</string>
<string name="wifi_calling_suggestion_summary" msgid="1331793267608673739">"Qamrovni kengaytirish uchun Wi-Fi chaqiruvni yoqing"</string>
- <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Qo‘ng‘iroqlar sozlamalari"</string>
- <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi qo‘ng‘iroq rejimi"</string>
+ <string name="wifi_calling_mode_title" msgid="2164073796253284289">"Afzal tarmoq"</string>
+ <string name="wifi_calling_mode_dialog_title" msgid="8149690312199253909">"Wi-Fi chaqiruv rejimi"</string>
<string name="wifi_calling_roaming_mode_title" msgid="1565039047187685115">"Rouming sozlamalari"</string>
<!-- no translation found for wifi_calling_roaming_mode_summary (8642014873060687717) -->
<skip />
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Yorqinlik"</string>
<string name="brightness_summary" msgid="838917350127550703">"Ekran yorqinligini moslash"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Moslashuvchan yorqinlik"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Yoniq"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"O‘chiq"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Tanlangan yorqinlik – juda past"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Tanlangan yorqinlik – past"</string>
@@ -1126,11 +1132,11 @@
<string name="night_display_auto_mode_title" msgid="6574111412154833409">"Jadval"</string>
<string name="night_display_auto_mode_never" msgid="2483761922928753400">"Hech qachon"</string>
<string name="night_display_auto_mode_custom" msgid="2379394568898721765">"Muayyan vaqtda yoqiladi"</string>
- <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Quyosh chiqishidan botishigacha"</string>
+ <string name="night_display_auto_mode_twilight" msgid="589042813708244059">"Quyosh botishidan to chiqishigacha"</string>
<string name="night_display_start_time_title" msgid="8918016772613689584">"Boshlanish vaqti"</string>
<string name="night_display_end_time_title" msgid="8286061578083519350">"Tugash vaqti"</string>
<string name="night_display_status_title" msgid="1784041143360286267">"Holati"</string>
- <string name="night_display_temperature_title" msgid="1435292789272017136">"Yorqinlik"</string>
+ <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensivlik"</string>
<string name="night_display_summary_off" msgid="1792750041697946539">"O‘chiq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="night_display_summary_off_auto_mode_never" msgid="3583590137322963513">"Hech qachon avtomatik yoqilmaydi"</string>
<string name="night_display_summary_off_auto_mode_custom" msgid="6365668239253173208">"<xliff:g id="ID_1">%1$s</xliff:g> da avtomatik yoqiladi"</string>
@@ -1141,10 +1147,10 @@
<string name="night_display_summary_on_auto_mode_twilight" msgid="852270120144683507">"Quyosh chiqishi bilan avtomatik tugaydi"</string>
<string name="night_display_activation_on_manual" msgid="277343561277625826">"Yoqish"</string>
<string name="night_display_activation_off_manual" msgid="4074557720918572883">"O‘chirish"</string>
- <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Quyosh chiqqunicha yoqish"</string>
- <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Quyosh botguncha o‘chirish"</string>
- <string name="night_display_activation_on_custom" msgid="5472029024427933598">"<xliff:g id="ID_1">%1$s</xliff:g> gacha yoqish"</string>
- <string name="night_display_activation_off_custom" msgid="6169984658293744715">"<xliff:g id="ID_1">%1$s</xliff:g> gacha o‘chirish"</string>
+ <string name="night_display_activation_on_twilight" msgid="6976051971534953845">"Quyosh chiqqunicha yoniq tursin"</string>
+ <string name="night_display_activation_off_twilight" msgid="7196227685059907233">"Quyosh botguncha yoqilmasin"</string>
+ <string name="night_display_activation_on_custom" msgid="5472029024427933598">"<xliff:g id="ID_1">%1$s</xliff:g> gacha yoniq tursin"</string>
+ <string name="night_display_activation_off_custom" msgid="6169984658293744715">"<xliff:g id="ID_1">%1$s</xliff:g> gacha yoqilmasin"</string>
<string name="screen_timeout" msgid="4351334843529712571">"Uyqu rejimi"</string>
<string name="screen_timeout_title" msgid="5130038655092628247">"Ekranning o‘chishi"</string>
<string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> harakatsizlikdan keyin"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"PIN-kod o‘zgartirilmadi.\nNoto‘g‘ri PIN-kod terildi shekilli."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"SIM karta PIN kodi o‘zgartirildi"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"SIM karta qulfi holati o‘zgarmadi.\nPIN-kod noto‘g‘ri kiritildi shekilli."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"PIN kod faolsizlantirilmadi."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"PIN kod yoqilmadi."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Bekor qilish"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Bir nechta SIM karta topildi"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Buning uchun <xliff:g id="NAME_0">^1</xliff:g> qurilmasini formatlash lozim. \n\n"<b>"Agar formatlansa, <xliff:g id="NAME_1">^1</xliff:g> xotirasida joylashgan barcha ma’lumotlar o‘chib ketadi."</b>" Ma’lumotlar yo‘qolishining oldini olish uchun ularni zaxiralab qo‘ying."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Tozalash va formatlash"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> formatlanmoqda…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"<xliff:g id="NAME">^1</xliff:g> formatlanayotganda, uni chiqarmang."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"<xliff:g id="NAME">^1</xliff:g> formatlanayotganda, uni chiqarmang."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Yangi kartaga ko‘chirib o‘tkazing"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Siz rasm, fayl va ba’zi ilovalarni ushbu SD-kartaga (<xliff:g id="NAME">^1</xliff:g>) ko‘chirib o‘tkazishingiz mumkin. \n\nKo‘chirish taxminan <xliff:g id="TIME">^2</xliff:g> vaqt oladi va ichki xotirada <xliff:g id="SIZE">^3</xliff:g> joy bo‘shaydi. Ko‘chirish vaqtida ba’zi ilovalar ishlamasligi mumkin."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Ko‘chirib o‘tkazish"</string>
@@ -1501,7 +1509,7 @@
<string name="erase_esim_storage" msgid="5684858600215441932">"eSIM kartani tozalash"</string>
<string name="erase_esim_storage_description" product="default" msgid="708691303677321598">"Telefondan barcha eSIM kartalarni tozalash. Bunda mobil xizmat tarif rejalari bekor qilinmaydi."</string>
<string name="erase_esim_storage_description" product="tablet" msgid="1780953956941209107">"Planshetdan barcha eSIM kartalarni tozalash. Bunda mobil xizmat tarif rejalari bekor qilinmaydi."</string>
- <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Planshetni dastlabki sozlamarga qaytarish"</string>
+ <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Planshet sozlamalarini asliga qaytarish"</string>
<string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Telefon sozlamalarini tiklash"</string>
<string name="master_clear_final_desc" msgid="7318683914280403086">"Barcha shaxsiy ma’lumotlaringiz va yuklab olingan ilovalar o‘chirib tashlansinmi? Ularni keyin qayta tiklab bo‘lmaydi."</string>
<string name="master_clear_final_button_text" msgid="5390908019019242910">"Barchasini o‘chirish"</string>
@@ -1695,7 +1703,7 @@
<string name="advanced_settings_summary" msgid="4016682978071086747">"Qo‘shimcha sozlamalar tanlamalarini yoqib qo‘yish"</string>
<string name="application_info_label" msgid="5736524913065714880">"Ilova haqida"</string>
<string name="storage_label" msgid="8700867073480107253">"Xotira"</string>
- <string name="auto_launch_label" msgid="2669236885531442195">"Birlamchi ilova"</string>
+ <string name="auto_launch_label" msgid="2669236885531442195">"Odatiy tarzda ochish"</string>
<string name="auto_launch_label_generic" msgid="3230569852551968694">"Birlamchi"</string>
<string name="screen_compatibility_label" msgid="663250687205465394">"Ekrandagi moslashuv"</string>
<string name="permissions_label" msgid="2605296874922726203">"Ruxsatlar"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"O‘rnatilgan"</string>
<string name="no_applications" msgid="7336588977497084921">"Hech qanday ilova yo‘q."</string>
<string name="internal_storage" msgid="1584700623164275282">"Ichki xotira"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"ichki xotira"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB xotira"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD karta xotirasi"</string>
<string name="recompute_size" msgid="7722567982831691718">"Xajm qayta hisoblanmoqda…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Ilova ma‘lumotlari o‘chirilsinmi?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Ushbu ilovaning barcha ma’lumotlari, jumladan, fayllar, ma’lumotlar bazalari, sozlamalar, hisoblar va boshqa narsalar o‘chirib tashlanadi. Keyin ularni qayta tiklab bo‘lmaydi."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Ilova o‘rnatilgan ilovalar ro‘yxatidan topilmadi."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Xotira tozalanmadi."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ushbu ilova planshetda quyida ko‘rsatilgan ruxsatlarga ega:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ushbu ilova telefonda quyida ko‘rsatilgan ruxsatlarga ega:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Bu ilova planshetingizda quyidagilarga kirishi mumkin. Unumdorlikni oshirish hamda xotira iste‘molini kamaytirish maqsadida, bu ruxsatlarning ba‘zilari <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> uchun mavjud, chunki u xuddi quyidagilar kabi bir xil jarayonda ishlaydi <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Bu ilova telefoningizda quyidagilarga kirishi mumkin. Unumdorlikni oshirish hamda xotira iste‘molini kamaytirish maqsadida, bu ruxsatlarning ba‘zilari <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> uchun mavjud, chunki u xuddi quyidagilar kabi bir xil jarayonda ishlaydi <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> va <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Ushbu ilova sizdan haq talab qilishi mumkin:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Premium SMS yuborish"</string>
<string name="computing_size" msgid="1599186977475211186">"Hisoblanmoqda…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Paket o‘lchamini hisoblamadi"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Sizda hech qanday uchinchi shaxs ilovalar o‘rnatilmagan"</string>
<string name="version_text" msgid="9189073826278676425">"<xliff:g id="VERSION_NUM">%1$s</xliff:g> versiya"</string>
<string name="move_app" msgid="5042838441401731346">"Ko‘chirish"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Planshetga o‘tkazish"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Telefonga ko‘chirish"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"USB xotiraga o‘tkazish"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"SD kartaga o‘tkazish"</string>
- <string name="moving" msgid="6431016143218876491">"O‘tkazilmoqda"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Boshqa bir ko‘chirish amalga oshirilmoqda."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Xotirada yetarlicha bo‘sh joy yo‘q."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Ilova mavjud emas."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Qurilma administratori ilovasini tashqi xotira qurilmasiga o‘rnatib bo‘lmaydi"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Majburan to‘xtatilsinmi?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Ilovani majburan to‘xtatish uning ishlashiga ta’sir ko‘rsatishi mumkin."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Ilovani ko‘chirib bo‘lmadi. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Afzal ko‘rilgan o‘rnatish joyi"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Yangi ilovalar uchun tanlangan o‘rnatish joyini o‘zgartirish"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Ilovani o‘chirib qo‘ymoqchimisiz?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Ilovani o‘chirib qo‘yish"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Agar bu ilovani o‘chirib qo‘ysangiz, Android va boshqa ilovalar bundan buyon kutilganidek ishlamasligi mumkin."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ma‘lumotlarni o‘chirib tashlab, ilova o‘chirib qo‘yilsinmi?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Agar bu ilovani o‘chirib qo‘ysangiz, Android va boshqa ilovalar bundan buyon kutilganidek ishlamasligi mumkin. Ma’lumotlaringiz ham o‘chib ketadi."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Xabarnomalar o‘chirib qo‘yilsinmi?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Agar bu ilova uchun xabarnomalarni o‘chirib qo‘ysangiz, muhim ogohlantirishlar va yangilanishlardan bexabar qolishingiz mumkin."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Market"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Ilova haqida"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Ilova <xliff:g id="APP_STORE">%1$s</xliff:g> orqali o‘rnatilgan"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Xizmatdan foydalanish"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Rangni tuzatish funksiyasidan foydalanish"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Taglavhalardan foydalanish"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Davom etish"</string>
<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="6371077608778830020">"Eshitish apparatlarini qo‘shish"</string>
@@ -2140,8 +2134,6 @@
<!-- String.format failed for translation -->
<!-- no translation found for device_screen_usage (3386088035570409683) -->
<skip />
- <string name="device_screen_consumption" msgid="4607589286438986687">"Ekran sarfi"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Mobil tarmoqni tekshirish"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"100%% quvvatlanganidan beri quvvati sarfi"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"To‘liq quvvat olganidan beri ekran yoniq turgan vaqt miqdori"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"To‘liq quvvat olganidan beri qurilmaning quvvat sarfi"</string>
@@ -2168,11 +2160,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Batareya sarfi"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Quvvatdan foydalanishni moslash"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Quyidagi paketlarni o‘z ichiga oladi"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Ortiqcha quvvat sarflayotgan ilovalar"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Qurilma uyqu rejimiga kirmaydi"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Qurilmani fonda uyg‘otmoqda"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Joylashuv axborotini tez-tez so‘ramoqda"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ta ilova xato ishlayapti"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Ilovalar odatdagidek ishlamoqda"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Telefon fonda batareya quvvatidan odatdagidek foydalanmoqda"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Planshet fonda batareya quvvatidan odatdagidek foydalanmoqda"</string>
@@ -2242,6 +2229,7 @@
<item quantity="other">%1$d ta ilova uchun batareya sarfi cheklangan</item>
<item quantity="one">%1$d ta ilova uchun batareya sarfi cheklangan</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Cheklangan: <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Mazkur ilovalar fonda batareyani sarflamoqda. Cheklangan ilovalar xato ishlashi va bildirishnomalar kechikishi mumkin."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Battery Manager ishlatish"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Ilovalar batareyani ortiqcha sarflayotganini aniqlash"</string>
@@ -2427,23 +2415,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Bekor qilish"</string>
<string name="tts_reset" msgid="2661752909256313270">"Asliga qaytarish"</string>
<string name="tts_play" msgid="2628469503798633884">"Ijro"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Quvvat boshqaruvi"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi sozlamasi yangilanmoqda"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth sozlamar yangilanmoqda"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"yoniq"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"o‘chiq"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"yoqish"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"o‘chirish"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Joylashuv"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Sinxronlash"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Yorqinlik <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"avtomatik"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"eng yuqori"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"o‘rtacha"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"min"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Hisob ma’lumotlari ombori"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Xotira kartasidan o‘rnatish"</string>
@@ -2601,7 +2572,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="TOTAL">%2$s</xliff:g>dan <xliff:g id="NUMBER">%1$s</xliff:g>tasi"</string>
<string name="select_all" msgid="1562774643280376715">"Hammasini belgilash"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Trafik sarfi"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ilovalar sarflagan trafik"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Mobil internet va Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Ilovalar"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ILOVA HAQIDA"</string>
@@ -2978,7 +2949,6 @@
<item quantity="other">%d ta yashirin elementni ko‘rsatish</item>
<item quantity="one">%d ta yashirin elementni ko‘rsatish</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Yig‘ish"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Tarmoq va Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"mobil"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"trafik sarfi"</string>
@@ -2990,12 +2960,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ilovalar va bildirishnomalar"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Ruxsatlar, birlamchi ilovalar"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Ishchi profildagi ilovalarga bildirishnomalar ruxsati berilmagan."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Hisoblar"</string>
- <string name="account_dashboard_default_summary" msgid="3998347400161811075">"Hech qanday hisob qo‘shilmagan"</string>
+ <string name="account_dashboard_default_summary" msgid="3998347400161811075">"Hech qanday hisobga kirilmagan"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Birlamchi ilovalar"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Tillar, vaqt, zaxira, yangilanishlar"</string>
<string name="search_results_title" msgid="1796252422574886932">"Sozlamalar"</string>
- <string name="search_menu" msgid="6283419262313758339">"Sozlamalar ichidan qidirish"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"Wi-Fi, WiFi, tarmoq aloqasi, Internet, simsiz, mobil internet, Wi Fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"Wi-Fi, wi-fi, almashtirish, boshqarish"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"SMS, matnli xabar, xabar, SMS/MMS, birlamchi"</string>
@@ -3040,6 +3010,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"to‘lash, bosish, to‘lovlar"</string>
<string name="keywords_backup" msgid="470070289135403022">"zaxira, zaxira nusxa olish"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"imo-ishora"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"yuz, qulfdan chiqarish, tekshiruv, kirish"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, prl versiyasi, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"tarmoq, mobil tarmoq holati, xizmat holati, signal kuchi, mobil tarmoq turi, rouming, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"seriya raqami, apparat versiyasi"</string>
@@ -3047,6 +3018,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"tungi mavzu"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"xato"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Ekranning avtomatik yonishi, ekran qulfi"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"qulflangan ekrandagi bildirishnoma"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"yuz"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"barmoq izi"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"xira ekran, sensorli ekran, batareya, smart yorqinlik, dinamik yorqinlik"</string>
@@ -3078,7 +3050,7 @@
<string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Qo‘ng‘iroq vaqti tebranish yoqilgan"</string>
<string name="sound_settings_summary_silent" msgid="5074529767435584948">"Qo‘ng‘iroq ovozi o‘chirilgan"</string>
<string name="sound_settings_example_summary" msgid="2404914514266523165">"Qo‘ng‘iroq ovozi balandligi: 80%"</string>
- <string name="media_volume_option_title" msgid="2811531786073003825">"Multimedia ovozi"</string>
+ <string name="media_volume_option_title" msgid="2811531786073003825">"Multimedia tovushi"</string>
<string name="call_volume_option_title" msgid="1265865226974255384">"Chaqiruv tovushi"</string>
<string name="alarm_volume_option_title" msgid="8219324421222242421">"Signal tovushi balandligi"</string>
<string name="ring_volume_option_title" msgid="6767101703671248309">"Rington"</string>
@@ -3289,7 +3261,7 @@
<string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Xiralikni kamaytirish (tavsiya etiladi)"</string>
<string name="display_vr_pref_off" msgid="2190091757123260989">"Miltillashni kamaytirish"</string>
<string name="picture_in_picture_title" msgid="5824849294270017113">"Tasvir ustida tasvir"</string>
- <string name="picture_in_picture_empty_text" msgid="685224245260197779">"O‘rnatilgan ilovalar Tasvir ustida tasvir rejimi bilan mos emas"</string>
+ <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Oʻrnatilgan ilovalar Tasvir ustida tasvir rejimi bilan mos emas"</string>
<string name="picture_in_picture_keywords" msgid="8361318686701764690">"tasvir ustida tasvir"</string>
<string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Tasvir ustida tasvir"</string>
<string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tasvir ustida tasvir rejimiga ruxsat berish"</string>
@@ -3324,7 +3296,7 @@
<string name="notification_content_block_title" msgid="5854232570963006360">"Bildirishnomalar ko‘rsatilsin"</string>
<string name="notification_content_block_summary" msgid="7746185794438882389">"Fonda yoki tashqi qurilmalarda bildirishnomalar hech qachon ko‘rsatilmasin"</string>
<string name="notification_badge_title" msgid="6370122441168519809">"Nuqtali bildirishnoma belgisi"</string>
- <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildirishnoma belgisini ko‘rsatish"</string>
+ <string name="notification_channel_badge_title" msgid="2240827899882847087">"Bildirishnoma belgisining chiqishi"</string>
<string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Bezovta qilinmasin rejimi ustidan yozish"</string>
<string name="app_notification_override_dnd_summary" msgid="2612502099373472686">"Bezovta qilinmasin rejimi yoniqligida mazkur bildirishnomalarning qalqib chiqishiga ruxsat berish"</string>
<string name="app_notification_visibility_override_title" msgid="7821124557634786985">"Ekran qulfida"</string>
@@ -3478,13 +3450,13 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Ushbu qurilmani ishga tushirish uchun PIN-kodni kiritganingizda, “<xliff:g id="SERVICE">%1$s</xliff:g>” kabi maxsus xizmatlar hali yoqilmagan bo‘ladi."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Ushbu qurilmani ishga tushirish uchun chizmali parolni kiritganingizda, “<xliff:g id="SERVICE">%1$s</xliff:g>” kabi maxsus xizmatlar hali yoqilmagan bo‘ladi."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Ushbu qurilmani ishga tushirish uchun parolni kiritganingizda, “<xliff:g id="SERVICE">%1$s</xliff:g>” kabi maxsus xizmatlar hali yoqilmagan bo‘ladi."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Eslatma: O‘chirib-yoqilgandan so‘ng, bu ilova to telefoningiz qulfdan chiqarilmaguncha ishga tushmaydi"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Eslatma: Agar telefonni qayta ishga tushirsangiz va ekran qulfi sozlangan bo‘lsa, bu ilova to telefoningiz qulfdan chiqarilmaguncha ishga tushmaydi"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI kod ma’lumotlari"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI raqamiga aloqador ma’lumotlar"</string>
<string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>-uya)"</string>
- <string name="launch_by_default" msgid="1840761193189009248">"Birlamchi ilova"</string>
+ <string name="launch_by_default" msgid="1840761193189009248">"Odatiy tarzda ochish"</string>
<string name="app_launch_domain_links_title" msgid="1160925981363706090">"Havolalarni ochish"</string>
- <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Mos havolalar ochilsin"</string>
+ <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Mos havolalarni ochish"</string>
<string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Avtomatik ochilsin"</string>
<string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Mos havolalar"</string>
<string name="app_launch_other_defaults_title" msgid="2516812499807835178">"Boshqa birlamchi sozlamalar"</string>
@@ -3527,12 +3499,12 @@
<string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Hech qanday ruxsat berilmagan"</string>
<string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Hech qanday ruxsat so‘ralmagan"</string>
<string name="filter_all_apps" msgid="1988403195820688644">"Barcha ilovalar"</string>
- <string name="filter_enabled_apps" msgid="5395727306799456250">"O‘rnatilgan ilovalar"</string>
+ <string name="filter_enabled_apps" msgid="5395727306799456250">"Oʻrnatilgan ilovalar"</string>
<string name="filter_instant_apps" msgid="574277769963965565">"Darhol ochiladigan ilovalar"</string>
<string name="filter_personal_apps" msgid="3277727374174355971">"Shaxsiy"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Ishga oid"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Ilovalar: hammasi"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Ilovalar: o‘chiq"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Bildirishnoma kelmaydi"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Turkumlar: favqulodda muhim"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Turkumlar: unchalik muhim emas"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Tukrumlar: o‘chiq"</string>
@@ -3553,7 +3525,7 @@
<item quantity="other">Mos havolalarni <xliff:g id="COUNT">%d</xliff:g> ta ilovada ochish mumkin</item>
<item quantity="one">Mos havolalarni bitta ilovada ochish mumkin</item>
</plurals>
- <string name="app_link_open_always" msgid="2474058700623948148">"Ushbu ilovada ochilsin"</string>
+ <string name="app_link_open_always" msgid="2474058700623948148">"Shu ilovada ochish"</string>
<string name="app_link_open_ask" msgid="7800878430190575991">"Har safar so‘ralsin"</string>
<string name="app_link_open_never" msgid="3407647600352398543">"Bu ilovada ochilmasin"</string>
<string name="fingerprint_not_recognized" msgid="1739529686957438119">"Barmoq izi aniqlanmadi"</string>
@@ -3593,7 +3565,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Ogohlantirishlar"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Butun qurilmaning quvvat sarfi"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Ilovalardan foydalanish"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Batareya sarfi yuqori"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ta ilova noodatiy ishlayapti</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> noodatiy ishlayapti</item>
@@ -3682,8 +3653,8 @@
<string name="running_frequency" msgid="6622624669948277693">"Yuz berish oralig‘i"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Maksimal foydalanish"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Trafik sarflanmagan"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> ilovasiga “Bezovta qilinmasin” rejimidan foydalanishga ruxsat berilsinmi?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Bu ilova “Bezovta qilinmasin” rejimini yoqishi/o‘chirishi hamda unga aloqador sozlamalarni o‘zgartirishi mumkin."</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"<xliff:g id="APP">%1$s</xliff:g> uchun Bezovta qilinmasin rejimiga ruxsat berilsinmi?"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Bu ilova Bezovta qilinmasin rejimini yoqishi/o‘chirishi hamda unga aloqador sozlamalarni o‘zgartirish imkoniga ega bo‘ladi."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Yoniq turishi shart, sababi bildirishnomalardan foydalanishga ruxsat berilgan"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"<xliff:g id="APP">%1$s</xliff:g> ilovasi uchun “Bezovta qilinmasin” rejimiga ruxsati bekor qilinsinmi?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Ushbu ilova tomonidan yaratilgan barcha “Bezovta qilinmasin” rejimi qoidalari o‘chirib tashlanadi."</string>
@@ -3757,6 +3728,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Ichki xotira: <xliff:g id="PERCENTAGE">%1$s</xliff:g> band – <xliff:g id="FREE_SPACE">%2$s</xliff:g> bo‘sh"</string>
<string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nofaollikdan keyin uyqu rejimiga o‘tish"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Fon rasmi, uyqu rejimi, shrift"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"10 daqiqa nofaollikdan keyin uyqu rejimiga o‘tish"</string>
<string name="memory_summary" msgid="8080825904671961872">"O‘rtacha <xliff:g id="USED_MEMORY">%1$s</xliff:g> ishlatilmoqda, jami: <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"Siz <xliff:g id="USER_NAME">%1$s</xliff:g> sifatida kirgansiz"</string>
@@ -3772,7 +3745,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"SMS yuborishga ruxsat berilmagan"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Kameraga ruxsat berilmagan"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Skrinshot olishga ruxsat berilmagan"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Zaxiralash funksiyasini faolsizlantirish imkonsiz"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Bu ilovani ochish imkonsiz"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Savollaringizga javob olish uchun AT administratoringizga murojaat qiling"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Qo‘shimcha tafsilotlar"</string>
@@ -3936,9 +3908,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Kesimli displey simulyatsiyasi"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Ekran kesimi"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"ekran kesimi, kesim"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Hech qanday"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Qurilma standarti"</string>
<string name="special_access" msgid="3458780842491881155">"Maxsus ruxsatlar"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ta ilova uchun trafik cheklanmagan</item>
@@ -3960,11 +3932,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"<xliff:g id="ID_1">%1$s</xliff:g> qurilmasiga ulangan"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Bir nechta qurilmaga ulangan"</string>
<string name="demo_mode" msgid="2798762752209330277">"Tizim interfeysi demo rejimi"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Tungi rejim"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Tungi rejimni sozlash"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Tungi mavzu"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Tungi mavzudan foydalanish"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Tezkor sozlamalarning dasturchi tugmalari"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope trassirovkasi"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> – <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Ishchi profil sozlamalari"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Kontaktlarni qidirish"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Tashkilot nomi bo‘yicha qidiruvda qo‘ng‘iroq qiluvchi abonent va uning kontaktini aniqlashga ruxsat berish"</string>
@@ -3992,7 +3963,7 @@
<string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Telefonni boshqarish uchun tezkor imo-ishoralar"</string>
<string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Planshetni boshqarish uchun tezkor imo-ishoralar"</string>
<string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Qurilmani boshqarish uchun tezkor imo-ishoralar"</string>
- <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kameraga o‘tish"</string>
+ <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kamerani tezkor ochish"</string>
<string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamerani tezda ochish uchun quvvat tugmasini ikki marta bosing. Har qanday ekranda ishlaydi."</string>
<string name="double_tap_power_for_camera_suggestion_title" msgid="6500405261202883589">"Kamerani tezkor ochish"</string>
<string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamerani almashtirish"</string>
@@ -4005,14 +3976,18 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Ekranga ikki marta bosib bildirishnomalarni tekshirish"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Planshetni tekshirish uchun ekranni ikki marta bosing"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Qurilmani tekshirish uchun ekranni ikki marta bosing"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun ekranni ikki marta bosing."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Vaqt, bildirishnoma va boshqa ma’lumotlarni tekshirish uchun ekranni ikki marta bosing."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefonni olib bildirishnomalarni tekshirish"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tekshirish uchun planshetni yuqoriga ko‘taring"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Tekshirish uchun qurilmani yuqoriga ko‘taring"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun telefonni qo‘lingizga oling."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun planshetni qo‘lingizga oling."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Vaqt, bildirishnoma belgilari va boshqa ma’lumotlarni tekshirish uchun qurilmani qo‘lingizga oling."</string>
- <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Barmoq izi skaneridan foydalanish"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Ekranni yoqish"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Vaqt, bildirishnoma va boshqa ma’lumotlarni tekshirish uchun telefonni qo‘lingizga oling."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Vaqt, bildirishnoma va boshqa ma’lumotlarni tekshirish uchun planshetni qo‘lingizga oling."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Vaqt, bildirishnoma va boshqa ma’lumotlarni tekshirish uchun qurilmani qo‘lingizga oling."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Ekran qulfini ko‘rsatish"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
+ <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Bildirishnomalarni ochish uchun barmoq izi skaneridan foydalanish"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Barmoq izi skaneri"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Bildirishnomalarni tekshirish uchun telefon orqasidagi barmoq izi skaneri ustida pastga suring"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Bildirishnomalarni tekshirish uchun planshet orqasidagi barmoq izi skaneri ustida pastga suring"</string>
@@ -4030,7 +4005,7 @@
<string name="web_action_enable_summary" msgid="3108127559723396382">"Havolalarni ilovalarda (hatto ular o‘rnatilmagan bo‘lsa ham) ochish"</string>
<string name="web_action_section_title" msgid="7364647086538399136">"Darhol ochiladigan ilovalar"</string>
<string name="instant_apps_settings" msgid="8827777916518348213">"Darhol ochiladigan ilovalar sozlamalari"</string>
- <string name="domain_url_section_title" msgid="7046835219056428883">"O‘rnatilgan ilovalar"</string>
+ <string name="domain_url_section_title" msgid="7046835219056428883">"Oʻrnatilgan ilovalar"</string>
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"Xotirangiz hozirda xotira boshqaruvi tomonidan boshqarilmoqda"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g> – hisoblar"</string>
<string name="configure_section_header" msgid="7391183586410814450">"Sozlash"</string>
@@ -4056,7 +4031,7 @@
<string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Eng oxirgi xatoliklar hisoboti"</string>
<string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Eng oxirgi xavfsizlik jurnali"</string>
<string name="enterprise_privacy_none" msgid="7706621148858381189">"Hech qanday"</string>
- <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"O‘rnatilgan ilovalar"</string>
+ <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Oʻrnatilgan ilovalar"</string>
<string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"Ilovalar soni hisoblanmoqda. Play Market orqali o‘rnatilmagan ilovalar hisoblanmasligi mumkin."</string>
<plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
<item quantity="other">Kamida <xliff:g id="COUNT_1">%d</xliff:g> ta ilova</item>
@@ -4091,7 +4066,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta urinish</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ta urinish</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Bu qurilma ma’lumotlari zaxiralanadi"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Bu – tashkilotingiz tomonidan boshqariladigan qurilma."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Bu – <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> tomonidan boshqariladigan qurilma."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4132,6 +4106,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Avtomatik to‘ldirish xizmati"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"avtomatik, to‘ldirish, avtomatik to‘ldirish"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Bu ilova ishonchli ekanini tekshiring</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> ekraningizda nimani avtomatik to‘ldirish kerakligini aniqlaydi."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Avtomatik kiritish"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Jurnal yuritish darajasi"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Bitta seansdagi maksimum talablar"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Maksimum ochiq axborot bazalari"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Birlamchi qiymatlariga tiklash"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Avtomatik kiritishning dasturchi parametrlari asliga qaytarildi"</string>
<string name="device_theme" msgid="4571803018917608588">"Qurilma mavzusi"</string>
<string name="default_theme" msgid="7085644992078579076">"Standart"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Tarmoq nomi"</string>
@@ -4146,15 +4126,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Operator ta’minotini yoqish/o‘chirish"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Bezovta qilinmasin rejimini yoqing"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Bezovta qiluvchi bildirishnomalarni pauza qiling"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Nima yangi va qiziqarli narsalar bor?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Yangi telefoningiz bilan tanishib chiqing"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Yangi planshetingiz bilan tanishib chiqing"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Yangi qurilmangiz bilan tanishib chiqing"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Bu funksiya ushbu qurilmada ishlamaydi"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Butun GNSS statistikasini yuklash"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Siklsiz barcha GNSS sxema va davriyliklarini kuzatish"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Buzilish oynasi doim ko‘rsatilsin"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Ilova ishdan chiqqanda har safar muloqot oynasi ko‘rsatilsin"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"ANGLE yoqilgan ilovani tanlang"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"ANGLE yoqilgan ilova tanlanmagan"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"ANGLE yoqilgan ilova: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Kataloglarga kirish"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"kataloglarga kirish"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4195,4 +4174,85 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Tarmoq tafsilotlari"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Telefoningizdagi barcha ilovalarga qurilma nomi ko‘rinadi. Qurilmalarga Bluetooth orqali ulanganingizda yoki Wi-Fi hotspot sozlaganingizda boshqa foydalanuvchilarni ularni ko‘rishi mumkin."</string>
<string name="devices_title" msgid="7701726109334110391">"Qurilmalar"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Barcha sozlamalar"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Takliflar"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS axboroti"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS axboroti"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Tarmoqni tanlash"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Ulanmagan"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Ulandi"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Ulanmoqda…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Ulanmadi"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Birorta ham tarmoq topilmadi."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Hech qanday tarmoq topilmadi. Qaytadan urining."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(taqiqlangan)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"SIM karta solinmagan"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Kengaytirilgan chaqiruv"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Tanlangan tarmoq rejimi: WCDMA tanlangan"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Tanlangan tarmoq rejimi: faqat GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Tanlangan tarmoq rejimi: faqat WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Tanlangan tarmoq rejimi: GSM / WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Tanlangan tarmoq rejimi: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Tanlangan tarmoq rejimi: CDMA / EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Tanlangan tarmoq rejimi: faqat CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Tanlangan tarmoq rejimi: faqat EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Tanlangan tarmoq rejimi: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Tanlangan tarmoq rejimi: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Tanlangan tarmoq rejimi: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Tanlangan tarmoq rejimi: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Tanlangan tarmoq rejimi: Global"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Tanlangan tarmoq rejimi: LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Ma’qul tarmoq rejimi: LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Ma’qul tarmoq rejimi: LTE / CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Tanlangan tarmoq rejimi: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Tavsiya etilgan tarmoq rejimi: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Tavsiya etilgan tarmoq rejimi: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Tavsiya etilgan tarmoq rejimi: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Tavsiya etilgan tarmoq rejimi: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Tavsiya etilgan tarmoq rejimi: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Tavsiya etilgan tarmoq rejimi: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Tavsiya etilgan tarmoq rejimi: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Tavsiya etilgan tarmoq rejimi: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Tavsiya etilgan tarmoq rejimi: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (tavsiya etiladi)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (tavsiya etiladi)"</string>
+ <string name="network_global" msgid="959947774831178632">"Global"</string>
+ <string name="label_available" msgid="1731547832803057893">"Mavjud tarmoqlar"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Qidirilmoqda…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"<xliff:g id="NETWORK">%s</xliff:g> tarmogʻiga qayd qilinmoqda…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"SIM kartangiz ushbu tarmoqqa ulanishga ruxsat bermaydi."</string>
+ <string name="connect_later" msgid="978991102125216741">"Hozirda bu tarmoqqa ulanish imkonsiz. Keyinroq qaytadan urining."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Tarmoqda qayd qilingan."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Tarmoqni avtomatik tanlash"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Operator sozlamalari"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Internet xizmatini sozlash"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Mobil internet"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Mobil tarmoq orqali internetdan foydalanish"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Tarmoq turi"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Tarmoq rejimini almashtiring"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Tarmoq turi"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Aloqa operatori"</string>
+ <string name="call_category" msgid="8108654745239563833">"Chaqiruvlar"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Operator orqali videomuloqot"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Tizimni tanlang"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"CDMA tarmoq rouming rejimini almashtirish"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Tizimni tanlang"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Tarmoq"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Tarmoq"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA uchun obuna"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"RUIM/SIM va NV orasida almashish"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"obuna"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Avtomatik registratsiya…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Internet-roumingga ruxsat berilsinmi?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Paketlar narxlari haqidagi ma’lumotni internet provayderingizdan olishingiz mumkin."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Ilova sarflagan trafik"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Notanish tarmoq rejimi: <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Inkor qilish"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"<xliff:g id="CARRIER">%1$s</xliff:g> bilan ishlamaydi"</string>
+ <string name="see_more" msgid="5953815986207345223">"Yana"</string>
+ <string name="see_less" msgid="1250265310929558370">"Kamroq"</string>
+ <plurals name="show_connected_devices" formatted="false" msgid="5484062660312192006">
+ <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>
+ </plurals>
+ <string name="no_connected_devices" msgid="6657176404588389594">"Hech qanday qurilma ulanmagan"</string>
</resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 36caf3e..f2627fa 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Xử lý như là mạng có đo lượng dữ liệu"</item>
<item msgid="2266114985518865625">"Xử lý như là mạng không đo lượng dữ liệu"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Mặc định (sử dụng địa chỉ MAC được gán ngẫu nhiên)"</item>
+ <item msgid="5398461510512959597">"Đáng tin cậy"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Không"</item>
<item msgid="3863157480502955888">"Có"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Luôn bật"</item>
<item msgid="6385301106124765323">"Luôn tắt"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Tắt"</item>
+ <item msgid="2182686878828390312">"Gỡ lỗi"</item>
+ <item msgid="5286514712714822064">"Chi tiết"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Chỉ nhà riêng"</item>
+ <item msgid="5034813753274486448">"Tự động"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA được ưu tiên"</item>
+ <item msgid="807926878589867564">"Chỉ GSM"</item>
+ <item msgid="488474605709912156">"Chỉ WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA tự động"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo tự động"</item>
+ <item msgid="370391313511477301">"CDMA không có EvDo"</item>
+ <item msgid="4678789463133969294">"Chỉ EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Toàn cầu"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"Chỉ TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Toàn cầu"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7dc8656..1099362 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Tạo"</string>
<string name="allow" msgid="3349662621170855910">"Cho phép"</string>
<string name="deny" msgid="6947806159746484865">"Từ chối"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Đóng"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Chuyển đổi"</string>
<string name="device_info_default" msgid="7847265875578739287">"Không xác định"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">Bây giờ, bạn chỉ cần thực hiện <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> bước nữa là trở thành nhà phát triển.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Không cần, bạn đã là nhà phát triển."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Vui lòng bật tùy chọn của nhà phát triển trước."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Mạng không dây và mạng"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Kết nối"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Thiết bị"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Cá nhân"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Truy cập"</string>
<string name="header_category_system" msgid="2816866961183068977">"Hệ thống"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Bật kết nối dữ liệu"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Tắt kết nối dữ liệu"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Địa chỉ Bluetooth của thiết bị: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ngắt kết nối <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Phát sóng"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Thiết bị Bluetooth chưa được đặt tên"</string>
<string name="progress_scanning" msgid="192587958424295789">"Đang tìm kiếm"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Ko tìm thấy th.bị Bluetooth lân cận nào."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Một ứng dụng muốn bật Bluetooth và đặt điện thoại của bạn ở chế độ hiển thị với các thiết bị khác. Bạn có thể thay đổi cài đặt này sau trong cài đặt Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Đang bật Bluetooth…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Đang tắt Bluetooth…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Tự động kết nối"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Yêu cầu kết nối Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Nhấn để kết nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Bạn có muốn kết nối với \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" không?"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Các thiết bị thực hiện cuộc gọi có sẵn"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Hiện đã kết nối"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Thiết bị đã lưu"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Thêm thiết bị"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"Bluetooth sẽ bật để ghép nối"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Tùy chọn kết nối"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Các thiết bị đã kết nối trước đây"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Đã kết nối trước đó"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"Đã bật Bluetooth"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Xem tất cả"</string>
<string name="date_and_time" msgid="9062980487860757694">"Ngày và giờ"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Chọn múi giờ"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Bỏ qua"</string>
<string name="next_label" msgid="4693520878012668114">"Tiếp theo"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Ngôn ngữ"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Tùy chọn ngôn ngữ"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Xóa"</string>
<string name="add_a_language" msgid="2330538812283783022">"Thêm ngôn ngữ"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Cài đặt"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Lối tắt cài đặt"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Chế độ trên máy bay"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Thêm"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Không dây & mạng"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Quản lý Wi-Fi, Bluetooth, chế độ trên máy bay, mạng di động và VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Dữ liệu di động"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Bảo mật"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Bị quản trị viên vô hiệu hóa"</string>
<string name="security_status_title" msgid="5848766673665944640">"Trạng thái bảo mật"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Khóa màn hình, mở khóa bằng khuôn mặt"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Khóa màn hình, vân tay"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Khóa màn hình"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Đã thêm khuôn mặt"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Mở khóa bằng khuôn mặt của bạn"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Sử dụng khuôn mặt của bạn để xác thực"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Sử dụng khuôn mặt của bạn để mở khóa điện thoại, ủy quyền các giao dịch mua hoặc đăng nhập vào các ứng dụng."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Sử dụng khuôn mặt của bạn"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Sử dụng khuôn mặt của bạn để mở khóa điện thoại hoặc phê duyệt các giao dịch mua.\n\nLưu ý: Bạn không thể sử dụng khuôn mặt của mình để mở khóa thiết bị này. Để biết thêm thông tin, hãy liên hệ với quản trị viên của tổ chức bạn."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Sử dụng khuôn mặt của bạn để mở khóa điện thoại, ủy quyền các giao dịch mua hoặc đăng nhập vào các ứng dụng"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Bạn có thể thêm tới <xliff:g id="COUNT">%d</xliff:g> vân tay số"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Căn giữa khuôn mặt trong hình tròn"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Thực hiện sau"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Bạn có thể thêm tới <xliff:g id="COUNT">%d</xliff:g> khuôn mặt"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Bạn đã thêm số khuôn mặt tối đa"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Không thể thêm khuôn mặt khác nữa"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Đăng ký chưa hoàn tất"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"OK"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Đã đến giới hạn thời gian đăng ký khuôn mặt. Hãy thử lại."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Đăng ký khuôn mặt không hoạt động."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Đã hoàn tất. Trông rất ổn."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Xong"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Sử dụng khuôn mặt để"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Mở khóa thiết bị"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Đăng nhập ứng dụng và thanh toán"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Hãy mở mắt để mở khóa"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Khi sử dụng tính năng xác thực khuôn mặt, bạn phải mở mắt"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Xóa dữ liệu khuôn mặt"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Cải thiện dữ liệu khuôn mặt"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Bạn có thể sử dụng khuôn mặt để mở khóa thiết bị của mình và truy cập vào các ứng dụng. "<annotation id="url">"Tìm hiểu thêm"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vân tay"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Quản lý vân tay"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sử dụng vân tay để"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Chọn ít nhất một băng tần cho điểm phát sóng Wi‑Fi:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Cài đặt IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Quyền riêng tư"</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>
<string name="wifi_unspecified" msgid="4917316464723064807">"Vui lòng chọn"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Hủy"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Bỏ qua mạng?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Tất cả mật khẩu của mạng này sẽ bị xóa"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Mạng đã lưu"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d mạng</item>
<item quantity="one">1 mạng</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Độ sáng"</string>
<string name="brightness_summary" msgid="838917350127550703">"Điều chỉnh độ sáng của màn hình"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Độ sáng thích nghi"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Đang bật"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Tắt"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Độ sáng ưa thích là rất thấp"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Độ sáng ưa thích là thấp"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Không thể thay đổi mã PIN.\nCó thể mã PIN không đúng."</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"Mã PIN của SIM đã được thay đổi thành công"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Không thể thay đổi trạng thái khóa thẻ SIM.\nCó thể mã PIN không đúng."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Không thể tắt mã PIN."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Không thể bật mã PIN."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Hủy"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Tìm thấy nhiều SIM"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Việc này yêu cầu phải định dạng <xliff:g id="NAME_0">^1</xliff:g>. \n\n"<b>"Định dạng sẽ xóa tất cả dữ liệu hiện được lưu trữ trên <xliff:g id="NAME_1">^1</xliff:g>."</b>" Để tránh mất dữ liệu, bạn nên sao lưu."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Xóa và định dạng"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Đang định dạng <xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Không tháo <xliff:g id="NAME">^1</xliff:g> khi đang định dạng."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Không tháo <xliff:g id="NAME">^1</xliff:g> khi đang định dạng."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Chuyển dữ liệu sang bộ nhớ mới"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Bạn có thể di chuyển ảnh, tệp và một số ứng dụng sang <xliff:g id="NAME">^1</xliff:g> mới này. \n\nQuá trình di chuyển mất khoảng <xliff:g id="TIME">^2</xliff:g> và sẽ giải phóng <xliff:g id="SIZE">^3</xliff:g> trên bộ nhớ trong. Một số ứng dụng sẽ không hoạt động trong khi di chuyển."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Di chuyển ngay bây giờ"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"Đã cài đặt"</string>
<string name="no_applications" msgid="7336588977497084921">"Không có ứng dụng nào."</string>
<string name="internal_storage" msgid="1584700623164275282">"Bộ nhớ trong"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"bộ nhớ trong"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Bộ nhớ USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"D.lượng thẻ SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Đang tính toán lại kích thước…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Xóa dữ liệu ứng dụng?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Tất cả dữ liệu của ứng dụng này sẽ bị xóa vĩnh viễn, bao gồm tất cả các tệp, cài đặt, tài khoản, cơ sở dữ liệu, v.v."</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Không tìm thấy ứng dụng trong danh sách các ứng dụng đã cài đặt."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Không thể xóa bộ nhớ của ứng dụng."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Ứng dụng này có thể truy cập các mục sau trên máy tính bảng của bạn:"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Ứng dụng này có thể truy cập các mục sau trên điện thoại của bạn:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Ứng dụng này có thể truy cập thông tin sau đây trên máy tính bảng của bạn. Để cải tiến hiệu suất và giảm sử dụng bộ nhớ, một số quyền này khả dụng với <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> do ứng dụng chạy trong cùng một quá trình với <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Ứng dụng này có thể truy cập thông tin sau đây trên điện thoại của bạn. Để cải tiến hiệu suất và giảm sử dụng bộ nhớ, một số quyền này khả dụng đối với <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> do ứng dụng này chạy trong cùng một quá trình với <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> và <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Bạn có thể phải trả tiền cho ứng dụng này:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Gửi SMS cao cấp"</string>
<string name="computing_size" msgid="1599186977475211186">"Đang tính toán…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Không thể tính toán kích thước gói."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Bạn chưa cài đặt ứng dụng của bên thứ ba nào."</string>
<string name="version_text" msgid="9189073826278676425">"phiên bản <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Chuyển"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Chuyển đến máy tính bảng"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Chuyển sang điện thoại"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Chuyển đến b.nhớ USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Chuyển sang thẻ SD"</string>
- <string name="moving" msgid="6431016143218876491">"Đang chuyển"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Đang diễn ra một hoạt động di chuyển khác."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Không đủ dung lượng lưu trữ."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Ứng dụng không tồn tại."</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Không thể cài đặt ứng dụng dành cho quản trị viên thiết bị trên phương tiện bên ngoài."</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Buộc dừng?"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Nếu bạn buộc dừng một ứng dụng, ứng dụng đó có thể hoạt động sai."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Không thể di chuyển ứng dụng. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Vị trí cài đặt ưa thích"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Thay đổi vị trí cài đặt ưa thích cho ứng dụng mới"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Tắt ứng dụng tích hợp sẵn?"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Tắt ứng dụng"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Nếu bạn tắt ứng dụng này, Android và các ứng dụng khác có thể không còn hoạt động như dự kiến."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Xóa dữ liệu và tắt ứng dụng?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Nếu bạn tắt ứng dụng này, Android và các ứng dụng khác có thể không còn hoạt động như dự kiến. Dữ liệu của bạn cũng sẽ bị xóa."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Tắt thông báo?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Nếu bạn tắt thông báo cho ứng dụng này, bạn có thể bỏ qua cảnh báo và cập nhật quan trọng."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Cửa hàng"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Chi tiết ứng dụng"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Ứng dụng đã được cài đặt từ <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Sử dụng dịch vụ"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Sử dụng tính năng sửa màu"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Sử dụng phụ đề"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Tiếp tục"</string>
<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="6371077608778830020">"Thêm thiết bị trợ thính"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động sai"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Không thể hạn chế ứng dụng này vì bạn chưa đặt để tối ưu hóa pin.\n\nĐể hạn chế ứng dụng, trước tiên hãy bật tối ưu hóa pin."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Mức sử dụng màn hình kể từ lần sạc đầy"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Mức tiêu thụ của màn hình"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Quét mạng di động"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Mức sử dụng pin kể từ lần sạc đầy"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Lượng thời gian sử dụng màn hình kể từ khi sạc đầy"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Mức sử dụng thiết bị kể từ lần sạc đầy"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Chi tiết sử dụng"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Điều chỉnh việc sử dụng nguồn"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Gói bao gồm"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Ứng dụng tiêu hao pin"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Giữ thiết bị ở chế độ bật"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Đánh thức thiết bị trong nền"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Thường xuyên yêu cầu vị trí"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> ứng dụng hoạt động sai"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Các ứng dụng đang chạy bình thường"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Điện thoại có mức sử dụng pin bình thường trong nền"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Máy tính bảng có mức sử dụng pin bình thường trong nền"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">Giới hạn mức sử dụng pin đối với ứng dụng %1$d</item>
<item quantity="one">Giới hạn mức sử dụng pin đối với ứng dụng %1$d</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Giới hạn <xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Các ứng dụng này vẫn đang sử dụng pin trong nền. Những ứng dụng bị hạn chế có thể hoạt động không bình thường và thông báo có thể bị chậm trễ."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Sử dụng Trình quản lý pin"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Phát hiện khi ứng dụng tiêu hao pin"</string>
@@ -2397,7 +2385,7 @@
<string name="voice_input_settings_title" msgid="2676028028084981891">"Nhập bằng giọng nói"</string>
<string name="voice_service_preference_section_title" msgid="3778706644257601021">"Dịch vụ nhập bằng giọng nói"</string>
<string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Tương tác và từ nóng đầy đủ"</string>
- <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Ngôn từ đơn giản dễ nhắn tin"</string>
+ <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Lời nói thành văn bản đơn giản"</string>
<string name="voice_interaction_security_warning" msgid="6378608263983737325">"Dịch vụ nhập bằng giọng nói này có thể thực hiện theo dõi bằng giọng nói luôn bật và kiểm soát các ứng dụng hỗ trợ giọng nói thay mặt cho bạn. Dịch vụ này đến từ <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Cho phép sử dụng dịch vụ này?"</string>
<string name="tts_engine_preference_title" msgid="1578826947311494239">"Công cụ ưu tiên"</string>
<string name="tts_engine_settings_title" msgid="6886964122861384818">"Cài đặt công cụ"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Hủy"</string>
<string name="tts_reset" msgid="2661752909256313270">"Đặt lại"</string>
<string name="tts_play" msgid="2628469503798633884">"Phát"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Kiểm soát điện năng"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Đang cập nhật cài đặt Wi‑Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Đang cập nhật cài đặt Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"bật"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"đang tắt"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"đang bật"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"đang tắt"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Vị trí"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Đồng bộ hóa"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Độ sáng <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"tự động"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"tối đa"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"trung bình"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"tối thiểu"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"Lưu thông tin xác thực"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Cài đặt từ bộ nhớ"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Chọn tất cả"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Mức sử dụng dữ liệu"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Dữ liệu ứng dụng"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Dữ liệu di động và Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Cách tính dữ liệu của nhà mạng có thể khác với thiết bị của bạn."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Sử dụng ứng dụng"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"THÔNG TIN ỨNG DỤNG"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">Hiển thị %d mục ẩn</item>
<item quantity="one">Hiển thị %d mục ẩn</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Thu gọn"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Mạng và Internet"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"thiết bị di động"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"sử dụng dữ liệu"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Ứng dụng và thông báo"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Quyền, ứng dụng mặc định"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Trong hồ sơ công việc, các ứng dụng không có quyền truy cập vào mục thông báo."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Tài khoản"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Chưa thêm tài khoản nào"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Ứng dụng mặc định"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Ngôn ngữ, thời gian, sao lưu, cập nhật"</string>
<string name="search_results_title" msgid="1796252422574886932">"Cài đặt"</string>
- <string name="search_menu" msgid="6283419262313758339">"Tìm kiếm cài đặt"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, kết nối mạng, internet, không dây, dữ liệu, wi fi"</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_default_sms_app" msgid="8597706109432491909">"tin nhắn văn bản, nhắn tin, tin nhắn, mặc định"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"thanh toán, nhấn, khoản thanh toán"</string>
<string name="keywords_backup" msgid="470070289135403022">"sao lưu"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"cử chỉ"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"khuôn mặt, mở khóa, xác thực, đăng nhập"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, phiên bản prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"mạng, trạng thái mạng di động, trạng thái dịch vụ, cường độ tín hiệu, loại mạng di động, chuyển vùng, iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"số sê-ri, phiên bản phần cứng"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"chủ đề màu tối"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"lỗi"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Màn hình sáng, Màn hình ở chế độ màn hình khóa"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"thông báo trên màn hình khóa"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"khuôn mặt"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"vân tay"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"làm mờ màn hình, màn hình cảm ứng, pin, độ sáng thông minh, độ sáng động"</string>
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Khi bạn nhập mã PIN để khởi động thiết bị này, các dịch vụ hỗ trợ tiếp cận như <xliff:g id="SERVICE">%1$s</xliff:g> sẽ chưa sẵn sàng để sử dụng."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Khi bạn nhập hình mở khóa để khởi động thiết bị này, các dịch vụ hỗ trợ tiếp cận như <xliff:g id="SERVICE">%1$s</xliff:g> sẽ chưa sẵn sàng để sử dụng."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Khi bạn nhập mật khẩu để khởi động thiết bị này, các dịch vụ hỗ trợ tiếp cận như <xliff:g id="SERVICE">%1$s</xliff:g> sẽ chưa sẵn sàng để sử dụng."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Lưu ý: Sau khi khởi động lại, ứng dụng này không thể khởi động cho đến khi bạn mở khóa điện thoại"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Lưu ý: Nếu bạn khởi động lại điện thoại và đặt khóa màn hình, thì ứng dụng này không thể khởi động cho đến khi bạn mở khóa điện thoại."</string>
<string name="imei_information_title" msgid="8499085421609752290">"Thông tin IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Thông tin liên quan đến IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Khe cắm<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Cá nhân"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Cơ quan"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Ứng dụng: Tất cả"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Ứng dụng: Bị tắt"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Đã tắt"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Danh mục: Tầm q.trọng khẩn cấp"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Danh mục: Tầm quan trọng thấp"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Danh mục: Bị tắt"</string>
@@ -3558,7 +3530,7 @@
<string name="system_default_app" msgid="3091113402349739037">"(Mặc định của hệ thống)"</string>
<string name="apps_storage" msgid="4353308027210435513">"Bộ nhớ ứng dụng"</string>
<string name="usage_access" msgid="5479504953931038165">"Truy cập dữ liệu sử dụng"</string>
- <string name="permit_usage_access" msgid="4012876269445832300">"Cho phép quyền truy cập sử dụng"</string>
+ <string name="permit_usage_access" msgid="4012876269445832300">"Cho phép truy cập dữ liệu sử dụng"</string>
<string name="app_usage_preference" msgid="7065701732733134991">"Tùy chọn sử dụng ứng dụng"</string>
<string name="time_spent_in_app_pref_title" msgid="649419747540933845">"Thời gian dùng ứng dụng"</string>
<string name="usage_access_description" msgid="1352111094596416795">"Quyền truy cập vào dữ liệu sử dụng cho phép một ứng dụng theo dõi các ứng dụng khác mà bạn đang sử dụng và tần suất sử dụng cũng như thông tin nhà mạng, thông tin cài đặt ngôn ngữ và các chi tiết khác."</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Thông báo về mức sử dụng"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Hiển thị dữ liệu sử dụng thiết bị đầy đủ"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Hiển thị dữ liệu sử dụng ứng dụng"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Mức sử dụng cao"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> ứng dụng đang hoạt động bất thường</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> đang hoạt động bất thường</item>
@@ -3666,8 +3637,8 @@
<string name="running_frequency" msgid="6622624669948277693">"Tần suất"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"Mức sử dụng tối đa"</string>
<string name="no_data_usage" msgid="9131454024293628063">"Không có dữ liệu nào được sử dụng"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Cho phép truy cập vào Không làm phiền cho <xliff:g id="APP">%1$s</xliff:g>?"</string>
- <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Ứng dụng có thể bật/tắt Không làm phiền và thực hiện thay đổi đối với các cài đặt liên quan."</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Cho phép <xliff:g id="APP">%1$s</xliff:g> truy cập chế độ Không làm phiền?"</string>
+ <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Ứng dụng có thể bật/tắt chế độ Không làm phiền và thay đổi các mục cài đặt liên quan."</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Phải luôn bật vì quyền truy cập thông báo được bật"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Thu hồi quyền truy cập vào chế độ Không làm phiền của <xliff:g id="APP">%1$s</xliff:g>?"</string>
<string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Mọi quy tắc Không làm phiền do ứng dụng này tạo sẽ đều bị xóa."</string>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Bộ nhớ trong: Đã sử dụng <xliff:g id="PERCENTAGE">%1$s</xliff:g> - Còn trống <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"Chuyển sang chế độ ngủ sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> không hoạt động"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Hình nền, ngủ, kích thước phông chữ"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Chuyển sang chế độ ngủ sau 10 phút không hoạt động"</string>
<string name="memory_summary" msgid="8080825904671961872">"Trung bình <xliff:g id="USED_MEMORY">%1$s</xliff:g>/<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> bộ nhớ được sử dụng"</string>
<string name="users_summary" msgid="1674864467098487328">"Đã đăng nhập với tên <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"Không cho phép SMS"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Không cho phép máy ảnh"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Không cho phép ảnh chụp màn hình"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Không thể tắt sao lưu"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Không thể mở ứng dụng này"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Nếu bạn có câu hỏi, hãy liên hệ với quản trị viên CNTT"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Thông tin chi tiết khác"</string>
@@ -3776,7 +3748,7 @@
<string name="condition_battery_summary" msgid="507347940746895275">"Trình tiết kiệm pin sẽ tắt một số tính năng của thiết bị và hạn chế ứng dụng"</string>
<string name="condition_cellular_title" msgid="1327317003797575735">"Dữ liệu di động đang tắt"</string>
<string name="condition_cellular_summary" msgid="1818046558419658463">"Internet chỉ khả dụng qua Wi-Fi"</string>
- <string name="condition_bg_data_title" msgid="2483860304802846542">"Trình tiết kiệm dữ liệu bật"</string>
+ <string name="condition_bg_data_title" msgid="2483860304802846542">"Trình tiết kiệm dữ liệu đang bật"</string>
<string name="condition_bg_data_summary" msgid="656957852895282228">"Dữ liệu nền chỉ khả dụng qua Wi-Fi. Điều này có thể ảnh hưởng đến một số ứng dụng hoặc dịch vụ khi không có Wi-Fi."</string>
<string name="condition_work_title" msgid="7293722361184366648">"Hồ sơ công việc đã tắt"</string>
<string name="condition_work_summary" msgid="7543202177571590378">"Ứng dụng, đồng bộ hóa dưới nền và các tính năng khác có liên quan đến hồ sơ công việc của bạn bị tắt."</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Mô phỏng màn hình có phần cắt khoét"</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>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Không"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Cài đặt mặc định của thiết bị"</string>
<string name="special_access" msgid="3458780842491881155">"Quyền truy cập đặc biệt"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ứng dụng có thể sử dụng dữ liệu không bị hạn chế</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Được kết nối với <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Được kết nối với nhiều thiết bị"</string>
<string name="demo_mode" msgid="2798762752209330277">"Chế độ thử nghiệm giao diện người dùng hệ thống"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Chế độ ban đêm"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Đặt chế độ ban đêm"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Chế độ tối"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Đặt chế độ tối"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ô nhà phát triển cài đặt nhanh"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Dấu vết Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Cài đặt hồ sơ công việc"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Tìm kiếm liên hệ"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Cho phép tìm kiếm liên hệ theo tổ chức để xác định người gọi và liên hệ"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Nhấn đúp để kiểm tra điện thoại"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Nhấn đúp để kiểm tra máy tính bảng"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Nhấn đúp để kiểm tra thiết bị"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Để xem thời gian, biểu tượng thông báo và thông tin khác, hãy nhấn đúp vào màn hình."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Để xem thời gian, thông báo và thông tin khác, hãy nhấn đúp vào màn hình."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Nhấc để kiểm tra điện thoại"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Nhấc để kiểm tra máy tính bảng"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Nhấc để kiểm tra thiết bị"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Để xem thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc điện thoại lên."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Để xem thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc máy tính bảng lên."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Để xem thời gian, biểu tượng thông báo và thông tin khác, hãy nhấc thiết bị lên."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Đánh thức màn hình"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Để xem thời gian, thông báo và thông tin khác, hãy nhấc điện thoại của bạn lên."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Để xem thời gian, thông báo và thông tin khác, hãy nhấc máy tính bảng của bạn lên."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Để xem thời gian, thông báo và thông tin khác, hãy nhấc thiết bị của bạn lên."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Cử chỉ đánh thức màn hình khóa"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Vuốt cảm biến vân tay để xem thông báo"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Vuốt vân tay"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau điện thoại."</string>
@@ -4075,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> lần thử</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> lần thử</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Dữ liệu của thiết bị này đang được sao lưu"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Thiết bị này do tổ chức của bạn quản lý."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Thiết bị này được <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> quản lý."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Dịch vụ tự động điền"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"tự động, điền, tự động điền"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Hãy đảm bảo bạn tin tưởng ứng dụng này</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> sử dụng nội dung trên màn hình của bạn để xác định nội dung nào có thể được tự động điền."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Tự động điền"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Mức ghi nhật ký"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Số yêu cầu tối đa trong mỗi phiên hoạt động"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Số tập dữ liệu hiển thị tối đa"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Đặt lại về giá trị mặc định"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Đã đặt lại tùy chọn tự động điền dành cho nhà phát triển"</string>
<string name="device_theme" msgid="4571803018917608588">"Chủ đề thiết bị"</string>
<string name="default_theme" msgid="7085644992078579076">"Mặc định"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Tên mạng"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Kích hoạt cấp phép của nhà cung cấp dịch vụ"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Cập nhật chế độ Không làm phiền"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Tạm dừng thông báo để tập trung"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Thông tin mới và thú vị?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Tham quan điện thoại mới của bạn"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Tham quan máy tính bảng mới của bạn"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Tham quan thiết bị mới của bạn"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Không sử dụng được tính năng này trên thiết bị này"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Thực thi số đo GNSS đầy đủ"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Theo dõi tất cả chòm sao và tần suất GNSS mà không có chu kỳ làm việc"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Luôn hiển thị hộp thoại sự cố"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Hiển thị hộp thoại mỗi khi ứng dụng gặp sự cố"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Chọn ứng dụng hỗ trợ ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Chưa đặt ứng dụng hỗ trợ ANGLE nào"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Ứng dụng hỗ trợ ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Quyền truy cập vào thư mục"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"quyền truy cập vào thư mục"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Thông tin chi tiết về mạng"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Tên thiết bị của bạn sẽ hiển thị với các ứng dụng trên điện thoại. Những người khác cũng có thể thấy tên thiết bị này khi bạn kết nối với thiết bị Bluetooth hoặc thiết lập điểm phát sóng Wi-Fi."</string>
<string name="devices_title" msgid="7701726109334110391">"Thiết bị"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Tất cả tùy chọn cài đặt"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Đề xuất"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Dữ liệu CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Dữ liệu CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Chọn mạng"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Đã ngắt kết nối"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Đã kết nối"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Đang kết nối…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Không thể kết nối"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Không tìm thấy mạng nào."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Không tìm thấy mạng. Hãy thử lại."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(cấm)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Không có thẻ SIM nào"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Gọi nâng cao"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Chế độ mạng ưa thích: ưu tiên WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Chế độ mạng ưa thích: chỉ GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Chế độ mạng ưa thích: chỉ WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Chế độ mạng ưa thích: GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Chế độ mạng ưa thích: CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Chế độ mạng ưa thích: CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Chế độ mạng ưa thích: chỉ CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Chế độ mạng ưa thích: chỉ EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Chế độ mạng ưa thích: CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Chế độ mạng ưa thích: LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Chế độ mạng ưa thích: GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Chế độ mạng ưa thích: CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Chế độ mạng ưa thích: Toàn cầu"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Chế độ mạng ưa thích: LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Chế độ mạng ưa thích: LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Chế độ mạng ưa thích: LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Chế độ mạng ưa thích: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Chế độ mạng ưa thích: TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Chế độ mạng ưa thích: LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Chế độ mạng ưa thích: TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Chế độ mạng ưa thích: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Chế độ mạng ưa thích: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Chế độ mạng ưa thích: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Chế độ mạng ưa thích: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Chế độ mạng ưa thích: TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Chế độ mạng ưa thích: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (đề xuất)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (đề xuất)"</string>
+ <string name="network_global" msgid="959947774831178632">"Toàn cầu"</string>
+ <string name="label_available" msgid="1731547832803057893">"Mạng có sẵn"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Đang tìm kiếm…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Đang đăng ký trên <xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"Thẻ SIM của bạn không cho phép kết nối với mạng này."</string>
+ <string name="connect_later" msgid="978991102125216741">"Không thể kết nối với mạng này ngay bây giờ. Hãy thử lại sau."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Đã đăng ký trên mạng."</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Tự động chọn mạng"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Cài đặt nhà mạng"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Thiết lập dịch vụ dữ liệu"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Dữ liệu di động"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Truy cập dữ liệu bằng mạng di động"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Loại mạng ưa thích"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Thay đổi chế độ hoạt động của mạng"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Loại mạng ưa thích"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Nhà mạng"</string>
+ <string name="call_category" msgid="8108654745239563833">"Gọi điện"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Tính năng gọi video của nhà mạng"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Chọn hệ thống"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Thay đổi chế độ chuyển vùng CDMA"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Chọn hệ thống"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Mạng"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Mạng"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Gói đăng ký CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Thay đổi giữa RUIM/SIM và NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"gói đăng ký"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Đăng ký tự động..."</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Cho phép chuyển vùng dữ liệu?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Hãy liên hệ với nhà mạng của bạn để biết giá cước."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Mức sử dụng dữ liệu của ứng dụng"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Chế độ mạng <xliff:g id="NETWORKMODEID">%1$d</xliff:g> không hợp lệ. Bỏ qua."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Không sử dụng được khi kết nối với <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Xem thêm"</string>
+ <string name="see_less" msgid="1250265310929558370">"Xem bớt"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml
index b6b4591..df9d56f 100755
--- a/res/values-xlarge/dimens.xml
+++ b/res/values-xlarge/dimens.xml
@@ -18,4 +18,8 @@
<dimen name="screen_margin_sides">128dip</dimen>
<dimen name="datetime_margin_top">154dip</dimen>
<dimen name="datetime_margin_bottom">96dip</dimen>
+
+ <!-- Padding for screen pinning -->
+ <dimen name="screen_pinning_padding_start">128dp</dimen>
+ <dimen name="screen_pinning_padding_end">128dp</dimen>
</resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 7f5abc8..af5ac2e 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"视为按流量计费"</item>
<item msgid="2266114985518865625">"视为不按流量计费"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"默认（使用随机 MAC）"</item>
+ <item msgid="5398461510512959597">"受信任"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"否"</item>
<item msgid="3863157480502955888">"是"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"始终开启"</item>
<item msgid="6385301106124765323">"始终关闭"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"关闭"</item>
+ <item msgid="2182686878828390312">"调试"</item>
+ <item msgid="5286514712714822064">"详细"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"仅本地系统"</item>
+ <item msgid="5034813753274486448">"自动"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"首选 GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"仅限 GSM"</item>
+ <item msgid="488474605709912156">"仅限 WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA 自动选择"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo 自动选择"</item>
+ <item msgid="370391313511477301">"CDMA，无 EvDo 功能"</item>
+ <item msgid="4678789463133969294">"仅限 EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"通用"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"仅限 TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"通用"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 13df219..9059250 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"创建"</string>
<string name="allow" msgid="3349662621170855910">"允许"</string>
<string name="deny" msgid="6947806159746484865">"拒绝"</string>
- <string name="dlg_close" msgid="7471087791340790015">"关闭"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"切换"</string>
<string name="device_info_default" msgid="7847265875578739287">"未知"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">现在只需再执行 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 步操作即可进入开发者模式。</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"您已处于开发者模式，无需进行此操作。"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"请先启用开发者选项。"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"无线和网络"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"无线和网络"</string>
- <string name="header_category_device" msgid="4544026001618307754">"设备"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"个人"</string>
- <string name="header_category_access" msgid="7580499097416970962">"帐号和权限"</string>
<string name="header_category_system" msgid="2816866961183068977">"系统"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"启用数据网络连接"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"停用数据网络连接"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"设备的蓝牙地址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"要断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的连接吗？"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"广播"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"未命名的蓝牙设备"</string>
<string name="progress_scanning" msgid="192587958424295789">"正在搜索"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"未在附近找到蓝牙设备。"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"某个应用请求开启蓝牙，以便其他设备可检测到您的手机。您可以稍后在“蓝牙”设置中更改此设置。"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"正在打开蓝牙..."</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"正在关闭蓝牙…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"自动连接"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"蓝牙连接请求"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"点按即可连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”。"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"要连接到“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”吗？"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"可用的通话设备"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"当前已连接"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"保存的设备"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"添加设备"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"系统将开启蓝牙以进行配对"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"连接偏好设置"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"之前连接的设备"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"之前连接的设备"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"已开启蓝牙"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"查看全部"</string>
<string name="date_and_time" msgid="9062980487860757694">"日期和时间"</string>
<string name="choose_timezone" msgid="1362834506479536274">"选择时区"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"跳过"</string>
<string name="next_label" msgid="4693520878012668114">"下一步"</string>
<string name="language_picker_title" msgid="3596315202551687690">"语言"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"语言偏好设置"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"移除"</string>
<string name="add_a_language" msgid="2330538812283783022">"添加语言"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"设置"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"设置快捷方式"</string>
<string name="airplane_mode" msgid="8837269988154128601">"飞行模式"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"更多"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"无线和网络"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"管理WLAN、蓝牙、飞行模式、移动网络和VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"移动数据"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"隐私设置"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"已被管理员停用"</string>
<string name="security_status_title" msgid="5848766673665944640">"安全状态"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"屏幕锁定、人脸解锁"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"屏幕锁定、指纹"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"屏幕锁定"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"已添加面孔"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"使用您的面孔进行解锁"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"使用您的面孔进行身份验证"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"通过您的面孔解锁手机、授权购买交易或登录应用。"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"使用您的面孔"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"请使用您的面孔解锁手机或批准购买交易。\n\n注意：您无法使用面孔来解锁此设备。要了解详情，请与贵单位的管理员联系。"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"使用您的面孔解锁手机、授权购买交易或登录应用"</string>
- <string name="face_add_max" msgid="2342250989212694454">"您最多可以添加 <xliff:g id="COUNT">%d</xliff:g> 个指纹"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"让您的面孔位于圆圈的中心位置"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"以后再说"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"您最多可以添加 <xliff:g id="COUNT">%d</xliff:g> 个面孔"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"您添加的面孔数量已达到上限"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"无法再添加面孔"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"未完成注册"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"确定"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"面孔注册操作超时，请重试。"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"无法注册面孔。"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"完成注册。未发现任何问题。"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"完成"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"使用您的人脸："</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"为设备解锁"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"应用登录和付款"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"睁开眼睛即可解锁"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"使用面孔身份验证时，您必须睁开眼睛"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"移除人脸数据"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"改善您的人脸数据"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"您可以使用自己的人脸将设备解锁及访问应用。"<annotation id="url">"了解详情"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"指纹"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"管理指纹"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"将指纹用于以下用途："</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"请为 WLAN 热点至少选择一个频段："</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP 设置"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"隐私"</string>
<string name="wifi_shared" msgid="844142443226926070">"与其他设备用户共享"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"（未更改）"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"请选择"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"要取消保存网络吗？"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"系统将删除此网络的所有密码"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"已保存的网络"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d 个网络</item>
<item quantity="one">1 个网络</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"亮度"</string>
<string name="brightness_summary" msgid="838917350127550703">"调整屏幕亮度"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"自动调节亮度"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"开启"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"关闭"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"偏好的亮度为“很低”"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"偏好的亮度为“低”"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"无法更改PIN码。\n输入的PIN码可能不正确。"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"已成功更改 SIM 卡 PIN 码"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"无法更改 SIM 卡锁定状态。\nPIN 码可能不正确。"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"无法停用 PIN 码。"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"无法启用 PIN 码。"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"确定"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"找到多张SIM卡"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g>必须进行格式化。\n\n"<b>"格式化操作会清空当前存储在<xliff:g id="NAME_1">^1</xliff:g>上的所有数据。"</b>"为避免丢失数据，建议您先将数据备份。"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"清空并格式化"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"正在格式化<xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"请勿在<xliff:g id="NAME">^1</xliff:g>进行格式化时将其移除。"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"请勿在 <xliff:g id="NAME">^1</xliff:g>进行格式化时将其移除。"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"将数据移动到新的存储设备"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"您可以将自己的照片、文件和部分应用转移到这个新<xliff:g id="NAME">^1</xliff:g>上。\n\n转移操作大约需要 <xliff:g id="TIME">^2</xliff:g>，完成后将腾出 <xliff:g id="SIZE">^3</xliff:g> 的内部存储空间。在转移过程中，部分应用将无法正常运行。"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"立即移动"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"已安装"</string>
<string name="no_applications" msgid="7336588977497084921">"无应用。"</string>
<string name="internal_storage" msgid="1584700623164275282">"内部存储空间"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"内部存储设备"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB存储设备"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD卡存储设备"</string>
<string name="recompute_size" msgid="7722567982831691718">"正在重新计算大小..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"要删除应用数据吗？"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"系统会永久删除此应用的所有数据。删除的内容包括所有文件、设置、帐号、数据库等。"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"在已安装应用的列表中找不到该应用。"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"无法清除应用的存储空间。"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"此应用拥有以下权限："</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"此应用拥有以下权限："</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"此应用可访问您平板电脑上的以下内容。为了提高性能和减少内存使用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>可获得其中的部分权限，因为它与<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>运行在同一进程中。"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"此应用可访问您手机上的以下内容。为了提高性能和减少内存使用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>可获得其中的部分权限，因为它与<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>运行在同一进程中。"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>和<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>、<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"使用此应用可能会产生费用："</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"发送付费短信"</string>
<string name="computing_size" msgid="1599186977475211186">"正在计算..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"无法计算软件包的大小。"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"未安装任何第三方应用。"</string>
<string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"移动"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"移至平板电脑"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"移至手机"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"移至USB存储设备"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"移至SD卡"</string>
- <string name="moving" msgid="6431016143218876491">"正在移动"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"系统目前正在执行另一项迁移操作。"</string>
<string name="insufficient_storage" msgid="481763122991093080">"存储空间不足。"</string>
<string name="does_not_exist" msgid="1501243985586067053">"应用不存在。"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"无法在外部媒体上安装设备管理应用"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"要强行停止吗？"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"强行停止某个应用可能会导致其出现异常。"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"无法移动应用。<xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"首选安装位置"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"更改安装新应用时使用的首选安装位置"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"要停用内置应用吗？"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"停用应用"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"如果您停用此应用，Android 和其他应用可能会无法正常运行。"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"确定要删除数据并停用应用吗？"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"如果您停用此应用，Android 和其他应用可能会无法正常运行。您的数据也将会遭到删除。"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"要关闭通知吗？"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"如果关闭此应用的通知，您可能会错过重要提醒和最新动态信息。"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"商店"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"应用详情"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"通过<xliff:g id="APP_STORE">%1$s</xliff:g>安装的应用"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"使用服务"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"使用色彩校正"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"使用字幕"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"继续"</string>
<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="6371077608778830020">"添加助听器"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"如果您限制某个应用的后台活动，可能会导致该应用出现异常"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"由于此应用未设置为优化电池用量，因此您无法对其加以限制。\n\n要限制该应用，请先开启电池优化功能。"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"上次充满电后的屏幕用电量"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"屏幕耗电量"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"移动网络扫描"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"充满电后的电池用量"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"充满电后的屏幕使用时间"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"充满电后的设备用电量"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"详细使用情况"</string>
<string name="controls_subtitle" msgid="390468421138288702">"省电提示"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"包含的软件包"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"多个应用正大量耗电"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"使设备保持唤醒状态"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"在后台唤醒设备"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"请求获取位置信息的频率过高"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 个应用出现异常"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"应用正常运行中"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"手机的后台耗电量正常"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"平板电脑的后台耗电量正常"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">正在限制 %1$d 个应用的电池用量</item>
<item quantity="one">正在限制 %1$d 个应用的电池用量</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"限制时间：<xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"这些应用一直在后台消耗电量。受限应用可能无法正常运行，且相关通知可能也会有所延迟。"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"使用电池管理器"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"检测应用何时使用电量"</string>
@@ -2411,23 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"取消"</string>
<string name="tts_reset" msgid="2661752909256313270">"重置"</string>
<string name="tts_play" msgid="2628469503798633884">"播放"</string>
- <string name="gadget_title" msgid="5519037532720577836">"电量控制"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"正在更新WLAN设置"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新蓝牙设置"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g><xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"开启"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"关闭"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"正在开启"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"正在关闭"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"WLAN"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"蓝牙"</string>
- <string name="gadget_location" msgid="2974757497945178165">"位置信息"</string>
- <string name="gadget_sync" msgid="858895763714222152">"同步"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"亮度 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"自动"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"最亮"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"一半"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"关闭"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"凭据存储空间"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"从存储设备安装"</string>
@@ -2585,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>，共 <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"全选"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"流量使用情况"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"应用的流量使用情况"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"移动数据和 WLAN"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"运营商的流量计算方式可能与您设备的计算方式不同。"</string>
<string name="data_usage_app" msgid="4970478397515423303">"应用使用情况"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"应用信息"</string>
@@ -2962,7 +2933,6 @@
<item quantity="other">显示 %d 项隐藏内容</item>
<item quantity="one">显示 %d 项隐藏内容</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"收起"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"网络和互联网"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"移动网络"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"流量使用"</string>
@@ -2974,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"蓝牙"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"应用和通知"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"权限、默认应用"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"工作资料中的应用无法访问通知。"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"帐号"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"未添加任何帐号"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"默认应用"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"语言、时间、备份、更新"</string>
<string name="search_results_title" msgid="1796252422574886932">"设置"</string>
- <string name="search_menu" msgid="6283419262313758339">"在设置中搜索"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, WLAN, 网络连接, 互联网, 无线, 数据, WLAN 网络"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"WLAN, wlan, 切换, 控制"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"短信, 发短信, 消息, 发消息, 默认"</string>
@@ -3024,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"支付、点按、付款"</string>
<string name="keywords_backup" msgid="470070289135403022">"备份内容, 备份"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"手势"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"人脸, 解锁, 身份验证, 登录"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"IMEI, MEID, MIN, PRL 版本, IMEI SV"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"网络, 移动网络状态, 服务状态, 信号强度, 移动网络类型, 漫游, ICCID"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"序列号, 硬件版本"</string>
@@ -3031,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"深色主题背景"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"错误"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"主动显示, 锁定屏幕显示"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"锁定屏幕通知"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"面孔"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"指纹"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"降低屏幕亮度, 触摸屏, 电池, 智能亮度, 动态亮度"</string>
@@ -3361,7 +3333,7 @@
<string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
<string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g>到<xliff:g id="END">%2$s</xliff:g>"</string>
<string name="zen_mode_calls" msgid="7051492091133751208">"来电"</string>
- <string name="zen_mode_calls_title" msgid="623395033931747661">"允许进行通话"</string>
+ <string name="zen_mode_calls_title" msgid="623395033931747661">"允许通话"</string>
<string name="zen_mode_calls_footer" msgid="3618700268458237781">"开启勿扰模式后，系统会屏蔽来电。您可以调整相应设置，以便允许您的好友、家人或其他联系人与您联系。"</string>
<string name="zen_mode_starred_contacts_title" msgid="1848464279786960190">"已加星标的联系人"</string>
<plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="500105380255018671">
@@ -3462,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"当您输入 PIN 码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等无障碍服务还未开启。"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"当您绘制解锁图案以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等无障碍服务还未开启。"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"当您输入密码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等无障碍服务还未开启。"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"注意：重新启动后，您必须将手机解锁才能运行此应用"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"注意：如果您重启手机并设置了屏幕锁定，则必须将手机解锁才能运行此应用"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI 信息"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI相关信息"</string>
<string name="slot_number" msgid="3762676044904653577">"（插槽<xliff:g id="SLOT_NUM">%1$d</xliff:g>）"</string>
@@ -3516,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"个人应用"</string>
<string name="filter_work_apps" msgid="24519936790795574">"工作应用"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"应用：全部"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"已屏蔽的应用"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"已关闭"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"类别：重要性 - 紧急"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"类别：重要性 - 低"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"类别：已关闭"</string>
@@ -3577,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"电池用量提醒"</string>
<string name="show_all_apps" msgid="1512506948197818534">"显示完整的设备用电量"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"显示应用的耗电情况"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"耗电量高"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> 个应用的行为异常</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g>的行为异常</item>
@@ -3741,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"内部存储空间：已使用 <xliff:g id="PERCENTAGE">%1$s</xliff:g>，还剩 <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"闲置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后进入休眠状态"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"壁纸、休眠、字体大小"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"闲置 10 分钟后会进入休眠状态"</string>
<string name="memory_summary" msgid="8080825904671961872">"平均内存用量为 <xliff:g id="USED_MEMORY">%1$s</xliff:g>，共 <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
<string name="users_summary" msgid="1674864467098487328">"目前登录的用户为：<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3756,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"不允许使用短信功能"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"不允许使用相机"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"不允许使用屏幕截图功能"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"无法关闭备份功能"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"无法打开此应用"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"如有任何问题，请与您的 IT 管理员联系"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"更多详情"</string>
@@ -3920,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"模拟“刘海屏”"</string>
- <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"显示屏凹口, 凹口"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"无"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"刘海屏"</string>
+ <string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"刘海屏, 缺口"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"设备默认设置"</string>
<string name="special_access" msgid="3458780842491881155">"特殊应用权限"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> 个应用可以无限量使用流量</item>
@@ -3944,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"已连接到<xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"已连接到多部设备"</string>
<string name="demo_mode" msgid="2798762752209330277">"系统界面演示模式"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"夜间模式"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"设置夜间模式"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"夜间模式"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"设置夜间模式"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"快捷设置开发者图块"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope 跟踪"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"工作资料设置"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"联系人搜索"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允许您的单位搜索联系人，以便识别来电者和联系人的身份"</string>
@@ -3989,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"点按两次即可查看手机"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"点按两次即可查看平板电脑"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"点按两次即可查看设备"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"点按两次屏幕即可查看时间、通知图标和其他信息。"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"点按两次屏幕即可查看时间、通知和其他信息。"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"拿起手机即显示"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"拿起平板电脑即可查看"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"拿起设备即可查看"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"拿起您的手机即可查看时间、通知图标和其他信息。"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"拿起您的平板电脑即可查看时间、通知图标和其他信息。"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"要查看时间、通知图标和其他信息，请拿起您的设备。"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"唤醒显示屏"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"拿起您的手机即可查看时间、通知和其他信息。"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"拿起您的平板电脑即可查看时间、通知和其他信息。"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"拿起您的设备即可查看时间、通知和其他信息。"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"唤醒锁定屏幕手势"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"滑动指纹即可查看通知"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"滑动指纹"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"要查看通知，请在手机背面的指纹传感器上向下滑动手指。"</string>
@@ -4075,7 +4050,6 @@
<item quantity="other">已尝试 <xliff:g id="COUNT_1">%d</xliff:g> 次</item>
<item quantity="one">已尝试 <xliff:g id="COUNT_0">%d</xliff:g> 次</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"系统正在备份此设备的数据"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"此设备由贵单位管理。"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"此设备由“<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>”管理。"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4116,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"自动填充服务"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"自动, 填充, 自动填充, auto, fill, autofill"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>请确认这是您信任的应用</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g>会根据您的屏幕内容判断可自动填充哪些内容。"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"自动填充"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"日志记录级别"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"每次会话的请求数上限"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"可见数据集最大数量"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"重置为默认值"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"已重置自动填充开发者选项"</string>
<string name="device_theme" msgid="4571803018917608588">"设备主题背景"</string>
<string name="default_theme" msgid="7085644992078579076">"默认"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"网络名称"</string>
@@ -4130,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"触发运营商配置"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"更新勿扰模式"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"暂停通知即可保持专注"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"新增了哪些精彩功能？"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"新手机功能导览"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"新平板电脑功能导览"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"新设备功能导览"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"该设备不支持此功能"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"强制启用 GNSS 测量结果全面跟踪"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"在停用工作周期的情况下跟踪所有 GNSS 星座和频率"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"一律显示崩溃对话框"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"在每次应用崩溃时显示对话框"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"选择已启用 ANGLE 的应用"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"未设置已启用 ANGLE 的应用"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"已启用 ANGLE 的应用：<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"目录访问权限"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"目录访问权限"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g>（<xliff:g id="DIRECTORY">%2$s</xliff:g>）"</string>
@@ -4179,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"网络详情"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"您的设备名称会显示在手机上的应用中。此外，当您连接到蓝牙设备或设置 WLAN 热点时，其他人可能也会看到您的设备名称。"</string>
<string name="devices_title" msgid="7701726109334110391">"设备"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"所有设置"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"建议"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS 数据"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS 数据"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"选择网络"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"已断开连接"</string>
+ <string name="network_connected" msgid="4943925032253989621">"已连接"</string>
+ <string name="network_connecting" msgid="76404590784733557">"正在连接…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"无法连接"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"未找到网络。"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"找不到网络，请重试。"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"（禁止）"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"没有 SIM 卡"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"高级通话"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"首选网络模式：首选 WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"首选网络模式：仅限 GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"首选网络模式：仅限 WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"首选网络模式：GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"首选网络模式：CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"首选网络模式：CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"首选网络模式：仅限 CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"首选网络模式：仅限 EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"首选网络模式：CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"首选网络模式：LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"首选网络模式：GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"首选网络模式：CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"首选网络模式：通用"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"首选网络模式：LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"首选网络模式：LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"首选网络模式：LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"首选网络模式：TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"首选网络模式：TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"首选网络模式：LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"首选网络模式：TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"首选网络模式：LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"首选网络模式：TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"首选网络模式：LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"首选网络模式：LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"首选网络模式：TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"首选网络模式：LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE（推荐）"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G（推荐）"</string>
+ <string name="network_global" msgid="959947774831178632">"通用"</string>
+ <string name="label_available" msgid="1731547832803057893">"可用网络"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"正在搜索…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"正在<xliff:g id="NETWORK">%s</xliff:g>上注册…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"您的 SIM 卡不允许连接到此网络。 daisy 您的 SIM 卡无法连接到此网络。"</string>
+ <string name="connect_later" msgid="978991102125216741">"目前无法连接到此网络，请稍后重试。"</string>
+ <string name="registration_done" msgid="4573820010512184521">"已在网络上注册。"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"自动选择网络"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"运营商设置"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"设置数据服务"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"移动数据"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"通过移动网络访问数据"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"首选网络类型"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"更改网络运行方式"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"首选网络类型"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"运营商"</string>
+ <string name="call_category" msgid="8108654745239563833">"通话"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"运营商视频通话"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"系统选择"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"更改 CDMA 漫游模式"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"系统选择"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"网络"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"网络"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA 订阅"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"在 RUIM/SIM 和 NV 之间切换"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"订阅"</string>
+ <string name="register_automatically" msgid="518185886971595020">"自动注册…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"要允许数据网络漫游吗？"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"请与您的网络服务提供商联系以了解定价。"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"应用的流量使用情况"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"无效的网络模式<xliff:g id="NETWORKMODEID">%1$d</xliff:g>。忽略。"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"连接到<xliff:g id="CARRIER">%1$s</xliff:g>时无法使用"</string>
+ <string name="see_more" msgid="5953815986207345223">"查看更多"</string>
+ <string name="see_less" msgid="1250265310929558370">"隐藏部分"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 7c2bfa5..2ff7c6a 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"設定為按數據用量收費"</item>
<item msgid="2266114985518865625">"設定為不限數據用量收費"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"預設 (隨機使用 MAC)"</item>
+ <item msgid="5398461510512959597">"可信任"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"否"</item>
<item msgid="3863157480502955888">"是"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"永遠開啟"</item>
<item msgid="6385301106124765323">"一律關閉"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"關閉"</item>
+ <item msgid="2182686878828390312">"偵錯"</item>
+ <item msgid="5286514712714822064">"詳細"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"僅限住宅電話"</item>
+ <item msgid="5034813753274486448">"自動"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"首選 GSM/WCDMA"</item>
+ <item msgid="807926878589867564">"只限 GSM"</item>
+ <item msgid="488474605709912156">"只限 WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA 自動切換"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo 自動切換"</item>
+ <item msgid="370391313511477301">"CDMA (沒有 EvDo)"</item>
+ <item msgid="4678789463133969294">"只限 EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"全球"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"只限 TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"全球"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 003e339..0286d79 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"建立"</string>
<string name="allow" msgid="3349662621170855910">"允許"</string>
<string name="deny" msgid="6947806159746484865">"拒絕"</string>
- <string name="dlg_close" msgid="7471087791340790015">"關閉"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"切換"</string>
<string name="device_info_default" msgid="7847265875578739287">"未知"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">您只需完成 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"不需要了，您已經是開發人員。"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"請先啟用開發人員選項。"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"無線與網絡"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"連線"</string>
- <string name="header_category_device" msgid="4544026001618307754">"裝置"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"個人"</string>
- <string name="header_category_access" msgid="7580499097416970962">"存取"</string>
<string name="header_category_system" msgid="2816866961183068977">"系統"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"啟用數據連線"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"停用數據連線"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"裝置的藍牙位址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"解除與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」的連結？"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"未命名的藍牙裝置"</string>
<string name="progress_scanning" msgid="192587958424295789">"正在搜尋..."</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"附近找不到藍牙裝置。"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"應用程式要求開啟藍牙功能，並將手機設為向其他裝置顯示。您稍後可在「藍牙」設定中變更這項設定。"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"藍牙開啟中…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"關閉藍牙？？？"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動連線"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"藍牙連線要求"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"輕按即可連接至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"您要連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」嗎？"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"可用的通話裝置"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"目前已連接的裝置"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"已儲存的裝置"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"新增裝置"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"系統將開啟藍牙以配對裝置"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"連接偏好設定"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"之前已連接的裝置"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"之前已連接的裝置"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"已開啟藍牙"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"查看全部"</string>
<string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
<string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"略過"</string>
<string name="next_label" msgid="4693520878012668114">"下一步"</string>
<string name="language_picker_title" msgid="3596315202551687690">"語言"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"語言偏好設定"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"移除"</string>
<string name="add_a_language" msgid="2330538812283783022">"新增語言"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"設定捷徑"</string>
<string name="airplane_mode" msgid="8837269988154128601">"飛行模式"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"更多"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線與網絡"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"管理 Wi-Fi、藍牙、飛行模式、流動網絡和 VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"流動數據"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"私隱權"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"已由管理員停用"</string>
<string name="security_status_title" msgid="5848766673665944640">"安全性狀態"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"螢幕鎖定, 臉容解鎖"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"螢幕鎖定、指紋"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"螢幕鎖定"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"已加入臉孔"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"使用臉孔解鎖"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"使用臉孔驗證"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"使用臉孔解鎖手機、授權購物或登入應用程式。"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"使用您的臉孔"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"使用臉孔解鎖手機或核准購物交易。\n\n請注意：您無法使用臉孔解鎖此裝置。如需瞭解詳情，請聯絡您機構的管理員。"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"使用臉孔解鎖手機、授權購物或登入應用程式"</string>
- <string name="face_add_max" msgid="2342250989212694454">"您可以加入最多 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"將您的臉孔置於圓圈中心"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"稍後再註冊"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"您可以加入最多 <xliff:g id="COUNT">%d</xliff:g> 張臉孔"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"您加入的臉孔數目已達上限"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"無法加入更多臉孔"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"尚未完成註冊"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"確定"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"臉孔註冊時限已過，請再試一次。"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"無法註冊臉孔。"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"完成註冊，效果不錯。"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"完成"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"使用臉容完成以下操作"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"解鎖裝置"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"應用程式登入與付款"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"張開眼睛以解鎖"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"使用臉容驗證時必須張開眼睛"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"移除臉容資料"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"改善您的臉容資料"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"您的臉容可以用來解鎖裝置和存取應用程式。"<annotation id="url">"瞭解詳情"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"指紋"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"管理指紋"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"使用指紋"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"請為 Wi-Fi 熱點至少選擇一個頻段："</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP 設定"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"私隱"</string>
<string name="wifi_shared" msgid="844142443226926070">"與其他裝置使用者分享"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(未變更)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"請選取"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"要移除此網絡嗎？"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"系統將刪除此網絡的所有密碼"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"已儲存的網絡"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d 個網絡</item>
<item quantity="one">1 個網絡</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"光暗度"</string>
<string name="brightness_summary" msgid="838917350127550703">"調校螢幕亮度"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"自動調校亮度"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"開"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"關閉"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"偏好的亮度為非常低"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"偏好的亮度為低"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"無法更改 PIN 碼。\nPIN 碼可能不正確。"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"成功更改 SIM PIN"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"無法更改 SIM 卡鎖定狀態。\n可能輸入了不正確的 PIN 碼。"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"無法停用 PIN。"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"無法啟用 PIN。"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"確定"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"找到多張 SIM 卡"</string>
@@ -1373,7 +1381,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"<xliff:g id="NAME_0">^1</xliff:g>需要格式化。\n\n"<b>"格式化會刪除<xliff:g id="NAME_1">^1</xliff:g>上的所有現存資料。"</b>"要避免資料遺失，請先備份資料。"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"清除和格式化"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"正在格式化<xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"請勿在 <xliff:g id="NAME">^1</xliff:g>格式化時將其移除。"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"請勿在 <xliff:g id="NAME">^1</xliff:g>格式化時將其移除。"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"將資料移至新的儲存空間"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"您可以將相片、檔案和部分應用程式移至此全新 <xliff:g id="NAME">^1</xliff:g>。\n\n此操作大約需時 <xliff:g id="TIME">^2</xliff:g>，並能釋放 <xliff:g id="SIZE">^3</xliff:g> 的內部儲存空間。部分應用程式將在過程中無法正常運作。"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"立即移動"</string>
@@ -1755,9 +1763,6 @@
<string name="installed" msgid="3070865169422600098">"已安裝"</string>
<string name="no_applications" msgid="7336588977497084921">"沒有應用程式。"</string>
<string name="internal_storage" msgid="1584700623164275282">"內部儲存空間"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"內部儲存空間"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 儲存裝置"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 記憶卡儲存空間"</string>
<string name="recompute_size" msgid="7722567982831691718">"正在重新計算大小..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"您要刪除應用程式資料嗎？"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"這個應用程式的所有資料都將被永久刪除，包含所有檔案、設定、帳戶、資料庫等。"</string>
@@ -1766,24 +1771,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"在已安裝的應用程式清單中找不到這個應用程式。"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"無法清除應用程式的儲存空間。"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"此應用程式可存取您平板電腦上的下列項目："</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"這個應用程式可存取您手機上的下列各項："</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"這個應用程式可存取您平板電腦上的下列項目。由於「<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>」可在與「<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>」相同的程序中執行，為增進效能及降低記憶體用量，應用程式可以使用部分權限："</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"這個應用程式可存取您手機上的下列項目。由於「<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>」可在與「<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>」相同的程序中執行，為增進效能及降低記憶體用量，應用程式可以使用部分權限："</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>及<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>、<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"這個應用程式可能需要付費："</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"傳送付費短訊"</string>
<string name="computing_size" msgid="1599186977475211186">"正在計算..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"無法計算套件大小。"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"您並未安裝任何第三方應用程式。"</string>
<string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"移動"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"移至平板電腦"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"移至手機"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"移至 USB 儲存裝置"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"移至 SD 卡"</string>
- <string name="moving" msgid="6431016143218876491">"正在移動"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"另一個轉移正在進行中。"</string>
<string name="insufficient_storage" msgid="481763122991093080">"儲存空間不足。"</string>
<string name="does_not_exist" msgid="1501243985586067053">"應用程式不存在。"</string>
@@ -1793,17 +1790,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"無法在外部媒體上安裝裝置管理應用程式"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"您要強制停止嗎？"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"強制停止應用程式，可能會導致操作不正常。"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"無法移動應用程式。<xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"偏好的安裝位置"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"更改新應用程式在安裝時的喜好位置。"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"您要停用內置應用程式嗎？"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"停用應用程式"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"如果您停用此應用程式，Android 和其他應用程式可能無法正常運作。"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"要刪除資料並停用應用程式嗎？"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"如果您停用此應用程式，Android 和其他應用程式可能無法正常運作，您的資料亦會被刪除。"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"關閉通知？"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"如果您關閉這個應用程式的通知，可能會錯失重要的警示與更新。"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"商店"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"應用程式詳細資料"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"從「<xliff:g id="APP_STORE">%1$s</xliff:g>」安裝的應用程式"</string>
@@ -1996,6 +1989,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"使用服務"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"使用色彩校正"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"使用字幕"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"繼續"</string>
<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="6371077608778830020">"加入助聽器"</string>
@@ -2139,8 +2133,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"如果您限制應用程式的背景活動，應用程式可能無法正常運作"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"由於此應用程式並未設定為優化電池，您無法限制其使用。\n\n如要限制應用程式，請先開啟電池優化功能。"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"充滿電後的螢幕用量"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"流動網絡掃瞄"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"完全充電後的電池用量"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"充滿電後的螢幕開啟時間"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"充滿電後的裝置用量"</string>
@@ -2167,11 +2159,6 @@
<string name="details_subtitle" msgid="32593908269911734">"詳細使用狀況"</string>
<string name="controls_subtitle" msgid="390468421138288702">"調整電力使用"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"已包含套件"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"大量耗電的應用程式"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"一直喚醒裝置"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"在背景喚醒裝置"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"要求獲取位置資訊的頻率過高"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個應用程式運作異常"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"應用程式正常運作中"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"手機的背景耗電量正常"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"平板電腦的背景耗電量正常"</string>
@@ -2235,6 +2222,7 @@
<item quantity="other">限制 %1$d 個應用程式的用電量</item>
<item quantity="one">限制 %1$d 個應用程式的用電量</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"受限時間：<xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"這些應用程式會在背景中耗電。受限制的應用程式可能會無法正常運作，且相關通知可能會延遲。"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"使用電池管理工具"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"偵測應用程式何時耗電"</string>
@@ -2412,25 +2400,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"取消"</string>
<string name="tts_reset" msgid="2661752909256313270">"重設"</string>
<string name="tts_play" msgid="2628469503798633884">"播放"</string>
- <string name="gadget_title" msgid="5519037532720577836">"電源控制"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"正在更新 Wi-Fi 設定"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新藍牙設定"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"開啟"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"關閉"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"開啟中"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"關閉中"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"藍牙"</string>
- <string name="gadget_location" msgid="2974757497945178165">"位置"</string>
- <string name="gadget_sync" msgid="858895763714222152">"同步"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"亮度 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"自動"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"最亮"</string>
- <!-- String.format failed for translation -->
- <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
- <skip />
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"關閉"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"憑證儲存空間"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"從儲存裝置安裝"</string>
@@ -2588,7 +2557,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>，總共 <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"全部選取"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"數據用量"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"應用程式數據用量"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"流動數據與 Wi-Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"流動網絡供應商的數據計算方式可能與裝置有所不同。"</string>
<string name="data_usage_app" msgid="4970478397515423303">"應用程式使用情況"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"應用程式資料"</string>
@@ -2965,7 +2934,6 @@
<item quantity="other">顯示 %d 個隱藏項目</item>
<item quantity="one">顯示 %d 個隱藏項目</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"收合"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"網絡和互聯網"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"流動網絡"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"數據用量"</string>
@@ -2977,12 +2945,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"藍牙"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"權限、預設應用程式"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"工作設定檔中的應用程式無法存取通知設定。"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"帳戶"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"未新增任何帳戶"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"預設應用程式"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"語言、時間、備份、更新"</string>
<string name="search_results_title" msgid="1796252422574886932">"設定"</string>
- <string name="search_menu" msgid="6283419262313758339">"搜尋設定"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"Wifi, Wi-Fi, 網絡連線, 互聯網, 無線, 數據, Wifi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"WiFi, Wi-Fi, 切換, 控制"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"短訊, 發短訊, 訊息, 傳送訊息, 預設"</string>
@@ -3027,6 +2995,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"支付, 輕按, 付款"</string>
<string name="keywords_backup" msgid="470070289135403022">"備份內容, 備份"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"手勢"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"臉容, 解鎖, 驗證, 登入"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"MEI, MEID, MIN, PRL 版本, IMEI SV"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"網絡, 流動網絡狀態, 服務狀態, 訊號強度, 流動網絡類型, 漫遊, ICCID"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"序號, 硬件版本"</string>
@@ -3034,6 +3003,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"深色主題背景"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"錯誤"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"環境顯示，上鎖畫面顯示"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"上鎖畫面通知"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"臉孔"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"指紋"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"螢幕變暗, 觸控螢幕, 電池, 智能亮度, 動態亮度"</string>
@@ -3465,7 +3435,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"輸入您的 PIN 碼以啟動裝置後，您將無法直接使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等協助工具服務。"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"輸入您的解鎖圖案以啟動裝置後，您將無法直接使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等協助工具服務。"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"輸入您的密碼以啟動裝置後，您將無法直接使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等協助工具服務。"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"注意：重新啟動後，您必須解鎖手機，才可開始使用此應用程式"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"請注意：如果您重新啟動手機並設定了螢幕鎖定，就必須先將手機解鎖，才可執行這個應用程式"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI 資料"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI 相對資料"</string>
<string name="slot_number" msgid="3762676044904653577">"(插槽 <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3515,11 +3485,11 @@
<string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"沒有要求權限"</string>
<string name="filter_all_apps" msgid="1988403195820688644">"所有應用程式"</string>
<string name="filter_enabled_apps" msgid="5395727306799456250">"已安裝的應用程式"</string>
- <string name="filter_instant_apps" msgid="574277769963965565">"即時應用程式"</string>
+ <string name="filter_instant_apps" msgid="574277769963965565">"免安裝應用程式"</string>
<string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
<string name="filter_work_apps" msgid="24519936790795574">"工作"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"應用程式：全部"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"應用程式：已關閉"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"已關閉"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"類別：緊急重要性"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"類別：低重要性"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"類別：已關閉"</string>
@@ -3580,7 +3550,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"用量警示"</string>
<string name="show_all_apps" msgid="1512506948197818534">"顯示完整的裝置用電量"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"顯示應用程式使用情況"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"耗電量高"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> 個應用程式不正常執行中</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> 不正常執行中</item>
@@ -3669,7 +3638,7 @@
<string name="running_frequency" msgid="6622624669948277693">"頻率"</string>
<string name="memory_maximum_usage" msgid="6513785462055278341">"最高用量"</string>
<string name="no_data_usage" msgid="9131454024293628063">"並未使用數據"</string>
- <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"允許「<xliff:g id="APP">%1$s</xliff:g>」存取「請勿騷擾」？"</string>
+ <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"允許「<xliff:g id="APP">%1$s</xliff:g>」存取「請勿騷擾」嗎？"</string>
<string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"應用程式能開啟或關閉「請勿騷擾」，並變更有關設定。"</string>
<string name="zen_access_disabled_package_warning" msgid="302820100078584431">"請啟用功能，通知存取權已開放"</string>
<string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"要撤銷「<xliff:g id="APP">%1$s</xliff:g>」存取「請勿騷擾」的權限嗎？"</string>
@@ -3744,6 +3713,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"內部儲存空間：已使用 <xliff:g id="PERCENTAGE">%1$s</xliff:g>，剩餘 <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後進入休眠狀態"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"桌布、休眠、字型大小"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"閒置 10 分鐘後進入休眠狀態"</string>
<string name="memory_summary" msgid="8080825904671961872">"平均記憶體用量為 <xliff:g id="USED_MEMORY">%1$s</xliff:g> (共 <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>)"</string>
<string name="users_summary" msgid="1674864467098487328">"已使用<xliff:g id="USER_NAME">%1$s</xliff:g>的身分登入"</string>
@@ -3759,7 +3730,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"不允許傳送短訊"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"不允許使用相機"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"不允許擷取螢幕畫面"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"無法關閉備份功能"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"無法開啟此應用程式"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"如有任何問題，請與 IT 管理員聯絡"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"更多詳細資料"</string>
@@ -3923,9 +3893,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"模擬具有凹口的顯示屏"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"顯示屏凹口"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"顯示屏凹口 (缺口)"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"無"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"裝置預設設定"</string>
<string name="special_access" msgid="3458780842491881155">"特別應用程式權限"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> 個應用程式可使用無限數據</item>
@@ -3947,11 +3917,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"已連接至 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"已連接多部裝置"</string>
<string name="demo_mode" msgid="2798762752209330277">"系統使用者介面示範模式"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"夜間模式"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"設定夜間模式"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"夜間模式"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"設定「夜間模式」"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"快速設定開發人員圖塊"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope 追蹤"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"工作設定檔設定"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"聯絡人搜尋"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允許您的機構搜尋聯絡人，以識別來電者和聯絡人"</string>
@@ -3992,13 +3961,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"輕按兩下以查看手機"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"輕按兩下即可查看平板電腦"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"輕按兩下即可查看裝置"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"輕按螢幕兩下即可查看時間、通知圖示和其他資訊。"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"輕按螢幕兩下即可查看時間、通知和其他資訊。"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"拿起手機後顯示的資料"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"提起即可查看平板電腦"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"提起即可查看裝置"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"拿起手機即可查看時間、通知圖示和其他資訊。"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"拿起您的平板電腦即可查看時間、通知圖示和其他資訊。"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"拿起您的裝置即可查看時間、通知圖示和其他資訊。"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"喚醒顯示屏"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"拿起您的手機即可查看時間、通知和其他資訊。"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"拿起您的平板電腦即可查看時間、通知和其他資訊。"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"拿起您的裝置即可查看時間、通知和其他資訊。"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"喚醒上鎖畫面手勢"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"在指紋感應器滑動以查看通知"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"滑動指紋"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"在手機背面的指紋感應器向下滑動，即可查看通知。"</string>
@@ -4013,10 +3986,10 @@
<string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"無法在已遭流動網絡供應商鎖定的裝置上啟用"</string>
<string name="oem_lock_info_message" msgid="9218313722236417510">"請重新啟動裝置以啟用裝置保護功能。"</string>
<string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"已釋放共 <xliff:g id="SIZE">%1$s</xliff:g>\n\n上次執行時間：<xliff:g id="DATE">%2$s</xliff:g>"</string>
- <string name="web_action_enable_title" msgid="4051513950976670853">"即時應用程式"</string>
+ <string name="web_action_enable_title" msgid="4051513950976670853">"免安裝應用程式"</string>
<string name="web_action_enable_summary" msgid="3108127559723396382">"即使您沒有安裝應用程式，亦可在應用程式內開啟連結"</string>
- <string name="web_action_section_title" msgid="7364647086538399136">"即時應用程式"</string>
- <string name="instant_apps_settings" msgid="8827777916518348213">"即時應用程式偏好設定"</string>
+ <string name="web_action_section_title" msgid="7364647086538399136">"免安裝應用程式"</string>
+ <string name="instant_apps_settings" msgid="8827777916518348213">"免安裝應用程式偏好設定"</string>
<string name="domain_url_section_title" msgid="7046835219056428883">"已安裝的應用程式"</string>
<string name="automatic_storage_manager_activation_warning" msgid="6353100011690933254">"您的儲存空間即將由儲存空間管理員管理"</string>
<string name="account_for_section_header" msgid="5356566418548737121">"<xliff:g id="USER_NAME">%1$s</xliff:g>的帳戶"</string>
@@ -4078,7 +4051,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 次嘗試</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 次嘗試</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"正在備份此裝置的資料"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"此裝置由您的機構管理。"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"此裝置由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 管理。"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4109,7 +4081,7 @@
<string name="storage_volume_total" msgid="3499221850532701342">"已使用 (共 <xliff:g id="TOTAL">%1$s</xliff:g>)"</string>
<string name="storage_percent_full" msgid="6095012055875077036">"已使用"</string>
<string name="clear_instant_app_data" msgid="2004222610585890909">"清除應用程式"</string>
- <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"您要移除此即時應用程式嗎？"</string>
+ <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"您要移除此免安裝應用程式嗎？"</string>
<string name="launch_instant_app" msgid="391581144859010499">"開啟"</string>
<string name="game_storage_settings" msgid="3410689937046696557">"遊戲"</string>
<string name="audio_files_title" msgid="4777048870657911307">"音訊檔案"</string>
@@ -4119,6 +4091,12 @@
<string name="autofill_app" msgid="7338387238377914374">"自動填入服務"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"自動, 填入, 自動填入"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>請確定您信任此應用程式</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> 應用程式會根據您畫面上的內容判斷可自動填入的資料。"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"自動填入"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"記錄等級"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"每個工作階段的要求數量上限"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"數據集顯示上限"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"重設為預設值"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"自動填入開發人員選項已重設"</string>
<string name="device_theme" msgid="4571803018917608588">"裝置主題"</string>
<string name="default_theme" msgid="7085644992078579076">"預設"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"網絡名稱"</string>
@@ -4126,22 +4104,21 @@
<string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
<string name="storage_manager_indicator_off" msgid="7488057587180724388">"關閉"</string>
<string name="storage_manager_indicator_on" msgid="8625551710194584733">"開啟"</string>
- <string name="install_type_instant" msgid="3174425974536078647">"即時應用程式"</string>
+ <string name="install_type_instant" msgid="3174425974536078647">"免安裝應用程式"</string>
<string name="automatic_storage_manager_deactivation_warning" msgid="5605210730828410482">"要停用儲存空間管理員嗎？"</string>
<string name="storage_movies_tv" msgid="5498394447562086890">"電影和電視應用程式"</string>
<string name="carrier_provisioning" msgid="4398683675591893169">"流動網絡供應商佈建資料"</string>
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發流動網絡供應商佈建程序"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"更新請勿騷擾模式"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"暫停通知，助您保持專注"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"新增了哪些精彩功能？"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"探索您的新手機"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"探索您的新平板電腦"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"探索您的新裝置"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"這部裝置不支援此功能"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"強制啟用完整的 GNSS 測量資料"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"一律顯示當機對話框"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"在每次應用程式當機時顯示對話框"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"選取支援 ANGLE 的應用程式"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"尚未設定支援 ANGLE 的應用程式"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"支援 ANGLE 的應用程式：<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"目錄存取權"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"目錄存取權"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4182,4 +4159,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"網絡詳細資料"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"您的裝置名稱會在手機的應用程式上顯示。當您連接藍牙裝置或設定 Wi-Fi 熱點時，其他人亦可能會看到您的裝置名稱。"</string>
<string name="devices_title" msgid="7701726109334110391">"裝置"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"所有設定"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"建議"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS 數據"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS 數據"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"選擇網絡"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"連接已中斷"</string>
+ <string name="network_connected" msgid="4943925032253989621">"已連接"</string>
+ <string name="network_connecting" msgid="76404590784733557">"連接中…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"無法連接"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"找不到網絡。"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"找不到網絡，請再試一次。"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(禁止)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"沒有 SIM 卡"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"進階通話"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"首選網絡模式：首選 WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"首選網絡模式：僅限 GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"首選網絡模式：僅限 WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"首選網絡模式：GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"首選網絡模式：CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"首選網絡模式：CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"首選網絡模式：僅限 CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"首選網絡模式：僅限 EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"首選網絡模式：CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"首選網絡模式：LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"首選網絡模式：GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"首選網絡模式：CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"首選網絡模式：全球"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"首選網絡模式：LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"首選網絡模式：LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"首選網絡模式：LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"首選網絡模式：TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"首選網絡模式：TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"首選網絡模式：LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"首選網絡模式：TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"首選網絡模式：LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"首選網絡模式：TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"首選網絡模式：LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"首選網絡模式：LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"首選網絡模式：TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"首選網絡模式：LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (建議)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (建議)"</string>
+ <string name="network_global" msgid="959947774831178632">"全球"</string>
+ <string name="label_available" msgid="1731547832803057893">"可用的網絡"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"正在搜尋…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"正在註冊<xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"您的 SIM 卡無法連接這個網絡。"</string>
+ <string name="connect_later" msgid="978991102125216741">"目前無法連接這個網絡，請稍後再試。"</string>
+ <string name="registration_done" msgid="4573820010512184521">"已在網絡上註冊。"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"自動選取網絡"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"流動網絡供應商設定"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"設定數據服務"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"流動數據"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"使用流動網絡存取數據"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"首選網絡類型"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"更改網絡操作模式"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"首選網絡類型"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"流動網絡供應商"</string>
+ <string name="call_category" msgid="8108654745239563833">"通話"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"流動網絡供應商視像通話"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"系統選擇"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"更改 CDMA 漫遊模式"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"系統選擇"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"網絡"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"網絡"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA 訂閱"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"在 RUIM/SIM 和 NV 之間切換"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"訂閱"</string>
+ <string name="register_automatically" msgid="518185886971595020">"自動註冊…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"要允許數據漫遊嗎？"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"請聯絡您的網絡供應商查詢定價。"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"應用程式數據用量"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"網絡模式 <xliff:g id="NETWORKMODEID">%1$d</xliff:g> 無效。忽略。"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"無法在連接至<xliff:g id="CARRIER">%1$s</xliff:g>時使用"</string>
+ <string name="see_more" msgid="5953815986207345223">"查看更多"</string>
+ <string name="see_less" msgid="1250265310929558370">"顯示較少"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 32279a2..24a958c 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"視為計量付費"</item>
<item msgid="2266114985518865625">"視為非計量付費"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"預設 (使用隨機化 MAC)"</item>
+ <item msgid="5398461510512959597">"可信任"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"否"</item>
<item msgid="3863157480502955888">"是"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"一律開啟"</item>
<item msgid="6385301106124765323">"一律關閉"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"關閉"</item>
+ <item msgid="2182686878828390312">"偵錯"</item>
+ <item msgid="5286514712714822064">"詳細"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"僅限家用網路"</item>
+ <item msgid="5034813753274486448">"自動"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"GSM/WCDMA 優先"</item>
+ <item msgid="807926878589867564">"僅限 GSM"</item>
+ <item msgid="488474605709912156">"僅限 WCDMA"</item>
+ <item msgid="1912421096218750039">"GSM/WCDMA 自動切換"</item>
+ <item msgid="5072198667819683600">"CDMA/EvDo 自動切換"</item>
+ <item msgid="370391313511477301">"CDMA (不具 EvDo)"</item>
+ <item msgid="4678789463133969294">"僅限 EvDo"</item>
+ <item msgid="3960210542349075517">"CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"通用"</item>
+ <item msgid="8516691658640163073">"LTE"</item>
+ <item msgid="3108828968591899719">"LTE/WCDMA"</item>
+ <item msgid="1879225673847443662">"僅限 TDSCDMA"</item>
+ <item msgid="8373504428469988469">"TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"通用"</item>
+ <item msgid="817971827645657949">"LTE/CDMA"</item>
+ <item msgid="519208953133334357">"LTE/GSM/UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 703a8ed..c6a6af7 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"建立"</string>
<string name="allow" msgid="3349662621170855910">"允許"</string>
<string name="deny" msgid="6947806159746484865">"拒絕"</string>
- <string name="dlg_close" msgid="7471087791340790015">"關閉"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"切換"</string>
<string name="device_info_default" msgid="7847265875578739287">"不明"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="other">你只需完成剩餘的 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"不需要了，你已經是開發人員。"</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"請先啟用開發人員選項。"</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"無線與網路"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"連線方式"</string>
- <string name="header_category_device" msgid="4544026001618307754">"裝置"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"個人"</string>
- <string name="header_category_access" msgid="7580499097416970962">"存取"</string>
<string name="header_category_system" msgid="2816866961183068977">"系統"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"啟用數據連線"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"停用數據連線"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"裝置的藍牙位址：<xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"要中斷與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」的連線嗎？"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"未命名的藍牙裝置"</string>
<string name="progress_scanning" msgid="192587958424295789">"搜尋中"</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"找不到附近的藍牙裝置。"</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"某個應用程式要求開啟藍牙功能，讓其他裝置能偵測到你的手機。你日後可在 [藍牙] 設定中變更這項設定。"</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"藍牙開啟中…"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"正在關閉藍牙…"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"自動連線"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"藍牙連線要求"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"輕觸即可與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」連線。"</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"你要連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」嗎？"</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"可用的通話裝置"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"目前已連線的裝置"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"已儲存的裝置"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"新增裝置"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"系統將開啟藍牙以配對裝置"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"連線偏好設定"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"先前連線的裝置"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"先前連線的裝置"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"已開啟藍牙"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"查看全部"</string>
<string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
<string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"略過"</string>
<string name="next_label" msgid="4693520878012668114">"下一頁"</string>
<string name="language_picker_title" msgid="3596315202551687690">"語言"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"語言偏好設定"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"移除"</string>
<string name="add_a_language" msgid="2330538812283783022">"新增語言"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"設定捷徑"</string>
<string name="airplane_mode" msgid="8837269988154128601">"飛航模式"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"更多"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線與網路"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"管理 Wi-Fi、藍牙、飛航模式、行動網路和 VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"行動數據"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"隱私權"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"已由管理員停用"</string>
<string name="security_status_title" msgid="5848766673665944640">"安全性狀態"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"螢幕鎖定, 人臉解鎖"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"螢幕鎖定、指紋"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"螢幕鎖定"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"已新增臉孔"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"以臉孔解鎖"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"使用你的臉孔進行驗證"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"使用你的臉孔將手機解鎖、授權購物交易或登入應用程式。"</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"使用你的臉孔"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"使用你的臉孔將手機解鎖或核准購物交易。\n\n注意：你無法使用臉孔將這個裝置解鎖，詳情請洽貴機構的管理員。"</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"使用你的臉孔將手機解鎖、授權購物交易或登入應用程式"</string>
- <string name="face_add_max" msgid="2342250989212694454">"你最多可以新增 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"請將你的臉孔對準圓圈中心"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"稍後再說"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"你最多可以新增 <xliff:g id="COUNT">%d</xliff:g> 個臉孔"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"你新增的臉孔數量已達上限"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"無法新增其他臉孔"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"未完成註冊"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"確定"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"已達臉孔註冊時間上限，請再試一次。"</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"無法註冊臉孔。"</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"設定完成，沒有任何問題。"</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"完成"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"使用你的臉孔："</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"將裝置解鎖"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"登入應用程式及付款"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"睜開眼睛即可解鎖"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"使用臉孔驗證時必須睜開眼睛"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"移除臉孔資料"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"改善臉孔資料"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"你可以使用自己的臉孔將裝置解鎖及存取應用程式。"<annotation id="url">"瞭解詳情"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"指紋"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"管理指紋"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"指紋辨識用途："</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"請至少選擇一個用於 Wi‑Fi 無線基地台的頻帶："</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"IP 設定"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"隱私權"</string>
<string name="wifi_shared" msgid="844142443226926070">"與裝置的其他使用者共用"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(未變更)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"請選取"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"要刪除網路嗎？"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"系統將刪除這個網路的所有密碼"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"已儲存的網路"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="other">%d 個網路</item>
<item quantity="one">1 個網路</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"亮度"</string>
<string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"自動調整亮度"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"開啟"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"關閉"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"偏好的亮度設為「非常低」"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"偏好的亮度設為「低」"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"無法變更 PIN。\nPIN 碼可能不正確。"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"成功變更 SIM PIN"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"無法變更 SIM 卡鎖定狀態。\n可能輸入了不正確的 PIN。"</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"無法停用 PIN 碼。"</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"無法啟用 PIN 碼。"</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"確定"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"取消"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"找到多張 SIM 卡"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"「<xliff:g id="NAME_0">^1</xliff:g>」必須經過格式化。\n\n"<b>"格式化作業會清除目前儲存在 <xliff:g id="NAME_1">^1</xliff:g>中的所有資料。"</b>"為避免資料遺失，建議你先進行備份。"</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"清除並格式化"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"正在格式化「<xliff:g id="NAME">^1</xliff:g>」…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"請勿在 <xliff:g id="NAME">^1</xliff:g>格式化時將其移除。"</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"請勿在 <xliff:g id="NAME">^1</xliff:g>格式化時將其移除。"</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"將資料移動到新的儲存空間"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"你可以將相片、檔案和部分應用程式移到新的「<xliff:g id="NAME">^1</xliff:g>」。\n\n移動作業大約需要 <xliff:g id="TIME">^2</xliff:g>，完成後將可釋放 <xliff:g id="SIZE">^3</xliff:g> 內部儲存空間。在執行移動作業的過程中，部分應用程式可能無法正常運作。"</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"立即移動"</string>
@@ -1754,9 +1762,6 @@
<string name="installed" msgid="3070865169422600098">"已安裝"</string>
<string name="no_applications" msgid="7336588977497084921">"沒有應用程式。"</string>
<string name="internal_storage" msgid="1584700623164275282">"內部儲存空間"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"內部儲存空間"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 儲存裝置"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 卡儲存裝置"</string>
<string name="recompute_size" msgid="7722567982831691718">"重新計算大小…"</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"你要刪除應用程式資料嗎？"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"系統會永久刪除這個應用程式的所有資料，包含所有檔案、設定、帳戶、資料庫等。"</string>
@@ -1765,24 +1770,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"在已安裝的應用程式清單中找不到這個應用程式。"</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"無法清除應用程式的儲存空間。"</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"這個應用程式可存取你平板電腦中的下列項目："</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"這個應用程式可存取你手機上的下列項目："</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"這個應用程式可存取你平板電腦上的下列內容。為了增進效能及降低記憶體用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> 可獲得其中的部分權限，因為這個應用程式與 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> 在同一程序中執行。"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"這個應用程式可存取你手機上的下列內容。為了增進效能及降低記憶體用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> 可獲得其中的部分權限，因為這個應用程式與 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> 在同一程序中執行。"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>和<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>、<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"這個應用程式可能需要付費使用："</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"傳送付費簡訊"</string>
<string name="computing_size" msgid="1599186977475211186">"計算中…"</string>
<string name="invalid_size_value" msgid="1582744272718752951">"無法計算套件大小。"</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"你並未安裝任何第三方應用程式。"</string>
<string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"移動"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"移至平板電腦"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"移至手機"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"移至 USB 儲存裝置"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"移至 SD 卡"</string>
- <string name="moving" msgid="6431016143218876491">"正在移動"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"目前已在執行另一項遷移作業。"</string>
<string name="insufficient_storage" msgid="481763122991093080">"儲存空間不足。"</string>
<string name="does_not_exist" msgid="1501243985586067053">"應用程式不存在。"</string>
@@ -1792,17 +1789,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"無法在外部媒體上安裝裝置管理員"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"你要強制停止嗎？"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"如果你強制停止應用程式，應用程式可能無法正常運作。"</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"無法移動應用程式。原因：<xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"偏好的安裝位置"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"變更偏好的新應用程式安裝位置"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"你要停用內建應用程式嗎？"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"停用應用程式"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"如果你停用這個應用程式，Android 和其他應用程式可能無法正常運作。"</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"刪除資料並停用應用程式？"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"如果你停用這個應用程式，Android 和其他應用程式可能無法正常運作，你的資料也會遭到刪除。"</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"關閉通知？"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"如果你關閉這個應用程式的通知，可能會錯失重要的警示與更新。"</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"商店"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"應用程式詳細資料"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"應用程式安裝來源：<xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1995,6 +1988,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"使用服務"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"使用色彩校正"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"使用字幕"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"繼續"</string>
<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="6371077608778830020">"新增助聽器"</string>
@@ -2138,8 +2132,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"如果你限制應用程式的背景活動，應用程式可能無法正常運作"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"由於這個應用程式並未設為最佳化電池用量，因此你無法加以限制。\n\n如要限制應用程式，請先開啟電池效能最佳化功能。"</string>
<string name="device_screen_usage" msgid="3386088035570409683">"上次完全充飽電後的螢幕使用時間"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"行動網路掃描作業"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"上次充飽電後的電池用量"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"充飽後的螢幕點亮時間"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"充飽後的裝置用量"</string>
@@ -2166,11 +2158,6 @@
<string name="details_subtitle" msgid="32593908269911734">"使用狀況詳細資訊"</string>
<string name="controls_subtitle" msgid="390468421138288702">"調整電力使用"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"已包含封裝檔案"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"多個應用程式正在大量耗電"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"一直讓裝置保持喚醒狀態"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"在背景喚醒裝置"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"要求取得位置資訊的頻率過高"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> 個應用程式未正常運作"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"應用程式正常執行中"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"手機的背景耗電量一般"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"平板電腦的背景耗電量一般"</string>
@@ -2234,6 +2221,7 @@
<item quantity="other">限制 %1$d 個應用程式的電池用量</item>
<item quantity="one">限制 %1$d 個應用程式的電池用量</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"限制時間：<xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"這些應用程式會在背景耗用電量。受限制的應用程式可能無法正常運作，且相關通知可能會延遲。"</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"使用電池管理員"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"偵測應用程式是否耗用大量電力"</string>
@@ -2411,27 +2399,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"取消"</string>
<string name="tts_reset" msgid="2661752909256313270">"重設"</string>
<string name="tts_play" msgid="2628469503798633884">"播放"</string>
- <string name="gadget_title" msgid="5519037532720577836">"電源控制"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"更新 Wi-Fi 設定"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新藍牙設定"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"開啟"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"關閉"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"開啟中"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"關閉中"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"藍牙"</string>
- <string name="gadget_location" msgid="2974757497945178165">"定位"</string>
- <string name="gadget_sync" msgid="858895763714222152">"同步處理"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"亮度 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"自動"</string>
- <!-- String.format failed for translation -->
- <!-- no translation found for gadget_brightness_state_full (6814570109772137631) -->
- <skip />
- <!-- String.format failed for translation -->
- <!-- no translation found for gadget_brightness_state_half (3696671957608774204) -->
- <skip />
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"關閉"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">"憑證儲存空間"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"從裝置的儲存空間安裝"</string>
@@ -2589,7 +2556,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g>，總共 <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"全選"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"數據用量"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"應用程式數據用量"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"行動數據和 Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"電信業者與裝置的數據計算方式可能有所不同。"</string>
<string name="data_usage_app" msgid="4970478397515423303">"應用程式使用情況"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"應用程式資訊"</string>
@@ -2966,7 +2933,6 @@
<item quantity="other">顯示 %d 個隱藏項目</item>
<item quantity="one">顯示 %d 個隱藏項目</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"收合"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"網路和網際網路"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"行動網路"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"數據用量"</string>
@@ -2978,12 +2944,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"藍牙"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"應用程式和通知"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"權限、預設應用程式"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"這個工作資料夾中的應用程式無法存取通知。"</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"帳戶"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"未新增任何帳戶"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"預設應用程式"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"語言、時間、備份、更新"</string>
<string name="search_results_title" msgid="1796252422574886932">"設定"</string>
- <string name="search_menu" msgid="6283419262313758339">"搜尋設定"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"wifi, wi-fi, 網路連線, 網際網路, 無線, 數據, wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"wifi, wi-fi, 切換, 控制"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"簡訊, 發送簡訊, 訊息, 傳送訊息, 預設"</string>
@@ -3028,6 +2994,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"支付、輕觸、付款"</string>
<string name="keywords_backup" msgid="470070289135403022">"備份內容, 備份"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"手勢"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"臉孔, 解鎖, 驗證, 登入"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"IMEI、MEID、MIN、PRL 版本、IMEI SV"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"網路、行動網路狀態、服務狀態、訊號強度、行動網路類型、漫遊、ICCID"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"序號、硬體版本"</string>
@@ -3035,6 +3002,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"深色主題"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"錯誤"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"微光螢幕, 螢幕鎖定畫面"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"螢幕鎖定通知"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"臉孔"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"指紋"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"調暗螢幕, 觸控螢幕, 電池, 智慧型亮度, 動態亮度"</string>
@@ -3466,7 +3434,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"輸入你的 PIN 啟動裝置後，你將無法使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等各項協助工具服務。"</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"畫出解鎖圖案啟動裝置後，你將無法使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等各項協助工具服務。"</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"輸入你的密碼啟動裝置後，你將無法使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等各項協助工具服務。"</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"注意：重新啟動後，你必須將手機解鎖，才能執行這個應用程式"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"注意：如果你重新啟動手機並設定了螢幕鎖定，你必須先將手機解鎖，才能執行這個應用程式"</string>
<string name="imei_information_title" msgid="8499085421609752290">"IMEI 資訊"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"IMEI 相關資訊"</string>
<string name="slot_number" msgid="3762676044904653577">"(插槽 <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3520,7 +3488,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"個人"</string>
<string name="filter_work_apps" msgid="24519936790795574">"工作"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"應用程式：全部"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"應用程式：已關閉"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"已關閉"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"類別：緊急重要性"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"類別：低重要性"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"類別：已關閉"</string>
@@ -3581,7 +3549,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"電池用量警示"</string>
<string name="show_all_apps" msgid="1512506948197818534">"顯示完整的裝置用電量"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"應用程式使用情況"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"耗電量高"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> 個應用程式無法正常運作</item>
<item quantity="one"><xliff:g id="APP">%1$s</xliff:g> 無法正常運作</item>
@@ -3745,6 +3712,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"內部儲存空間：已使用 <xliff:g id="PERCENTAGE">%1$s</xliff:g> - 尚餘 <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
<string name="display_summary" msgid="6737806235882127328">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後休眠"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"桌布、休眠、字型大小"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"閒置 10 分鐘後休眠"</string>
<string name="memory_summary" msgid="8080825904671961872">"平均記憶體用量為 <xliff:g id="USED_MEMORY">%1$s</xliff:g> (共 <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>)"</string>
<string name="users_summary" msgid="1674864467098487328">"登入身分：<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3760,7 +3729,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"不允許使用簡訊功能"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"不允許使用相機功能"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"不允許使用螢幕畫面擷取功能"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"無法關閉備份功能"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"無法開啟這個應用程式"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"如有任何問題，請與你的 IT 管理員聯絡"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"其他詳細資訊"</string>
@@ -3907,9 +3875,9 @@
<string name="notification_log_details_importance" msgid="2153168790791683139">"重要性"</string>
<string name="notification_log_details_explanation" msgid="1914295130775393551">"說明"</string>
<string name="notification_log_details_badge" msgid="3258183328267662285">"可顯示徽章"</string>
- <string name="notification_log_details_content_intent" msgid="1113554570409128083">"調用請求"</string>
- <string name="notification_log_details_delete_intent" msgid="905118520685297007">"刪除調用請求"</string>
- <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"全螢幕調用請求"</string>
+ <string name="notification_log_details_content_intent" msgid="1113554570409128083">"意圖"</string>
+ <string name="notification_log_details_delete_intent" msgid="905118520685297007">"刪除意圖"</string>
+ <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"全螢幕意圖"</string>
<string name="notification_log_details_actions" msgid="242523930165118066">"動作"</string>
<string name="notification_log_details_title" msgid="7177091647508863295">"標題"</string>
<string name="notification_log_details_remoteinput" msgid="8328591329858827409">"遠端輸入裝置"</string>
@@ -3924,9 +3892,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"模擬具有凹口的顯示畫面"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"螢幕凹口"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"螢幕凹口, 凹口"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"無"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"裝置預設設定"</string>
<string name="special_access" msgid="3458780842491881155">"特殊應用程式存取權"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="other"><xliff:g id="COUNT">%d</xliff:g> 個應用程式不受數據用量限制</item>
@@ -3948,11 +3916,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"已連線到「<xliff:g id="ID_1">%1$s</xliff:g>」"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"已連線到多個裝置"</string>
<string name="demo_mode" msgid="2798762752209330277">"系統 UI 示範模式"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"夜間模式"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"設定夜間模式"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"深色模式"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"設定深色模式"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"快速設定開發人員圖塊"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Winscope 追蹤"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"工作資料夾設定"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"聯絡人搜尋"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允許你的機構搜尋聯絡人，以便識別來電者和聯絡人的身分"</string>
@@ -3993,13 +3960,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"輕觸兩下手機即可查看"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"輕觸兩下平板電腦即可查看"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"輕觸兩下裝置即可查看"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"輕觸兩下螢幕即可查看時間、通知圖示和其他資訊。"</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"輕觸兩下螢幕即可查看時間、通知和其他資訊。"</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"拿起手機即可查看"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"拿起平板電腦即可查看"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"拿起裝置即可查看"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"拿起手機即可查看時間、通知圖示和其他資訊。"</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"拿起平板電腦即可查看時間、通知圖示和其他資訊。"</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"拿起裝置即可查看時間、通知圖示和其他資訊。"</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"喚醒螢幕"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"拿起手機即可查看時間、通知和其他資訊。"</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"拿起平板電腦即可查看時間、通知和其他資訊。"</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"拿起裝置即可查看時間、通知和其他資訊。"</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"喚醒鎖定畫面手勢"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"滑動感應指紋以查看通知"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"滑動手指"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"將手指放在手機背面的指紋感應器上並向下滑動，即可查看通知。"</string>
@@ -4079,7 +4050,6 @@
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 次嘗試</item>
<item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 次嘗試</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"正在備份這個裝置的資料"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"這個裝置是由貴機構所管理。"</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"這個裝置是由 <xliff:g id="ORGANIZATION_NAME">%s</xliff:g> 所管理。"</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4120,6 +4090,12 @@
<string name="autofill_app" msgid="7338387238377914374">"自動填入服務"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"自動、填入、自動填入"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>請確定這是你信任的應用程式</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g>應用程式會根據你的畫面內容判斷要自動填入的內容。"</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"自動填入"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"記錄層級"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"每個工作階段的要求數上限"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"可見資料集數量上限"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"重設為預設值"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"已重設自動填入開發人員選項"</string>
<string name="device_theme" msgid="4571803018917608588">"裝置主題"</string>
<string name="default_theme" msgid="7085644992078579076">"預設"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"網路名稱"</string>
@@ -4134,15 +4110,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"觸發電信業者佈建程序"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"更新「零打擾」模式"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"暫停通知以保持專注"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"有什麼新奇功能？"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"認識你的新手機"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"認識你的新平板電腦"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"認識你的新裝置"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"這個裝置不支援此功能"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"強制啟用完整的 GNSS 測量資料"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"一律顯示當機對話方塊"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"在每次應用程式當機時顯示對話方塊"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"選取已啟用 ANGLE 的應用程式"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"未設定已啟用 ANGLE 的應用程式"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"已啟用 ANGLE 的應用程式：<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"目錄存取權"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"目錄存取權"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4183,4 +4158,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"網路詳細資料"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"你的裝置名稱會顯示在手機的應用程式上。此外，當你連上藍牙裝置或設定 Wi-Fi 無線基地台時，其他人可能也會看到你的裝置名稱。"</string>
<string name="devices_title" msgid="7701726109334110391">"裝置"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"所有設定"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"建議"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"CBRS 資料"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"CBRS 資料"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"選擇網路"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"連線中斷"</string>
+ <string name="network_connected" msgid="4943925032253989621">"已連線"</string>
+ <string name="network_connecting" msgid="76404590784733557">"連線中…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"無法連線"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"找不到網路。"</string>
+ <string name="network_query_error" msgid="7487714485362598410">"找不到網路，請再試一次。"</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(已禁止)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"沒有 SIM 卡"</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"進階通話功能"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"首選網路模式：首選 WCDMA"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"首選網路模式：僅限 GSM"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"首選網路模式：僅限 WCDMA"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"首選網路模式：GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"首選網路模式：CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"首選網路模式：CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"首選網路模式：僅限 CDMA"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"首選網路模式：僅限 EvDo"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"首選網路模式：CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"首選網路模式：LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"首選網路模式：GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"首選網路模式：CDMA + LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"首選網路模式：通用"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"首選網路模式：LTE/WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"首選網路模式：LTE/GSM/UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"首選網路模式：LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"首選網路模式：TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"首選網路模式：TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"首選網路模式：LTE/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"首選網路模式：TDSCDMA/GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"首選網路模式：LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"首選網路模式：TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"首選網路模式：LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"首選網路模式：LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"首選網路模式：TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"首選網路模式：LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"LTE (建議)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"4G (建議)"</string>
+ <string name="network_global" msgid="959947774831178632">"通用"</string>
+ <string name="label_available" msgid="1731547832803057893">"可用的網路"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"搜尋中…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"正在註冊「<xliff:g id="NETWORK">%s</xliff:g>」…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"你的 SIM 卡無法連上這個網路。"</string>
+ <string name="connect_later" msgid="978991102125216741">"目前無法連上這個網路，請稍後再試。"</string>
+ <string name="registration_done" msgid="4573820010512184521">"註冊網路成功。"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"自動選取網路"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"電信業者設定"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"設定數據傳輸服務"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"行動數據"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"使用行動網路存取數據"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"首選網路類型"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"變更網路操作模式"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"首選網路類型"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"電信業者"</string>
+ <string name="call_category" msgid="8108654745239563833">"通話"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"電信業者視訊通話"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"選取系統"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"變更 CDMA 漫遊模式"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"選取系統"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"網路"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"網路"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"CDMA 訂閱"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"在 RUIM/SIM 和 NV 之間切換"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"訂閱"</string>
+ <string name="register_automatically" msgid="518185886971595020">"自動註冊…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"要允許漫遊服務嗎？"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"請向你的網路供應商洽詢定價。"</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"應用程式數據用量"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"網路模式 <xliff:g id="NETWORKMODEID">%1$d</xliff:g> 無效。忽略。"</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"無法在連線到「<xliff:g id="CARRIER">%1$s</xliff:g>」時使用"</string>
+ <string name="see_more" msgid="5953815986207345223">"顯示更多"</string>
+ <string name="see_less" msgid="1250265310929558370">"顯示較少"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index d134cbd..4431a1d 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -477,6 +477,10 @@
<item msgid="8745603368609022803">"Phatha njengokulinganisiwe"</item>
<item msgid="2266114985518865625">"Phatha njengokungalinganisiwe"</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item msgid="5222330396373765981">"Okuzenzakalelayo (sebenzisa i-MAC engahleliwe)"</item>
+ <item msgid="5398461510512959597">"Othenjiwe"</item>
+ </string-array>
<string-array name="wifi_hidden_entries">
<item msgid="234221371123852300">"Cha"</item>
<item msgid="3863157480502955888">"Yebo"</item>
@@ -486,4 +490,56 @@
<item msgid="6620560879508595181">"Ihlala ivuliwe"</item>
<item msgid="6385301106124765323">"Ihlala ivaliwe"</item>
</string-array>
+ <string-array name="autofill_logging_level_entries">
+ <item msgid="1036676483322832067">"Valiwe"</item>
+ <item msgid="2182686878828390312">"Susa iphutha"</item>
+ <item msgid="5286514712714822064">"I-Verbose"</item>
+ </string-array>
+ <string-array name="cdma_system_select_choices">
+ <item msgid="8727887686723706826">"Ekhaya kuphela"</item>
+ <item msgid="5034813753274486448">"Okuzenzekelayo"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices">
+ <item msgid="4168919392737496563">"Okukhethwayo kwe-GSM / WCDMA"</item>
+ <item msgid="807926878589867564">"I-GSM kuphela"</item>
+ <item msgid="488474605709912156">"I-WCDMA kuphela"</item>
+ <item msgid="1912421096218750039">"Okuzenzakalelayo kwe-GSM /WCDMA"</item>
+ <item msgid="5072198667819683600">"I-CDMA / EvDo ezenzakalelayo"</item>
+ <item msgid="370391313511477301">"I-CDMA w/o EvDo"</item>
+ <item msgid="4678789463133969294">"I-EvDo kuphela"</item>
+ <item msgid="3960210542349075517">"I-CDMA/EvDo/GSM/WCDMA"</item>
+ <item msgid="2961817320209454599">"I-CDMA + LTE/EvDo"</item>
+ <item msgid="8008611169788556519">"I-GSM/WCDMA/LTE"</item>
+ <item msgid="4486851520863433847">"Okomhlaba jikelele"</item>
+ <item msgid="8516691658640163073">"I-LTE"</item>
+ <item msgid="3108828968591899719">"I-LTE / WCDMA"</item>
+ <item msgid="1879225673847443662">"I-TDSCDMA kuphela"</item>
+ <item msgid="8373504428469988469">"I-TDSCDMA/WCDMA"</item>
+ <item msgid="8097271911945758303">"I-LTE/TDSCDMA"</item>
+ <item msgid="2272560096982726294">"I-TDSCDMA/GSM"</item>
+ <item msgid="131738018826229696">"I-LTE/TDSCDMA/GSM"</item>
+ <item msgid="629422387044789699">"I-TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="5686260911275077041">"I-LTE/TDSCDMA/WCDMA"</item>
+ <item msgid="4545655348143499596">"I-LTE/TDSCDMA/GSM/WCDMA"</item>
+ <item msgid="4107769721462339672">"I-TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ <item msgid="8811683254058088466">"I-LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA"</item>
+ </string-array>
+ <string-array name="cdma_subscription_choices">
+ <item msgid="8753271080005095725">"I-RUIM/SIM"</item>
+ <item msgid="2214656470548320124">"NV"</item>
+ </string-array>
+ <string-array name="cdma_subscription_values">
+ <item msgid="3697517500945829780">"0"</item>
+ <item msgid="8113210705878681550">"1"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item msgid="1054992858056320116">"Okomhlaba jikelele"</item>
+ <item msgid="817971827645657949">"I-LTE / CDMA"</item>
+ <item msgid="519208953133334357">"I-LTE / GSM / UMTS"</item>
+ </string-array>
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item msgid="3904215366284600030">"10"</item>
+ <item msgid="4187053702071521357">"8"</item>
+ <item msgid="5461421967189969022">"9"</item>
+ </string-array>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 8121528..639c2fc 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -21,8 +21,6 @@
<string name="create" msgid="3578857613172647409">"Yakha"</string>
<string name="allow" msgid="3349662621170855910">"Vumela"</string>
<string name="deny" msgid="6947806159746484865">"Nqaba"</string>
- <string name="dlg_close" msgid="7471087791340790015">"Vala"</string>
- <string name="dlg_switch" msgid="6243971420240639064">"Shintshela"</string>
<string name="device_info_default" msgid="7847265875578739287">"Akwaziwa"</string>
<plurals name="show_dev_countdown" formatted="false" msgid="7201398282729229649">
<item quantity="one">Manje ususele ngamagxathu angu-<xliff:g id="STEP_COUNT_1">%1$d</xliff:g> ukuthi ube ngunjiniyela.</item>
@@ -32,10 +30,6 @@
<string name="show_dev_already" msgid="2151632240145446227">"Asikho isidingo, usuvele ungunjiniyela."</string>
<string name="dev_settings_disabled_warning" msgid="4909448907673974370">"Sicela unike amandla izinketho zokuthuthukisa kuqala."</string>
<string name="header_category_wireless_networks" msgid="5110914332313954940">"Okugenantambo namanethiwekhi"</string>
- <string name="header_category_connections" msgid="6471513040815680662">"Oxhumana nabo"</string>
- <string name="header_category_device" msgid="4544026001618307754">"Idivayisi"</string>
- <string name="header_category_personal" msgid="3310195187905720823">"Okomuntu siqu"</string>
- <string name="header_category_access" msgid="7580499097416970962">"Ukufinyelela"</string>
<string name="header_category_system" msgid="2816866961183068977">"Isistimu"</string>
<string name="radio_info_data_connection_enable" msgid="8656750679353982712">"Vumela uxhumano lwedatha"</string>
<string name="radio_info_data_connection_disable" msgid="8541302390883231216">"Khubaza uxhumano lwedatha"</string>
@@ -121,7 +115,6 @@
<string name="bluetooth_footer_mac_message" product="device" msgid="8413944740341742061">"Ikheli le-Bluetooth yedivayisi: <xliff:g id="BLUETOOTH_MAC_ADDRESS">%1$s</xliff:g>"</string>
<string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Nqamula i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
<string name="bluetooth_broadcasting" msgid="16583128958125247">"Ukusakaza"</string>
- <string name="bluetooth_unknown" msgid="644716244548801421"></string>
<string name="bluetooth_device" msgid="5291950341750186887">"Idivayisi ye-Bluetooth engaqanjwanga igama"</string>
<string name="progress_scanning" msgid="192587958424295789">"Iyasesha..."</string>
<string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Awekho amadivayisi e-Bluetooth atholakele."</string>
@@ -153,7 +146,6 @@
<string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"Uhlelo lokusebenza lifuna ukuvula i-Bluetooth futhi lenze ifoni yakho ibonakale kwamanye amadivayisi. Ungakushintsha lokhu emuva kwesikhathi kuzilungiselelo ze-Bluetooth."</string>
<string name="bluetooth_turning_on" msgid="4850574877288036646">"Ivula i-Bluetooth"</string>
<string name="bluetooth_turning_off" msgid="2337747302892025192">"Ivala i-Bluetooth"</string>
- <string name="bluetooth_auto_connect" msgid="40711424456733571">"Ukuxhuma okuzenzakalelayo"</string>
<string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Isicelo sohleloxhumano lwe-Bluetooth"</string>
<string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"Thepha kuze uxhume ku-\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
<string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"Uyafuna ukuxhuma ku \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\""</string>
@@ -181,12 +173,12 @@
<string name="connected_device_available_call_title" msgid="697154660967595684">"Amadivayisi atholakalayo ekholi"</string>
<string name="connected_device_connected_title" msgid="5871712271201945606">"Kuxhunyiwe manje"</string>
<string name="connected_device_saved_title" msgid="688364359746674536">"Amadivayisi alondoloziwe"</string>
- <string name="connected_device_add_device_title" msgid="7803521577708810621">"Engeza idivayisi"</string>
<string name="connected_device_add_device_summary" msgid="4041865900298680338">"I-Bluetooth izovula ukuze ibhanqe"</string>
<string name="connected_device_connections_title" msgid="5988939345181466770">"Izinketho zoxhumo"</string>
<string name="connected_device_previously_connected_title" msgid="491765792822244604">"Amadivayisi axhunywe ngaphambilini"</string>
<string name="connected_device_previously_connected_screen_title" msgid="6196066429488377795">"Kuxhunywe ngaphambilini"</string>
<string name="connected_device_bluetooth_turned_on_toast" msgid="5683648191381637533">"I-Bluetooth ivuliwe"</string>
+ <string name="previous_connected_see_all" msgid="3626779872898778415">"Buka konke"</string>
<string name="date_and_time" msgid="9062980487860757694">"Idethi nesikhathi"</string>
<string name="choose_timezone" msgid="1362834506479536274">"Khetha isikhathi sendawo"</string>
<!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -269,7 +261,6 @@
<string name="skip_label" msgid="47510779345218297">"Yeqa"</string>
<string name="next_label" msgid="4693520878012668114">"Okulandelayo"</string>
<string name="language_picker_title" msgid="3596315202551687690">"Izilimi"</string>
- <string name="pref_title_lang_selection" msgid="2014920136978776034">"Izinketho zolimi"</string>
<string name="locale_remove_menu" msgid="7651301406723638854">"Susa"</string>
<string name="add_a_language" msgid="2330538812283783022">"Engeza ulimi"</string>
<plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
@@ -303,7 +294,6 @@
<string name="settings_label_launcher" msgid="8344735489639482340">"Izilungiselelo"</string>
<string name="settings_shortcut" msgid="3936651951364030415">"Isinqamuleli sezilungiselelo"</string>
<string name="airplane_mode" msgid="8837269988154128601">"Imodi yendiza"</string>
- <string name="radio_controls_title" msgid="3447085191369779032">"Okuningi"</string>
<string name="wireless_networks_settings_title" msgid="3643009077742794212">"Amanethiwekhi; nokungenantambo"</string>
<string name="radio_controls_summary" msgid="1838624369870907268">"Phatha i-Wi-Fi, i-Bluetooth, imodi yendiza, amanethiwekhi eselula; nama-VPN"</string>
<string name="cellular_data_title" msgid="6835451574385496662">"Idatha yeselula"</string>
@@ -388,6 +378,7 @@
<string name="security_passwords_title" msgid="2881269890053568809">"Ubumfihlo"</string>
<string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Kukhutshazwe umlawuli"</string>
<string name="security_status_title" msgid="5848766673665944640">"Isimo sokuphepha"</string>
+ <string name="security_dashboard_summary_face" msgid="268234254306703218">"Ukukhiya isikrini, i-face unlock"</string>
<string name="security_dashboard_summary" msgid="6757421634477554939">"Ukukhiywa kwesikrini, isigxivizo somunwe"</string>
<string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Isikrini sivaliwe"</string>
<string name="security_settings_face_preference_summary" msgid="1290187225482642821">"Ubuso bungeziwe"</string>
@@ -397,11 +388,27 @@
<string name="security_settings_face_enroll_introduction_title" msgid="2694505011712885439">"Vula ngobuso bakho"</string>
<string name="security_settings_face_enroll_introduction_title_unlock_disabled" msgid="8180330567034286589">"Sebenzisa ubuso bakho ukuze ufakazele ubuqiniso"</string>
<string name="security_settings_face_enroll_introduction_message" msgid="6150611993438981458">"Sebenzisa ubuso bakho ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza."</string>
- <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6300341727101929207">"Sebenzisa wena"</string>
+ <string name="security_settings_face_enroll_introduction_message_unlock_disabled" msgid="6393270235632444857">"Sebenzisa ubuso bakho ukuze uvule ifoni yakho noma uvumele ukuthengwa.\n\nQaphela: Awukwazi ukusebenzisa ifoni yakho ukuze uvule le divayisi. Ukuze uthole olunye ulwazi, xhumana nomphathi wenhlangano yakho."</string>
<string name="security_settings_face_enroll_introduction_message_setup" msgid="5704661081718707858">"Sebenzisa ubuso bakho ukuze uvule ifoni yakho, ugunyaze ukuthenga, noma ungene ngemvume kuzinhlelo zokusebenza"</string>
- <string name="face_add_max" msgid="2342250989212694454">"Ungangeza izigxivizo zeminwe ezingafika kwezingu-<xliff:g id="COUNT">%d</xliff:g>"</string>
+ <string name="security_settings_face_enroll_repeat_title" msgid="4019853239039918762">"Faka phakathi kwendawo ubuso bakho kundingiliza"</string>
+ <string name="security_settings_face_enroll_enrolling_skip" msgid="1933553314312349529">"Yenza emuva kwesikhathi"</string>
+ <string name="face_add_max" msgid="4408683751143942949">"Ungangeza kufikela kubuso obungu-<xliff:g id="COUNT">%d</xliff:g>"</string>
<string name="face_intro_error_max" msgid="160022811747660581">"Ungene inombolo enkulu yobuso"</string>
<string name="face_intro_error_unknown" msgid="6367721696446677261">"Ayikwazi ukungeza ubuso obuningi"</string>
+ <string name="security_settings_face_enroll_error_dialog_title" msgid="2869110702072655323">"Ukubhaliswa akuzange kuqedwe"</string>
+ <string name="security_settings_face_enroll_dialog_ok" msgid="2980238861223265089">"KULUNGILE"</string>
+ <string name="security_settings_face_enroll_error_timeout_dialog_message" msgid="1701191960569185087">"Kufinyelelwe kumkhawulo wesikhathi sokubhaliswa kobuso. Zama futhi."</string>
+ <string name="security_settings_face_enroll_error_generic_dialog_message" msgid="3825066262969499407">"Ukubhaliswa kobuso akuzange kusebenze."</string>
+ <string name="security_settings_face_enroll_finish_title" msgid="8268014305067971249">"Konke sokulungile. Kubukeka kukuhle."</string>
+ <string name="security_settings_face_enroll_done" msgid="6670735678797960484">"Kwenziwe"</string>
+ <string name="security_settings_face_settings_use_face_category" msgid="8444494667872034497">"Sebenzisa ubuso bakho"</string>
+ <string name="security_settings_face_settings_use_face_unlock_phone" msgid="8720574411679475571">"Vula idivayisi yakho"</string>
+ <string name="security_settings_face_settings_use_face_for_apps" msgid="5751549943998662469">"Ukungena ngemvume kohlelo lokusebenza nezinkokhelo"</string>
+ <string name="security_settings_face_settings_require_attention" msgid="1638445716306615123">"Amehlo avuliwe ukuze kuvulwe"</string>
+ <string name="security_settings_face_settings_require_attention_details" msgid="5749808567341263288">"Uma usebenzisa ukufakazela ubuqiniso bobuso, amehlo akho kumele avulwe"</string>
+ <string name="security_settings_face_settings_remove_face_data" msgid="3477772641643318370">"Susa idatha yobuso"</string>
+ <string name="security_settings_face_settings_improve_face" msgid="1771390557275699911">"Thuthukisa idatha yobuso bakho"</string>
+ <string name="security_settings_face_settings_footer" msgid="8056977398747222768">"Ubuso bakho bungasetshenziswa ukuvula idivayisi yakho nokufinyelela izinhlelo zokusebenza. "<annotation id="url">"Funda kabanzi"</annotation></string>
<string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Izigxivizo zeminwe"</string>
<string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Phatha izigxivizo zeminwe"</string>
<string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sebenzisa izigxivizo zeminwe ukuthi"</string>
@@ -884,6 +891,7 @@
<string name="wifi_ap_5G" msgid="4020713496716329468">"5.0 GHz"</string>
<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Khetha okungenani ibhendi eyodwa ye-Wi‑Fi hotspot:"</string>
<string name="wifi_ip_settings" msgid="3359331401377059481">"Izilungiselelo ze-IP"</string>
+ <string name="wifi_privacy_settings" msgid="5500777170960315928">"Ubumfihlo"</string>
<string name="wifi_shared" msgid="844142443226926070">"Yabelana nabanye abasebenzisi bedivayisi"</string>
<string name="wifi_unchanged" msgid="3410422020930397102">"(akushintshiwe)"</string>
<string name="wifi_unspecified" msgid="4917316464723064807">"Sicela ukhethe"</string>
@@ -923,7 +931,6 @@
<string name="wifi_cancel" msgid="6763568902542968964">"Khansela"</string>
<string name="wifi_forget_dialog_title" msgid="6224151903586192426">"Khohlwa inethiwekhi?"</string>
<string name="wifi_forget_dialog_message" msgid="2337060138532166680">"Onke amaphasiwedi ale nethiwekhi azosuswa"</string>
- <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Amanethiwekhi alondoloziwe"</string>
<plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
<item quantity="one">%d amanethiwekhi</item>
<item quantity="other">%d amanethiwekhi</item>
@@ -1102,8 +1109,7 @@
<string name="brightness_title" msgid="5746272622112982836">"Ukugqama"</string>
<string name="brightness_summary" msgid="838917350127550703">"Lungisa ukukhanya kwesikrini"</string>
<string name="auto_brightness_title" msgid="6341042882350279391">"Ukukhanya okuguqukayo"</string>
- <!-- no translation found for auto_brightness_summary_on (3519854265558828744) -->
- <skip />
+ <string name="auto_brightness_summary_on" msgid="3519854265558828744">"Vuliwe"</string>
<string name="auto_brightness_summary_off" msgid="2802336459335410626">"Kuvaliwe"</string>
<string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Ukukhanya okukhethwayo kuphansi kakhulu"</string>
<string name="auto_brightness_summary_low" msgid="5609877905833960427">"Ukukhanya okukhethwayo kuphansi"</string>
@@ -1199,6 +1205,8 @@
<string name="sim_change_failed" msgid="3602072380172511475">"Ayikwazi ukushintsha i-PIN.\nMhlawumbe i-PIN engalungile"</string>
<string name="sim_change_succeeded" msgid="8556135413096489627">"I-PIN ye-SIM ishintshwe ngempumelelo"</string>
<string name="sim_lock_failed" msgid="2489611099235575984">"Ayikwazi ukushintsha isimo sokuvala ikhadi le-SIM.\nKungenzeka i-PIN engalungile."</string>
+ <string name="sim_pin_disable_failed" msgid="7932981135799678220">"Ayikwazi ukukhubaza iphinikhodi."</string>
+ <string name="sim_pin_enable_failed" msgid="3414621075632931753">"Ayikwazi ukunika amandla iphinikhodi."</string>
<string name="sim_enter_ok" msgid="6475946836899218919">"KULUNGILE"</string>
<string name="sim_enter_cancel" msgid="6240422158517208036">"Khansela"</string>
<string name="sim_multi_sims_title" msgid="9159427879911231239">"Kutholakele ama-SIM amaningi"</string>
@@ -1372,7 +1380,7 @@
<string name="storage_wizard_format_confirm_public_body" msgid="1516932692920060272">"Lokhu kudinga i-<xliff:g id="NAME_0">^1</xliff:g> ukuthi ifomethwe. \n\n"<b>"Ukufometha kusula yonke idatha okwamanje elondolozwe ku-<xliff:g id="NAME_1">^1</xliff:g>."</b>" Ukugwema ukulahlekelwa idatha, naka ukwenza idatha."</string>
<string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"Sula uphinde ufomethe"</string>
<string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"Ifometha i-<xliff:g id="NAME">^1</xliff:g>…"</string>
- <string name="storage_wizard_format_progress_body" msgid="5255269692453900303">"Ungasusi i-<xliff:g id="NAME">^1</xliff:g> ngenkathi ifometha."</string>
+ <string name="storage_wizard_format_progress_body" msgid="3983764797223576658">"Ungasusi i-<xliff:g id="NAME">^1</xliff:g> ngenkathi ifometha."</string>
<string name="storage_wizard_migrate_title" msgid="1363078147938160407">"Hambisa idatha kusitoreji esisha"</string>
<string name="storage_wizard_migrate_body" msgid="890751699549542345">"Ungahambisa izithombe zakho, amafayela nezinye izinhlelo zokusebenza kule <xliff:g id="NAME">^1</xliff:g> entsha. \n\nUkuhamba kuthatha cise u-<xliff:g id="TIME">^2</xliff:g> futhi kuzokhulula u-<xliff:g id="SIZE">^3</xliff:g> kusitoreji sangaphakathi. Ezinye izinhlelo zokusebenza ngeke zisebenze ngenkathi isebenza."</string>
<string name="storage_wizard_migrate_now" msgid="4523444323744239143">"Hambisa manje"</string>
@@ -1755,9 +1763,6 @@
<string name="installed" msgid="3070865169422600098">"Kufakiwe"</string>
<string name="no_applications" msgid="7336588977497084921">"Azikho izinhlelo zokusebenza"</string>
<string name="internal_storage" msgid="1584700623164275282">"Isitoreji sangaphakathi"</string>
- <string name="internal_storage_sentence" msgid="889098931914857143">"isitoreji sangaphakathi"</string>
- <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Isitoreji se-USB"</string>
- <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Isitoreji sekhadi le-SD"</string>
<string name="recompute_size" msgid="7722567982831691718">"Ilungisa kabusha usayizi..."</string>
<string name="clear_data_dlg_title" msgid="5605258400134511197">"Ngabe ususa yonke imininingo yohlelo lokusebenza?"</string>
<string name="clear_data_dlg_text" msgid="3951297329833822490">"Yonke le datha yohlelo lokusebenza izosuswa ngokuphelele. Lokhu kuhlanganisa wonke amafayela, izilungiselelo, ama-akhawunti, izizinda zemininingwane nokunye."</string>
@@ -1766,24 +1771,16 @@
<string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
<string name="app_not_found_dlg_text" msgid="4893589904687340011">"Uhlelo lokusebenza alutholakalanga ohlwini lwezinhlelo zokusebenza ezifakiwe."</string>
<string name="clear_failed_dlg_text" msgid="8651231637137025815">"Ayikwazanga ukusula isitoreji sohlelo lokusebenza."</string>
- <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Lolu hlelo lokusebenza lungafinyelela okulandelayo kwi-tablet yakho"</string>
- <string name="security_settings_desc" product="default" msgid="61749028818785244">"Lolu hlelo lokusebenza lungafinyelela okulandelayo efonini yakho:"</string>
- <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Lolu hlelo lokusebenza lingafinyelela okulandelayo kuthebhulethi yakho. Ukuze uthuthukise ukusebenza futhi wehlise ukusetshenziswa kwememori, ezinye izimvume ziyatholakala ku-<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ngoba isebenzisa inqubo efanayo ne-<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
- <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Lolu hlelo lokusebenza lingafinyelela okulandelayo efonini yakho. Ukuze uthuthukise ukusebenza futhi wehlise ukusetshenziswa kwememori, ezinye izimvume ziyatholakala ku-<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> ngoba isebenzisa inqubo efanayo ne-<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
<string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> no-<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
<string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
- <string name="security_settings_billing_desc" msgid="8061019011821282358">"Lolu hlelo lokusebenza lungakukhokhisa:"</string>
- <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"Ukuthumela i-SMS ye-premium?"</string>
<string name="computing_size" msgid="1599186977475211186">"Iyakhompyutha..."</string>
<string name="invalid_size_value" msgid="1582744272718752951">"Ayikwazanga ukubala usayizi wephakeji."</string>
- <string name="empty_list_msg" msgid="3552095537348807772">"Awunazo izinhlelo zokusebenza zelingu langaphandle ezifakiwe."</string>
<string name="version_text" msgid="9189073826278676425">"Inguqulo <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
<string name="move_app" msgid="5042838441401731346">"Hambisa"</string>
<string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Yisa kwithebhulethi"</string>
<string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Hambisa kwifoni"</string>
<string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Hambisa kusitoreji se-USB"</string>
<string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Hambisa ekhadini le-SD"</string>
- <string name="moving" msgid="6431016143218876491">"Ukukhipha"</string>
<string name="another_migration_already_in_progress" msgid="7817354268848365487">"Okunye ukuthutha sekuvele kuyaqhubeka."</string>
<string name="insufficient_storage" msgid="481763122991093080">"Ayikho indawo eyanele yokulondoloza."</string>
<string name="does_not_exist" msgid="1501243985586067053">"Ifayela ayikho"</string>
@@ -1793,17 +1790,13 @@
<string name="move_error_device_admin" msgid="8673026002690505763">"Uhlelo lokusebenza lomlawuli wedivayisi alikwazi ukufakwa kumidiya yangaphandle"</string>
<string name="force_stop_dlg_title" msgid="977530651470711366">"Phoqelela ukumisa"</string>
<string name="force_stop_dlg_text" msgid="7208364204467835578">"Uma uphoqa ukumisa uhlelo lokusebenza, kungenzeka ukuthi lungasebenzi."</string>
- <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
- <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Yehlulekile ukuhambisa uhlelo lokusebenza. <xliff:g id="REASON">%1$s</xliff:g>"</string>
<string name="app_install_location_title" msgid="2068975150026852168">"Indawo yokufaka ekhethwayo"</string>
<string name="app_install_location_summary" msgid="5155453752692959098">"Shintsha indawo yokufaka efiswayo yezinhlelo zokusebenza ezintsha"</string>
- <string name="app_disable_dlg_title" msgid="3916469657537695436">"Khubeza uhlelo lokusebenza olakhelwe"</string>
<string name="app_disable_dlg_positive" msgid="7375627244201714263">"Khubaza uhlelo lokusebenza"</string>
<string name="app_disable_dlg_text" msgid="5632072173181990531">"Uma ukhubaza lolu hlelo lokusebenza, i-Android nezinye izinhlelo zokusebenza kungenzeka zingasasebenzi njengoba zihlosiwe."</string>
<string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Susa idatha futhi ukhubaze uhlelo lokusebenza?"</string>
<string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Uma ukhubaza lolu hlelo lokusebenza, i-Android nezinye izinhlelo zokusebenza kungenzeka zingasasebenzi njengoba zihlosiwe. Idatha yakho nayo izosuswa."</string>
<string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Cima izaziso?"</string>
- <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Uma ucima izaziso kulolu hlelo lokusebenza, ungageja izaziso nezibuyekezo ezibalulekile."</string>
<string name="app_install_details_group_title" msgid="7084623031296083574">"Isitolo"</string>
<string name="app_install_details_title" msgid="6905279702654975207">"Imininingwane yohlelo lokusebenza"</string>
<string name="app_install_details_summary" msgid="6464796332049327547">"Uhlelo lokusebenza lufakiwe kusuka ku-<xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
@@ -1996,6 +1989,7 @@
<string name="accessibility_service_master_switch_title" msgid="6835441300276358239">"Sebenzisa isevisi"</string>
<string name="accessibility_daltonizer_master_switch_title" msgid="8655284637968823154">"Sebenzisa ukulungisa kombala"</string>
<string name="accessibility_caption_master_switch_title" msgid="4010227386676077826">"Sebenzisa amagama-ncazo"</string>
+ <string name="accessibility_hearingaid_instruction_continue_button" msgid="974461729380409972">"Qhubeka"</string>
<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="6371077608778830020">"Engeza insiza yokuzwa"</string>
@@ -2139,8 +2133,6 @@
<string name="background_activity_warning_dialog_text" msgid="7049624449246121981">"Uma ukhawulela umsebenzi wangasemuva wohlelo lokusebenza, lungahle lungasebenzi kahle"</string>
<string name="background_activity_disabled_dialog_text" msgid="6133420589651880824">"Njengoba lolu hlelo lokusebenza lungasethiwe ukuze kulungiselelwe ibhethri, awukwazi ukulikhawulela.\n\nUkuze ukhawulele uhlelo lokusebenza, qala uvule ukulungiselelwa kwebhethri."</string>
<string name="device_screen_usage" msgid="3386088035570409683">"Ukusebenzisa kwesikrini kusuka ekushajeni okuphelele"</string>
- <string name="device_screen_consumption" msgid="4607589286438986687">"Ukusetshenziswa kwesikrini"</string>
- <string name="device_cellular_network" msgid="4724773411762382950">"Ukuskena kwenethiwekhi yeselula"</string>
<string name="power_usage_list_summary" msgid="5584049564906462506">"Ukusetshenziswa kwebhethri kusukela ekushajweni okugcwele"</string>
<string name="screen_usage_summary" msgid="6687403051423153550">"Inani lesikhathi isikrini sivuliwe kusuka ekushijeni okuphelele"</string>
<string name="device_usage_list_summary" msgid="5623036661468763251">"Ukusebenza kwedivayisi kusuka ekushajeni okuphelele"</string>
@@ -2167,11 +2159,6 @@
<string name="details_subtitle" msgid="32593908269911734">"Sebenzisa imininingwane"</string>
<string name="controls_subtitle" msgid="390468421138288702">"Lungisa amandla okusebenza"</string>
<string name="packages_subtitle" msgid="4736416171658062768">"Amaphakheji ahlanganisiwe"</string>
- <string name="battery_abnormal_details_title" msgid="5469019021857291216">"Izinhlelo zokusebenza eziqeda ibhethri"</string>
- <string name="battery_abnormal_wakelock_summary" msgid="4326186999058828831">"Igcina idivayisi ivukile"</string>
- <string name="battery_abnormal_wakeup_alarm_summary" msgid="644657277875785240">"Ivusa idivayisi ngasemuva"</string>
- <string name="battery_abnormal_location_summary" msgid="6552797246798806002">"Icela indawo njalo"</string>
- <string name="battery_abnormal_apps_summary" msgid="792553273248686972">"<xliff:g id="NUMBER">%1$d</xliff:g> izinhlelo zokusebenza ezingaziphathi kahle"</string>
<string name="battery_tip_summary_title" msgid="368729969313047399">"Izinhlelo zokusebenza zisebenza ngokujwayelekile"</string>
<string name="battery_tip_summary_summary" product="default" msgid="2198778125778121221">"Ifoni inokusebenza kwebhethri kwangemuva"</string>
<string name="battery_tip_summary_summary" product="tablet" msgid="1183976728682325345">"Ithebhulethi inokusebenza kwebhethri kwangemuva"</string>
@@ -2235,6 +2222,7 @@
<item quantity="one">Ikhawulela ukusetshenziswa kwebhethri kwezinhlelo zokusebenza ezingu-%1$d</item>
<item quantity="other">Ikhawulela ukusetshenziswa kwebhethri kwezinhlelo zokusebenza ezingu-%1$d</item>
</plurals>
+ <string name="restricted_app_time_summary" msgid="6983512391277778623">"Kukhawulelwe ngo-<xliff:g id="TIME">%1$s</xliff:g>"</string>
<string name="restricted_app_detail_footer" msgid="6739863162364046859">"Lezi zinhlelo zokusebenza zisebenzise ibhethri ngemuva. Izinhlelo zokusebenza ezikhawulelwe zingahle zingasebenzi kahle futhi izaziso zingabambezeleka."</string>
<string name="battery_auto_restriction_title" msgid="6553271897488963709">"Sebenzisa isiphathi sebhethri"</string>
<string name="battery_auto_restriction_summary" msgid="8561335400991281062">"Iyathola uma izinhlelo zokusebenza zidonsa ibhethri"</string>
@@ -2412,23 +2400,6 @@
<string name="tts_install_voices_cancel" msgid="4711492804851107459">"Khansela"</string>
<string name="tts_reset" msgid="2661752909256313270">"Setha kabusha"</string>
<string name="tts_play" msgid="2628469503798633884">"Dlala"</string>
- <string name="gadget_title" msgid="5519037532720577836">"Ukulawula Amandla"</string>
- <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ibuyekeza isilungiselelo se-Wi-Fi"</string>
- <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ibuyekeza ilungiselelo le-Bluetooth"</string>
- <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="gadget_state_on" msgid="6909119593004937688">"vuliwe"</string>
- <string name="gadget_state_off" msgid="5220212352953066317">"valiwe"</string>
- <string name="gadget_state_turning_on" msgid="3395992057029439039">"iyakhanyisa"</string>
- <string name="gadget_state_turning_off" msgid="2395546048102176157">"Iyavala"</string>
- <string name="gadget_wifi" msgid="4712584536500629417">"I-Wi-Fi"</string>
- <string name="gadget_bluetooth" msgid="8998572807378694410">"I-Bluetooth"</string>
- <string name="gadget_location" msgid="2974757497945178165">"Indawo"</string>
- <string name="gadget_sync" msgid="858895763714222152">"Vumelanisa"</string>
- <string name="gadget_brightness_template" msgid="930541920933123603">"Ukukhanya <xliff:g id="ID_1">%1$s</xliff:g>"</string>
- <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ngokuzenzakalela"</string>
- <string name="gadget_brightness_state_full" msgid="6814570109772137631">"kugcwele"</string>
- <string name="gadget_brightness_state_half" msgid="3696671957608774204">"uhafu"</string>
- <string name="gadget_brightness_state_off" msgid="946382262872753084">"valiwe"</string>
<string name="vpn_settings_title" msgid="5662579425832406705">"I-VPN"</string>
<string name="credentials_title" msgid="4446234003860769883">" Isitoreji sokuqinisekisa"</string>
<string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Faka kusukela kusitoreji se-USB"</string>
@@ -2586,7 +2557,7 @@
<string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> kwayi-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
<string name="select_all" msgid="1562774643280376715">"Khetha konke"</string>
<string name="data_usage_summary_title" msgid="3804110657238092929">"Ukusebenzisa idatha"</string>
- <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Ukusetshenziswa kwedatha yohlelo lokusebenza"</string>
+ <string name="data_usage_app_summary_title" msgid="5571051159374290375">"Idatha yeselula kanye ne-Wi‑Fi"</string>
<string name="data_usage_accounting" msgid="7170028915873577387">"Ukubalwa kwedatha yenkampani kungahluka kudivayisi yakho."</string>
<string name="data_usage_app" msgid="4970478397515423303">"Ukusetshenziswa kohlelo lokusebenza"</string>
<string name="data_usage_app_info_label" msgid="3409931235687866706">"ULWAZI LOHLELO LOKUSEBENZA"</string>
@@ -2963,7 +2934,6 @@
<item quantity="one">Bonisa izinto ezingu-%d ezifihliwe</item>
<item quantity="other">Bonisa izinto ezingu-%d ezifihliwe</item>
</plurals>
- <string name="dashboard_suggestion_condition_footer_content_description" msgid="2898588191174845961">"Goqa"</string>
<string name="network_dashboard_title" msgid="3135144174846753758">"Inethiwekhi ne-inthanethi"</string>
<string name="network_dashboard_summary_mobile" msgid="3851083934739500429">"iselula"</string>
<string name="network_dashboard_summary_data_usage" msgid="3843261364705042212">"ukusetshenziswa kwedatha"</string>
@@ -2975,12 +2945,12 @@
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary" msgid="5250078362483148199">"I-Bluetooth"</string>
<string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Izinhlelo zokusebenza nezaziso"</string>
<string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Izimvume, izinhlelo zokusebenza ezienzakalelayo"</string>
+ <string name="notification_settings_work_profile" msgid="3186757479243373003">"Ukufinyelela kwesaziso akutholakaleli izinhelo zokusebenza kuphrofayela yomsebenzi."</string>
<string name="account_dashboard_title" msgid="5895948991491438911">"Ama-akhawunti"</string>
<string name="account_dashboard_default_summary" msgid="3998347400161811075">"Awekho ama-akhawunti angeziwe"</string>
<string name="app_default_dashboard_title" msgid="7342549305933047317">"Izinhlelo zokusebenza ezizenzakalelayo"</string>
<string name="system_dashboard_summary" msgid="5797743225249766685">"Izilimi, isikhathi, isipele, izibuyekezo"</string>
<string name="search_results_title" msgid="1796252422574886932">"Izilungiselelo"</string>
- <string name="search_menu" msgid="6283419262313758339">"Sesha izilungiselelo"</string>
<string name="keywords_wifi" msgid="3646884600964177062">"i-wifi, i-wi-fi, uxhumo lwenethiwekhi, i-inthanethi, i-wireless, idatha, i-wi fi"</string>
<string name="keywords_change_wifi_state" msgid="627068244033681010">"I-wifi, i-wi-fi, guqula, lawula"</string>
<string name="keywords_more_default_sms_app" msgid="8597706109432491909">"umlayezo wombhalo, umbhalo, imilayezo, umlayezo, okuzenzakalelayo"</string>
@@ -3025,6 +2995,7 @@
<string name="keywords_payment_settings" msgid="5220104934130446416">"khokha, thepha, i-payments"</string>
<string name="keywords_backup" msgid="470070289135403022">"isipele, yenza isipele"</string>
<string name="keywords_assist_gesture_launch" msgid="813968759791342591">"ukuthinta"</string>
+ <string name="keywords_face_unlock" msgid="254144854349092754">"ubuso, ukuvulwa, i-auth, ukungena ngemvume"</string>
<string name="keywords_imei_info" msgid="7230982940217544527">"imei, meid, min, inguqulo ye-prl, imei sv"</string>
<string name="keywords_sim_status" msgid="1474422416860990564">"inethiwekhi, isimo senethiwekhi yeselula, isimo sesevisi, amandla esignali, uhlobo lwenethiwekhi yeselula, ukuzula, i-iccid"</string>
<string name="keywords_model_and_hardware" msgid="1459248377212829642">"inombolo yomkhiqizo, inguqulo yehadiwe"</string>
@@ -3032,6 +3003,7 @@
<string name="keywords_systemui_theme" msgid="9112852512550404882">"itimu emnyama"</string>
<string name="keywords_device_feedback" msgid="564493721125966719">"isiphazamisi"</string>
<string name="keywords_ambient_display_screen" msgid="5874969496073249362">"Isibonisi se-Ambient, isibonisi sesikrini sokukhiya"</string>
+ <string name="keywords_lock_screen_notif" msgid="6610464036497568711">"isaziso sokukhiya isikrini"</string>
<string name="keywords_face_settings" msgid="7505388678116799329">"ubuso"</string>
<string name="keywords_fingerprint_settings" msgid="239222512315619538">"izigxivizo zeminwe"</string>
<string name="keywords_display_auto_brightness" msgid="4130320471533951796">"fiphalisa isikrini, isikrini esithintwayo, ibhethri, ukukhanya okuhlakaniphile, ukukhanya okuguqukayo"</string>
@@ -3463,7 +3435,7 @@
<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Uma ufaka iphinikhodi yakho ukuqala le divayisi, amasevisi wokufinyelela njenge-<xliff:g id="SERVICE">%1$s</xliff:g> ngeke atholakale okwamanje."</string>
<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Uma ufaka iphethini yakho ukuqala le divayisi, amasevisi wokufinyelela njenge-<xliff:g id="SERVICE">%1$s</xliff:g> ngeke atholakale okwamanje."</string>
<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Uma ufaka phasiwedi yakho ukuqala le divayisi, amasevisi wokufinyelela njenge-<xliff:g id="SERVICE">%1$s</xliff:g> ngeke atholakale okwamanje."</string>
- <string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Yazi: Ngemuva kokuqalisa, lolu hlelo lokusebenza alukwazi ukuqala uze uvule ifoni yakho"</string>
+ <string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Inothi: Uma uqalisa kabusha ifoni yakho futhi usethe ukukhiya kwesikrini, lolu hlelo lokusebenza alikwazi uze uvule ifoni yakho"</string>
<string name="imei_information_title" msgid="8499085421609752290">"Ulwazi le-IMEI"</string>
<string name="imei_information_summary" msgid="2074095606556565233">"Ulwazi oluhlobene lwe-IMEI"</string>
<string name="slot_number" msgid="3762676044904653577">"(Isilothi<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3517,7 +3489,7 @@
<string name="filter_personal_apps" msgid="3277727374174355971">"Okomuntu siqu"</string>
<string name="filter_work_apps" msgid="24519936790795574">"Umsebenzi"</string>
<string name="filter_notif_all_apps" msgid="2299049859443680242">"Izinhlelo zokusebenza: Konke"</string>
- <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Izinhlelo zokusebenza: Kuvaliwe"</string>
+ <string name="filter_notif_blocked_apps" msgid="3383043508771300704">"Vala"</string>
<string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Izigaba: Ukubaluleka okusheshayo"</string>
<string name="filter_notif_low_channels" msgid="4128487387390004604">"Izigaba: Ukubaluleka okuphansi"</string>
<string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Izigaba: Kuvaliwe"</string>
@@ -3578,7 +3550,6 @@
<string name="additional_battery_info" msgid="4754099329165411970">"Izexwayiso zokusetshenziswa"</string>
<string name="show_all_apps" msgid="1512506948197818534">"Bonisa ukusetshenziswa kwedivayisi okugcwele"</string>
<string name="hide_extra_apps" msgid="5016497281322459633">"Bonisa ukusetshenziswa kohlelo lokusebenza"</string>
- <string name="power_high_usage_title" msgid="6027369425057347826">"Ukusetshenziswa okuphezulu"</string>
<plurals name="power_high_usage_summary" formatted="false" msgid="467347882627862744">
<item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> izinhlelo zokusebenza ziziphatha ngokungajwayelekile</item>
<item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> izinhlelo zokusebenza ziziphatha ngokungajwayelekile</item>
@@ -3742,6 +3713,8 @@
<string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Isitoreij sangaphakathi: <xliff:g id="PERCENTAGE">%1$s</xliff:g> okusetshenzisiwe - <xliff:g id="FREE_SPACE">%2$s</xliff:g> okukhululekile"</string>
<string name="display_summary" msgid="6737806235882127328">"Lala ngemuva ko-<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ukungasebenzi"</string>
<string name="display_dashboard_summary" msgid="4145888780290131488">"Isithombe sangemuva, ukulala, usayizi wefonti"</string>
+ <!-- no translation found for display_dashboard_nowallpaper_summary (7840559323355210111) -->
+ <skip />
<string name="display_summary_example" msgid="9102633726811090523">"Lalisa ngemuva kwamaminithi angu-10 okungasebenzi"</string>
<string name="memory_summary" msgid="8080825904671961872">"Okumaphakathi okungu-<xliff:g id="USED_MEMORY">%1$s</xliff:g> kokungu-<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> imemori esetshenzisiwe"</string>
<string name="users_summary" msgid="1674864467098487328">"Ungene ngemvume njengo-<xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -3757,7 +3730,6 @@
<string name="disabled_by_policy_title_sms" msgid="5733307423899610340">"I-SMS ayivunyelwe"</string>
<string name="disabled_by_policy_title_camera" msgid="6225008536855644874">"Ikhamera ayivunyelwe"</string>
<string name="disabled_by_policy_title_screen_capture" msgid="4066913623298047094">"Isithombe-skrini asivunyelwe"</string>
- <string name="disabled_by_policy_title_turn_off_backups" msgid="7330460584199383321">"Ayikwazi ukuvala izipele"</string>
<string name="disabled_by_policy_title_suspend_packages" msgid="7872038990805477554">"Ayikwazi ukuvula lolu hlelo lokusebenza"</string>
<string name="default_admin_support_msg" msgid="4489678214035485367">"Uma unemibuzo, xhumana nomlawuli wakho we-IT"</string>
<string name="admin_support_more_info" msgid="8901377038510512654">"Imininingwane engaphezulu"</string>
@@ -3921,9 +3893,9 @@
<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="display_cutout_emulation" msgid="6306593933746393170">"Hlalisa isiboniso ngokusika ukhiphe"</string>
+ <string name="display_cutout_emulation" msgid="7466869822418376317">"Ukusikwa kwesiboniso"</string>
<string name="display_cutout_emulation_keywords" msgid="4495418317471622562">"bonisa ukusika, inotshi"</string>
- <string name="display_cutout_emulation_none" msgid="5144174674654097316">"Lutho"</string>
+ <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Idivayisi ezenzakalelayo"</string>
<string name="special_access" msgid="3458780842491881155">"Ukufinyelela kohlelo lokusebenza okukhethekile"</string>
<plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
<item quantity="one"><xliff:g id="COUNT">%d</xliff:g> izinhlelo zokusebenza zingasebenzisa idatha engakhawulelwe</item>
@@ -3945,11 +3917,10 @@
<string name="bluetooth_connected_summary" msgid="7672528674593152862">"Ixhumeke ku-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
<string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Ixhumeke kumadivayisi amaningi"</string>
<string name="demo_mode" msgid="2798762752209330277">"Imodi yedemo ye-UI yesistimu"</string>
- <string name="dark_ui_mode" msgid="2112241426441807273">"Imodi yasebusuku"</string>
- <string name="dark_ui_mode_title" msgid="975299966259850992">"Setha imodi yasebusuku"</string>
+ <string name="dark_ui_mode" msgid="4176511670311366886">"Imodi emnyama"</string>
+ <string name="dark_ui_mode_title" msgid="3471395820322819817">"Setha imodi emnyama"</string>
<string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Othayela bonjiniyela bezilungiselelo ezisheshayo"</string>
<string name="winscope_trace_quick_settings_title" msgid="1294290008255732032">"Ukulandelelwa kwe-Winscope"</string>
- <string name="support_country_format" msgid="4502523713489559595">"<xliff:g id="COUNTRY">%1$s</xliff:g> - <xliff:g id="LANGUAGE">%2$s</xliff:g>"</string>
<string name="managed_profile_settings_title" msgid="2729481936758125054">"Izilungiselelo zephrofayela yomsebenzi"</string>
<string name="managed_profile_contact_search_title" msgid="6034734926815544221">"Usesho loxhumana naye"</string>
<string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"Vumela usesho loxhumana naye ngenhlangano yakho ukuze ukhombe abashayayo noxhumana nabo"</string>
@@ -3990,13 +3961,17 @@
<string name="ambient_display_title" product="default" msgid="5144814600610448504">"Thepha kabili ukuze uhlole ifoni"</string>
<string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Thepha kabili ukuze uhlole ithebulethi"</string>
<string name="ambient_display_title" product="device" msgid="3423781975742145894">"Thepha kabili ukuze uhlole idivayisi"</string>
- <string name="ambient_display_summary" msgid="525662960806416373">"Ukuze uhlole isikhathi, izithonjana zesaziso, nolunye ulwazi, thepha kabili isikrini sakho."</string>
+ <string name="ambient_display_summary" msgid="8534654210539169707">"Ukuze uhlole isikhathi, izaziso, nolunye ulwazi, thepha kabili isikrini sakho."</string>
<string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Phakamisa ukuze uhlole ifoni"</string>
<string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Phakamisa ukuze uhlole ithebulethi"</string>
<string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Phakamisa ukuze uhlole idivayisi"</string>
- <string name="ambient_display_pickup_summary" product="default" msgid="4567020486787561873">"Ukuze uhlole isikhathi, izithonjana zesaziso, nolunye ulwazi, khetha ifoni yakho."</string>
- <string name="ambient_display_pickup_summary" product="tablet" msgid="5435283849947236648">"Ukuze uhlole isikhathi, izithonjana zesaziso, nolunye ulwazi, khetha ithebhulethi yakho."</string>
- <string name="ambient_display_pickup_summary" product="device" msgid="8256669101643381568">"Ukuze uhlole isikhathi, izithonjana zesaziso, nolunye ulwazi, khetha idivayisi yakho."</string>
+ <string name="ambient_display_wake_screen_title" msgid="4091523525326925790">"Vusa isiboniso"</string>
+ <string name="ambient_display_wake_screen_summary" msgid="7046476455581790544"></string>
+ <string name="ambient_display_pickup_summary" product="default" msgid="3436302177038243869">"Ukuze uhlole isikhathi, izaziso, nolunye ulwazi, bamba ifoni yakho."</string>
+ <string name="ambient_display_pickup_summary" product="tablet" msgid="4938504160398665156">"Ukuze uhlole isikhathi, izaziso, nolunye ulwazi, bamba ithebhulethi yakho."</string>
+ <string name="ambient_display_pickup_summary" product="device" msgid="4264958533375250254">"Ukuze uhlole isikhathi, izaziso, nolunye ulwazi, bamba idivayisi yakho."</string>
+ <string name="ambient_display_wake_lock_screen_title" msgid="562547995385322349">"Vusa ukuthinta kokukhiya isikrini"</string>
+ <string name="ambient_display_wake_lock_screen_summary" product="default" msgid="7758512805102207920"></string>
<string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Swayipha izigxivizo zeminwe ukuze uthole izaziso"</string>
<string name="fingerprint_gesture_screen_title" msgid="8562169633234041196">"Swayipha izigxivizo zeminwe"</string>
<string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ukuze uhlole izaziso zakho, swayiphela phansi kunzwa yezigxivizo zeminwe ngemuva kwefoni yakho."</string>
@@ -4076,7 +4051,6 @@
<item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> imizamo</item>
<item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> imizamo</item>
</plurals>
- <string name="enterprise_privacy_backups_enabled" msgid="8186700798406539053">"Idatha yale divayisi yenziwa isipele"</string>
<string name="do_disclosure_generic" msgid="8653670456990823307">"Le divayisi iphethwe inhlangano yakho."</string>
<string name="do_disclosure_with_name" msgid="1141081465968481380">"Le divayisi iphethwe yi-<xliff:g id="ORGANIZATION_NAME">%s</xliff:g>."</string>
<string name="do_disclosure_learn_more_separator" msgid="3558079393757238670">" "</string>
@@ -4117,6 +4091,12 @@
<string name="autofill_app" msgid="7338387238377914374">"Isevisi yokugcwalisa ngokuzenzakalela"</string>
<string name="autofill_keywords" msgid="7485591824120812710">"okuzenzakalelayo, gcwalisa, ukugcwalisa okuzenzakalelayo"</string>
<string name="autofill_confirmation_message" msgid="2784869528908005194">"<b>Qiniseka ukuthi wethemba lolu hlelo lokusebenza</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> isebenzisa okusesikrinini sakho ukunquma okungagcwaliswa ngokuzenzakalela."</string>
+ <string name="debug_autofill_category" msgid="8050326960545979035">"Ukugcwalisa okuzenzakalelayo"</string>
+ <string name="autofill_logging_level_title" msgid="899483289251346778">"Ileveli lokuloga"</string>
+ <string name="autofill_max_partitions" msgid="7590272120101271461">"Izicelo eziningi ngesikhathi"</string>
+ <string name="autofill_max_visible_datasets" msgid="4531033613378881109">"Amadathasethi amakhulu abonakalayo"</string>
+ <string name="autofill_reset_developer_options" msgid="5819016237049525099">"Setha kabusha kuye kumanani azenzakalelayo"</string>
+ <string name="autofill_reset_developer_options_complete" msgid="7548288932341619412">"Izinketho zokugcwalisa ngokuzenzakalela zonjiniyela zisethwe kabusha"</string>
<string name="device_theme" msgid="4571803018917608588">"Itimu yedivayisi"</string>
<string name="default_theme" msgid="7085644992078579076">"Okuzenzakalelayo"</string>
<string name="show_operator_name_title" msgid="805135053530442951">"Igama lenethiwekhi"</string>
@@ -4131,15 +4111,14 @@
<string name="trigger_carrier_provisioning" msgid="3434865918009286187">"Cupha ukunikezwa kwenkampani yenethiwekhi"</string>
<string name="zen_suggestion_title" msgid="798067603460192693">"Buyekeza okuthi ungaphazamisi"</string>
<string name="zen_suggestion_summary" msgid="5928686804697233014">"Misa isikhashana izikhangiso ukuze uhlale ugxilile"</string>
- <string name="new_device_suggestion_title" msgid="698847081680980774">"Yini okusha nokujabulisayo?"</string>
- <string name="new_device_suggestion_summary" product="default" msgid="206396571522515855">"Thatha uhambo lwefoni yakho entsha"</string>
- <string name="new_device_suggestion_summary" product="tablet" msgid="393751455688210956">"Thatha uhambo kuthebulethi yakho entsha"</string>
- <string name="new_device_suggestion_summary" product="device" msgid="2939870049868336652">"Thatha uhambo lwedivayisi yakho entsha"</string>
<string name="disabled_low_ram_device" msgid="3751578499721173344">"Lesi sici asitholakali kule divayisi"</string>
<string name="enable_gnss_raw_meas_full_tracking" msgid="1294470289520660584">"Phoqa izikali ezigcwele ze-GNSS"</string>
<string name="enable_gnss_raw_meas_full_tracking_summary" msgid="496344699046454200">"Landelela onke ama-constellation nezimvamisa ngomjikelezo ongenawo umsebenzi"</string>
<string name="show_first_crash_dialog" msgid="8889957119867262599">"Njalo bonisa ibhokisi lokusaphazeka"</string>
<string name="show_first_crash_dialog_summary" msgid="703224456285060428">"Bonisa ibhokisi njalo izinhlelo zokusebenza zisaphazeka"</string>
+ <string name="angle_enabled_app" msgid="1841862539745838255">"Khetha uhlelo lokusebenza olunikwe amandla lwe-ANGLE"</string>
+ <string name="angle_enabled_app_not_set" msgid="864740024581634768">"Alukho uhlelo lokusebenza olunikwe amandla lwe-ANGLE olusethiwe"</string>
+ <string name="angle_enabled_app_set" msgid="226015765615525056">"Uhlelo lokusebenza olunikwe amandla lwe-ANGLE: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
<string name="directory_access" msgid="4722237210725864244">"Ukufinyelela kuhla lwemibhalo"</string>
<string name="keywords_directory_access" msgid="360557532842445280">"ukufinyelela kuhla lwemibhalo"</string>
<string name="directory_on_volume" msgid="1246959267814974387">"<xliff:g id="VOLUME">%1$s</xliff:g> (<xliff:g id="DIRECTORY">%2$s</xliff:g>)"</string>
@@ -4180,4 +4159,83 @@
<string name="pref_title_network_details" msgid="7186418845727358964">"Imininingwane yenethiwekhi"</string>
<string name="about_phone_device_name_warning" msgid="8885670415541365348">"Igama ledivayisi yakho liyabonakala kuzinhlelo zokusebenza efonini yakho. Futhi lingabonwa ngabanye abantu uma uxhuma kumadivayisi e-Bluetooth noma usetha i-Wi-Fi hotspot."</string>
<string name="devices_title" msgid="7701726109334110391">"Amadivayisi"</string>
+ <string name="homepage_all_settings" msgid="1245540304900512919">"Zonke izilungiselelo"</string>
+ <string name="homepage_personal_settings" msgid="1570415428680432319">"Iziphakamiso"</string>
+ <string name="cbrs_data_switch" msgid="2438108549734702331">"Idatha ye-CBRS"</string>
+ <string name="cbrs_data_switch_summary" msgid="1359701543634843588">"Idatha ye-CBRS"</string>
+ <string name="choose_network_title" msgid="5702586742615861037">"Khetha inethiwekhi"</string>
+ <string name="network_disconnected" msgid="2933191767567503504">"Inqamukile"</string>
+ <string name="network_connected" msgid="4943925032253989621">"Ixhunyiwe"</string>
+ <string name="network_connecting" msgid="76404590784733557">"Iyaxhuma…"</string>
+ <string name="network_could_not_connect" msgid="1113813392274155369">"Ayikwazanga ukuxhumeka"</string>
+ <string name="empty_networks_list" msgid="2578752112731781190">"Awekho amanethiwekhi atholakele."</string>
+ <string name="network_query_error" msgid="7487714485362598410">"Ayikwazanga ukuthola amanethiwekhi. Zama futhi."</string>
+ <string name="forbidden_network" msgid="4626592887509826545">"(kunqatshelwe)"</string>
+ <string name="no_sim_card" msgid="1360669528113557381">"Alikho ikhadi le-SIM."</string>
+ <string name="enhanced_4g_lte_mode_title_variant" msgid="758804404006513787">"Ukushaya okuthuthukile"</string>
+ <string name="preferred_network_mode_wcdma_perf_summary" msgid="3956515670308744433">"Imodi yenethiwekhi ekhethwayo: i-WCDMA ekhethwayo"</string>
+ <string name="preferred_network_mode_gsm_only_summary" msgid="5225727680228194864">"Imodi yenethiwekhi ekhethwayo: i-GSM kuphela"</string>
+ <string name="preferred_network_mode_wcdma_only_summary" msgid="8956197584659205699">"Imodi yenethiwekhi ekhethwayo: i-WCDMA kuphela"</string>
+ <string name="preferred_network_mode_gsm_wcdma_summary" msgid="4290654515569144276">"Imodi yenethiwekhi ekhethwayo: i-GSM/WCDMA"</string>
+ <string name="preferred_network_mode_cdma_summary" msgid="854981096234906594">"Imodi yenethiwekhi ekhethwayo: i-CDMA"</string>
+ <string name="preferred_network_mode_cdma_evdo_summary" msgid="2578065433446506616">"Imodi yenethiwekhi ekhethwayo: i-CDMA/EvDo"</string>
+ <string name="preferred_network_mode_cdma_only_summary" msgid="6604102246309629962">"Imodi yenethiwekhi ekhethwayo: i-CDMA kuphela"</string>
+ <string name="preferred_network_mode_evdo_only_summary" msgid="7558385602277592784">"Imodi yenethiwekhi ekhethwayo: i-EvDo kuphela"</string>
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary" msgid="1742638677806401815">"Imodi yenethiwekhi ekhethwayo: i-CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_summary" msgid="8528755811985330696">"Imodi yenethiwekhi ekhethwayo: i-LTE"</string>
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary" msgid="6632007438739933645">"Imodi yenethiwekhi ekhethwayo: i-GSM/WCDMA/LTE"</string>
+ <string name="preferred_network_mode_lte_cdma_evdo_summary" msgid="5464960267483576515">"Imodi yenethiwekhi ekhethwayo: i-CDMA+LTE/EVDO"</string>
+ <string name="preferred_network_mode_global_summary" msgid="8552400100470153638">"Imodi yenethiwekhi ekhethwayo: Umhlaba jikelele"</string>
+ <string name="preferred_network_mode_lte_wcdma_summary" msgid="8037915274486919940">"Imodi yenethiwekhi ekhethwayo: i-LTE / WCDMA"</string>
+ <string name="preferred_network_mode_lte_gsm_umts_summary" msgid="104110625441127919">"Imodi yenethiwekhi encanyelwayo: i-LTE / GSM / UMTS"</string>
+ <string name="preferred_network_mode_lte_cdma_summary" msgid="2561159741461407053">"Imodi yenethiwekhi ekhethwayo: i-LTE/CDMA"</string>
+ <string name="preferred_network_mode_tdscdma_summary" msgid="1111689194136766011">"Imodi yenethiwekhi encanyelwayo: TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_wcdma_summary" msgid="4272515966019344433">"Imodi yenethiwekhi ekhethwayo: TDSCDMA / WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_summary" msgid="3138210224248737600">"Imodi yenethiwekhi ekhethwayo: LTE / TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_summary" msgid="7575595856957063853">"Imodi yenethiwekhi ekhethwayo: TDSCDMA / GSM"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary" msgid="1512046749970721629">"Imodi yenethiwekhi ekhethwayo: LTE/GSM/TDSCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary" msgid="1038314909945393905">"Imodi yenethiwekhi ekhethwayo: TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary" msgid="3277980364222159279">"Imodi yenethiwekhi ekhethwayo: LTE/TDSCDMA/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary" msgid="1572937828071126891">"Imodi yenethiwekhi ekhethwayo: LTE/TDSCDMA/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="8393145171649288912">"Imodi yenethiwekhi ekhethwayo: i-CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary" msgid="5544016990994809932">"Imodi yenethiwekhi ekhethwayo: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA"</string>
+ <string name="network_lte" msgid="1287709529829131860">"I-LTE (inconyiwe)"</string>
+ <string name="network_4G" msgid="8611758013994499559">"I-4G (inconyiwe)"</string>
+ <string name="network_global" msgid="959947774831178632">"Okomhlaba jikelele"</string>
+ <string name="label_available" msgid="1731547832803057893">"Amanethiwekhi atholakalayo"</string>
+ <string name="load_networks_progress" msgid="7709402068413190831">"Iyasesha…"</string>
+ <string name="register_on_network" msgid="766516026652295941">"Ibhalisa ku-<xliff:g id="NETWORK">%s</xliff:g>…"</string>
+ <string name="not_allowed" msgid="1667079919821581706">"I-SIM card yakho ayivumeli ukuxhumeka kule nethiwekhi."</string>
+ <string name="connect_later" msgid="978991102125216741">"Ayikwazi ukuxhumeka kule nethiwekhi khona manje. Zama futhi ngemuva kwesikhathi."</string>
+ <string name="registration_done" msgid="4573820010512184521">"Ibhalisiwe kwinethiwekhi"</string>
+ <string name="select_automatically" msgid="7318032984017853975">"Khetha ngokuzenzakalela inethiwekhi"</string>
+ <string name="carrier_settings_title" msgid="3503012527671299886">"Izilungiselelo zenkampani yenethiwekhi"</string>
+ <string name="cdma_lte_data_service" msgid="8507044148856536098">"Misa isevisi yedatha"</string>
+ <string name="mobile_data_settings_title" msgid="7674604042461065482">"Idatha yeselula"</string>
+ <string name="mobile_data_settings_summary" msgid="2708261377199805404">"Finyelela kudatha usebenzisa inethiwekhi yeselula"</string>
+ <string name="preferred_network_mode_title" msgid="6505630109389684100">"Uhlobo lwenethiwekhi oluncamelayo"</string>
+ <string name="preferred_network_mode_summary" msgid="1216219115667163264">"Shintsha imodi esebenzayo yenethiwekhi"</string>
+ <string name="preferred_network_mode_dialogtitle" msgid="849254040214447984">"Uhlobo lwenethiwekhi oluncamelayo"</string>
+ <string name="carrier_settings_euicc" msgid="8658562169133242581">"Inkampani yenethiwekhi"</string>
+ <string name="call_category" msgid="8108654745239563833">"Iyashaya"</string>
+ <string name="video_calling_settings_title" msgid="8153216918491498505">"Ukushaya kwevidiyo kwenkampani yenethiwekhi"</string>
+ <string name="cdma_system_select_title" msgid="7210256688912895790">"Ukukhetha isistimu"</string>
+ <string name="cdma_system_select_summary" msgid="3413863051181111941">"Sintsha imodi yokuzulazula ye-cdma"</string>
+ <string name="cdma_system_select_dialogtitle" msgid="1198883288864916563">"Ukukhetha isistimu"</string>
+ <string name="network_operator_category" msgid="8451238364605724918">"Inethiwekhi"</string>
+ <string name="network_select_title" msgid="8394621216255081026">"Inethiwekhi"</string>
+ <string name="cdma_subscription_title" msgid="1473189596933979467">"Okubhalisile kwe-CDMA"</string>
+ <string name="cdma_subscription_summary" msgid="7191590908367194209">"Shintsha phakathi kwe-RUIM/SIM ne-NV"</string>
+ <string name="cdma_subscription_dialogtitle" msgid="9153005469617575361">"Okubhalisile"</string>
+ <string name="register_automatically" msgid="518185886971595020">"Ukubhalisa okuzenzakalelayo…"</string>
+ <string name="roaming_alert_title" msgid="7458177294163751484">"Vumela ukuhamba kwedatha?"</string>
+ <string name="roaming_check_price_warning" msgid="4979418631753681300">"Hlola ngomhlinzeki wakho wenethiwekhi ukuze uthole intengo."</string>
+ <string name="mobile_data_usage_title" msgid="7862429216994894656">"Ukusetshenziswa kwedatha yohlelo lokusebenza"</string>
+ <string name="mobile_network_mode_error" msgid="4784347953600013818">"Imodi yenethiwekhi engavumelekile <xliff:g id="NETWORKMODEID">%1$d</xliff:g>. Ziba."</string>
+ <string name="manual_mode_disallowed_summary" msgid="2085670341790561153">"Ayitholakali uma ixhumeke ku-<xliff:g id="CARRIER">%1$s</xliff:g>"</string>
+ <string name="see_more" msgid="5953815986207345223">"Bona okuningi"</string>
+ <string name="see_less" msgid="1250265310929558370">"Buka okuncane"</string>
+ <!-- no translation found for show_connected_devices (5484062660312192006) -->
+ <!-- no translation found for no_connected_devices (6657176404588389594) -->
+ <skip />
</resources>
diff --git a/res/values/aliases.xml b/res/values/aliases.xml
index 1be4350..060ba1d 100644
--- a/res/values/aliases.xml
+++ b/res/values/aliases.xml
@@ -23,6 +23,5 @@
<item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
<item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
<item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
- <item name="ic_search_floating_24dp" type="drawable">@drawable/ic_search_24dp</item>
</resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index e57cbfa..94d915c 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1081,6 +1081,11 @@
<item>Treat as unmetered</item>
</string-array>
+ <string-array name="wifi_privacy_entries">
+ <item>Default (use randomized MAC)</item>
+ <item>Trusted</item>
+ </string-array>
+
<string-array name="wifi_hidden_entries">
<item>No</item>
<item>Yes</item>
@@ -1092,6 +1097,11 @@
<item>2</item>
</string-array>
+ <string-array name="wifi_privacy_values" translatable="false">
+ <item>0</item>
+ <item>1</item>
+ </string-array>
+
<!-- Titles for ui dark mode preference. -->
<string-array name="dark_ui_mode_entries" >
<item>Automatic (based on time of day)</item>
@@ -1133,4 +1143,186 @@
<item>4</item> <!-- AutofillManager.FLAG_ADD_CLIENT_VERBOSE -->
</string-array>
+ <string-array name="enabled_networks_choices" translatable="false">
+ <item>@string/network_lte</item>
+ <item>@string/network_3G</item>
+ <item>@string/network_2G</item>
+ </string-array>
+ <string-array name="enabled_networks_4g_choices" translatable="false">
+ <item>@string/network_4G</item>
+ <item>@string/network_3G</item>
+ <item>@string/network_2G</item>
+ </string-array>
+ <string-array name="enabled_networks_values" translatable="false">
+ <item>"9"</item>
+ <item>"0"</item>
+ <item>"1"</item>
+ </string-array>
+
+ <string-array name="cdma_system_select_choices">
+ <!-- System select dialog screen, setting option name -->
+ <item>Home only</item>
+ <!-- Remove the following option "Affiliated Networks" from the option list -->
+ <!-- <item>Affiliated Networks</item> -->
+ <!-- System select dialog screen, setting option name -->
+ <item>Automatic</item>
+ </string-array>
+ <string-array name="cdma_system_select_values" translatable="false">
+ <!-- Do not translate. -->
+ <item>"0"</item>
+ <!-- Remove the following value "1" which corresponds to "Affiliated Networks" above -->
+ <!-- <item>"1"</item> -->
+ <!-- Do not translate. -->
+ <item>"2"</item>
+ </string-array>
+
+ <!-- The preferred network modes in Mobile network settings -->
+ <string-array name="preferred_network_mode_choices">
+ <item>GSM/WCDMA preferred</item>
+ <item>GSM only</item>
+ <item>WCDMA only</item>
+ <item>GSM/WCDMA auto</item>
+ <item>CDMA/EvDo auto</item>
+ <item>CDMA w/o EvDo</item>
+ <item>EvDo only</item>
+ <item>CDMA/EvDo/GSM/WCDMA</item>
+ <item>CDMA + LTE/EvDo</item>
+ <item>GSM/WCDMA/LTE</item>
+ <item>Global</item>
+ <item>LTE</item>
+ <item>LTE / WCDMA</item>
+ <item>TDSCDMA only</item>
+ <item>TDSCDMA/WCDMA</item>
+ <item>LTE/TDSCDMA</item>
+ <item>TDSCDMA/GSM</item>
+ <item>LTE/TDSCDMA/GSM</item>
+ <item>TDSCDMA/GSM/WCDMA</item>
+ <item>LTE/TDSCDMA/WCDMA</item>
+ <item>LTE/TDSCDMA/GSM/WCDMA</item>
+ <item>TDSCDMA/CDMA/EVDO/GSM/WCDMA </item>
+ <item>LTE/TDSCDMA/CDMA/EVDO/GSM/WCDMA</item>
+ </string-array>
+ <!-- The preferred network modes RIL constants, in order of the modes above,
+ e.g. the choice "GSM/WCDMA preferred" has the corresponding value "0" -->
+ <string-array name="preferred_network_mode_values" translatable="false">
+ <item>"0"</item>
+ <item>"1"</item>
+ <item>"2"</item>
+ <item>"3"</item>
+ <item>"4"</item>
+ <item>"5"</item>
+ <item>"6"</item>
+ <item>"7"</item>
+ <item>"8"</item>
+ <item>"9"</item>
+ <item>"10"</item>
+ <item>"11"</item>
+ <item>"12"</item>
+ <item>"13"</item>
+ <item>"14"</item>
+ <item>"15"</item>
+ <item>"16"</item>
+ <item>"17"</item>
+ <item>"18"</item>
+ <item>"19"</item>
+ <item>"20"</item>
+ <item>"21"</item>
+ <item>"22"</item>
+ </string-array>
+
+ <!-- Choices for CDMA subscription-->
+ <string-array name="cdma_subscription_choices">
+ <item>RUIM/SIM</item>
+ <item>NV</item>
+ </string-array>
+ <!-- Values for CDMA subscription-->
+ <string-array name="cdma_subscription_values">
+ <item>"0"</item>
+ <item>"1"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_except_gsm_choices" translatable="false">
+ <item>@string/network_lte</item>
+ <item>@string/network_3G</item>
+ </string-array>
+ <string-array name="enabled_networks_except_gsm_4g_choices" translatable="false">
+ <item>@string/network_4G</item>
+ <item>@string/network_3G</item>
+ </string-array>
+ <string-array name="enabled_networks_except_gsm_values" translatable="false">
+ <item>"9"</item>
+ <item>"0"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_except_lte_choices" translatable="false">
+ <item>@string/network_3G</item>
+ <item>@string/network_2G</item>
+ </string-array>
+ <string-array name="enabled_networks_except_lte_values" translatable="false">
+ <item>"0"</item>
+ <item>"1"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_except_gsm_lte_choices" translatable="false">
+ <item>@string/network_3G</item>
+ </string-array>
+ <string-array name="enabled_networks_except_gsm_lte_values" translatable="false">
+ <item>"0"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_cdma_choices" translatable="false">
+ <item>@string/network_lte</item>
+ <item>@string/network_3G</item>
+ <item>@string/network_1x</item>
+ <item>@string/network_global</item>
+ </string-array>
+ <string-array name="enabled_networks_cdma_values" translatable="false">
+ <item>"8"</item>
+ <item>"4"</item>
+ <item>"5"</item>
+ <item>"10"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_cdma_no_lte_choices" translatable="false">
+ <item>@string/network_3G</item>
+ <item>@string/network_1x</item>
+ </string-array>
+ <string-array name="enabled_networks_cdma_no_lte_values" translatable="false">
+ <item>"4"</item>
+ <item>"5"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_cdma_only_lte_choices" translatable="false">
+ <item>@string/network_lte</item>
+ <item>@string/network_global</item>
+ </string-array>
+ <string-array name="enabled_networks_cdma_only_lte_values" translatable="false">
+ <item>"8"</item>
+ <item>"10"</item>
+ </string-array>
+
+ <string-array name="enabled_networks_tdscdma_choices" translatable="false">
+ <item>@string/network_lte</item>
+ <item>@string/network_3G</item>
+ <item>@string/network_2G</item>
+ </string-array>
+ <string-array name="enabled_networks_tdscdma_values" translatable="false">
+ <item>"22"</item>
+ <item>"18"</item>
+ <item>"1"</item>
+ </string-array>
+
+ <!--String arrays for World preferred netwrok modes -->
+ <string-array name="preferred_network_mode_choices_world_mode">
+ <item>Global</item>
+ <item>LTE / CDMA</item>
+ <item>LTE / GSM / UMTS</item>
+ </string-array>
+
+ <string-array name="preferred_network_mode_values_world_mode">
+ <item>"10"</item>
+ <item>"8"</item>
+ <item>"9"</item>
+ </string-array>
+
</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7bdbe6d..afff3ce 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -15,35 +15,6 @@
-->
<resources>
- <declare-styleable name="BatteryHistoryChart">
- <!-- Base text color, typeface, size, and style. -->
- <attr name="android:textAppearance" />
- <!-- Text color. -->
- <attr name="android:textColor" />
- <!-- Size of the text. Recommended dimension type for text is "sp" for scaled-pixels (example: 15sp). -->
- <attr name="android:textSize" />
- <!-- Typeface (normal, sans, serif, monospace) for the text. -->
- <attr name="android:typeface" />
- <!-- Style (bold, italic, bolditalic) for the text. -->
- <attr name="android:textStyle" />
- <!-- Place a shadow of the specified color behind the text. -->
- <attr name="android:shadowColor" />
- <!-- Horizontal offset of the shadow. -->
- <attr name="android:shadowDx" />
- <!-- Vertical offset of the shadow. -->
- <attr name="android:shadowDy" />
- <!-- Radius of the shadow. -->
- <attr name="android:shadowRadius" />
- <!-- Text color, typeface, size, and style of header. -->
- <attr name="headerAppearance" format="reference" />
- <!-- Primary color of chart. -->
- <attr name="barPrimaryColor" format="color|reference" />
- <!-- Color of predicted future use part of chart. -->
- <attr name="barPredictionColor" format="color|reference" />
- <!-- Minimum height of the chart itself. -->
- <attr name="chartMinHeight" format="dimension|reference" />
- </declare-styleable>
-
<declare-styleable name="PercentageBarChart">
<!-- Background color -->
<attr name="emptyColor" format="color" />
@@ -79,13 +50,6 @@
<attr name="android:textAppearance" />
</declare-styleable>
- <declare-styleable name="ChartNetworkSeriesView">
- <attr name="strokeColor" format="color" />
- <attr name="fillColor" format="color" />
- <attr name="fillColorSecondary" format="color" />
- <attr name="safeRegion" />
- </declare-styleable>
-
<attr name="apnPreferenceStyle" format="reference" />
<attr name="footerPreferenceStyle" format="reference" />
@@ -98,10 +62,14 @@
<declare-styleable name="Preference">
<!-- Synonyms for search results -->
<attr name="keywords" format="string" />
+ <!-- Whether or not the preference is searchable, by default it's true. -->
+ <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" />
+ <!-- Whether or not dynamic summary text from PreferenceController is allowed when creating slice object, by default it's false. -->
+ <attr name="allowDynamicSummaryInSlice" format="boolean" />
</declare-styleable>
<!-- For DotsPageIndicator -->
@@ -128,6 +96,7 @@
<attr name="switchBarMarginEnd" format="dimension" />
<attr name="switchBarBackgroundColor" format="color" />
<attr name="switchBarBackgroundActivatedColor" format="color" />
+ <attr name="switchBarRestrictionIcon" format="reference" />
<attr name="preferenceBackgroundColor" format="color" />
diff --git a/res/values/bools.xml b/res/values/bools.xml
index 0a928c3..8bd11c7 100644
--- a/res/values/bools.xml
+++ b/res/values/bools.xml
@@ -21,9 +21,6 @@
<bool name="has_boot_sounds">false</bool>
<!-- Whether there is a silent mode checkbox -->
<bool name="has_silent_mode">true</bool>
- <!-- Whether the DEPRECATED power control widget is enabled for this
- device. Should be overridden for specific product builds. -->
- <bool name="has_powercontrol_widget">false</bool>
<!-- Display additional System Update menu if true -->
<bool name="config_additional_system_update_setting_enable">false</bool>
@@ -177,6 +174,9 @@
<!-- Whether wifi_mac_address should be shown or not. -->
<bool name="config_show_wifi_mac_address">true</bool>
- <!-- Whether to disable "Uninstall Updates" menu item for System apps or not.. -->
+ <!-- Whether to disable "Uninstall Updates" menu item for System apps or not. -->
<bool name="config_disable_uninstall_update">false</bool>
+
+ <!-- Whether or not extra preview panels should be used for screen zoom setting. -->
+ <bool name="config_enable_extra_screen_zoom_preview">true</bool>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e5f7c27..a00fd8a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -125,6 +125,7 @@
<color name="homepage_system_background">#757575</color>
<color name="homepage_support_background">#26459C</color>
<color name="homepage_generic_icon_background">#1A73E8</color>
+ <color name="homepage_location_background">#2EC7DC</color>
<!-- End of dashboard/homepage icon background colors -->
<color name="glif_error_color">@*android:color/material_red_A700</color>
@@ -136,5 +137,11 @@
<color name="battery_maybe_color_dark">#fdd835</color> <!-- Material Yellow 600 -->
<color name="battery_bad_color_dark">#f44336</color> <!-- Material Red 500 -->
+ <!-- TODO: Figure out colors -->
+ <color name="face_anim_particle_color_1">#ff00bcd4</color> <!-- Material Cyan 500 -->
+ <color name="face_anim_particle_color_2">#ffef6c00</color> <!-- Material Orange 800 -->
+ <color name="face_anim_particle_color_3">#ff4caf50</color> <!-- Material Green 500 -->
+ <color name="face_anim_particle_color_4">#fffdd835</color> <!-- Material Yellow 600 -->
+ <color name="face_anim_particle_error">#ff9e9e9e</color> <!-- Material Gray 500 -->
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 2920ac8..b496080 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -106,8 +106,8 @@
-->
</string-array>
- <!-- Whether or not we should tint the icon color on setting pages. -->
- <bool name="config_tintSettingIcon">true</bool>
+ <!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
+ <string-array name="slice_whitelist_package_names" translatable="false"/>
<!-- Whether or not App & Notification screen should display recently used apps -->
<bool name="config_display_recent_apps">true</bool>
@@ -133,4 +133,15 @@
devices will be able to vary their amplitude but do not possess enough dynamic range to
have distinct intensity levels -->
<bool name="config_vibration_supports_multiple_intensities">false</bool>
+
+ <!-- Whether or not TopLevelSettings should force rounded icon for injected tiles -->
+ <bool name="config_force_rounded_icon_TopLevelSettings">true</bool>
+
+ <!-- TODO(b/115429501): move those 3 configs to framework-->
+ <!-- Show enabled lte option for lte device -->
+ <bool name="config_enabled_lte" translatable="false">false</bool>
+ <!-- Show enabled tdscdma option for device -->
+ <bool name="config_support_tdscdma" translatable="false">false</bool>
+ <!-- Show enabled tdscdma option for device when connect roaming network -->
+ <string-array name="config_support_tdscdma_roaming_on_networks" translatable="false"></string-array>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2341728..18bcc38 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -22,7 +22,6 @@
<dimen name="action_bar_switch_padding">16dip</dimen>
<dimen name="app_icon_size">40dip</dimen>
- <dimen name="secondary_app_icon_size">32dp</dimen>
<dimen name="min_tap_target_size">48dp</dimen>
<dimen name="screen_margin_sides">64dip</dimen>
<dimen name="screen_margin_top">72dip</dimen>
@@ -33,8 +32,6 @@
<dimen name="bind_app_widget_dialog_checkbox_bottom_padding">16dip</dimen>
<dimen name="installed_app_details_bullet_offset">8dip</dimen>
- <dimen name="battery_history_chart_height">120dp</dimen>
-
<dimen name="data_usage_chart_height">228dip</dimen>
<dimen name="data_usage_chart_optimalWidth">440dip</dimen>
<dimen name="usage_number_text_size">36sp</dimen>
@@ -47,11 +44,6 @@
<dimen name="divider_margin_top">6dip</dimen>
<dimen name="divider_margin_bottom">7dip</dimen>
- <!-- Size of icons in the top-level of settings -->
- <dimen name="header_icon_width">28dp</dimen>
- <dimen name="appwidget_min_width">280dip</dimen>
- <dimen name="appwidget_min_height">40dip</dimen>
-
<dimen name="pager_tabs_padding">0dp</dimen>
<dimen name="pager_tabs_title_padding">16dp</dimen>
<dimen name="pager_tabs_selected_indicator_height">3dp</dimen>
@@ -87,19 +79,6 @@
<dimen name="actionbar_contentInsetStart">16dp</dimen>
<dimen name="actionbar_subsettings_contentInsetStart">72dp</dimen>
- <!-- Dashboard padding in its container -->
- <dimen name="dashboard_padding_start">0dp</dimen>
- <dimen name="dashboard_padding_end">0dp</dimen>
- <dimen name="dashboard_padding_top">0dp</dimen>
- <dimen name="dashboard_padding_bottom">0dp</dimen>
-
- <!-- Dashboard category padding start / end -->
- <dimen name="dashboard_category_padding_start">0dp</dimen>
- <dimen name="dashboard_category_padding_end">0dp</dimen>
-
- <!-- Dashboard tile minimum height -->
- <dimen name="dashboard_tile_minimum_height">72dp</dimen>
-
<!-- Dashboard image tile size -->
<dimen name="dashboard_tile_image_size">36dp</dimen>
@@ -109,8 +88,8 @@
<!-- Dashboard foreground image inset (from background edge to foreground edge) -->
<dimen name="dashboard_tile_foreground_image_inset">6dp</dimen>
- <!-- Dashboard tile image margin start / end -->
- <dimen name="dashboard_tile_image_margin">18dp</dimen>
+ <!-- Preference icon foreground image inset (from background edge to foreground edge) -->
+ <dimen name="preference_icon_foreground_image_inset">12dp</dimen>
<!-- SwitchBar sub settings margin start / end -->
<dimen name="switchbar_subsettings_margin_start">72dp</dimen>
@@ -127,6 +106,9 @@
<dimen name="search_bar_text_size">16dp</dimen>
<dimen name="search_bar_card_elevation">2dp</dimen>
<dimen name="search_bar_content_inset">64dp</dimen>
+ <dimen name="search_bar_avatar_size">32dp</dimen>
+ <dimen name="search_bar_avatar_start_margin">4dp</dimen>
+ <dimen name="search_bar_avatar_end_margin">16dp</dimen>
<!-- Dimensions for Wifi Assistant Card -->
<dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
@@ -274,6 +256,8 @@
<!-- Restricted icon in switch bar -->
<dimen name="restricted_icon_margin_end">16dp</dimen>
+ <!-- Restricted icon size in switch bar -->
+ <dimen name="restricted_icon_size">@*android:dimen/config_restrictedIconSize</dimen>
<!-- Display Size and Font Size preview screen -->
<dimen name="preview_pager_padding">8dp</dimen>
@@ -304,9 +288,20 @@
<dimen name="battery_meter_width">66dp</dimen>
<dimen name="battery_meter_height">100dp</dimen>
+ <!-- Margin for the reset screens -->
+ <dimen name="reset_network_margin_start">72dp</dimen>
+ <dimen name="reset_network_margin_end">12dp</dimen>
+ <dimen name="reset_master_clear_margin_start">32dp</dimen>
+ <dimen name="reset_master_clear_margin_end">12dp</dimen>
+
+ <!-- Padding for screen pinning -->
+ <dimen name="screen_pinning_padding_start">64dp</dimen>
+ <dimen name="screen_pinning_padding_end">64dp</dimen>
+
<!-- Suggestion/condition header padding -->
<dimen name="suggestion_condition_header_padding_collapsed">10dp</dimen>
<dimen name="suggestion_condition_header_padding_expanded">5dp</dimen>
+ <dimen name="condition_header_height">36dp</dimen>
<!-- Suggestion cards size and padding -->
<dimen name="suggestion_card_icon_size">24dp</dimen>
@@ -319,6 +314,9 @@
<dimen name="suggestion_card_button_top_margin">16dp</dimen>
<dimen name="suggestion_card_button_bottom_margin">18dp</dimen>
+ <!-- Condition cards size and padding -->
+ <dimen name="condition_card_elevation">2dp</dimen>
+
<!-- Padding for the reset screens -->
<dimen name="reset_checkbox_padding_end">8dp</dimen>
<dimen name="reset_checkbox_title_padding_top">12dp</dimen>
@@ -332,4 +330,22 @@
<dimen name="homepage_bottombar_top_margin">34dp</dimen>
<dimen name="homepage_bottombar_fab_cradle">68dp</dimen>
+ <!-- Homepage cards size and padding -->
+ <dimen name="homepage_card_corner_radius">8dp</dimen>
+ <dimen name="homepage_card_elevation">2dp</dimen>
+ <dimen name="homepage_card_vertical_margin">4dp</dimen>
+ <dimen name="homepage_card_side_margin">8dp</dimen>
+ <dimen name="homepage_card_padding_start">16dp</dimen>
+ <dimen name="homepage_card_padding_end">16dp</dimen>
+
+ <!-- Horizontal divider size and margin -->
+ <dimen name="horizontal_divider_margin_top">4dp</dimen>
+ <dimen name="horizontal_divider_margin_bottom">8dp</dimen>
+ <dimen name="horizontal_divider_height">.75dp</dimen>
+
+ <!-- Signal icon in NetworkSelectSetting -->
+ <dimen name="signal_strength_icon_size">24dp</dimen>
+
+
+
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index df98e0e..e828ac2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -25,9 +25,6 @@
<!-- Strings for Dialog deny button -->
<string name="deny">Deny</string>
- <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
- <string name="dlg_close">Close</string>
-
<!-- Device Info screen. Used for a status item's value when the proper value is not known -->
<string name="device_info_default">Unknown</string>
<!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
@@ -384,15 +381,15 @@
<!-- Summary for bluetooth item in connection detail page. (phone)-->
<string name="bluetooth_pref_summary" product="default">Allow your phone to communicate with nearby Bluetooth devices</string>
- <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=40] -->
+ <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
<string name="bluetooth_disable_a2dp_hw_offload">Disable Bluetooth A2DP hardware offload</string>
- <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=20] -->
+ <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
<string name="bluetooth_disable_a2dp_hw_offload_dialog_title">Restart Device?</string>
- <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=60] -->
+ <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
<string name="bluetooth_disable_a2dp_hw_offload_dialog_message">You need to restart your device to change this setting.</string>
- <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=10] -->
+ <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
<string name="bluetooth_disable_a2dp_hw_offload_dialog_confirm">Restart</string>
- <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=10] -->
+ <!-- UI debug setting: Disable Bluetooth A2DP hardware offload [CHAR LIMIT=none] -->
<string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Cancel</string>
<!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
@@ -414,6 +411,9 @@
<!-- Toast text for hint user bluetooth is turned on [CHAR LIMIT=none]-->
<string name="connected_device_bluetooth_turned_on_toast">Bluetooth turned on</string>
+ <!-- Title to see all the previous connected devices [CHAR LIMIT=50] -->
+ <string name="previous_connected_see_all">See all</string>
+
<!-- Date & time settings screen title -->
<string name="date_and_time">Date & time</string>
<!-- The title of the activity to pick a time zone. -->
@@ -814,11 +814,13 @@
<string name="location_settings_title">Location</string>
<!-- Used in the location settings to control turning on/off the feature entirely -->
<string name="location_settings_master_switch_title">Use location</string>
+ <!-- Summary for Location settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
+ <string name="location_settings_summary">Scanning, location history</string>
<!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
<string name="account_settings_title">Accounts</string>
<!-- Main Settings screen setting option title for the item to take you to the security screen -->
- <string name="security_settings_title">Security & location</string>
+ <string name="security_settings_title">Security</string>
<!-- Security Settings screen setting option title for the item to take you to the encryption and credential screen -->
<string name="encryption_and_credential_settings_title">Encryption & credentials</string>
<!-- Security Settings screen Encryption and crendential summary -->
@@ -893,6 +895,12 @@
<string name="security_settings_face_settings_use_face_category">Use your face to</string>
<!-- Text shown on a toggle which allows or disallows the device to use face for unlocking the device. [CHAR LIMIT=20] -->
<string name="security_settings_face_settings_use_face_unlock_phone">Unlock your device</string>
+ <!-- Text shown on a toggle which allows or disallows the device to use face authentication for apps. This will be presented to the user together with the context of security_settings_face_settings_use_face_category. [CHAR LIMIT=30] -->
+ <string name="security_settings_face_settings_use_face_for_apps">App sign-in \u0026 payments</string>
+ <!-- Text shown on a toggle which disables/enables face authentication, depending if the user's eyes are open. [CHAR LIMIT=30] -->
+ <string name="security_settings_face_settings_require_attention">Eyes open to unlock</string>
+ <!-- Text shown on the details of a toggle which disables/enables face authentication, depending if the user's eyes are open. [CHAR LIMIT=70] -->
+ <string name="security_settings_face_settings_require_attention_details">When using face authentication, your eyes must be open</string>
<!-- Button text in face settings which removes the user's faces from the device [CHAR LIMIT=20] -->
<string name="security_settings_face_settings_remove_face_data">Remove face data</string>
<!-- Text shown in face settings allowing the user to update/improve the enrolled face. This brings the user back to the enrollment flow. [CHAR LIMIT=30] -->
@@ -1045,9 +1053,6 @@
<!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
<string name="fingerprint_last_delete_confirm">Yes, remove</string>
- <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
- <string name="confirm_fingerprint_icon_content_description">Use your fingerprint to continue.</string>
-
<!-- Title of the preferences category for preference items to control encryption -->
<string name="crypt_keeper_settings_title">Encryption</string>
@@ -2043,6 +2048,8 @@
<string name="wifi_ap_band_select_one">Choose at least one band for Wi\u2011Fi hotspot:</string>
<!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
<string name="wifi_ip_settings">IP settings</string>
+ <!-- Label for the spinner to show Wifi MAC randomization [CHAR LIMIT=25] -->
+ <string name="wifi_privacy_settings">Privacy</string>
<!-- Label for the check box to share a network with other users on the same device -->
<string name="wifi_shared">Share with other device users</string>
<!-- Hint for unchanged fields -->
@@ -2759,6 +2766,10 @@
<string name="sim_change_succeeded">SIM PIN changed successfully</string>
<!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
<string name="sim_lock_failed">Can\u2019t change SIM card lock state.\nPossibly incorrect PIN.</string>
+ <!-- SIM card lock settings screen, toast after disabling PIN failed from modem -->
+ <string name="sim_pin_disable_failed">Can\'t disable PIN.</string>
+ <!-- SIM card lock settings screen, toast after enabling PIN failed from modem -->
+ <string name="sim_pin_enable_failed">Can\'t enable PIN.</string>
<!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
<string name="sim_enter_ok">OK</string>
<!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
@@ -3167,7 +3178,7 @@
<!-- In-progress title. This string lets the user know the SD card is being formatted. The user won't be able to proceed with setup until this step is finished. The placeholder is for the name of the device (e.g. brand name of the SD card). [CHAR LIMIT=32] -->
<string name="storage_wizard_format_progress_title">Formatting <xliff:g id="name" example="SD card">^1</xliff:g>\u2026</string>
<!-- Subtext for a full-screen title. This string lets the user know that the SD card can't be removed during this process. The user won't be able to proceed with setup until this step is finished. The placeholder is for the specific device (e.g. SD card, USB drive, etc.). [CHAR LIMIT=NONE] -->
- <string name="storage_wizard_format_progress_body">Don\u2019t remove the <xliff:g id="name" example="SD card">^1</xliff:g> while it\u2019s being formatting.</string>
+ <string name="storage_wizard_format_progress_body">Don\u2019t remove the <xliff:g id="name" example="SD card">^1</xliff:g> while it\u2019s being formatted.</string>
<!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
<string name="storage_wizard_migrate_title">Move data to new storage</string>
@@ -3697,6 +3708,10 @@
<!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
<string name="settings_safetylegal_activity_loading">Loading\u2026</string>
+ <!-- ConfirmDeviceCredential settings-->
+ <!-- Button text shown on BiometricPrompt (system dialog that asks for biometric authentication) giving the user the option to use an alternate form of authentication (Pin/Pattern/Pass) [CHAR LIMIT=30] -->
+ <string name="confirm_device_credential_use_alternate_method">Use alternate method</string>
+
<!-- Lock Pattern settings -->
<!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=40] -->
<string name="lockpassword_choose_your_screen_lock_header">Set screen lock</string>
@@ -3759,8 +3774,8 @@
<string name="lockpassword_confirm_your_password_generic_profile">Enter your work password to continue</string>
<!-- This string shows up on a screen where a user can enter a pattern that
- unlocks their device. This is an extra security measure that's required for them to
- continue. [CHAR LIMIT=100] -->
+ unlocks their device. This is an extra security measure that's required for them to
+ continue. [CHAR LIMIT=100] -->
<string name="lockpassword_strong_auth_required_device_pattern">For added security, use your device pattern</string>
<!-- This string shows up on a screen where a user can enter a PIN that unlocks their device.
This is an extra security measure that's required for them to continue. [CHAR LIMIT=100]
@@ -5534,39 +5549,6 @@
<!-- Name for buttont hat plays a sample of the currently selected text-to-speech engine. -->
<string name="tts_play">Play</string>
- <!-- Power Control Widget -->
- <string name="gadget_title">Power control</string>
- <string name="gadget_toggle_wifi">Updating Wi\u2011Fi setting</string>
- <string name="gadget_toggle_bluetooth">Updating Bluetooth setting</string>
- <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
- <string name="gadget_state_template"><xliff:g name="feature" example="Wi\u2011Fi">%1$s</xliff:g> <xliff:g name="state" example="off">%2$s</xliff:g></string>
- <!-- Gadget value used to describe on state. -->
- <string name="gadget_state_on">on</string>
- <!-- Gadget value used to describe off state. -->
- <string name="gadget_state_off">off</string>
- <!-- Gadget value used to describe turning on state. -->
- <string name="gadget_state_turning_on">turning on</string>
- <!-- Gadget value used to describe turning off state. -->
- <string name="gadget_state_turning_off">turning off</string>
- <!-- Spoken description for the Wi-Fi power control gadget. -->
- <string name="gadget_wifi">Wi\u2011Fi</string>
- <!-- Spoken description for the Bluetooth power control gadget. -->
- <string name="gadget_bluetooth">Bluetooth</string>
- <!-- Spoken description for the Location power control gadget. -->
- <string name="gadget_location">Location</string>
- <!-- Spoken description for the data synchronization gadget. -->
- <string name="gadget_sync">Sync</string>
- <!-- Template for brightness gadget toggle button description. -->
- <string name="gadget_brightness_template">Brightness <xliff:g name="state" example="half">%1$s</xliff:g></string>
- <!-- Brightness gadget value used to describe automatic brightness state. -->
- <string name="gadget_brightness_state_auto">auto</string>
- <!-- Brightness gadget value used to describe maximum brightness state. -->
- <string name="gadget_brightness_state_full">full</string>
- <!-- Brightness gadget value used to describe half brightness state. -->
- <string name="gadget_brightness_state_half">half</string>
- <!-- Brightness gadget value used to describe minimum brightness state. -->
- <string name="gadget_brightness_state_off">off</string>
-
<!-- Title of preference to enter the VPN settings activity -->
<string name="vpn_settings_title">VPN</string>
@@ -5675,12 +5657,18 @@
<string name="remove_and_uninstall_device_admin">Deactivate & uninstall</string>
<!-- Label for screen showing to select device admin apps -->
<string name="select_device_admin_msg">Device admin apps</string>
+
<!-- Message when there are no available device admin apps to display -->
<string name="no_device_admins">No device admin apps available</string>
<!-- Title for personal device admin apps on the list [CHAR_LIMIT=25] -->
<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 -->
<string name="no_trust_agents">No available trust agents</string>
@@ -6889,9 +6877,6 @@
<item quantity="other">Show %d hidden items</item>
</plurals>
- <!-- Content description for suggestion footer button. Double tapping will cause suggestion list to collapse [CHAR LIMIT=NONE]-->
- <string name="dashboard_suggestion_condition_footer_content_description">Collapse</string>
-
<!-- Title for setting tile leading to network and Internet settings [CHAR LIMIT=40]-->
<string name="network_dashboard_title">Network & internet</string>
<!-- Summary for Network and Internet settings, explaining it contains mobile network setting [CHAR LIMIT=NONE]-->
@@ -6930,8 +6915,6 @@
<!-- Search strings -->
<!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
<string name="search_results_title">Settings</string>
- <!-- Text used as a search hint into the search box -->
- <string name="search_menu">Search settings</string>
<!-- Search breadcrumb connector symbol -->
<string name="search_breadcrumb_connector" translatable="false">
<xliff:g name="first_item">%1$s</xliff:g> > <xliff:g name="second_item">%2$s</xliff:g>
@@ -6982,7 +6965,7 @@
<string name="keywords_payment_settings">pay, tap, payments</string>
<string name="keywords_backup">backup, back up</string>
<string name="keywords_assist_gesture_launch">gesture</string>
- <string name="keywords_face_unlock">face, unlock</string>
+ <string name="keywords_face_unlock">face, unlock, auth, sign in</string>
<string name="keywords_imei_info">imei, meid, min, prl version, imei sv</string>
<string name="keywords_sim_status">network, mobile network state, service state, signal strength, mobile network type, roaming, iccid</string>
<string name="keywords_model_and_hardware">serial number, hardware version</string>
@@ -6997,6 +6980,9 @@
<!-- Search keyword for Ambient display settings screen. -->
<string name="keywords_ambient_display_screen">Ambient display, Lock screen display</string>
+ <!-- Search keyword for lock screen notification setting [CHAR_LIMIT=NONE] -->
+ <string name="keywords_lock_screen_notif">lock screen notification</string>
+
<!-- Search keyword for face settings. -->
<string name="keywords_face_settings">face</string>
@@ -7208,20 +7194,26 @@
<string name="zen_mode_behavior_alarms_only">No sound except alarms and media</string>
<!-- Do not disturb: Title for the zen mode automation option in Settings. [CHAR LIMIT=40] -->
- <string name="zen_mode_automation_settings_title">Turn on automatically</string>
+ <string name="zen_mode_automation_settings_title">Schedules</string>
<!-- Do not disturb: Title for the zen mode automatic rules page in settings. [CHAR LIMIT=30] -->
- <string name="zen_mode_automation_settings_page_title">Automatic rules</string>
+ <string name="zen_mode_automation_settings_page_title">Do Not Disturb</string>
<!-- Do not disturb: Title for a specific zen mode automatic rule in settings. [CHAR LIMIT=30] -->
<string name="zen_mode_automatic_rule_settings_page_title">Automatic rule</string>
+ <!-- Do not disturb: Title do not disturb settings representing automatic (scheduled) do not disturb rules. [CHAR LIMIT=30] -->
+ <string name="zen_mode_schedule_category_title">Schedule</string>
+
<!-- Do not disturb: Title for the zen mode automation option Suggestion. [CHAR LIMIT=46] -->
<string name="zen_mode_automation_suggestion_title">Silence phone at certain times</string>
<!-- Do not disturb: Summary for the zen mode automation option Suggestion. [CHAR LIMIT=55] -->
<string name="zen_mode_automation_suggestion_summary">Set Do Not Disturb rules</string>
+ <!-- Do not disturb: Header for the Do Not Disturb automatic rules. [CHAR LIMIT=55] -->
+ <string name="zen_mode_schedule_title">Schedule</string>
+
<!-- Do not disturb: Switch toggle to toggle whether to use an automatic dnd rule or not [CHAR LIMIT=40] -->
<string name="zen_mode_use_automatic_rule">Use rule</string>
@@ -7244,10 +7236,10 @@
<string name="zen_mode_visual_signals_settings_subtitle">Allow visual signals</string>
<!-- Do not disturb: zen settings screens category title [CHAR LIMIT=100] -->
- <string name="zen_mode_settings_category">When Do Not Disturb is turned on</string>
+ <string name="zen_mode_settings_category">When Do Not Disturb is on</string>
- <!-- Do not disturb: restrict notifications title [CHAR LIMIT=60] -->
- <string name="zen_mode_restrict_notifications_title">Notifications</string>
+ <!-- Do not disturb: restrict notifications title [CHAR LIMIT=80] -->
+ <string name="zen_mode_restrict_notifications_title">Notification restrictions</string>
<!-- Do not disturb: Mute notifications option [CHAR LIMIT=60] -->
<string name="zen_mode_restrict_notifications_mute">No sound from notifications</string>
<!-- Do not disturb:Mute notifications summary [CHAR LIMIT=NONE] -->
@@ -7288,9 +7280,9 @@
<!-- Do not disturb: what to block option [CHAR LIMIT=NONE] -->
<string name="zen_mode_block_effect_peek">Don\'t pop notifications on screen</string>
<!-- Do not disturb: what to block option [CHAR LIMIT=NONE] -->
- <string name="zen_mode_block_effect_status">Hide status bar icons</string>
+ <string name="zen_mode_block_effect_status">Hide status bar icons at top of screen</string>
<!-- Do not disturb: what to block option [CHAR LIMIT=NONE] -->
- <string name="zen_mode_block_effect_badge">Hide notification dots</string>
+ <string name="zen_mode_block_effect_badge">Hide notification dots on app icons</string>
<!-- Do not disturb: what to block option [CHAR LIMIT=NONE] -->
<string name="zen_mode_block_effect_ambient">Don\'t wake for notifications</string>
<!-- Do not disturb: what to block option [CHAR LIMIT=NONE] -->
@@ -7379,15 +7371,15 @@
<item quantity="other"><xliff:g id="on_count" example="3">%d</xliff:g> rules can turn on automatically</item>
</plurals>
- <!-- Do not disturb settings, category header [CHAR LIMIT=100]-->
- <string name="zen_category_behavior">Behavior</string>
- <!-- Do not disturb settings, category header [CHAR LIMIT=100]-->
+ <!-- Do not disturb settings, category header [CHAR LIMIT=120]-->
+ <string name="zen_category_behavior">Mute phone, but allow exceptions</string>
+ <!-- Do not disturb settings, exceptions to dnd title [CHAR LIMIT=100]-->
<string name="zen_category_exceptions">Exceptions</string>
<!-- Do not disturb settings, category header [CHAR LIMIT=100]-->
<string name="zen_category_schedule">Schedule</string>
- <!-- Do not disturb settings, sound and vibrations title [CHAR LIMIT=100]-->
- <string name="zen_sound_title">Sound & vibration</string>
+ <!-- Do not disturb settings, sound and vibrations exceptions title [CHAR LIMIT=100]-->
+ <string name="zen_sound_title">See all exceptions</string>
<!-- Do not disturb settings, sound and vibrations screen footer [CHAR LIMIT=NONE]-->
<string name="zen_sound_footer">When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above.</string>
<!-- Do not disturb settings, sound and vibrations screen category [CHAR LIMIT=100]-->
@@ -7839,8 +7831,8 @@
<!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
<string name="zen_mode_rule_name_warning">Rule name already in use</string>
- <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
- <string name="zen_mode_add_rule">Add rule</string>
+ <!-- [CHAR LIMIT=40] Zen mode settings: Add another automatic zen rule option name-->
+ <string name="zen_mode_add_rule">Add more</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Add event-based rule, set rule name title -->
<string name="zen_mode_add_event_rule">Add event rule</string>
@@ -7965,6 +7957,9 @@
<!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
<string name="zen_mode_messages">Messages</string>
+ <!-- Do not disturb settings, messages, events and reminders footer [CHAR LIMIT=NONE]-->
+ <string name="zen_mode_messages_footer">When Do Not Disturb is on, incoming text messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.</string>
+
<!-- [CHAR LIMIT=40] Zen mode settings: Allow messages toggle title -->
<string name="zen_mode_messages_title">Allow messages</string>
@@ -8001,42 +7996,36 @@
<!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: None -->
<string name="zen_mode_from_none">None</string>
- <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
- <string name="zen_mode_alarms">Alarms</string>
+ <!-- [CHAR LIMIT=80] Zen mode settings: Allow alarms option -->
+ <string name="zen_mode_alarms">Allow alarms</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Alarms option (ie: sound from alarm clock) -->
<string name="zen_mode_alarms_list">alarms</string>
- <!-- [CHAR LIMIT=50] Zen mode settings: Media option -->
- <string name="zen_mode_media">Media</string>
+ <!-- [CHAR LIMIT=80] Zen mode settings: Allow media (sound from video) to bypass dnd -->
+ <string name="zen_mode_media">Allow media</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Media (ie: sound from video) -->
<string name="zen_mode_media_list">media</string>
- <!-- [CHAR LIMIT=50] Zen mode settings: System option which includes sounds such as touch sounds -->
- <string name="zen_mode_system">Touch sounds</string>
+ <!-- [CHAR LIMIT=80] Zen mode settings: allow touch sounds to bypass DND -->
+ <string name="zen_mode_system">Allow touch sounds</string>
<!-- [CHAR LIMIT=50] Zen mode settings: System sounds (ie: touch sounds) -->
<string name="zen_mode_system_list">touch sounds</string>
- <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
- <string name="zen_mode_reminders">Reminders</string>
+ <!-- [CHAR LIMIT=80] Zen mode settings: Allow reminder notifications/sounds to bypass DND -->
+ <string name="zen_mode_reminders">Allow reminders</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Reminders (ie: calendar reminders are allowed to bypass dnd) -->
<string name="zen_mode_reminders_list">reminders</string>
- <!-- [CHAR LIMIT=70] Zen mode settings: Allow reminders toggle title -->
- <string name="zen_mode_reminders_title">Allow reminders</string>
-
- <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
- <string name="zen_mode_events">Events</string>
+ <!-- [CHAR LIMIT=80] Zen mode settings: Allow event notifications/sounds to bypass DND -->
+ <string name="zen_mode_events">Allow events</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Events (ie: calendar events) -->
<string name="zen_mode_events_list">events</string>
- <!-- [CHAR LIMIT=70] Zen mode settings: Allow events toggle title -->
- <string name="zen_mode_events_title">Allow events</string>
-
<!-- [CHAR LIMIT=50] Zen mode settings: All callers summary -->
<string name="zen_mode_all_callers">anyone</string>
@@ -8226,7 +8215,7 @@
<string name="encrypt_talkback_dialog_message_password">When you enter your password to start this device, accessibility services like <xliff:g id="service" example="TalkBack">%1$s</xliff:g> won\u2019t yet be available.</string>
<!-- [CHAR LIMIT=NONE] Dialog body explaining that the app just selected by the user will not work after a reboot until until after the user enters their credentials, such as a PIN or password. -->
- <string name="direct_boot_unaware_dialog_message">Note: After a reboot, this app can\'t start until you unlock your phone</string>
+ <string name="direct_boot_unaware_dialog_message">Note: If you restart your phone and have a screen lock set, this app can\'t start until you unlock your phone</string>
<!-- Title and summary for SIM Status -->
<string name="imei_information_title">IMEI information</string>
@@ -8334,7 +8323,7 @@
<!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
<string name="filter_notif_all_apps">Apps: All</string>
<!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
- <string name="filter_notif_blocked_apps">Apps: Turned off</string>
+ <string name="filter_notif_blocked_apps">Turned off</string>
<!-- Label for showing categories with urgent notifications in list [CHAR LIMIT=30] -->
<string name="filter_notif_urgent_channels">Categories: Urgent importance</string>
<!-- Label for showing categories with low importance notifications in list [CHAR LIMIT=30] -->
@@ -8394,9 +8383,6 @@
<!-- Explanation that the app that will NEVER be launched to open web links to domains that it understands -->
<string name="app_link_open_never">Don’t open in this app</string>
- <!-- Fingerprint hint message when finger was not recognized.-->
- <string name="fingerprint_not_recognized">Not recognized</string>
-
<!-- Title for Default Apps settings [CHAR LIMIT=30] -->
<string name="default_apps_title">Default</string>
@@ -8943,6 +8929,10 @@
<string name="display_summary">Sleep after <xliff:g id="timeout_description" example="10 minutes">%1$s</xliff:g> of inactivity</string>
<!-- Summary for Display settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
<string name="display_dashboard_summary">Wallpaper, sleep, font size</string>
+
+ <!-- Summary for Display settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
+ <string name="display_dashboard_nowallpaper_summary">Sleep, font size</string>
+
<!-- Example summary of display used in Setup Wizard preview screen [CHAR LIMIT=NONE] -->
<string name="display_summary_example">Sleep after 10 minutes of inactivity</string>
@@ -8955,12 +8945,6 @@
<!-- Summary of payment screen [CHAR LIMIT=NONE] -->
<string name="payment_summary"><xliff:g id="app_name" example="Payment App">%1$s</xliff:g> is default</string>
- <!-- Summary of location on screen [CHAR LIMIT=NONE] -->
- <string name="location_on_summary">On</string>
-
- <!-- Location off [CHAR LIMIT=NONE] -->
- <string name="location_off_summary">Off</string>
-
<!-- Backup disabled summary [CHAR LIMIT=NONE] -->
<string name="backup_disabled">Back up disabled</string>
@@ -8981,8 +8965,6 @@
<string name="disabled_by_policy_title_camera">Camera not allowed</string>
<!-- Title for dialog displayed to tell user that screenshots are disabled by an admin [CHAR LIMIT=50] -->
<string name="disabled_by_policy_title_screen_capture">Screenshot not allowed</string>
- <!-- Title for dialog displayed to tell user that turning off backups is disallowed by an admin [CHAR LIMIT=50] -->
- <string name="disabled_by_policy_title_turn_off_backups">Can’t turn off backups</string>
<!-- Title for dialog displayed to tell user that the app was suspended by an admin [CHAR LIMIT=50] -->
<string name="disabled_by_policy_title_suspend_packages">Can’t open this app</string>
<!-- Shown when the user tries to change a settings locked by an admin [CHAR LIMIT=200] -->
@@ -9425,13 +9407,13 @@
<string name="notification_log_details_ranking_none">Ranking object doesn\'t contain this key.</string>
<!-- [CHAR_LIMIT=NONE] Developer Settings: Title of the setting which turns on emulation of a display cutout. -->
- <string name="display_cutout_emulation">Simulate a display with a cutout</string>
+ <string name="display_cutout_emulation">Display cutout</string>
<!-- [CHAR_LIMIT=NONE] Developer Settings: Search keywords for the setting which turns on emulation of a display cutout. -->
<string name="display_cutout_emulation_keywords">display cutout, notch</string>
- <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that turns off display cutout emulation. -->
- <string name="display_cutout_emulation_none">None</string>
+ <!-- [CHAR_LIMIT=NONE] Developer Settings: Label for the option that turns off display cutout emulation, (i.e. on devices whose screen actually has a cutout, selecting this option will show that cutout).-->
+ <string name="display_cutout_emulation_device_default">Device default</string>
<!-- [CHAR_LIMIT=60] Label for special access screen -->
<string name="special_access">Special app access</string>
@@ -9492,11 +9474,11 @@
<!-- [CHAR LIMIT=60] Name of dev option called "System UI demo mode" -->
<string name="demo_mode">System UI demo mode</string>
- <!-- [CHAR LIMIT=60] Name of dev option that changes the UI Mode -->
- <string name="dark_ui_mode">Night mode</string>
+ <!-- [CHAR LIMIT=60] Name of setting that changes the UI to dark -->
+ <string name="dark_ui_mode">Dark mode</string>
<!-- [CHAR LIMIT=60] Name of dev option that changes the color of the UI -->
- <string name="dark_ui_mode_title">Set Night mode</string>
+ <string name="dark_ui_mode_title">Set Dark mode</string>
<!-- [CHAR LIMIT=60] Name of dev option to enable extra quick settings tiles -->
<string name="quick_settings_developer_tiles">Quick settings developer tiles</string>
@@ -9504,9 +9486,6 @@
<!-- [CHAR LIMIT=25] Title of developer tile to toggle winscope trace -->
<string name="winscope_trace_quick_settings_title">Winscope Trace</string>
- <!-- Template for formatting country and language. eg Canada - French [CHAR LIMIT=NONE]-->
- <string name="support_country_format"><xliff:g id="country" example="Canada">%1$s</xliff:g> - <xliff:g id="language" example="French">%2$s</xliff:g></string>
-
<!-- [CHAR LIMIT=60] Title of work profile setting page -->
<string name="managed_profile_settings_title">Work profile settings</string>
<!-- [CHAR LIMIT=60] The preference title for enabling cross-profile remote contact search -->
@@ -9601,7 +9580,7 @@
<string name="ambient_display_title" product="device">Double-tap to check device</string>
<!-- Summary text for ambient display double tap [CHAR LIMIT=NONE]-->
- <string name="ambient_display_summary">To check time, notification icons, and other info, double-tap your screen.</string>
+ <string name="ambient_display_summary">To check time, notifications, and other info, double-tap your screen.</string>
<!-- Preference and settings suggestion title text for ambient display pick up (phone) [CHAR LIMIT=60]-->
<string name="ambient_display_pickup_title" product="default">Lift to check phone</string>
@@ -9610,12 +9589,22 @@
<!-- Preference and settings suggestion title text for ambient display pick up (device) [CHAR LIMIT=60]-->
<string name="ambient_display_pickup_title" product="device">Lift to check device</string>
+ <!-- Preference and settings suggestion title text for display wake-up gesture [CHAR LIMIT=60]-->
+ <string name="ambient_display_wake_screen_title">Wake up display</string>
+ <!-- Summary text for ambient display wake-up gesture [CHAR LIMIT=NONE]-->
+ <string name="ambient_display_wake_screen_summary"></string>
+
<!-- Summary text for ambient display (phone) [CHAR LIMIT=NONE]-->
- <string name="ambient_display_pickup_summary" product="default">To check time, notification icons, and other info, pick up your phone.</string>
+ <string name="ambient_display_pickup_summary" product="default">To check time, notifications, and other info, pick up your phone.</string>
<!-- Summary text for ambient display (tablet) [CHAR LIMIT=NONE]-->
- <string name="ambient_display_pickup_summary" product="tablet">To check time, notification icons, and other info, pick up your tablet.</string>
+ <string name="ambient_display_pickup_summary" product="tablet">To check time, notifications, and other info, pick up your tablet.</string>
<!-- Summary text for ambient display (device) [CHAR LIMIT=NONE]-->
- <string name="ambient_display_pickup_summary" product="device">To check time, notification icons, and other info, pick up your device.</string>
+ <string name="ambient_display_pickup_summary" product="device">To check time, notifications, and other info, pick up your device.</string>
+
+ <!-- Preference and settings suggestion title text for gesture that shows the lock screen [CHAR LIMIT=60]-->
+ <string name="ambient_display_wake_lock_screen_title">Wake lock screen gesture</string>
+ <!-- Summary text for ambient display [CHAR LIMIT=NONE]-->
+ <string name="ambient_display_wake_lock_screen_summary" product="default"></string>
<!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
<string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
@@ -9780,8 +9769,6 @@
<item quantity="one"><xliff:g id="count">%d</xliff:g> attempt</item>
<item quantity="other"><xliff:g id="count">%d</xliff:g> attempts</item>
</plurals>
- <!-- List item in a work device's settings. This text lets the user know that their IT administrator requires their device's data to be backed up. The user can't change this setting. [CHAR LIMIT=NONE] -->
- <string name="enterprise_privacy_backups_enabled">This device\'s data is being backed up</string>
<!-- Message indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=NONE] -->
<string name="do_disclosure_generic">This device is managed by your organization.</string>
<!-- Message indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=NONE] -->
@@ -9970,6 +9957,13 @@
<!-- UI debug setting: preference summary - describes the behavior of showing a dialog every time an app crashes [CHAR LIMIT=NONE] -->
<string name="show_first_crash_dialog_summary">Show dialog every time an app crashes</string>
+ <!-- UI debug setting: select current app to use ANGLE [CHAR LIMIT=100] -->
+ <string name="angle_enabled_app">Select ANGLE enabled app</string>
+ <!-- UI debug setting: no ANGLE enabled app has been set [CHAR LIMIT=100] -->
+ <string name="angle_enabled_app_not_set">No ANGLE enabled application set</string>
+ <!-- UI debug setting: ANGLE enabled app has been set [CHAR LIMIT=NONE] -->
+ <string name="angle_enabled_app_set">ANGLE enabled application: <xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>
+
<!-- Title for Directory Access settings -->
<string name="directory_access">Directory access</string>
<!-- Keywords for Directory Access settings -->
@@ -10090,4 +10084,201 @@
<!-- Title for Connected device shortcut [CHAR LIMIT=30] -->
<string name="devices_title">Devices</string>
+
+ <!-- Homepage bottom menu. Title for display all Settings [CHAR LIMIT=30] -->
+ <string name="homepage_all_settings">All Settings</string>
+
+ <!-- Homepage bottom menu. Title for display personalized Settings [CHAR LIMIT=30] -->
+ <string name="homepage_personal_settings">Suggestions</string>
+
+ <!-- Setting Checkbox title whether to enable CBRS data. [CHAR LIMIT=40] -->
+ <string name="cbrs_data_switch">CBRS Data</string>
+
+ <!-- Title of implications of enabling CBRS Data -->
+ <string name="cbrs_data_switch_summary">CBRS Data</string>
+
+ <!-- Available networks screen, name of button when user wants to select network manually [CHAR LIMIT=60] -->
+ <string name="choose_network_title">Choose network</string>
+ <!-- Available networks screen, text when no networks connected [CHAR LIMIT=60] -->
+ <string name="network_disconnected">Disconnected</string>
+ <!-- Available networks screen, text when network connected [CHAR LIMIT=60] -->
+ <string name="network_connected">Connected</string>
+ <!-- Available networks screen, text when a network is connecting [CHAR LIMIT=60] -->
+ <string name="network_connecting">Connecting\u2026</string>
+ <!-- Available networks screen, text when a network cannot be connected [CHAR LIMIT=60] -->
+ <string name="network_could_not_connect">Couldn\u2019t connect</string>
+ <!-- Available networks screen, text when no networks are found [CHAR LIMIT=NONE] -->
+ <string name="empty_networks_list">No networks found.</string>
+ <!-- Available networks screen, toast when an error is encountered when searching for networks [CHAR LIMIT=NONE] -->
+ <string name="network_query_error">Couldn\u2019t find networks. Try again.</string>
+ <!-- Text to show this network is forbidden [CHAR LIMIT=NONE] -->
+ <string name="forbidden_network">(forbidden)</string>
+
+ <!-- Message informs the user that has no SIM card in personalized Settings [CHAR LIMIT=30] -->
+ <string name="no_sim_card">No SIM card</string>
+
+ <!-- Carrier variant of Enhaced 4G LTE Mode title. [CHAR LIMIT=50] -->
+ <string name="enhanced_4g_lte_mode_title_variant">Advanced Calling</string>
+ <!-- The following strings are summaries for preferred network modes in Mobile network settings,
+ and have a character limit of 100 -->
+ <!-- WCDMA preferred [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_wcdma_perf_summary">Preferred network mode: WCDMA preferred</string>
+ <!-- GSM only [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_gsm_only_summary">Preferred network mode: GSM only</string>
+ <!-- WCDMA only [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_wcdma_only_summary">Preferred network mode: WCDMA only</string>
+ <!-- GSM / WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_gsm_wcdma_summary">Preferred network mode: GSM / WCDMA</string>
+ <!-- CDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_cdma_summary">Preferred network mode: CDMA</string>
+ <!-- CDMA / EvDo [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_cdma_evdo_summary">Preferred network mode: CDMA / EvDo</string>
+ <!-- CDMA only [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_cdma_only_summary">Preferred network mode: CDMA only</string>
+ <!-- EvDo only [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_evdo_only_summary">Preferred network mode: EvDo only</string>
+ <!-- CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: CDMA/EvDo/GSM/WCDMA</string>
+ <!-- LTE [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_summary">Preferred network mode: LTE </string>
+ <!-- GSM/WCDMA/LTE [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string>
+ <!-- CDMA+LTE/EVDO [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_cdma_evdo_summary">Preferred network mode: CDMA+LTE/EVDO</string>
+ <!-- Global [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_global_summary">Preferred network mode: Global</string>
+ <!-- LTE / WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_wcdma_summary">Preferred network mode: LTE / WCDMA</string>
+ <!-- LTE / GSM / UMTS [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_gsm_umts_summary">Preferred network mode: LTE / GSM / UMTS</string>
+ <!-- LTE / CDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_cdma_summary">Preferred network mode: LTE / CDMA</string>
+ <!-- TDSCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_tdscdma_summary">Preferred network mode: TDSCDMA</string>
+ <!-- TDSCDMA / WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_tdscdma_wcdma_summary">Preferred network mode: TDSCDMA / WCDMA</string>
+ <!-- LTE / TDSCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_tdscdma_summary">Preferred network mode: LTE / TDSCDMA</string>
+ <!-- TDSCDMA / GSM [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_tdscdma_gsm_summary">Preferred network mode: TDSCDMA / GSM</string>
+ <!-- LTE/GSM/TDSCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_tdscdma_gsm_summary">Preferred network mode: LTE/GSM/TDSCDMA</string>
+ <!-- TDSCDMA/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_tdscdma_gsm_wcdma_summary">Preferred network mode: TDSCDMA/GSM/WCDMA</string>
+ <!-- LTE/TDSCDMA/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_tdscdma_wcdma_summary">Preferred network mode: LTE/TDSCDMA/WCDMA</string>
+ <!-- LTE/TDSCDMA/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_tdscdma_gsm_wcdma_summary">Preferred network mode: LTE/TDSCDMA/GSM/WCDMA</string>
+ <!-- TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>
+ <!-- LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE/TDSCDMA/CDMA/EvDo/GSM/WCDMA</string>
+
+ <!-- Text for Network lte [CHAR LIMIT=NONE] -->
+ <string name="network_lte">LTE (recommended)</string>
+ <!-- Text for Network 4g [CHAR LIMIT=NONE] -->
+ <string name="network_4G">4G (recommended)</string>
+ <!-- Text for Network 3g [CHAR LIMIT=NONE] -->
+ <string name="network_3G" translatable="false">3G</string>
+ <!-- Text for Network 2g [CHAR LIMIT=NONE] -->
+ <string name="network_2G" translatable="false">2G</string>
+ <!-- Text for Network 1x [CHAR LIMIT=NONE] -->
+ <string name="network_1x" translatable="false">1x</string>
+ <!-- Text for Network global [CHAR LIMIT=NONE] -->
+ <string name="network_global">Global</string>
+
+ <!-- Configuration setting for world mode Format is <true;GID if any to be checked> [CHAR LIMIT=NONE] -->
+ <string translatable="false" name="config_world_mode"/>
+
+ <!-- Available networks screen title/heading [CHAR LIMIT=NONE] -->
+ <string name="label_available">Available networks</string>
+ <!-- Mobile network settings screen, toast when searching for available networks [CHAR LIMIT=NONE] -->
+ <string name="load_networks_progress">Searching\u2026</string>
+ <!-- Available networks screen, toast when registering on a specific network [CHAR LIMIT=NONE] -->
+ <string name="register_on_network">Registering on <xliff:g id="network" example="Verizon">%s</xliff:g>\u2026</string>
+ <!-- Available networks screen, toast when SIM card isn't allowed on a network [CHAR LIMIT=NONE] -->
+ <string name="not_allowed">Your SIM card doesn\u2019t allow a connection to this network.</string>
+ <!-- Available networks screen, toast when unable to connect to a network temporarily [CHAR LIMIT=NONE] -->
+ <string name="connect_later">Can\u2019t connect to this network right now. Try again later.</string>
+ <!-- Available networks screen, toast when registered on a specific network [CHAR LIMIT=NONE] -->
+ <string name="registration_done">Registered on network.</string>
+
+ <!-- Available networks screen, name of switch button for whether to select network automatically [CHAR LIMIT=NONE] -->
+ <string name="select_automatically">Automatically select network</string>
+
+ <!-- A menu item in "Mobile network settings" that allows the user to update the phone
+ with mobile operator specific settings. [CHAR LIMIT=25] -->
+ <string name="carrier_settings_title">Carrier settings</string>
+ <!-- Preference title for launching an account manager page for prepaid LTE [CHAR LIMIT=30] -->
+ <string name="cdma_lte_data_service">Set up data service</string>
+ <!-- Mobile network settings screen, title of Mobile Data switch preference [CHAR LIMIT=NONE] -->
+ <string name="mobile_data_settings_title">Mobile data</string>
+ <!-- Mobile network settings screen, title of Mobile data switch preference [CHAR LIMIT=NONE] -->
+ <string name="mobile_data_settings_summary">Access data using mobile network</string>
+
+ <!-- Title for preferred network type [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_title">Preferred network type</string>
+ <!-- Summary for preferred network type [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_summary">Change the network operating mode</string>
+ <!-- Dialog title for preferred network type [CHAR LIMIT=NONE] -->
+ <string name="preferred_network_mode_dialogtitle">Preferred network type</string>
+ <!-- Mobile network settings screen, name of the option to manage carrier profiles on devices which support embedded carrier profiles [CHAR LIMIT=NONE] -->
+ <string name="carrier_settings_euicc">Carrier</string>
+
+ <!-- Mobile network settings screen, name for call settings category [CHAR LIMIT=NONE] -->
+ <string name="call_category">Calling</string>
+ <!-- Mobile network settings screen, title of Video calling setting [CHAR LIMIT=NONE] -->
+ <string name="video_calling_settings_title">Carrier video calling</string>
+
+ <!-- Mobile network settings screen, setting option name [CHAR LIMIT=NONE] -->
+ <string name="cdma_system_select_title">System select</string>
+ <!-- Mobile network settings screen, setting summary text [CHAR LIMIT=NONE] -->
+ <string name="cdma_system_select_summary">Change the CDMA roaming mode</string>
+ <!-- System select settings screen title [CHAR LIMIT=NONE] -->
+ <string name="cdma_system_select_dialogtitle">System select</string>
+
+ <!-- Mobile network settings screen, name for network operator category [CHAR LIMIT=NONE] -->
+ <string name="network_operator_category">Network</string>
+ <!-- Available networks screen, name of button when user wants to select network manually [CHAR LIMIT=NONE] -->
+ <string name="network_select_title">Network</string>
+
+ <!-- Title for CDMA subscription [CHAR LIMIT=50] -->
+ <string name="cdma_subscription_title">CDMA subscription</string>
+ <!-- Summary for CDMA subscription [CHAR LIMIT=NONE] -->
+ <string name="cdma_subscription_summary">Change between RUIM/SIM and NV</string>
+ <!-- Dialog title for CDMA subscription [CHAR LIMIT=30] -->
+ <string name="cdma_subscription_dialogtitle">subscription</string>
+
+ <!-- Title to register automatically [CHAR LIMIT=NONE] -->
+ <string name="register_automatically">Automatic registration\u2026</string>
+ <!-- Mobile network settings screen, dialog message title when user selects the Data roaming check box [CHAR LIMIT=120] -->
+ <string name="roaming_alert_title">Allow data roaming?</string>
+ <!-- Mobile network settings screen, message asking the user to check their pricing with their Carrier, when enabling Data roaming. [CHAR LIMIT=NONE] -->
+ <string name="roaming_check_price_warning">Check with your network provider for pricing.</string>
+
+ <!-- Title for mobile data preference, to display the mobile data usage for each app. [CHAR LIMIT=NONE]-->
+ <string name="mobile_data_usage_title">App data usage</string>
+ <!-- Summary to show the current network mode is invalid. [CHAR LIMIT=NONE]-->
+ <string name="mobile_network_mode_error">Invalid Network Mode <xliff:g id="networkModeId" example="0">%1$d</xliff:g>. Ignore.</string>
+
+ <!-- Available networks screen, summary when button disallowed due to permanent automatic mode [CHAR LIMIT=NONE] -->
+ <string name="manual_mode_disallowed_summary">Unavailable when connected to <xliff:g id="carrier" example="verizon">%1$s</xliff:g></string>
+
+ <!-- Used for EmergencyInfoSlice slice helper class -->
+ <string name="emergency_info_contextual_card_summary" translatable="false">Medical info, emergency contacts</string>
+
+ <!-- See more items in contextual homepage [CHAR LIMIT=30]-->
+ <string name="see_more">See more</string>
+ <!-- See less items in contextual homepage [CHAR LIMIT=30]-->
+ <string name="see_less">See less</string>
+
+ <!-- Title for Network connection request Dialog [CHAR LIMIT=30] -->
+ <string name="network_connection_request_dialog_title">Choose device</string>
+
+ <plurals name="show_connected_devices">
+ <item quantity="one"><xliff:g id="number_device_count">%1$d</xliff:g> device connected</item>
+ <item quantity="other"><xliff:g id="number_device_count">%1$d</xliff:g> devices connected</item>
+ </plurals>
+ <!-- Title for no connected devices in connected device slice. [CHAR LIMIT=NONE] -->
+ <string name="no_connected_devices">No connected devices</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 88ff2bb..83971b6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -333,10 +333,6 @@
<item name="android:padding">8dp</item>
</style>
- <style name="SuggestionConditionStyle">
- <item name="android:background">?android:attr/colorPrimary</item>
- </style>
-
<style name="SuggestionCardText">
<item name="android:textAlignment">viewStart</item>
</style>
@@ -458,9 +454,13 @@
<item name="android:paddingBottom">24dp</item>
</style>
- <style name="master_clear_item_label" parent="android:Widget.TextView">
- <item name="android:textDirection">locale</item>
- <item name="android:textSize">18sp</item>
+ <style name="ContextualCardStyle">
+ <item name="android:layout_marginTop">@dimen/homepage_card_vertical_margin</item>
+ <item name="android:layout_marginBottom">@dimen/homepage_card_vertical_margin</item>
+ <item name="android:layout_marginStart">@dimen/homepage_card_side_margin</item>
+ <item name="android:layout_marginEnd">@dimen/homepage_card_side_margin</item>
+ <item name="cardCornerRadius">@dimen/homepage_card_corner_radius</item>
+ <item name="cardElevation">@dimen/homepage_card_elevation</item>
</style>
</resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 63944d9..4050cb2 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -85,6 +85,7 @@
<item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
<item name="switchBarBackgroundColor">@color/switch_bar_background</item>
<item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
+ <item name="switchBarRestrictionIcon">@*android:drawable/ic_info</item>
</style>
<style name="Widget.SwitchBar.Switch" parent="@android:style/Widget.Material.CompoundButton.Switch">
@@ -161,32 +162,25 @@
<item name="android:navigationBarColor">#00000000</item>
</style>
- <style name="Theme.BluetoothPermission" parent="@android:style/Theme.Material.Light.Dialog.Alert">
+ <style name="Theme.BluetoothPermission" parent="@style/Theme.AlertDialog">
<item name="android:windowNoTitle">true</item>
</style>
- <style name="Theme.Settings.Home" parent="Theme.AppCompat.DayNight.NoActionBar">
- <!-- Color names copied from frameworks/base/core/res/res/values/themes_device_defaults.xml -->
+ <style name="Theme.Settings.HomeBase" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
- <item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
<item name="colorAccent">@*android:color/accent_device_default_light</item>
+ <item name="preferenceTheme">@style/PreferenceTheme</item>
+
+ <!-- action bar, needed for search bar icon tinting -->
+ <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
</style>
- <!--TODO(b/111875856) This theme will be useless, when we add real activity/fragment to handle the full screen for WifiDialog -->
- <style name="Theme.Settings.WifiDialogFullScreen" parent="Theme.AppCompat.DayNight.NoActionBar">
- <!-- Color names copied from frameworks/base/core/res/res/values/themes_device_defaults.xml -->
- <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
+ <style name="Theme.Settings.Home" parent="Theme.Settings.HomeBase">
<item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
- <item name="colorAccent">@*android:color/accent_device_default_light</item>
-
- <!-- Add white nav bar with divider that matches material -->
- <item name="android:navigationBarDividerColor">@color/ripple_material_light</item>
+ <item name="android:windowLightStatusBar">true</item>
+ <item name="android:navigationBarDividerColor">@*android:color/ripple_material_light</item>
<item name="android:navigationBarColor">@android:color/white</item>
<item name="android:windowLightNavigationBar">true</item>
- <item name="android:windowLightStatusBar">true</item>
-
- <!-- For AndroidX AlertDialog -->
- <item name="alertDialogTheme">@style/Theme.AlertDialog</item>
</style>
</resources>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index f09b2b1..e0d25c9 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -17,7 +17,7 @@
<!-- SUW related themes -->
<resources>
- <style name="GlifTheme" parent="SuwThemeGlif">
+ <style name="GlifTheme" parent="SuwThemeGlif.DayNight">
<!-- For all AndroidX Alert Dialogs -->
<item name="alertDialogTheme">@style/ThemeOverlay.AlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -55,7 +55,7 @@
<item name="*android:colorError">@color/glif_error_color</item>
</style>
- <style name="GlifV2Theme" parent="SuwThemeGlifV2">
+ <style name="GlifV2Theme" parent="SuwThemeGlifV2.DayNight">
<!-- For all AndroidX Alert Dialogs -->
<item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -93,7 +93,7 @@
<item name="*android:colorError">@color/glif_error_color</item>
</style>
- <style name="GlifV3Theme" parent="SuwThemeGlifV3">
+ <style name="GlifV3Theme" parent="SuwThemeGlifV3.DayNight">
<!-- For all AndroidX Alert Dialogs -->
<item name="alertDialogTheme">@style/GlifV2ThemeAlertDialog</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -183,7 +183,6 @@
<!-- Accessibility portion of Setup Wizard -->
<style name="SetupWizardAccessibilityTheme" parent="Theme.SettingsBase">
- <item name="android:windowLightStatusBar">false</item>
<item name="android:colorPrimary">@color/material_grey_100</item>
<item name="android:colorAccent">@color/material_blue_700</item>
<item name="android:titleTextColor">@color/material_blue_700</item>
diff --git a/res/xml/accessibility_magnification_settings.xml b/res/xml/accessibility_magnification_settings.xml
index bac01bd..bb40394 100644
--- a/res/xml/accessibility_magnification_settings.xml
+++ b/res/xml/accessibility_magnification_settings.xml
@@ -13,10 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="magnification_preference_screen_title"
- android:title="@string/accessibility_screen_magnification_title">
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="magnification_preference_screen_title"
+ android:title="@string/accessibility_screen_magnification_title"
+ settings:searchable="false">
<Preference
android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"
android:key="screen_magnification_gestures_preference_screen"
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index e36f578..a76bef7 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -38,7 +38,8 @@
<Preference
android:key="tts_settings_preference"
android:fragment="com.android.settings.tts.TextToSpeechSettings"
- android:title="@string/tts_settings_title"/>
+ android:title="@string/tts_settings_title"
+ settings:searchable="false"/>
</PreferenceCategory>
<PreferenceCategory
@@ -46,14 +47,16 @@
android:title="@string/display_category_title">
<Preference
- android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
+ android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
android:key="font_size_preference_screen"
- android:title="@string/title_font_size" />
+ android:title="@string/title_font_size"
+ settings:searchable="false"/>
<com.android.settings.display.ScreenZoomPreference
android:key="accessibility_settings_screen_zoom"
android:fragment="com.android.settings.display.ScreenZoomSettings"
- android:title="@string/screen_zoom_title" />
+ android:title="@string/screen_zoom_title"
+ settings:searchable="false"/>
<Preference
android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
@@ -77,7 +80,8 @@
<Preference
android:fragment="com.android.settings.accessibility.ToggleAutoclickPreferenceFragment"
android:key="autoclick_preference"
- android:title="@string/accessibility_autoclick_preference_title"/>
+ android:title="@string/accessibility_autoclick_preference_title"
+ settings:searchable="false"/>
<SwitchPreference
android:key="toggle_power_button_ends_call_preference"
@@ -136,7 +140,8 @@
android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
android:key="daltonizer_preference"
android:title="@string/accessibility_display_daltonizer_preference_title"
- android:icon="@drawable/ic_daltonizer"/>
+ android:icon="@drawable/ic_daltonizer"
+ settings:searchable="false"/>
<SwitchPreference
android:key="toggle_inversion_preference"
diff --git a/res/xml/accessibility_settings_for_setup_wizard.xml b/res/xml/accessibility_settings_for_setup_wizard.xml
index c1141ab..738bb8e 100644
--- a/res/xml/accessibility_settings_for_setup_wizard.xml
+++ b/res/xml/accessibility_settings_for_setup_wizard.xml
@@ -33,7 +33,7 @@
<Preference
android:fragment=
- "com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard"
+ "com.android.settings.display.FontSizePreferenceFragmentForSetupWizard"
android:key="font_size_preference"
android:title="@string/title_font_size"
android:summary="@string/short_summary_font_size" />
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index dd661e0..c15df75 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -34,18 +34,18 @@
android:title="@string/applications_settings"
android:key="all_app_info"
android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
- android:order="20" />
+ android:order="20"/>
</PreferenceCategory>
<!-- Empty category to draw divider -->
<PreferenceCategory
android:key="all_app_info_divider"
- android:order="-190" />
+ android:order="-190"/>
<!-- Notifications (appears before manage_perms), default apps (appears after) -->
<PreferenceCategory
android:key="dashboard_tile_placeholder"
- android:order="10" />
+ android:order="10"/>
<Preference
android:key="manage_perms"
@@ -53,7 +53,7 @@
android:order="12"
settings:keywords="@string/keywords_app_permissions"
settings:controller="com.android.settings.applications.AppPermissionsPreferenceController">
- <intent android:action="android.intent.action.MANAGE_PERMISSIONS" />
+ <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
</Preference>
<com.android.settingslib.RestrictedPreference
@@ -64,13 +64,14 @@
<intent
android:action="android.intent.action.MAIN"
android:targetPackage="com.android.cellbroadcastreceiver"
- android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
+ android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
</com.android.settingslib.RestrictedPreference>
<Preference
android:key="special_access"
android:fragment="com.android.settings.applications.specialaccess.SpecialAccessSettings"
android:title="@string/special_access"
- android:order="20" />
+ android:order="20"
+ settings:controller="com.android.settings.applications.SpecialAppAccessPreferenceController"/>
</PreferenceScreen>
diff --git a/res/xml/app_default_settings.xml b/res/xml/app_default_settings.xml
index 3b7c80b..a993aa1 100644
--- a/res/xml/app_default_settings.xml
+++ b/res/xml/app_default_settings.xml
@@ -21,59 +21,59 @@
android:key="app_default_settings_screen"
android:title="@string/app_default_dashboard_title">
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="assist_and_voice_input"
android:title="@string/assist_and_voice_input_title"
android:fragment="com.android.settings.applications.assist.ManageAssist"
- settings:keywords="@string/keywords_assist_input"/>
+ settings:searchable="false"/>
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_browser"
android:title="@string/default_browser_title"
android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
settings:keywords="@string/keywords_default_browser">
<extra android:name="for_work" android:value="false" />
- </com.android.settings.widget.AppPreference>
+ </com.android.settingslib.widget.apppreference.AppPreference>
- <com.android.settings.widget.GearPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_home"
android:title="@string/home_app"
android:fragment="com.android.settings.applications.defaultapps.DefaultHomePicker"
settings:keywords="@string/keywords_home" />
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_phone_app"
android:title="@string/default_phone_title"
android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
settings:keywords="@string/keywords_default_phone_app" />
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_sms_app"
android:title="@string/sms_application_title"
android:fragment="com.android.settings.applications.defaultapps.DefaultSmsPicker"
settings:keywords="@string/keywords_more_default_sms_app" />
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_payment_app"
android:title="@string/nfc_payment_settings_title"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.nfc.PaymentSettings"
settings:keywords="@string/keywords_default_payment_app"/>
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_emergency_app"
android:title="@string/default_emergency_app"
settings:keywords="@string/keywords_emergency_app" />
<!--
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="default_notification_asst_app"
android:title="@string/default_notification_assistant"
android:fragment="com.android.settings.applications.defaultapps.DefaultNotificationAssistantPicker"
/>
-->
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="domain_urls"
android:title="@string/domain_urls_title"
android:fragment="com.android.settings.applications.managedomainurls.ManageDomainUrls"
@@ -83,20 +83,21 @@
android:key="work_app_defaults"
android:title="@string/default_for_work">
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="work_default_browser"
android:title="@string/default_browser_title"
- android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker">
+ android:fragment="com.android.settings.applications.defaultapps.DefaultBrowserPicker"
+ settings:searchable="false">
<extra android:name="for_work" android:value="true" />
- </com.android.settings.widget.AppPreference>
+ </com.android.settingslib.widget.apppreference.AppPreference>
- <com.android.settings.widget.AppPreference
+ <com.android.settingslib.widget.apppreference.AppPreference
android:key="work_default_phone_app"
android:title="@string/default_phone_title"
android:fragment="com.android.settings.applications.defaultapps.DefaultPhonePicker"
- settings:keywords="@string/keywords_default_phone_app">
+ settings:searchable="false">
<extra android:name="for_work" android:value="true" />
- </com.android.settings.widget.AppPreference>
+ </com.android.settingslib.widget.apppreference.AppPreference>
</com.android.settings.widget.WorkOnlyCategory>
diff --git a/res/xml/app_info_settings.xml b/res/xml/app_info_settings.xml
index 684d032..81afc1a 100644
--- a/res/xml/app_info_settings.xml
+++ b/res/xml/app_info_settings.xml
@@ -68,6 +68,12 @@
settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceController" />
<Preference
+ android:key="data_settings_v2"
+ android:title="@string/data_usage_app_summary_title"
+ android:summary="@string/summary_placeholder"
+ settings:controller="com.android.settings.applications.appinfo.AppDataUsagePreferenceControllerV2" />
+
+ <Preference
android:key="time_spent_in_app"
android:title="@string/time_spent_in_app_pref_title"
settings:controller="com.android.settings.applications.appinfo.TimeSpentInAppPreferenceController" />
diff --git a/res/xml/app_storage_settings.xml b/res/xml/app_storage_settings.xml
index ba18b1f..cbde0ca 100644
--- a/res/xml/app_storage_settings.xml
+++ b/res/xml/app_storage_settings.xml
@@ -75,7 +75,7 @@
<PreferenceCategory
android:key="uri_category"
- android:layout="@layout/headerless_preference_category"
+ android:layout="@layout/preference_category_no_label"
settings:allowDividerAbove="false"
settings:allowDividerBelow="false">
<com.android.settings.applications.LayoutPreference
diff --git a/res/xml/appwidget_info.xml b/res/xml/appwidget_info.xml
deleted file mode 100644
index 2d8c81e..0000000
--- a/res/xml/appwidget_info.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
- android:minWidth="@dimen/appwidget_min_width"
- android:minHeight="@dimen/appwidget_min_height"
- android:previewImage="@drawable/preview"
- android:initialLayout="@layout/widget"
- >
-</appwidget-provider>
diff --git a/res/layout/dashboard_spacer.xml b/res/xml/choose_network.xml
similarity index 64%
rename from res/layout/dashboard_spacer.xml
rename to res/xml/choose_network.xml
index 3ebcb09..97ea9be 100644
--- a/res/layout/dashboard_spacer.xml
+++ b/res/xml/choose_network.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- 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.
@@ -14,8 +14,15 @@
limitations under the License.
-->
-<View
+<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="8dp"
- android:background="?android:attr/colorSecondary"/>
+ android:key="mobile_choose_network_pref_screen"
+ android:title="@string/choose_network_title">
+
+ <PreferenceCategory
+ android:key="connected_network_operator_preference"/>
+
+ <PreferenceCategory
+ android:key="network_operators_preference"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index fbb464c..e4d948b 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -23,7 +23,8 @@
<com.android.settings.RestrictedListPreference
android:key="lock_screen_notifications"
android:title="@string/lock_screen_notifications_title"
- android:summary="@string/summary_placeholder"/>
+ android:summary="@string/summary_placeholder"
+ settings:searchable="false"/>
<!-- Notification badging -->
<SwitchPreference
@@ -35,7 +36,7 @@
<SwitchPreference
android:key="notification_pulse"
android:title="@string/notification_pulse_title"
- settings:controller="com.android.settings.notification.PulseNotificationPreferenceController" />
+ settings:controller="com.android.settings.notification.PulseNotificationPreferenceController"/>
<!-- Default notification ringtone -->
<com.android.settings.DefaultRingtonePreference
@@ -43,13 +44,13 @@
android:title="@string/notification_ringtone_title"
android:dialogTitle="@string/notification_ringtone_title"
android:summary="@string/summary_placeholder"
- android:ringtoneType="notification" />
+ android:ringtoneType="notification"/>
<Preference
android:key="gesture_swipe_down_fingerprint_notifications"
android:title="@string/fingerprint_swipe_for_notifications_title"
android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"
- settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController" />
+ settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController"/>
<com.android.settingslib.RestrictedPreference
android:key="zen_mode_notifications"
@@ -57,7 +58,7 @@
settings:useAdminDisabledSummary="true"
android:fragment="com.android.settings.notification.ZenModeSettings"
settings:controller="com.android.settings.notification.ZenModePreferenceController"
- settings:allowDividerAbove="false" />
+ settings:allowDividerAbove="false"/>
<!-- Empty category to draw divider -->
<PreferenceCategory
@@ -79,7 +80,7 @@
android:order="22">
<extra
android:name="classname"
- android:value="com.android.settings.Settings$NotificationAppListActivity" />
+ android:value="com.android.settings.Settings$NotificationAppListActivity"/>
</Preference>
</PreferenceCategory>
@@ -88,13 +89,15 @@
<PreferenceCategory
android:key="lock_screen_notifications_profile_header"
android:title="@string/profile_section_header"
- android:order="23">
+ android:order="23"
+ settings:searchable="false">
<com.android.settings.RestrictedListPreference
android:key="lock_screen_notifications_profile"
android:title="@string/locked_work_profile_notification_title"
android:summary="@string/summary_placeholder"
- android:order="24"/>
+ android:order="24"
+ settings:searchable="false"/>
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/connected_devices.xml b/res/xml/connected_devices.xml
index 424ca75..29c9e01 100644
--- a/res/xml/connected_devices.xml
+++ b/res/xml/connected_devices.xml
@@ -41,18 +41,24 @@
settings:useAdminDisabledSummary="true"
settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>
- <Preference
+ <PreferenceCategory
android:key="previously_connected_devices"
android:title="@string/connected_device_previously_connected_title"
- android:icon="@drawable/ic_devices_other_black"
- android:fragment="com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment"
- settings:allowDividerAbove="true"
- settings:controller="com.android.settings.connecteddevice.PreviouslyConnectedDevicePreferenceController"/>
+ settings:controller="com.android.settings.connecteddevice.PreviouslyConnectedDevicePreferenceController">
+
+ <Preference
+ android:key="previously_connected_devices_see_all"
+ android:title="@string/previous_connected_see_all"
+ android:icon="@drawable/ic_chevron_right_24dp"
+ android:order="10"
+ android:fragment="com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment"/>
+ </PreferenceCategory>
<Preference
android:key="connection_preferences"
android:title="@string/connected_device_connections_title"
android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"
+ settings:allowDividerAbove="true"
settings:controller="com.android.settings.connecteddevice.AdvancedConnectedDeviceController"/>
</PreferenceScreen>
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index 2ff27c9..a959d02 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -25,7 +25,8 @@
android:key="bluetooth_settings"
android:title="@string/bluetooth_settings_title"
android:icon="@drawable/ic_settings_bluetooth"
- android:order="-9"/>
+ android:order="-9"
+ settings:searchable="false"/>
<SwitchPreference
android:key="toggle_nfc"
@@ -57,7 +58,8 @@
android:summary="@string/summary_placeholder"
android:icon="@drawable/ic_settings_print"
android:fragment="com.android.settings.print.PrintSettingsFragment"
- android:order="-3"/>
+ android:order="-3"
+ settings:searchable="false"/>
<Preference
android:key="bt_received_files"
diff --git a/res/xml/default_autofill_picker_settings.xml b/res/xml/default_autofill_picker_settings.xml
new file mode 100644
index 0000000..da72b43
--- /dev/null
+++ b/res/xml/default_autofill_picker_settings.xml
@@ -0,0 +1,46 @@
+<?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.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="default_autofill_picker"
+ android:title="@string/autofill_app"
+ settings:keywords="@string/autofill_keywords">
+
+ <com.android.settings.widget.GearPreference
+ android:key="default_autofill_main"
+ android:title="@string/autofill_app"
+ android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
+ settings:keywords="@string/autofill_keywords">
+ <extra android:name="for_work" android:value="false" />
+ </com.android.settings.widget.GearPreference>
+
+
+ <com.android.settings.widget.WorkOnlyCategory
+ android:key="autofill_work_app_defaults"
+ android:title="@string/default_for_work">
+
+ <com.android.settings.widget.GearPreference
+ android:key="default_autofill_work"
+ android:title="@string/autofill_app"
+ android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
+ settings:keywords="@string/autofill_keywords">
+ <extra android:name="for_work" android:value="true" />
+ </com.android.settings.widget.GearPreference>
+ </com.android.settings.widget.WorkOnlyCategory>
+</PreferenceScreen>
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index b0c7c9c..6528cf7 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -183,7 +183,8 @@
<Preference
android:key="feature_flags_dashboard"
android:title="@string/feature_flags_dashboard_title"
- android:fragment="com.android.settings.development.featureflags.FeatureFlagsDashboard" />
+ android:fragment="com.android.settings.development.featureflags.FeatureFlagsDashboard"
+ settings:searchable="false" />
<SwitchPreference
android:key="enable_gpu_debug_layers"
@@ -233,6 +234,11 @@
android:title="@string/usb_default_label"/>
<SwitchPreference
+ android:key="cbrs_data_switch"
+ android:title="@string/cbrs_data_switch"
+ android:summary="@string/cbrs_data_switch" />
+
+ <SwitchPreference
android:key="bluetooth_show_devices_without_names"
android:title="@string/bluetooth_show_devices_without_names"
android:summary="@string/bluetooth_show_devices_without_names_summary" />
@@ -413,6 +419,9 @@
android:summary="%s"
android:title="@string/simulate_color_space" />
+ <Preference android:key="angle_enabled_app"
+ android:title="@string/angle_enabled_app" />
+
</PreferenceCategory>
<PreferenceCategory
@@ -504,6 +513,11 @@
<Preference
android:key="reset_shortcut_manager_throttling"
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" />
</PreferenceCategory>
<com.android.settings.development.autofill.AutofillPreferenceCategory
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 0686bdb..b0e362c 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -37,20 +37,22 @@
android:fragment="com.android.settings.display.NightDisplaySettings"
android:widgetLayout="@null"
settings:widgetLayout="@null"
- settings:keywords="@string/keywords_display_night_display" />
+ settings:searchable="false" />
<Preference
android:key="auto_brightness_entry"
android:title="@string/auto_brightness_title"
android:summary="@string/summary_placeholder"
android:fragment="com.android.settings.display.AutoBrightnessSettings"
+ settings:searchable="false"
settings:controller="com.android.settings.display.AutoBrightnessPreferenceController" />
<com.android.settingslib.RestrictedPreference
android:key="wallpaper"
android:title="@string/wallpaper_settings_title"
settings:keywords="@string/keywords_display_wallpaper"
- settings:useAdminDisabledSummary="true">
+ settings:useAdminDisabledSummary="true"
+ settings:controller="com.android.settings.display.WallpaperPreferenceController">
<intent
android:targetPackage="@string/config_wallpaper_picker_package"
android:targetClass="@string/config_wallpaper_picker_class" />
@@ -81,14 +83,14 @@
<Preference
android:key="font_size"
android:title="@string/title_font_size"
- android:fragment="com.android.settings.accessibility.ToggleFontSizePreferenceFragment"
+ android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
settings:controller="com.android.settings.display.FontSizePreferenceController" />
<com.android.settings.display.ScreenZoomPreference
android:key="display_settings_screen_zoom"
android:title="@string/screen_zoom_title"
android:fragment="com.android.settings.display.ScreenZoomSettings"
- settings:keywords="@string/screen_zoom_keywords" />
+ settings:searchable="false"/>
<SwitchPreference
android:key="show_operator_name"
@@ -99,7 +101,7 @@
android:key="screensaver"
android:title="@string/screensaver_settings_title"
android:fragment="com.android.settings.dream.DreamSettings"
- settings:controller="com.android.settings.dream.DreamEntryPreferenceController" />
+ settings:searchable="false" />
<com.android.settingslib.RestrictedPreference
android:key="lockscreen_from_display_settings"
diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml
index 0aa1415..4fa50e7 100644
--- a/res/xml/enterprise_privacy_settings.xml
+++ b/res/xml/enterprise_privacy_settings.xml
@@ -83,9 +83,6 @@
<Preference android:key="ca_certs_managed_profile"
android:title="@string/enterprise_privacy_ca_certs_work"
android:selectable="false"/>
- <Preference android:key="backups_enabled"
- android:title="@string/enterprise_privacy_backups_enabled"
- android:selectable="false"/>
</PreferenceCategory>
<PreferenceCategory android:key="device_access_category"
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 9f69102..df86251 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -28,6 +28,18 @@
settings:controller="com.android.settings.gestures.AssistGestureSettingsPreferenceController" />
<Preference
+ android:key="gesture_wake_screen_input_summary"
+ android:title="@string/ambient_display_wake_screen_title"
+ android:fragment="com.android.settings.gestures.WakeScreenGestureSettings"
+ settings:controller="com.android.settings.gestures.WakeScreenGesturePreferenceController" />
+
+ <Preference
+ android:key="gesture_wake_lock_screen_summary"
+ android:title="@string/ambient_display_wake_lock_screen_title"
+ android:fragment="com.android.settings.gestures.WakeLockScreenGestureSettings"
+ settings:controller="com.android.settings.gestures.WakeLockScreenGesturePreferenceController" />
+
+ <Preference
android:key="gesture_swipe_down_fingerprint_input_summary"
android:title="@string/fingerprint_swipe_for_notifications_title"
android:fragment="com.android.settings.gestures.SwipeToNotificationSettings"
diff --git a/res/xml/gsm_umts_options.xml b/res/xml/gsm_umts_options.xml
new file mode 100644
index 0000000..cf56595
--- /dev/null
+++ b/res/xml/gsm_umts_options.xml
@@ -0,0 +1,37 @@
+<?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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+ <!--We want separate APN setting from reset of settings because-->
+ <!--we want user to change it with caution.-->
+ <PreferenceCategory
+ android:key="category_gsm_apn_key"
+ android:layout="@layout/preference_category_no_label">
+
+ <com.android.settingslib.RestrictedPreference
+ android:key="button_gsm_apn_key"
+ android:title="@string/apn_settings"
+ android:persistent="false" />
+ </PreferenceCategory>
+
+ <PreferenceScreen
+ android:key="carrier_settings_key"
+ android:title="@string/carrier_settings_title">
+ <!-- b/114749736, create a preference controller to build intent -->
+ </PreferenceScreen>
+
+</PreferenceScreen>
diff --git a/res/xml/installed_app_details.xml b/res/xml/installed_app_details.xml
deleted file mode 100644
index 42822c0..0000000
--- a/res/xml/installed_app_details.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2016 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:key="installed_app_detail_settings_screen"
- app:initialExpandedChildrenCount="6">
-
- <com.android.settings.applications.LayoutPreference
- android:key="header_view"
- android:layout="@layout/settings_entity_header"
- android:selectable="false"
- android:order="-10000"/>
-
- <com.android.settings.applications.LayoutPreference
- android:key="instant_app_buttons"
- android:layout="@layout/instant_app_buttons"
- android:selectable="false"
- android:order="-9999"/>
-
- <com.android.settings.widget.ActionButtonPreference
- android:key="action_buttons"
- android:order="-9998" />
-
- <Preference
- android:key="notification_settings"
- android:title="@string/notifications_label"
- android:selectable="true"/>
-
- <com.android.settings.widget.FixedLineSummaryPreference
- android:key="permission_settings"
- android:title="@string/permissions_label"
- android:summary="@string/summary_placeholder"
- android:selectable="true"
- app:summaryLineCount="1" />
-
- <Preference
- android:key="storage_settings"
- android:title="@string/storage_settings"
- android:summary="@string/summary_placeholder"
- android:selectable="true"/>
-
- <com.android.settings.applications.AppDomainsPreference
- android:key="instant_app_launch_supported_domain_urls"
- android:title="@string/app_launch_supported_domain_urls_title"
- android:selectable="true" />
-
- <Preference
- android:key="data_settings"
- android:title="@string/data_usage_summary_title"
- android:summary="@string/summary_placeholder"
- android:selectable="true"/>
-
- <Preference
- android:key="battery"
- android:title="@string/power_usage_summary_title"
- android:summary="@string/summary_placeholder"
- android:selectable="true"/>
-
- <Preference
- android:key="preferred_settings"
- android:title="@string/launch_by_default"
- android:summary="@string/summary_placeholder"
- android:selectable="true"/>
-
- <Preference
- android:key="memory"
- android:title="@string/memory_settings_title"
- android:summary="@string/summary_placeholder"
- android:enabled="false"
- android:selectable="true"/>
-
- <Preference
- android:key="app_version"
- android:selectable="false"
- android:order="9999"/>
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index ec15f0d..8b63e32 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -39,7 +39,8 @@
android:key="physical_keyboard_pref"
android:title="@string/physical_keyboard_title"
android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment" />
+ android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment"
+ settings:searchable="false"/>
</PreferenceCategory>
<PreferenceCategory
@@ -54,10 +55,10 @@
android:persistent="false"
android:fragment="com.android.settings.inputmethod.SpellCheckersSettings" />
- <com.android.settings.widget.GearPreference
+ <Preference
android:key="default_autofill"
android:title="@string/autofill_app"
- android:fragment="com.android.settings.applications.defaultapps.DefaultAutofillPicker"
+ android:fragment="com.android.settings.applications.defaultapps.AutofillPicker"
settings:keywords="@string/autofill_keywords" />
<!-- User dictionary preference title and fragment will be set programmatically. -->
@@ -80,7 +81,8 @@
<Preference
android:key="tts_settings_summary"
android:title="@string/tts_settings_title"
- android:fragment="com.android.settings.tts.TextToSpeechSettings" />
+ android:fragment="com.android.settings.tts.TextToSpeechSettings"
+ settings:searchable="false"/>
</PreferenceCategory>
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 22079bf..b53e986 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -29,7 +29,8 @@
android:title="@string/location_recent_location_requests_see_all"
android:icon="@drawable/ic_chevron_right_24dp"
android:selectable="true"
- android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"/>
+ android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
+ settings:searchable="false"/>
<PreferenceCategory
android:key="location_advanced_settings"
diff --git a/res/xml/manage_assist.xml b/res/xml/manage_assist.xml
index dec8bc3..a2b2ad5 100644
--- a/res/xml/manage_assist.xml
+++ b/res/xml/manage_assist.xml
@@ -19,7 +19,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="manage_assist_screen"
- android:title="@string/assist_and_voice_input_title">
+ android:title="@string/assist_and_voice_input_title"
+ settings:keywords="@string/keywords_assist_input">
<com.android.settings.widget.GearPreference
android:key="default_assist"
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
new file mode 100644
index 0000000..0478664
--- /dev/null
+++ b/res/xml/mobile_network_settings.xml
@@ -0,0 +1,151 @@
+<?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.
+-->
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="mobile_network_pref_screen"
+ android:title="@string/network_settings_title"
+ settings:initialExpandedChildrenCount="4">
+
+ <Preference
+ android:key="cdma_lte_data_service_key"
+ android:title="@string/cdma_lte_data_service"
+ settings:controller="com.android.settings.network.telephony.DataServiceSetupPreferenceController">
+ </Preference>
+
+ <SwitchPreference
+ android:key="mobile_data_enable"
+ android:title="@string/mobile_data_settings_title"
+ android:summary="@string/mobile_data_settings_summary"
+ settings:controller="com.android.settings.network.telephony.MobileDataPreferenceController"/>
+
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="button_roaming_key"
+ android:title="@string/roaming"
+ android:persistent="false"
+ android:summaryOn="@string/roaming_enable"
+ android:summaryOff="@string/roaming_disable"
+ settings:userRestriction="no_data_roaming"
+ settings:controller="com.android.settings.network.telephony.RoamingPreferenceController"/>
+
+ <Preference
+ android:key="data_usage_summary"
+ android:title="@string/mobile_data_usage_title"
+ settings:controller="com.android.settings.network.telephony.DataUsagePreferenceController"/>
+
+ <SwitchPreference
+ android:key="enhanced_4g_lte"
+ android:title="@string/enhanced_4g_lte_mode_title"
+ android:persistent="false"
+ android:summary="@string/enhanced_4g_lte_mode_summary"
+ settings:controller="com.android.settings.network.telephony.Enhanced4gLtePreferenceController"/>
+
+ <ListPreference
+ android:key="preferred_network_mode_key"
+ android:title="@string/preferred_network_mode_title"
+ android:summary="@string/preferred_network_mode_summary"
+ android:entries="@array/preferred_network_mode_choices"
+ android:entryValues="@array/preferred_network_mode_values"
+ android:dialogTitle="@string/preferred_network_mode_dialogtitle"
+ settings:controller="com.android.settings.network.telephony.PreferredNetworkModePreferenceController"/>
+
+ <ListPreference
+ android:key="enabled_networks_key"
+ android:title="@string/preferred_network_mode_title"
+ android:summary="@string/preferred_network_mode_summary"
+ android:entries="@array/enabled_networks_choices"
+ android:entryValues="@array/enabled_networks_values"
+ android:dialogTitle="@string/preferred_network_mode_dialogtitle"
+ settings:controller="com.android.settings.network.telephony.EnabledNetworkModePreferenceController"/>
+
+ <Preference
+ android:key="carrier_settings_euicc_key"
+ android:title="@string/carrier_settings_euicc"
+ settings:controller="com.android.settings.network.telephony.EuiccPreferenceController" />
+
+ <PreferenceCategory
+ android:key="calling_category"
+ android:title="@string/call_category">
+
+ <PreferenceScreen
+ android:key="wifi_calling_key"
+ android:title="@string/wifi_calling_settings_title"
+ settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController" >
+ <intent android:action="android.intent.action.MAIN"
+ android:targetPackage="com.android.settings"
+ android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity">
+ <extra android:name="show_drawer_menu" android:value="true" />
+ </intent>
+ </PreferenceScreen>
+
+ <SwitchPreference
+ android:key="video_calling_key"
+ android:title="@string/video_calling_settings_title"
+ android:persistent="true"
+ settings:controller="com.android.settings.network.telephony.VideoCallingPreferenceController" />
+
+ </PreferenceCategory>
+
+ <com.android.settings.network.telephony.cdma.CdmaListPreference
+ android:key="cdma_system_select_key"
+ android:title="@string/cdma_system_select_title"
+ android:summary="@string/cdma_system_select_summary"
+ android:entries="@array/cdma_system_select_choices"
+ android:entryValues="@array/cdma_system_select_values"
+ android:dialogTitle="@string/cdma_system_select_dialogtitle"
+ settings:controller="com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController"/>
+
+ <com.android.settings.network.telephony.cdma.CdmaListPreference
+ android:key="cdma_subscription_key"
+ android:title="@string/cdma_subscription_title"
+ android:summary="@string/cdma_subscription_summary"
+ android:entries="@array/cdma_subscription_choices"
+ android:entryValues="@array/cdma_subscription_values"
+ android:dialogTitle="@string/cdma_subscription_dialogtitle"
+ settings:controller="com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController"/>
+
+ <PreferenceCategory
+ android:key="network_operators_category_key"
+ android:title="@string/network_operator_category"
+ settings:controller="com.android.settings.widget.PreferenceCategoryController">
+
+ <SwitchPreference
+ android:key="auto_select_key"
+ android:title="@string/select_automatically"
+ settings:controller="com.android.settings.network.telephony.gsm.AutoSelectPreferenceController"/>
+
+ <Preference
+ android:key="choose_network_key"
+ android:title="@string/choose_network_title"
+ android:fragment="com.android.phone.NetworkSelectSetting"
+ settings:controller="com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController"/>
+ </PreferenceCategory>
+
+ <!--We want separate APN setting from reset of settings because we want user to change it with caution-->
+ <com.android.settingslib.RestrictedPreference
+ android:key="telephony_apn_key"
+ android:persistent="false"
+ android:title="@string/apn_settings"
+ settings:allowDividerAbove="true"
+ settings:controller="com.android.settings.network.telephony.ApnPreferenceController"/>
+
+ <Preference
+ android:key="carrier_settings_key"
+ android:title="@string/carrier_settings_title"
+ settings:controller="com.android.settings.network.telephony.CarrierPreferenceController">
+ </Preference>
+
+</PreferenceScreen>
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 22c1844..7165218 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -47,7 +47,10 @@
android:order="3"
android:title="@string/status_number"
android:summary="@string/summary_placeholder"
- android:selectable="false"/>
+ android:selectable="false"
+ settings:allowDynamicSummaryInSlice="true"
+ settings:controller=
+ "com.android.settings.deviceinfo.PhoneNumberPreferenceController" />
<Preference
android:key="emergency_info"
@@ -61,7 +64,8 @@
android:order="5"
android:title="@string/legal_information"
android:fragment="com.android.settings.LegalSettings"
- settings:allowDividerAbove="true"/>
+ settings:allowDividerAbove="true"
+ settings:searchable="false"/>
<!-- Regulatory labels -->
<Preference
@@ -71,10 +75,18 @@
<intent android:action="android.settings.SHOW_REGULATORY_INFO"/>
</Preference>
+ <!-- Safety & regulatory manual -->
+ <Preference
+ android:key="safety_info"
+ android:order="7"
+ android:title="@string/safety_and_regulatory_info">
+ <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
+ </Preference>
+
<!-- SIM status -->
<Preference
android:key="sim_status"
- android:order="7"
+ android:order="8"
android:title="@string/sim_status_title"
settings:keywords="@string/keywords_sim_status"
android:summary="@string/summary_placeholder"
@@ -87,6 +99,7 @@
android:title="@string/hardware_info"
settings:keywords="@string/keywords_model_and_hardware"
android:summary="@string/summary_placeholder"
+ settings:allowDynamicSummaryInSlice="true"
settings:controller=
"com.android.settings.deviceinfo.DeviceModelPreferenceController" />
@@ -100,11 +113,12 @@
<!-- Android version -->
<Preference
- android:key="my_device_firmware_version"
+ android:key="firmware_version"
android:order="32"
android:title="@string/firmware_version"
settings:keywords="@string/keywords_android_version"
android:summary="@string/summary_placeholder"
+ settings:allowDynamicSummaryInSlice="true"
settings:controller=
"com.android.settings.deviceinfo.firmwareversion.FirmwareVersionPreferenceController" />
@@ -141,14 +155,6 @@
android:summary="@string/summary_placeholder"
android:selectable="false" />
- <!-- Safety & regulatory manual -->
- <Preference
- android:key="safety_info"
- android:order="39"
- android:title="@string/safety_and_regulatory_info">
- <intent android:action="android.settings.SHOW_SAFETY_AND_REGULATORY_INFO"/>
- </Preference>
-
<!-- Manual -->
<Preference
android:key="manual"
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index 0d130e0..8e36e91 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -42,10 +42,6 @@
settings:keywords="@string/keywords_more_mobile_networks"
settings:userRestriction="no_config_mobile_networks"
settings:useAdminDisabledSummary="true">
- <intent
- android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.phone"
- android:targetClass="com.android.phone.MobileNetworkSettings" />
</com.android.settingslib.RestrictedPreference>
<com.android.settingslib.RestrictedPreference
diff --git a/res/xml/network_and_internet_v2.xml b/res/xml/network_and_internet_v2.xml
new file mode 100644
index 0000000..680b268
--- /dev/null
+++ b/res/xml/network_and_internet_v2.xml
@@ -0,0 +1,100 @@
+<?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.
+-->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="network_and_internet_screen"
+ android:title="@string/network_dashboard_title"
+ settings:initialExpandedChildrenCount="5">
+
+ <com.android.settings.widget.MasterSwitchPreference
+ android:fragment="com.android.settings.wifi.WifiSettings"
+ android:key="toggle_wifi"
+ android:title="@string/wifi_settings"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_settings_wireless"
+ android:order="-30">
+ <intent
+ android:action="android.settings.WIFI_SETTINGS"
+ android:targetClass="Settings$WifiSettingsActivity" />
+ </com.android.settings.widget.MasterSwitchPreference>
+
+ <com.android.settingslib.RestrictedPreference
+ android:key="mobile_network_settings"
+ android:title="@string/network_settings_title"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_network_cell"
+ android:order="-15"
+ settings:keywords="@string/keywords_more_mobile_networks"
+ settings:userRestriction="no_config_mobile_networks"
+ settings:useAdminDisabledSummary="true">
+ </com.android.settingslib.RestrictedPreference>
+
+ <com.android.settingslib.RestrictedPreference
+ android:fragment="com.android.settings.TetherSettings"
+ android:key="tether_settings"
+ android:title="@string/tether_settings_title_all"
+ android:icon="@drawable/ic_wifi_tethering"
+ android:order="-5"
+ android:summary="@string/summary_placeholder"
+ settings:keywords="@string/keywords_hotspot_tethering"
+ settings:userRestriction="no_config_tethering"
+ settings:useAdminDisabledSummary="true" />
+
+ <com.android.settingslib.RestrictedPreference
+ android:key="manage_mobile_plan"
+ android:title="@string/manage_mobile_plan_title"
+ android:persistent="false"
+ android:order="0"
+ settings:userRestriction="no_config_mobile_networks"
+ settings:useAdminDisabledSummary="true" />
+
+ <com.android.settingslib.RestrictedSwitchPreference
+ android:key="toggle_airplane"
+ android:title="@string/airplane_mode"
+ android:icon="@drawable/ic_airplanemode_active"
+ android:disableDependentsState="true"
+ android:order="5"
+ settings:controller="com.android.settings.network.AirplaneModePreferenceController"
+ settings:platform_slice="true"
+ settings:userRestriction="no_airplane_mode"/>
+
+ <Preference
+ android:fragment="com.android.settings.ProxySelector"
+ android:key="proxy_settings"
+ android:title="@string/proxy_settings_title" />
+
+ <com.android.settingslib.RestrictedPreference
+ android:fragment="com.android.settings.vpn2.VpnSettings"
+ android:key="vpn_settings"
+ android:title="@string/vpn_settings_title"
+ android:icon="@drawable/ic_vpn_key"
+ android:order="10"
+ android:summary="@string/summary_placeholder"
+ settings:userRestriction="no_config_vpn"
+ settings:useAdminDisabledSummary="true" />
+
+ <com.android.settings.network.PrivateDnsModeDialogPreference
+ android:key="private_dns_settings"
+ android:title="@string/select_private_dns_configuration_title"
+ android:order="15"
+ android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
+ android:dialogLayout="@layout/private_dns_mode_dialog"
+ android:positiveButtonText="@string/save"
+ android:negativeButtonText="@android:string/cancel" />
+
+</PreferenceScreen>
diff --git a/res/xml/power_usage_detail.xml b/res/xml/power_usage_detail.xml
index 0493a51..1891702 100644
--- a/res/xml/power_usage_detail.xml
+++ b/res/xml/power_usage_detail.xml
@@ -15,7 +15,9 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto">
<com.android.settings.applications.LayoutPreference
android:key="header_view"
@@ -30,10 +32,11 @@
<PreferenceCategory
android:title="@string/battery_detail_manage_title">
- <Preference
+ <com.android.settingslib.RestrictedPreference
android:key="background_activity"
android:title="@string/background_activity_title"
- android:selectable="true"/>
+ android:selectable="true"
+ settings:userRestriction="no_control_apps"/>
<Preference
android:key="battery_optimization"
diff --git a/res/xml/screen_lock_settings.xml b/res/xml/screen_lock_settings.xml
index 9b2ef7e..43f96e9 100644
--- a/res/xml/screen_lock_settings.xml
+++ b/res/xml/screen_lock_settings.xml
@@ -17,8 +17,10 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="security_settings_password_sub_screen"
- android:title="@string/unlock_set_unlock_launch_picker_title">
+ android:title="@string/unlock_set_unlock_launch_picker_title"
+ settings:searchable="false">
<!-- available in pattern -->
<SwitchPreference
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index e543ad9..ce271cc 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -95,12 +95,6 @@
android:key="security_settings_misc_category"
android:title="@string/security_passwords_title">
- <Preference
- android:key="location"
- android:title="@string/location_settings_title"
- android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.location.LocationSettings" />
-
<SwitchPreference
android:key="show_password"
android:title="@string/show_password"
diff --git a/res/xml/security_lockscreen_settings.xml b/res/xml/security_lockscreen_settings.xml
index 2cd92c5..f829c8a 100644
--- a/res/xml/security_lockscreen_settings.xml
+++ b/res/xml/security_lockscreen_settings.xml
@@ -27,7 +27,8 @@
<com.android.settings.RestrictedListPreference
android:key="security_setting_lock_screen_notif"
android:title="@string/lock_screen_notifications_title"
- android:summary="@string/summary_placeholder" />
+ android:summary="@string/summary_placeholder"
+ settings:keywords="@string/keywords_lock_screen_notif"/>
<com.android.settingslib.RestrictedSwitchPreference
android:key="security_lockscreen_add_users_when_locked"
@@ -70,6 +71,12 @@
android:fragment="com.android.settings.gestures.PickupGestureSettings"
settings:controller="com.android.settings.gestures.PickupGesturePreferenceController" />
+ <Preference
+ android:key="ambient_display_wake_screen"
+ android:title="@string/ambient_display_wake_screen_title"
+ android:fragment="com.android.settings.gestures.WakeScreenGestureSettings"
+ settings:controller="com.android.settings.gestures.WakeScreenGesturePreferenceController" />
+
<SwitchPreference
android:key="ambient_display_notification"
android:title="@string/doze_title"
@@ -83,12 +90,14 @@
<PreferenceCategory
android:key="security_setting_lock_screen_notif_work_header"
android:title="@string/profile_section_header"
- android:order="1001">
+ android:order="1001"
+ settings:searchable="false">
<com.android.settings.RestrictedListPreference
android:key="security_setting_lock_screen_notif_work"
android:title="@string/locked_work_profile_notification_title"
- android:summary="@string/summary_placeholder" />
+ android:summary="@string/summary_placeholder"
+ settings:searchable="false"/>
</PreferenceCategory>
diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml
index 3dfcfd7..2bdfdc8 100644
--- a/res/xml/security_settings_face.xml
+++ b/res/xml/security_settings_face.xml
@@ -22,21 +22,34 @@
<com.android.settings.widget.VideoPreference
android:key="security_settings_face_video"
+ android:title="@string/summary_placeholder"
app:animation="@raw/gesture_fingerprint_swipe"
- app:preview="@drawable/face_enroll_introduction" />
+ app:preview="@drawable/face_enroll_introduction"
+ app:controller="com.android.settings.widget.VideoPreferenceController"/>
<PreferenceCategory
android:key="security_settings_face_unlock_category"
android:title="@string/security_settings_face_settings_use_face_category">
<SwitchPreference
- android:key="security_settings_face_unlock"
+ android:key="security_settings_face_keyguard"
android:title="@string/security_settings_face_settings_use_face_unlock_phone"
app:keywords="@string/keywords_face_unlock"
- app:controller="com.android.settings.biometrics.face.FaceSettingsUnlockPreferenceController"/>
+ app:controller="com.android.settings.biometrics.face.FaceSettingsKeyguardPreferenceController"/>
+ <SwitchPreference
+ android:key="security_settings_face_app"
+ android:title="@string/security_settings_face_settings_use_face_for_apps"
+ app:keywords="@string/keywords_face_unlock"
+ app:controller="com.android.settings.biometrics.face.FaceSettingsAppPreferenceController"/>
</PreferenceCategory>
<PreferenceCategory
android:key="security_settings_face_manage_category">
+ <SwitchPreference
+ android:key="security_settings_face_require_attention"
+ android:title="@string/security_settings_face_settings_require_attention"
+ app:keywords="@string/keywords_face_unlock"
+ app:controller="com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController"/>
+
<Preference
android:key="security_settings_face_improve"
android:title="@string/security_settings_face_settings_improve_face">
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
new file mode 100644
index 0000000..b5930e4
--- /dev/null
+++ b/res/xml/top_level_settings.xml
@@ -0,0 +1,135 @@
+<?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.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
+ android:key="top_level_settings"
+ android:title="@string/settings_label_launcher">
+
+ <Preference
+ android:key="top_level_network"
+ android:title="@string/network_dashboard_title"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_homepage_network"
+ android:order="-120"
+ android:fragment="com.android.settings.network.NetworkDashboardFragment"
+ settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
+
+ <Preference
+ android:key="top_level_connected_devices"
+ android:title="@string/connected_devices_dashboard_title"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_homepage_connected_device"
+ android:order="-110"
+ android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
+ settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
+
+ <Preference
+ android:key="top_level_apps_and_notifs"
+ android:title="@string/app_and_notification_dashboard_title"
+ android:summary="@string/app_and_notification_dashboard_summary"
+ android:icon="@drawable/ic_homepage_apps"
+ android:order="-100"
+ android:fragment="com.android.settings.applications.AppAndNotificationDashboardFragment"/>
+
+ <Preference
+ android:key="top_level_battery"
+ android:title="@string/power_usage_summary_title"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_homepage_battery"
+ android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
+ android:order="-90"
+ settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
+
+ <Preference
+ android:key="top_level_display"
+ android:title="@string/display_settings"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_homepage_display"
+ android:order="-80"
+ android:fragment="com.android.settings.DisplaySettings"
+ settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
+
+ <Preference
+ android:key="top_level_sound"
+ android:title="@string/sound_settings"
+ android:summary="@string/sound_dashboard_summary"
+ android:icon="@drawable/ic_homepage_sound"
+ android:order="-70"
+ android:fragment="com.android.settings.notification.SoundSettings"/>
+
+ <Preference
+ android:key="top_level_storage"
+ android:title="@string/storage_settings"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_homepage_storage"
+ android:order="-60"
+ android:fragment="com.android.settings.deviceinfo.StorageSettings"
+ settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
+
+ <Preference
+ android:key="top_level_location"
+ android:title="@string/location_settings_title"
+ android:summary="@string/location_settings_summary"
+ android:icon="@drawable/ic_homepage_location"
+ android:order="-50"
+ android:fragment="com.android.settings.location.LocationSettings"/>
+
+ <Preference
+ android:key="top_level_security"
+ android:title="@string/security_settings_title"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_homepage_security"
+ android:order="-40"
+ android:fragment="com.android.settings.security.SecuritySettings"
+ settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
+
+ <Preference
+ android:key="top_level_accounts"
+ android:title="@string/account_dashboard_title"
+ android:summary="@string/summary_placeholder"
+ android:icon="@drawable/ic_homepage_accounts"
+ android:order="-30"
+ android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+ settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
+
+ <Preference
+ android:key="top_level_accessibility"
+ android:title="@string/accessibility_settings"
+ android:summary="@string/accessibility_settings_summary"
+ android:icon="@drawable/ic_homepage_accessibility"
+ android:order="-20"
+ android:fragment="com.android.settings.accessibility.AccessibilitySettings"/>
+
+ <Preference
+ android:key="top_level_system"
+ android:title="@string/header_category_system"
+ android:summary="@string/system_dashboard_summary"
+ android:icon="@drawable/ic_homepage_system_dashboard"
+ android:order="10"
+ android:fragment="com.android.settings.system.SystemDashboardFragment"/>
+
+ <Preference
+ android:key="top_level_support"
+ android:summary="@string/support_summary"
+ android:title="@string/page_tab_title_support"
+ android:icon="@drawable/ic_homepage_support"
+ android:order="100"
+ settings:controller="com.android.settings.support.SupportPreferenceController"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/tts_settings.xml b/res/xml/tts_settings.xml
index be34b28..e76cdb7 100644
--- a/res/xml/tts_settings.xml
+++ b/res/xml/tts_settings.xml
@@ -16,23 +16,21 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="tts_settings_screen"
android:title="@string/tts_settings_title">
- <PreferenceCategory android:key="tts_engine_section">
+ <com.android.settings.widget.GearPreference
+ android:key="tts_engine_preference"
+ android:title="@string/tts_engine_preference_title"
+ android:fragment="com.android.settings.tts.TtsEnginePreferenceFragment"
+ settings:searchable="false"/>
- <com.android.settings.widget.GearPreference
- android:key="tts_engine_preference"
- android:title="@string/tts_engine_preference_title"
- android:fragment="com.android.settings.tts.TtsEnginePreferenceFragment"/>
-
- <ListPreference
- android:key="tts_default_lang"
- android:title="@string/tts_default_lang_title"
- android:summary="@string/tts_default_lang_summary"
- android:persistent="false" />
-
- </PreferenceCategory>
+ <ListPreference
+ android:key="tts_default_lang"
+ android:title="@string/tts_default_lang_title"
+ android:summary="@string/tts_default_lang_summary"
+ android:persistent="false" />
<PreferenceCategory android:key="tts_general_section">
diff --git a/res/xml/usb_details_fragment.xml b/res/xml/usb_details_fragment.xml
index 4efad6d..5c1efcf 100644
--- a/res/xml/usb_details_fragment.xml
+++ b/res/xml/usb_details_fragment.xml
@@ -36,9 +36,4 @@
<PreferenceCategory
android:key="usb_details_power_role"/>
- <!-- Empty category for spacing -->
- <PreferenceCategory
- android:key="usb_details_space"
- settings:allowDividerAbove="false"/>
-
</PreferenceScreen>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 934cb5a..b01e1f3 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -23,7 +23,8 @@
<PreferenceCategory
android:key="user_list"
android:title="@string/user_list_title"
- android:order="10">
+ android:order="10"
+ settings:searchable="false">
</PreferenceCategory>
<com.android.settingslib.RestrictedPreference
diff --git a/res/xml/virtual_keyboard_settings.xml b/res/xml/virtual_keyboard_settings.xml
index 93445f4..78b27f9 100644
--- a/res/xml/virtual_keyboard_settings.xml
+++ b/res/xml/virtual_keyboard_settings.xml
@@ -15,11 +15,13 @@
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="virtual_keyboard_category"
android:title="@string/virtual_keyboard_category">
<!-- Enabled input method list will be populated programmatically here. -->
<Preference
android:key="add_virtual_keyboard_screen"
android:title="@string/add_virtual_keyboard"
- android:fragment="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment" />
+ android:fragment="com.android.settings.inputmethod.AvailableVirtualKeyboardFragment"
+ settings:searchable="false"/>
</PreferenceScreen>
diff --git a/res/xml/wake_lock_screen_gesture_settings.xml b/res/xml/wake_lock_screen_gesture_settings.xml
new file mode 100644
index 0000000..5491bb1
--- /dev/null
+++ b/res/xml/wake_lock_screen_gesture_settings.xml
@@ -0,0 +1,37 @@
+<?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.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:key="gesture_wake_lock_screen_screen"
+ android:title="@string/ambient_display_wake_lock_screen_title">
+
+ <com.android.settings.widget.VideoPreference
+ android:key="gesture_wake_lock_screen_video"
+ app:animation="@raw/gesture_ambient_wake_lock_screen"
+ app:preview="@drawable/gesture_ambient_wake_lock_screen" />
+
+ <SwitchPreference
+ android:key="gesture_wake_lock_screen"
+ android:title="@string/ambient_display_wake_lock_screen_title"
+ android:summary="@string/ambient_display_wake_lock_screen_summary"
+ app:keywords="@string/keywords_gesture"
+ app:controller="com.android.settings.gestures.WakeLockScreenGesturePreferenceController"
+ app:allowDividerAbove="true" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/wake_screen_gesture_settings.xml b/res/xml/wake_screen_gesture_settings.xml
new file mode 100644
index 0000000..7bcb2e9
--- /dev/null
+++ b/res/xml/wake_screen_gesture_settings.xml
@@ -0,0 +1,37 @@
+<?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.
+ -->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:key="gesture_wake_screen_screen"
+ android:title="@string/ambient_display_wake_screen_title">
+
+ <com.android.settings.widget.VideoPreference
+ android:key="gesture_wake_screen_video"
+ app:animation="@raw/gesture_ambient_wake_screen"
+ app:preview="@drawable/gesture_ambient_wake_screen" />
+
+ <SwitchPreference
+ android:key="gesture_wake_screen"
+ android:title="@string/ambient_display_wake_screen_title"
+ android:summary="@string/ambient_display_wake_screen_summary"
+ app:keywords="@string/keywords_gesture"
+ app:controller="com.android.settings.gestures.WakeScreenGesturePreferenceController"
+ app:allowDividerAbove="true" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
index 5e2745a..7c8d9a0 100644
--- a/res/xml/wifi_network_details_fragment.xml
+++ b/res/xml/wifi_network_details_fragment.xml
@@ -56,6 +56,12 @@
android:title="@string/data_usage_metered_yes"
android:entries="@array/wifi_metered_entries"
android:entryValues="@array/wifi_metered_values"/>
+
+ <DropDownPreference
+ android:key="privacy"
+ android:title="@string/wifi_privacy_settings"
+ android:entries="@array/wifi_privacy_entries"
+ android:entryValues="@array/wifi_privacy_values"/>
</PreferenceCategory>
<!-- Network Details -->
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index 4ca9284..516ac0a 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -20,6 +20,9 @@
android:title="@string/wifi_settings"
settings:keywords="@string/keywords_wifi">
+ <com.android.settings.wifi.LinkablePreference
+ android:key="wifi_status_message"/>
+
<PreferenceCategory
android:key="connected_access_point"
android:layout="@layout/preference_category_no_label"/>
@@ -28,17 +31,14 @@
android:key="access_points"
android:layout="@layout/preference_category_no_label"/>
- <PreferenceCategory
- android:key="additional_settings"
- android:layout="@layout/preference_category_no_label">
- <Preference
- android:key="configure_settings"
- android:title="@string/wifi_configure_settings_preference_title"
- android:fragment="com.android.settings.wifi.ConfigureWifiSettings" />
+ <Preference
+ android:key="configure_settings"
+ android:title="@string/wifi_configure_settings_preference_title"
+ settings:allowDividerAbove="true"
+ android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
- <Preference
- android:key="saved_networks"
- android:title="@string/wifi_saved_access_points_label"
- android:fragment="com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings" />
- </PreferenceCategory>
+ <Preference
+ android:key="saved_networks"
+ android:title="@string/wifi_saved_access_points_label"
+ android:fragment="com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings"/>
</PreferenceScreen>
diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml
index 3e8f93f..6c5e3c4 100644
--- a/res/xml/wifi_tether_settings.xml
+++ b/res/xml/wifi_tether_settings.xml
@@ -20,31 +20,32 @@
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">
<com.android.settings.widget.ValidatedEditTextPreference
android:key="wifi_tether_network_name"
android:title="@string/wifi_hotspot_name_title"
- android:summary="@string/summary_placeholder" />
+ android:summary="@string/summary_placeholder"/>
<ListPreference
android:key="wifi_tether_security"
android:title="@string/wifi_security"
android:summary="@string/summary_placeholder"
android:entries="@array/wifi_tether_security"
- android:entryValues="@array/wifi_tether_security_values" />
+ android:entryValues="@array/wifi_tether_security_values"/>
<com.android.settings.widget.ValidatedEditTextPreference
android:key="wifi_tether_network_password"
android:persistent="false"
- android:title="@string/wifi_hotspot_password_title" />
+ android:title="@string/wifi_hotspot_password_title"/>
<SwitchPreference
android:key="wifi_tether_auto_turn_off"
android:title="@string/wifi_hotspot_auto_off_title"
- android:summary="@string/wifi_hotspot_auto_off_summary" />
+ android:summary="@string/wifi_hotspot_auto_off_summary"/>
<ListPreference
android:key="wifi_tether_network_ap_band"
- android:title="@string/wifi_hotspot_ap_band_title" />
+ android:title="@string/wifi_hotspot_ap_band_title"/>
</PreferenceScreen>
diff --git a/res/xml/zen_mode_automation_settings.xml b/res/xml/zen_mode_automation_settings.xml
index 99826ea..dade454 100644
--- a/res/xml/zen_mode_automation_settings.xml
+++ b/res/xml/zen_mode_automation_settings.xml
@@ -19,9 +19,9 @@
android:key="zen_mode_automation_settings_page"
android:title="@string/zen_mode_automation_settings_page_title" >
-
<PreferenceCategory
- android:key="zen_mode_automatic_rules">
+ android:key="zen_mode_automatic_rules"
+ android:title="@string/zen_mode_schedule_title">
<!-- Rules added at runtime -->
</PreferenceCategory>
diff --git a/res/xml/zen_mode_calls_settings.xml b/res/xml/zen_mode_calls_settings.xml
index 2da022c..74b6986 100644
--- a/res/xml/zen_mode_calls_settings.xml
+++ b/res/xml/zen_mode_calls_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_calls_settings_page"
android:title="@string/zen_mode_calls" >
diff --git a/res/xml/zen_mode_messages_settings.xml b/res/xml/zen_mode_messages_settings.xml
new file mode 100644
index 0000000..4ca6c92
--- /dev/null
+++ b/res/xml/zen_mode_messages_settings.xml
@@ -0,0 +1,40 @@
+<?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.
+-->
+
+<PreferenceScreen
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="zen_mode_messages_settings_page"
+ android:title="@string/zen_mode_messages" >
+
+ <PreferenceCategory
+ android:title="@string/zen_mode_settings_category"
+ android:key="zen_mode_settings_category_messages">
+ <!-- Messages -->
+ <ListPreference
+ android:key="zen_mode_messages"
+ android:title="@string/zen_mode_messages_title"
+ android:entries="@array/zen_mode_contacts_entries"
+ android:entryValues="@array/zen_mode_contacts_values"/>
+
+ <Preference
+ android:key="zen_mode_starred_contacts_messages"
+ android:title="@string/zen_mode_starred_contacts_title"/>
+ </PreferenceCategory>
+
+ <com.android.settingslib.widget.FooterPreference/>
+
+</PreferenceScreen>
diff --git a/res/xml/zen_mode_msg_event_reminder_settings.xml b/res/xml/zen_mode_msg_event_reminder_settings.xml
deleted file mode 100644
index 8fc6b47..0000000
--- a/res/xml/zen_mode_msg_event_reminder_settings.xml
+++ /dev/null
@@ -1,50 +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.
--->
-
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:key="zen_mode_msg_event_reminder_settings_page"
- android:title="@string/zen_msg_event_reminder_title" >
-
- <PreferenceCategory
- android:title="@string/zen_mode_settings_category"
- android:key="zen_mode_settings_category_msg_event_reminder">
- <!-- Messages -->
- <ListPreference
- android:key="zen_mode_messages"
- android:title="@string/zen_mode_messages_title"
- android:entries="@array/zen_mode_contacts_entries"
- android:entryValues="@array/zen_mode_contacts_values"/>
-
- <Preference
- android:key="zen_mode_starred_contacts_messages"
- android:title="@string/zen_mode_starred_contacts_title"/>
-
- <!-- Reminders -->
- <SwitchPreference
- android:key="zen_mode_reminders"
- android:title="@string/zen_mode_reminders_title"/>
-
- <!-- Events -->
- <SwitchPreference
- android:key="zen_mode_events"
- android:title="@string/zen_mode_events_title"/>
- </PreferenceCategory>
-
- <com.android.settingslib.widget.FooterPreference />
-
-</PreferenceScreen>
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index b8af650..1966484 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -25,62 +25,59 @@
<PreferenceCategory
android:key="zen_mode_settings_category_behavior"
android:title="@string/zen_category_behavior">
- <!-- sound vibration -->
+ <!-- Calls -->
+ <Preference
+ android:key="zen_mode_behavior_calls"
+ android:title="@string/zen_mode_calls_title"
+ android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
+
+ <!-- Messages -->
+ <Preference
+ android:key="zen_mode_behavior_messages"
+ android:title="@string/zen_mode_messages_title"
+ android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
+
+ <!-- Alarms -->
+ <SwitchPreference
+ android:key="zen_mode_behavior_alarms"
+ android:title="@string/zen_mode_alarms"/>
+
+ <!-- All sounds -->
<Preference
android:key="zen_sound_vibration_settings"
android:title="@string/zen_sound_title"
- android:fragment="com.android.settings.notification.ZenModeSoundVibrationSettings"/>
-
- <!-- What to block (effects) -->
- <Preference
- android:key="zen_mode_block_effects_settings"
- android:title="@string/zen_mode_restrict_notifications_title"
- android:fragment="com.android.settings.notification.ZenModeRestrictNotificationsSettings" />
+ android:fragment="com.android.settings.notification.ZenModeSoundVibrationSettings"
+ android:icon="@drawable/ic_chevron_right_24dp"/>
</PreferenceCategory>
- <PreferenceCategory
- android:key="zen_mode_settings_category_exceptions"
- android:title="@string/zen_category_exceptions">
- <Preference
- android:key="zen_mode_calls_settings"
- android:title="@string/zen_mode_calls"
- android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
- <Preference
- android:key="zen_mode_msg_event_reminder_settings"
- android:title="@string/zen_msg_event_reminder_title"
- android:fragment="com.android.settings.notification.ZenModeMsgEventReminderSettings" />
+ <!-- What to block (effects) -->
+ <Preference
+ android:key="zen_mode_block_effects_settings"
+ android:title="@string/zen_mode_restrict_notifications_title"
+ android:fragment="com.android.settings.notification.ZenModeRestrictNotificationsSettings"
+ settings:allowDividerAbove="true"/>
- </PreferenceCategory>
+ <!-- DND duration settings -->
+ <com.android.settings.notification.ZenDurationDialogPreference
+ android:key="zen_mode_duration_settings"
+ android:title="@string/zen_mode_duration_settings_title"
+ android:widgetLayout="@null"/>
- <PreferenceCategory
- android:key="zen_mode_settings_category_schedule"
- android:title="@string/zen_category_schedule">
- <!-- DND duration settings -->
- <com.android.settings.notification.ZenDurationDialogPreference
- android:key="zen_mode_duration_settings"
- android:title="@string/zen_mode_duration_settings_title"
- android:widgetLayout="@null"/>
-
- <!-- Automatic rules -->
- <Preference
- android:key="zen_mode_automation_settings"
- android:title="@string/zen_mode_automation_settings_title"
- android:fragment="com.android.settings.notification.ZenModeAutomationSettings" />
- </PreferenceCategory>
+ <!-- Automatic rules -->
+ <Preference
+ android:key="zen_mode_automation_settings"
+ android:title="@string/zen_mode_automation_settings_title"
+ android:fragment="com.android.settings.notification.ZenModeAutomationSettings"/>
<!-- Turn on DND button -->
- <!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory -->
- <PreferenceCategory
- android:key="zen_mode_settings_button_category">
- <com.android.settings.applications.LayoutPreference
- android:key="zen_mode_settings_button_container"
- android:selectable="false"
- android:layout="@layout/zen_mode_settings_button" />
- </PreferenceCategory>
+ <com.android.settings.applications.LayoutPreference
+ android:key="zen_mode_settings_button_container"
+ android:selectable="false"
+ android:layout="@layout/zen_mode_settings_button"
+ settings:allowDividerAbove="true"
+ settings:allowDividerBelow="true"/>
- <PreferenceCategory
- android:key="zen_mode_footer_container">
- <com.android.settingslib.widget.FooterPreference />
- </PreferenceCategory>
+ <!-- Footer that shows if user is put into alarms only or total silence mode by an app -->
+ <com.android.settingslib.widget.FooterPreference/>
</PreferenceScreen>
diff --git a/res/xml/zen_mode_sound_vibration_settings.xml b/res/xml/zen_mode_sound_vibration_settings.xml
index b3b8139..3d1da2f 100644
--- a/res/xml/zen_mode_sound_vibration_settings.xml
+++ b/res/xml/zen_mode_sound_vibration_settings.xml
@@ -18,11 +18,24 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
android:key="zen_mode_sound_vibration_settings_page"
- android:title="@string/zen_sound_title" >
+ android:title="@string/zen_category_exceptions" >
<PreferenceCategory
android:title="@string/zen_mode_settings_category"
android:key="zen_mode_settings_category_sound_vibration">
+
+ <!-- Calls -->
+ <Preference
+ android:key="zen_mode_calls_settings"
+ android:title="@string/zen_mode_calls_title"
+ android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
+
+ <!-- Messages -->
+ <Preference
+ android:key="zen_mode_messages_settings"
+ android:title="@string/zen_mode_messages_title"
+ android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
+
<!-- Alarms -->
<SwitchPreference
android:key="zen_mode_alarms"
@@ -37,6 +50,18 @@
<SwitchPreference
android:key="zen_mode_system"
android:title="@string/zen_mode_system"/>
+
+ <!-- Reminders -->
+ <SwitchPreference
+ android:key="zen_mode_reminders"
+ android:title="@string/zen_mode_reminders"/>
+
+ <!-- Events -->
+ <SwitchPreference
+ android:key="zen_mode_events"
+ android:title="@string/zen_mode_events"/>
+
+ <!-- TODO: beverlyt, add "Allow apps to override" -->
</PreferenceCategory>
<com.android.settingslib.widget.FooterPreference/>
diff --git a/src/com/android/settings/AllowBindAppWidgetActivity.java b/src/com/android/settings/AllowBindAppWidgetActivity.java
index 7557d97..1cfeb49 100644
--- a/src/com/android/settings/AllowBindAppWidgetActivity.java
+++ b/src/com/android/settings/AllowBindAppWidgetActivity.java
@@ -29,11 +29,11 @@
import android.view.LayoutInflater;
import android.widget.CheckBox;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
-import androidx.appcompat.app.AlertDialog;
-
/**
* This activity is displayed when an app launches the BIND_APPWIDGET intent. This allows apps
* that don't have the BIND_APPWIDGET permission to bind specific widgets.
diff --git a/src/com/android/settings/BandMode.java b/src/com/android/settings/BandMode.java
index 9728a5f..5be82f6 100644
--- a/src/com/android/settings/BandMode.java
+++ b/src/com/android/settings/BandMode.java
@@ -14,11 +14,11 @@
import android.widget.ArrayAdapter;
import android.widget.ListView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneFactory;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Radio Band Mode Selection Class
*
diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index d2b5ec1..1da985c 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java
@@ -26,12 +26,12 @@
import android.widget.CheckedTextView;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog.Builder;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.CustomDialogPreferenceCompat;
-import androidx.appcompat.app.AlertDialog.Builder;
-
public class BugreportPreference extends CustomDialogPreferenceCompat {
private static final String TAG = "BugreportPreference";
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 03a9203..7b0be94 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -38,6 +38,9 @@
import android.util.Log;
import android.widget.Toast;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.org.bouncycastle.asn1.ASN1InputStream;
import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
@@ -48,8 +51,6 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentActivity;
import sun.security.util.ObjectIdentifier;
import sun.security.x509.AlgorithmId;
@@ -105,6 +106,7 @@
private static final int CONFIRM_CLEAR_SYSTEM_CREDENTIAL_REQUEST = 2;
private final KeyStore mKeyStore = KeyStore.getInstance();
+ private LockPatternUtils mUtils;
/**
* When non-null, the bundle containing credentials to install.
@@ -112,6 +114,12 @@
private Bundle mInstallBundle;
@Override
+ protected void onCreate(Bundle savedState) {
+ super.onCreate(savedState);
+ mUtils = new LockPatternUtils(this);
+ }
+
+ @Override
protected void onResume() {
super.onResume();
@@ -159,7 +167,7 @@
return;
}
case UNLOCKED: {
- if (isActivePasswordQualityInsufficient()) {
+ if (!mUtils.isSecure(UserHandle.myUserId())) {
final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
dialog.show(getSupportFragmentManager(), ConfigureKeyGuardDialog.TAG);
return;
@@ -178,7 +186,7 @@
* case after unlocking with an old-style password).
*/
private void ensureKeyGuard() {
- if (isActivePasswordQualityInsufficient()) {
+ if (!mUtils.isSecure(UserHandle.myUserId())) {
// key guard not setup, doing so will initialize keystore
final ConfigureKeyGuardDialog dialog = new ConfigureKeyGuardDialog();
dialog.show(getSupportFragmentManager(), ConfigureKeyGuardDialog.TAG);
@@ -193,21 +201,11 @@
finish();
}
- /**
- * Returns true if the currently set key guard violates our minimum quality requirements.
- */
- private boolean isActivePasswordQualityInsufficient() {
- final int credentialOwner =
- UserManager.get(this).getCredentialOwnerProfile(UserHandle.myUserId());
- final int quality = new LockPatternUtils(this).getActivePasswordQuality(credentialOwner);
- return (quality >= MIN_PASSWORD_QUALITY);
- }
-
private boolean isHardwareBackedKey(byte[] keyData) {
try {
final ASN1InputStream bIn = new ASN1InputStream(new ByteArrayInputStream(keyData));
final PrivateKeyInfo pki = PrivateKeyInfo.getInstance(bIn.readObject());
- final String algOid = pki.getAlgorithmId().getAlgorithm().getId();
+ final String algOid = pki.getPrivateKeyAlgorithm().getAlgorithm().getId();
final String algName = new AlgorithmId(new ObjectIdentifier(algOid)).getName();
return KeyChain.isBoundKeyAlgorithm(algName);
@@ -349,7 +347,7 @@
protected Boolean doInBackground(Void... unused) {
// Clear all the users credentials could have been installed in for this user.
- new LockPatternUtils(CredentialStorage.this).resetKeyStore(UserHandle.myUserId());
+ mUtils.resetKeyStore(UserHandle.myUserId());
try {
final KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this);
diff --git a/src/com/android/settings/CustomListPreference.java b/src/com/android/settings/CustomListPreference.java
index 6ac7a56..734cac2 100644
--- a/src/com/android/settings/CustomListPreference.java
+++ b/src/com/android/settings/CustomListPreference.java
@@ -24,15 +24,15 @@
import android.os.Bundle;
import android.util.AttributeSet;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.preference.ListPreference;
import androidx.preference.ListPreferenceDialogFragmentCompat;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
public class CustomListPreference extends ListPreference {
public CustomListPreference(Context context, AttributeSet attrs) {
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index bf4299b..149deb1 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -186,10 +186,6 @@
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
List<SearchIndexableResource> result = new ArrayList<>();
- // Remove data/time settings from search in demo mode
- if (UserManager.isDeviceInDemoMode(context)) {
- return result;
- }
SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = R.xml.date_time_prefs;
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 236c7db..6557aee 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -46,11 +46,7 @@
public class DisplaySettings extends DashboardFragment {
private static final String TAG = "DisplaySettings";
- public static final String KEY_DISPLAY_SIZE = "display_settings_screen_zoom";
-
private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
- private static final String KEY_AUTO_BRIGHTNESS = "auto_brightness_entry";
- private static final String KEY_NIGHT_DISPLAY = "night_display";
@Override
public int getMetricsCategory() {
@@ -89,7 +85,6 @@
controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));
controllers.add(new VrDisplayPreferenceController(context));
controllers.add(new ShowOperatorNamePreferenceController(context));
- controllers.add(new WallpaperPreferenceController(context));
controllers.add(new ThemePreferenceController(context));
controllers.add(new BrightnessLevelPreferenceController(context, lifecycle));
return controllers;
@@ -109,16 +104,6 @@
}
@Override
- public List<String> getNonIndexableKeys(Context context) {
- List<String> keys = super.getNonIndexableKeys(context);
- keys.add(KEY_DISPLAY_SIZE);
- keys.add(WallpaperPreferenceController.KEY_WALLPAPER);
- keys.add(KEY_NIGHT_DISPLAY);
- keys.add(KEY_AUTO_BRIGHTNESS);
- return keys;
- }
-
- @Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context, null);
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index f710852..caef988 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -33,6 +33,8 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -41,8 +43,6 @@
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-
public class EncryptionInterstitial extends SettingsActivity {
private static final String TAG = EncryptionInterstitial.class.getSimpleName();
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index c161d9d..1de7a10 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -20,7 +20,9 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.content.res.Configuration;
import android.content.res.Resources;
+import android.graphics.PixelFormat;
import android.os.AsyncResult;
import android.os.Bundle;
import android.os.Handler;
@@ -30,9 +32,11 @@
import android.telephony.TelephonyManager;
import android.text.TextUtils;
import android.util.Log;
+import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.view.WindowManager;
import android.widget.EditText;
import android.widget.ListView;
import android.widget.TabHost;
@@ -40,16 +44,18 @@
import android.widget.TabHost.TabContentFactory;
import android.widget.TabHost.TabSpec;
import android.widget.TabWidget;
+import android.widget.TextView;
import android.widget.Toast;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.PhoneFactory;
-import com.android.internal.telephony.TelephonyIntents;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.TelephonyIntents;
+
/**
* Implements the preference screen to enable/disable ICC lock and
* also the dialogs to change the ICC PIN. In the former case, enabling/disabling
@@ -117,13 +123,16 @@
private static final int MSG_CHANGE_ICC_PIN_COMPLETE = 101;
private static final int MSG_SIM_STATE_CHANGED = 102;
+ // @see android.widget.Toast$TN
+ private static final long LONG_DURATION_TIMEOUT = 7000;
+
// For replies from IccCard interface
private Handler mHandler = new Handler() {
public void handleMessage(Message msg) {
AsyncResult ar = (AsyncResult) msg.obj;
switch (msg.what) {
case MSG_ENABLE_ICC_PIN_COMPLETE:
- iccLockChanged(ar.exception == null, msg.arg1);
+ iccLockChanged(ar.exception == null, msg.arg1, ar.exception);
break;
case MSG_CHANGE_ICC_PIN_COMPLETE:
iccPinChanged(ar.exception == null, msg.arg1);
@@ -453,22 +462,79 @@
mPinToggle.setEnabled(false);
}
- private void iccLockChanged(boolean success, int attemptsRemaining) {
+ private void iccLockChanged(boolean success, int attemptsRemaining, Throwable exception) {
if (success) {
mPinToggle.setChecked(mToState);
} else {
- Toast.makeText(getContext(), getPinPasswordErrorMessage(attemptsRemaining),
- Toast.LENGTH_LONG).show();
+ if (exception instanceof CommandException) {
+ CommandException.Error err = ((CommandException)(exception)).getCommandError();
+ if (err == CommandException.Error.PASSWORD_INCORRECT) {
+ createCustomTextToast(getPinPasswordErrorMessage(attemptsRemaining));
+ } else {
+ if (mToState) {
+ Toast.makeText(getContext(), mRes.getString
+ (R.string.sim_pin_enable_failed), Toast.LENGTH_LONG).show();
+ } else {
+ Toast.makeText(getContext(), mRes.getString
+ (R.string.sim_pin_disable_failed), Toast.LENGTH_LONG).show();
+ }
+ }
+ }
}
mPinToggle.setEnabled(true);
resetDialogState();
}
+ private void createCustomTextToast(CharSequence errorMessage) {
+ // Cannot overlay Toast on PUK unlock screen.
+ // The window type of Toast is set by NotificationManagerService.
+ // It can't be overwritten by LayoutParams.type.
+ // Ovarlay a custom window with LayoutParams (TYPE_STATUS_BAR_PANEL) on PUK unlock screen.
+ View v = ((LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE))
+ .inflate(com.android.internal.R.layout.transient_notification, null);
+ TextView tv = (TextView) v.findViewById(com.android.internal.R.id.message);
+ tv.setText(errorMessage);
+
+ final WindowManager.LayoutParams params = new WindowManager.LayoutParams();
+ final Configuration config = v.getContext().getResources().getConfiguration();
+ final int gravity = Gravity.getAbsoluteGravity(
+ getContext().getResources().getInteger(
+ com.android.internal.R.integer.config_toastDefaultGravity),
+ config.getLayoutDirection());
+ params.gravity = gravity;
+ if ((gravity & Gravity.HORIZONTAL_GRAVITY_MASK) == Gravity.FILL_HORIZONTAL) {
+ params.horizontalWeight = 1.0f;
+ }
+ if ((gravity & Gravity.VERTICAL_GRAVITY_MASK) == Gravity.FILL_VERTICAL) {
+ params.verticalWeight = 1.0f;
+ }
+ params.y = getContext().getResources().getDimensionPixelSize(
+ com.android.internal.R.dimen.toast_y_offset);
+
+ params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+ params.width = WindowManager.LayoutParams.WRAP_CONTENT;
+ params.format = PixelFormat.TRANSLUCENT;
+ params.windowAnimations = com.android.internal.R.style.Animation_Toast;
+ params.type = WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL;
+ params.setTitle(errorMessage);
+ params.flags = WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+ | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+ | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
+
+ WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+ wm.addView(v, params);
+
+ mHandler.postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ wm.removeViewImmediate(v);
+ }
+ }, LONG_DURATION_TIMEOUT);
+ }
+
private void iccPinChanged(boolean success, int attemptsRemaining) {
if (!success) {
- Toast.makeText(getContext(), getPinPasswordErrorMessage(attemptsRemaining),
- Toast.LENGTH_LONG)
- .show();
+ createCustomTextToast(getPinPasswordErrorMessage(attemptsRemaining));
} else {
Toast.makeText(getContext(), mRes.getString(R.string.sim_change_succeeded),
Toast.LENGTH_SHORT)
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 2983dba..97942fe 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -21,7 +21,7 @@
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
-import android.annotation.Nullable;
+import android.app.ActionBar;
import android.app.Activity;
import android.content.ComponentName;
import android.content.ContentResolver;
@@ -31,6 +31,7 @@
import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
import android.content.res.Resources;
+import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Environment;
@@ -53,18 +54,20 @@
import android.widget.ScrollView;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.setupwizardlib.TemplateLayout;
+import com.android.setupwizardlib.template.ButtonFooterMixin;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Confirm and execute a reset of the device to a clean "just out of the box"
* state. Multiple confirmations are required: first, a general "are you sure
@@ -78,8 +81,10 @@
public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutListener {
private static final String TAG = "MasterClear";
- @VisibleForTesting static final int KEYGUARD_REQUEST = 55;
- @VisibleForTesting static final int CREDENTIAL_CONFIRM_REQUEST = 56;
+ @VisibleForTesting
+ static final int KEYGUARD_REQUEST = 55;
+ @VisibleForTesting
+ static final int CREDENTIAL_CONFIRM_REQUEST = 56;
private static final String KEY_SHOW_ESIM_RESET_CHECKBOX
= "masterclear.allow_retain_esim_profiles_after_fdr";
@@ -88,27 +93,41 @@
static final String ERASE_ESIMS_EXTRA = "erase_esim";
private View mContentView;
- @VisibleForTesting Button mInitiateButton;
+ @VisibleForTesting
+ Button mInitiateButton;
private View mExternalStorageContainer;
- @VisibleForTesting CheckBox mExternalStorage;
+ @VisibleForTesting
+ CheckBox mExternalStorage;
private View mEsimStorageContainer;
- @VisibleForTesting CheckBox mEsimStorage;
- @VisibleForTesting ScrollView mScrollView;
+ @VisibleForTesting
+ CheckBox mEsimStorage;
+ @VisibleForTesting
+ ScrollView mScrollView;
@Override
public void onGlobalLayout() {
mInitiateButton.setEnabled(hasReachedBottom(mScrollView));
}
- @Override
- public void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- getActivity().setTitle(R.string.master_clear_short_title);
+ private void setUpActionBarAndTitle() {
+ final Activity activity = getActivity();
+ if (activity == null) {
+ Log.e(TAG, "No activity attached, skipping setUpActionBarAndTitle");
+ return;
+ }
+ final ActionBar actionBar = activity.getActionBar();
+ if (actionBar == null) {
+ Log.e(TAG, "No actionbar, skipping setUpActionBarAndTitle");
+ return;
+ }
+ actionBar.hide();
+ activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
}
/**
* Keyguard validation is run using the standard {@link ConfirmLockPattern}
* component as a subactivity
+ *
* @param request the request code to be returned once confirmation finishes
* @return true if confirmation launched
*/
@@ -188,8 +207,8 @@
Account[] accounts = am.getAccountsByType(accountType);
if (accounts != null && accounts.length > 0) {
final Intent requestAccountConfirmation = new Intent()
- .setPackage(packageName)
- .setComponent(new ComponentName(packageName, className));
+ .setPackage(packageName)
+ .setComponent(new ComponentName(packageName, className));
// Check to make sure that the intent is supported.
final PackageManager pm = context.getPackageManager();
final ResolveInfo resolution = pm.resolveActivity(requestAccountConfirmation, 0);
@@ -258,8 +277,9 @@
*/
@VisibleForTesting
void establishInitialState() {
- mInitiateButton = mContentView.findViewById(R.id.initiate_master_clear);
- mInitiateButton.setOnClickListener(mInitiateListener);
+ setUpActionBarAndTitle();
+ setUpInitiateButton();
+
mExternalStorageContainer = mContentView.findViewById(R.id.erase_external_container);
mExternalStorage = mContentView.findViewById(R.id.erase_external);
mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
@@ -333,7 +353,7 @@
mScrollView.setOnScrollChangeListener(new OnScrollChangeListener() {
@Override
public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX,
- int oldScrollY) {
+ int oldScrollY) {
if (v instanceof ScrollView && hasReachedBottom((ScrollView) v)) {
mInitiateButton.setEnabled(true);
mScrollView.setOnScrollChangeListener(null);
@@ -359,8 +379,8 @@
}
ContentResolver cr = context.getContentResolver();
return Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0
- || Settings.Global.getInt(
- cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+ || Settings.Global.getInt(
+ cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
}
@VisibleForTesting
@@ -387,21 +407,36 @@
return diff <= 0;
}
+ private void setUpInitiateButton() {
+ if (mInitiateButton != null) {
+ return;
+ }
+
+ final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
+ final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
+ buttonFooterMixin.removeAllViews();
+ buttonFooterMixin.addSpace();
+ buttonFooterMixin.addSpace();
+ mInitiateButton = buttonFooterMixin.addButton(R.string.master_clear_button_text,
+ R.style.SuwGlifButton_Primary);
+ mInitiateButton.setOnClickListener(mInitiateListener);
+ }
+
private void getContentDescription(View v, StringBuffer description) {
- if (v.getVisibility() != View.VISIBLE) {
- return;
- }
- if (v instanceof ViewGroup) {
- ViewGroup vGroup = (ViewGroup) v;
- for (int i = 0; i < vGroup.getChildCount(); i++) {
- View nextChild = vGroup.getChildAt(i);
- getContentDescription(nextChild, description);
- }
- } else if (v instanceof TextView) {
- TextView vText = (TextView) v;
- description.append(vText.getText());
- description.append(","); // Allow Talkback to pause between sections.
- }
+ if (v.getVisibility() != View.VISIBLE) {
+ return;
+ }
+ if (v instanceof ViewGroup) {
+ ViewGroup vGroup = (ViewGroup) v;
+ for (int i = 0; i < vGroup.getChildCount(); i++) {
+ View nextChild = vGroup.getChildAt(i);
+ getContentDescription(nextChild, description);
+ }
+ } else if (v instanceof TextView) {
+ TextView vText = (TextView) v;
+ description.append(vText.getText());
+ description.append(","); // Allow Talkback to pause between sections.
+ }
}
private boolean isExtStorageEncrypted() {
@@ -411,7 +446,7 @@
private void loadAccountList(final UserManager um) {
View accountsLabel = mContentView.findViewById(R.id.accounts_label);
- LinearLayout contents = (LinearLayout)mContentView.findViewById(R.id.accounts);
+ LinearLayout contents = (LinearLayout) mContentView.findViewById(R.id.accounts);
contents.removeAllViews();
Context context = getActivity();
@@ -420,7 +455,7 @@
AccountManager mgr = AccountManager.get(context);
- LayoutInflater inflater = (LayoutInflater)context.getSystemService(
+ LayoutInflater inflater = (LayoutInflater) context.getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
int accountsCount = 0;
@@ -499,11 +534,12 @@
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final Context context = getContext();
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(context,
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
final UserManager um = UserManager.get(context);
- final boolean disallow = !um.isAdminUser() || RestrictedLockUtils.hasBaseUserRestriction(
- context, UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
+ final boolean disallow = !um.isAdminUser() || RestrictedLockUtilsInternal
+ .hasBaseUserRestriction(context, UserManager.DISALLOW_FACTORY_RESET,
+ UserHandle.myUserId());
if (disallow && !Utils.isDemoUser(context)) {
return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
} else if (admin != null) {
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 0ea7250..8ebb710 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -16,18 +16,23 @@
package com.android.settings;
+
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import android.app.ActionBar;
+import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
+import android.graphics.Color;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.service.oemlock.OemLockManager;
import android.service.persistentdata.PersistentDataBlockManager;
+import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -37,7 +42,9 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.setupwizardlib.TemplateLayout;
+import com.android.setupwizardlib.template.ButtonFooterMixin;
/**
* Confirm and execute a reset of the device to a clean "just out of the box"
@@ -50,6 +57,7 @@
* This is the confirmation screen.
*/
public class MasterClearConfirm extends InstrumentedFragment {
+ private final static String TAG = "MasterClearConfirm";
private View mContentView;
private boolean mEraseSdCard;
@@ -102,9 +110,11 @@
mProgressDialog.show();
// need to prevent orientation changes as we're about to go into
- // a long IO request, so we won't be able to access inflate resources on flash
+ // a long IO request, so we won't be able to access inflate resources on
+ // flash
mOldOrientation = getActivity().getRequestedOrientation();
- getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+ getActivity().setRequestedOrientation(
+ ActivityInfo.SCREEN_ORIENTATION_LOCKED);
}
}.execute();
} else {
@@ -139,16 +149,37 @@
* Configure the UI for the final confirmation interaction
*/
private void establishFinalConfirmationState() {
- mContentView.findViewById(R.id.execute_master_clear)
- .setOnClickListener(mFinalClickListener);
+ final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
+
+ final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
+ buttonFooterMixin.removeAllViews();
+ buttonFooterMixin.addSpace();
+ buttonFooterMixin.addSpace();
+ buttonFooterMixin.addButton(R.string.master_clear_button_text,
+ R.style.SuwGlifButton_Primary).setOnClickListener(mFinalClickListener);
+ }
+
+ private void setUpActionBarAndTitle() {
+ final Activity activity = getActivity();
+ if (activity == null) {
+ Log.e(TAG, "No activity attached, skipping setUpActionBarAndTitle");
+ return;
+ }
+ final ActionBar actionBar = activity.getActionBar();
+ if (actionBar == null) {
+ Log.e(TAG, "No actionbar, skipping setUpActionBarAndTitle");
+ return;
+ }
+ actionBar.hide();
+ activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
getActivity(), UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
- if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+ if (RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
} else if (admin != null) {
@@ -159,6 +190,7 @@
return new View(getActivity());
}
mContentView = inflater.inflate(R.layout.master_clear_confirm, null);
+ setUpActionBarAndTitle();
establishFinalConfirmationState();
setAccessibilityTitle();
return mContentView;
@@ -166,8 +198,7 @@
private void setAccessibilityTitle() {
CharSequence currentTitle = getActivity().getTitle();
- TextView confirmationMessage =
- (TextView) mContentView.findViewById(R.id.master_clear_confirm);
+ TextView confirmationMessage = mContentView.findViewById(R.id.master_clear_confirm);
if (confirmationMessage != null) {
String accessibleText = new StringBuilder(currentTitle).append(",").append(
confirmationMessage.getText()).toString();
diff --git a/src/com/android/settings/MonitoringCertInfoActivity.java b/src/com/android/settings/MonitoringCertInfoActivity.java
index d181f7a..eadebc1 100644
--- a/src/com/android/settings/MonitoringCertInfoActivity.java
+++ b/src/com/android/settings/MonitoringCertInfoActivity.java
@@ -26,10 +26,10 @@
import android.os.UserHandle;
import android.provider.Settings;
-import com.android.settingslib.RestrictedLockUtils;
-
import androidx.appcompat.app.AlertDialog;
+import com.android.settingslib.RestrictedLockUtils;
+
/**
* Activity that shows a dialog explaining that a CA cert is allowing someone to monitor network
* traffic. This activity should be launched for the user into which the CA cert is installed
@@ -46,10 +46,17 @@
mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+ final UserHandle user;
+ if (mUserId == UserHandle.USER_NULL) {
+ user = null;
+ } else {
+ user = UserHandle.of(mUserId);
+ }
+
DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);
final int numberOfCertificates = getIntent().getIntExtra(
Settings.EXTRA_NUMBER_OF_CERTIFICATES, 1);
- final int titleId = RestrictedLockUtils.getProfileOrDeviceOwner(this, mUserId) != null
+ final int titleId = RestrictedLockUtils.getProfileOrDeviceOwner(this, user) != null
? R.plurals.ssl_ca_cert_settings_button // Check certificate
: R.plurals.ssl_ca_cert_dialog_title; // Trust or remove certificate
final CharSequence title = getResources().getQuantityText(titleId, numberOfCertificates);
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index a681b94..4bd4585 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -38,12 +38,12 @@
import android.widget.EditText;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
import com.android.settings.core.InstrumentedFragment;
-import androidx.appcompat.app.AlertDialog;
-
public class ProxySelector extends InstrumentedFragment implements DialogCreatable {
private static final String TAG = "ProxySelector";
@@ -113,7 +113,7 @@
if (mDialogFragment != null) {
Log.e(TAG, "Old dialog fragment not null!");
}
- mDialogFragment = new SettingsDialogFragment(this, dialogId);
+ mDialogFragment = SettingsDialogFragment.newInstance(this, dialogId);
mDialogFragment.show(getActivity().getSupportFragmentManager(), Integer.toString(dialogId));
}
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 3db9935..18c83f4 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -35,6 +35,7 @@
import android.net.TrafficStats;
import android.net.Uri;
import android.os.AsyncResult;
+import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
@@ -79,6 +80,8 @@
import android.widget.Switch;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.ims.ImsConfig;
import com.android.ims.ImsException;
import com.android.ims.ImsManager;
@@ -90,8 +93,6 @@
import java.net.URL;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-
public class RadioInfo extends Activity {
private static final String TAG = "RadioInfo";
@@ -1359,25 +1360,26 @@
imsVolteProvisionedSwitch.setOnCheckedChangeListener(null);
imsVolteProvisionedSwitch.setChecked(isImsVolteProvisioned());
imsVolteProvisionedSwitch.setOnCheckedChangeListener(mImsVolteCheckedChangeListener);
- imsVolteProvisionedSwitch.setEnabled(
- mImsManager.isVolteEnabledByPlatform(phone.getContext()));
+ imsVolteProvisionedSwitch.setEnabled(!Build.IS_USER
+ && mImsManager.isVolteEnabledByPlatform(phone.getContext()));
imsVtProvisionedSwitch.setOnCheckedChangeListener(null);
imsVtProvisionedSwitch.setChecked(isImsVtProvisioned());
imsVtProvisionedSwitch.setOnCheckedChangeListener(mImsVtCheckedChangeListener);
- imsVtProvisionedSwitch.setEnabled(
- mImsManager.isVtEnabledByPlatform(phone.getContext()));
+ imsVtProvisionedSwitch.setEnabled(!Build.IS_USER
+ && mImsManager.isVtEnabledByPlatform(phone.getContext()));
imsWfcProvisionedSwitch.setOnCheckedChangeListener(null);
imsWfcProvisionedSwitch.setChecked(isImsWfcProvisioned());
imsWfcProvisionedSwitch.setOnCheckedChangeListener(mImsWfcCheckedChangeListener);
- imsWfcProvisionedSwitch.setEnabled(
- mImsManager.isWfcEnabledByPlatform(phone.getContext()));
+ imsWfcProvisionedSwitch.setEnabled(!Build.IS_USER
+ && mImsManager.isWfcEnabledByPlatform(phone.getContext()));
eabProvisionedSwitch.setOnCheckedChangeListener(null);
eabProvisionedSwitch.setChecked(isEabProvisioned());
eabProvisionedSwitch.setOnCheckedChangeListener(mEabCheckedChangeListener);
- eabProvisionedSwitch.setEnabled(isEabEnabledByPlatform(phone.getContext()));
+ eabProvisionedSwitch.setEnabled(!Build.IS_USER
+ && isEabEnabledByPlatform(phone.getContext()));
}
OnClickListener mDnsCheckButtonHandler = new OnClickListener() {
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
index 6430a13..8bc1cef 100644
--- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
@@ -30,11 +30,11 @@
import android.widget.ImageView;
import android.widget.TextView;
-import java.util.Locale;
-
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
+import java.util.Locale;
+
/**
* {@link Activity} that displays regulatory information for the "Regulatory information"
* preference item, and when "*#07#" is dialed on the Phone keypad. To enable this feature,
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 22e5716..c1eca16 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -50,6 +50,7 @@
import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.ArrayList;
import java.util.List;
@@ -240,9 +241,9 @@
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final UserManager um = UserManager.get(getActivity());
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
getActivity(), UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
- if (!um.isAdminUser() || RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+ if (!um.isAdminUser() || RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
return inflater.inflate(R.layout.network_reset_disallowed_screen, null);
} else if (admin != null) {
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 88a7049..2044af5 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -40,6 +40,9 @@
import android.widget.Button;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.ims.ImsManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
@@ -47,9 +50,7 @@
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.network.ApnSettings;
import com.android.settingslib.RestrictedLockUtils;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
+import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* Confirm and execute a reset of the network settings to a clean "just out of the box"
@@ -204,9 +205,9 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
getActivity(), UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
- if (RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+ if (RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId())) {
return inflater.inflate(R.layout.network_reset_disallowed_screen, null);
} else if (admin != null) {
diff --git a/src/com/android/settings/RestrictedCheckBox.java b/src/com/android/settings/RestrictedCheckBox.java
index 2d45880..828c443 100644
--- a/src/com/android/settings/RestrictedCheckBox.java
+++ b/src/com/android/settings/RestrictedCheckBox.java
@@ -24,6 +24,7 @@
import android.widget.CheckBox;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* A checkbox that can be restricted by device policy, in which case it shows a dialog explaining
@@ -57,7 +58,8 @@
mEnforcedAdmin = admin;
if (mDisabledByAdmin != disabled) {
mDisabledByAdmin = disabled;
- RestrictedLockUtils.setTextViewAsDisabledByAdmin(mContext, this, mDisabledByAdmin);
+ RestrictedLockUtilsInternal.setTextViewAsDisabledByAdmin(mContext, this,
+ mDisabledByAdmin);
if (mDisabledByAdmin) {
getButtonDrawable().setColorFilter(mContext.getColor(R.color.disabled_text_color),
PorterDuff.Mode.MULTIPLY);
diff --git a/src/com/android/settings/RestrictedListPreference.java b/src/com/android/settings/RestrictedListPreference.java
index e79f03e..2e9ec14 100644
--- a/src/com/android/settings/RestrictedListPreference.java
+++ b/src/com/android/settings/RestrictedListPreference.java
@@ -34,17 +34,17 @@
import android.widget.ListAdapter;
import android.widget.ListView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog.Builder;
+import androidx.preference.ListPreferenceDialogFragmentCompat;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreferenceHelper;
import java.util.ArrayList;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AlertDialog.Builder;
-import androidx.preference.ListPreferenceDialogFragmentCompat;
-import androidx.preference.PreferenceViewHolder;
-
public class RestrictedListPreference extends CustomListPreference {
private final RestrictedPreferenceHelper mHelper;
private final List<RestrictedItem> mRestrictedItems = new ArrayList<>();
diff --git a/src/com/android/settings/RestrictedRadioButton.java b/src/com/android/settings/RestrictedRadioButton.java
index 7efba4f..20c2872 100644
--- a/src/com/android/settings/RestrictedRadioButton.java
+++ b/src/com/android/settings/RestrictedRadioButton.java
@@ -25,6 +25,7 @@
import android.widget.TextView;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
public class RestrictedRadioButton extends RadioButton {
private Context mContext;
@@ -63,7 +64,7 @@
mEnforcedAdmin = admin;
if (mDisabledByAdmin != disabled) {
mDisabledByAdmin = disabled;
- RestrictedLockUtils.setTextViewAsDisabledByAdmin(mContext,
+ RestrictedLockUtilsInternal.setTextViewAsDisabledByAdmin(mContext,
(TextView) this, mDisabledByAdmin);
if (mDisabledByAdmin) {
getButtonDrawable().setColorFilter(mContext.getColor(R.color.disabled_text_color),
diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java
index 2894366..13bc9c51 100644
--- a/src/com/android/settings/RestrictedSettingsFragment.java
+++ b/src/com/android/settings/RestrictedSettingsFragment.java
@@ -31,12 +31,13 @@
import android.view.View;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtils;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
+import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* Base class for settings screens that should be pin protected when in restricted mode or
@@ -219,10 +220,10 @@
}
public EnforcedAdmin getRestrictionEnforcedAdmin() {
- mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
+ mEnforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getActivity(),
mRestrictionKey, UserHandle.myUserId());
- if (mEnforcedAdmin != null && mEnforcedAdmin.userId == UserHandle.USER_NULL) {
- mEnforcedAdmin.userId = UserHandle.myUserId();
+ if (mEnforcedAdmin != null && mEnforcedAdmin.user == null) {
+ mEnforcedAdmin.user = UserHandle.of(UserHandle.myUserId());
}
return mEnforcedAdmin;
}
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 4f011c1..952c519 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -68,6 +68,7 @@
public static class AccessibilityDaltonizerSettingsActivity extends SettingsActivity { /* empty */ }
public static class SecurityDashboardActivity extends SettingsActivity { /* empty */ }
public static class UsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
+ public static class AppUsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class LocationSettingsActivity extends SettingsActivity { /* empty */ }
public static class ScanningSettingsActivity extends SettingsActivity { /* empty */ }
public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ }
@@ -121,7 +122,6 @@
}
public static class DirectoryAccessSettingsActivity extends SettingsActivity { /* empty */ }
- public static class TopLevelSettings extends SettingsActivity { /* empty */ }
public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }
public static class WifiCallingSettingsActivity extends SettingsActivity { /* empty */ }
public static class MemorySettingsActivity extends SettingsActivity { /* empty */ }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 0df0e6f..8ed368c 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -16,8 +16,6 @@
package com.android.settings;
-import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
-
import android.app.ActionBar;
import android.app.ActivityManager;
import android.content.BroadcastReceiver;
@@ -61,16 +59,14 @@
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.gateway.SettingsGateway;
import com.android.settings.dashboard.DashboardFeatureProvider;
-import com.android.settings.dashboard.DashboardSummary;
+import com.android.settings.homepage.TopLevelSettings;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.DeviceIndexFeatureProvider;
import com.android.settings.wfd.WifiDisplaySettings;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.instrumentation.Instrumentable;
import com.android.settingslib.core.instrumentation.SharedPreferencesLogger;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.utils.ThreadUtils;
import java.util.ArrayList;
import java.util.List;
@@ -250,10 +246,8 @@
// Getting Intent properties can only be done after the super.onCreate(...)
final String initialFragmentName = intent.getStringExtra(EXTRA_SHOW_FRAGMENT);
- final ComponentName cn = intent.getComponent();
- final String className = cn.getClassName();
-
- mIsShowingDashboard = className.equals(Settings.class.getName());
+ mIsShowingDashboard = TextUtils.equals(
+ SettingsActivity.class.getName(), intent.getComponent().getClassName());
// This is a "Sub Settings" when:
// - this is a real SubSettings
@@ -296,18 +290,9 @@
deviceProvisioned ? View.VISIBLE : View.INVISIBLE);
findViewById(R.id.action_bar).setVisibility(View.GONE);
final Toolbar toolbar = findViewById(R.id.search_action_bar);
+ setActionBar(toolbar);
FeatureFactory.getFactory(this).getSearchFeatureProvider()
.initSearchToolbar(this, toolbar);
- setActionBar(toolbar);
-
- // Please forgive me for what I am about to do.
- //
- // Need to make the navigation icon non-clickable so that the entire card is clickable
- // and goes to the search UI. Also set the background to null so there's no ripple.
- View navView = toolbar.getNavigationView();
- navView.setClickable(false);
- navView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
- navView.setBackground(null);
}
ActionBar actionBar = getActionBar();
@@ -402,9 +387,9 @@
} else {
// Show search icon as up affordance if we are displaying the main Dashboard
mInitialTitleResId = R.string.dashboard_title;
-
- switchToFragment(DashboardSummary.class.getName(), null /* args */, false, false,
+ switchToFragment(TopLevelSettings.class.getName(), null /* args */, false, false,
mInitialTitleResId, mInitialTitle, false);
+
}
}
@@ -507,7 +492,6 @@
registerReceiver(mBatteryInfoReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
updateTilesList();
- updateDeviceIndex();
}
@Override
@@ -629,19 +613,10 @@
});
}
- private void updateDeviceIndex() {
- DeviceIndexFeatureProvider indexProvider = FeatureFactory.getFactory(
- this).getDeviceIndexFeatureProvider();
-
- ThreadUtils.postOnBackgroundThread(
- () -> indexProvider.updateIndex(SettingsActivity.this, false /* force */));
- }
-
private void doUpdateTilesList() {
PackageManager pm = getPackageManager();
final UserManager um = UserManager.get(this);
final boolean isAdmin = um.isAdminUser();
- final FeatureFactory featureFactory = FeatureFactory.getFactory(this);
boolean somethingChanged = false;
final String packageName = getPackageName();
final StringBuilder changedList = new StringBuilder();
@@ -654,7 +629,6 @@
pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH), isAdmin)
|| somethingChanged;
-
// Enable DataUsageSummaryActivity if the data plan feature flag is turned on otherwise
// enable DataPlanUsageSummaryActivity.
somethingChanged = setTileEnabled(changedList,
@@ -688,16 +662,6 @@
&& !Utils.isMonkeyRunning(), isAdmin)
|| somethingChanged;
- somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
- Settings.NetworkDashboardActivity.class.getName()),
- !UserManager.isDeviceInDemoMode(this), isAdmin)
- || somethingChanged;
-
- somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
- Settings.DateTimeSettingsActivity.class.getName()),
- !UserManager.isDeviceInDemoMode(this), isAdmin)
- || somethingChanged;
-
final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)
&& !Utils.isMonkeyRunning();
somethingChanged = setTileEnabled(changedList, new ComponentName(packageName,
@@ -723,7 +687,8 @@
for (DashboardCategory category : categories) {
final int tileCount = category.getTilesCount();
for (int i = 0; i < tileCount; i++) {
- final ComponentName component = category.getTile(i).intent.getComponent();
+ final ComponentName component = category.getTile(i)
+ .getIntent().getComponent();
final String name = component.getClassName();
final boolean isEnabledForRestricted = ArrayUtils.contains(
SettingsGateway.SETTINGS_FOR_RESTRICTED, name);
diff --git a/src/com/android/settings/SettingsDumpService.java b/src/com/android/settings/SettingsDumpService.java
index c292dab..a57e983 100644
--- a/src/com/android/settings/SettingsDumpService.java
+++ b/src/com/android/settings/SettingsDumpService.java
@@ -30,6 +30,8 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.applications.ProcStatsData;
import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService;
import com.android.settingslib.net.DataUsageController;
@@ -42,8 +44,6 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
-import androidx.annotation.VisibleForTesting;
-
public class SettingsDumpService extends Service {
@VisibleForTesting
static final String KEY_SERVICE = "service";
diff --git a/src/com/android/settings/SettingsHomepageActivity.java b/src/com/android/settings/SettingsHomepageActivity.java
deleted file mode 100644
index 6eef99c..0000000
--- a/src/com/android/settings/SettingsHomepageActivity.java
+++ /dev/null
@@ -1,62 +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;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.FeatureFlagUtils;
-
-import com.android.settings.core.FeatureFlags;
-import com.android.settings.core.SettingsBaseActivity;
-import com.android.settings.homepage.HomepageFragment;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-
-public class SettingsHomepageActivity extends SettingsBaseActivity {
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- if (!isDynamicHomepageEnabled(this)) {
- final Intent settings = new Intent();
- settings.setAction("android.settings.SETTINGS");
- startActivity(settings);
- finish();
- }
- setContentView(R.layout.settings_homepage);
- switchToFragment(this, R.id.main_content, HomepageFragment.class.getName());
- }
-
- public static boolean isDynamicHomepageEnabled(Context context) {
- return FeatureFlagUtils.isEnabled(context, FeatureFlags.DYNAMIC_HOMEPAGE);
- }
-
- /**
- * Switch to a specific Fragment
- */
- public static void switchToFragment(FragmentActivity activity, int id, String fragmentName) {
- final Fragment f = Fragment.instantiate(activity, fragmentName, null /* args */);
-
- FragmentManager manager = activity.getSupportFragmentManager();
- manager.beginTransaction().replace(id, f).commitAllowingStateLoss();
- manager.executePendingTransactions();
- }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java
index a66207e..9c37df6 100644
--- a/src/com/android/settings/SettingsInitialize.java
+++ b/src/com/android/settings/SettingsInitialize.java
@@ -34,13 +34,13 @@
import android.os.UserManager;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.Settings.CreateShortcutActivity;
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Listens to {@link Intent.ACTION_PRE_BOOT_COMPLETED} and {@link Intent.ACTION_USER_INITIALIZED}
* performs setup steps for a managed profile (disables the launcher icon of the Settings app,
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index c1bf9e5..2581ed9 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -26,17 +26,17 @@
import android.util.Log;
import android.widget.Toast;
-import com.android.settings.users.RestrictedProfileSettings;
-import com.android.settingslib.license.LicenseHtmlLoaderCompat;
-
-import java.io.File;
-
import androidx.annotation.VisibleForTesting;
import androidx.core.content.FileProvider;
import androidx.fragment.app.FragmentActivity;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
+import com.android.settings.users.RestrictedProfileSettings;
+import com.android.settingslib.license.LicenseHtmlLoaderCompat;
+
+import java.io.File;
+
/**
* The "dialog" that shows from "License" in the Settings app.
*/
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 7ad18fe..5cfe218 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -32,6 +32,16 @@
import android.view.ViewGroup;
import android.widget.Button;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.XmlRes;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -48,16 +58,6 @@
import java.util.UUID;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.XmlRes;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* Base class for Settings fragments, with some helper functions and dialog management.
*/
@@ -454,7 +454,7 @@
if (mDialogFragment != null) {
Log.e(TAG, "Old dialog fragment not null!");
}
- mDialogFragment = new SettingsDialogFragment(this, dialogId);
+ mDialogFragment = SettingsDialogFragment.newInstance(this, dialogId);
mDialogFragment.show(getChildFragmentManager(), Integer.toString(dialogId));
}
@@ -541,26 +541,26 @@
private DialogInterface.OnCancelListener mOnCancelListener;
private DialogInterface.OnDismissListener mOnDismissListener;
- public SettingsDialogFragment() {
- /* do nothing */
- }
-
- public SettingsDialogFragment(DialogCreatable fragment, int dialogId) {
- super(fragment, dialogId);
+ public static SettingsDialogFragment newInstance(DialogCreatable fragment, int dialogId) {
if (!(fragment instanceof Fragment)) {
throw new IllegalArgumentException("fragment argument must be an instance of "
+ Fragment.class.getName());
}
- mParentFragment = (Fragment) fragment;
- }
+ final SettingsDialogFragment settingsDialogFragment = new SettingsDialogFragment();
+ settingsDialogFragment.setParentFragment(fragment);
+ settingsDialogFragment.setDialogId(dialogId);
+
+ return settingsDialogFragment;
+ }
@Override
public int getMetricsCategory() {
- if (mDialogCreatable == null) {
+ if (mParentFragment == null) {
return Instrumentable.METRICS_CATEGORY_UNKNOWN;
}
- final int metricsCategory = mDialogCreatable.getDialogMetricsCategory(mDialogId);
+ final int metricsCategory =
+ ((DialogCreatable) mParentFragment).getDialogMetricsCategory(mDialogId);
if (metricsCategory <= 0) {
throw new IllegalStateException("Dialog must provide a metrics category");
}
@@ -643,6 +643,14 @@
}
}
}
+
+ private void setParentFragment(DialogCreatable fragment) {
+ mParentFragment = (Fragment) fragment;
+ }
+
+ private void setDialogId(int dialogId) {
+ mDialogId = dialogId;
+ }
}
protected boolean hasNextButton() {
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index 60ad1ed..27cdb69 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -19,10 +19,10 @@
import android.content.Intent;
import android.os.SystemProperties;
-import com.android.setupwizardlib.util.WizardManagerHelper;
-
import androidx.annotation.VisibleForTesting;
+import com.android.setupwizardlib.util.WizardManagerHelper;
+
public class SetupWizardUtils {
@VisibleForTesting
diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java
index acfe89f..ff58f11 100644
--- a/src/com/android/settings/TestingSettings.java
+++ b/src/com/android/settings/TestingSettings.java
@@ -19,10 +19,10 @@
import android.os.Bundle;
import android.os.UserManager;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
import androidx.preference.PreferenceScreen;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+
public class TestingSettings extends SettingsPreferenceFragment {
@Override
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 9515a13..d32e387 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -36,6 +36,10 @@
import android.os.UserManager;
import android.provider.SearchIndexableResource;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.datausage.DataSaverBackend;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -50,10 +54,6 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicReference;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
/*
* Displays preferences for Tethering.
*/
@@ -423,9 +423,6 @@
startTethering(TETHERING_BLUETOOTH);
} else {
mCm.stopTethering(TETHERING_BLUETOOTH);
- // No ACTION_TETHER_STATE_CHANGED is fired or bluetooth unless a device is
- // connected. Need to update state manually.
- updateState();
}
}
diff --git a/src/com/android/settings/TrustedCredentialsDialogBuilder.java b/src/com/android/settings/TrustedCredentialsDialogBuilder.java
index 76bf861..806da92 100644
--- a/src/com/android/settings/TrustedCredentialsDialogBuilder.java
+++ b/src/com/android/settings/TrustedCredentialsDialogBuilder.java
@@ -31,6 +31,8 @@
import android.widget.LinearLayout;
import android.widget.Spinner;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.TrustedCredentialsSettings.CertHolder;
import com.android.settingslib.RestrictedLockUtils;
@@ -40,8 +42,6 @@
import java.util.List;
import java.util.function.IntConsumer;
-import androidx.appcompat.app.AlertDialog;
-
class TrustedCredentialsDialogBuilder extends AlertDialog.Builder {
public interface DelegateInterface {
List<X509Certificate> getX509CertsFromCertHolder(CertHolder certHolder);
@@ -229,7 +229,7 @@
&& !mDpm.isCaCertApproved(certHolder.getAlias(), certHolder.getUserId());
final boolean isProfileOrDeviceOwner = RestrictedLockUtils.getProfileOrDeviceOwner(
- mActivity, certHolder.getUserId()) != null;
+ mActivity, UserHandle.of(certHolder.getUserId())) != null;
// Show trust button only when it requires consumer user (non-PO/DO) to approve
CharSequence displayText = mActivity.getText(!isProfileOrDeviceOwner && mNeedsApproval
diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java
index 06d0be6..b1f9fe7 100644
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java
@@ -43,11 +43,17 @@
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import java.security.UnrecoverableKeyException;
import java.util.ArrayList;
@@ -56,11 +62,6 @@
import java.util.SortedMap;
import java.util.TreeMap;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.RecyclerView;
-
public class UserCredentialsSettings extends SettingsPreferenceFragment
implements View.OnClickListener {
private static final String TAG = "UserCredentialsSettings";
@@ -137,11 +138,12 @@
final String restriction = UserManager.DISALLOW_CONFIG_CREDENTIALS;
final int myUserId = UserHandle.myUserId();
- if (!RestrictedLockUtils.hasBaseUserRestriction(getContext(), restriction, myUserId)) {
+ if (!RestrictedLockUtilsInternal.hasBaseUserRestriction(getContext(), restriction,
+ myUserId)) {
DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
@Override public void onClick(DialogInterface dialog, int id) {
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
- getContext(), restriction, myUserId);
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal
+ .checkIfRestrictionEnforced(getContext(), restriction, myUserId);
if (admin != null) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
admin);
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 9d5f96f..14a9e83 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -87,6 +87,11 @@
import android.widget.ListView;
import android.widget.TabWidget;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
import com.android.internal.app.UnlaunchableAppActivity;
import com.android.internal.util.ArrayUtils;
import com.android.internal.widget.LockPatternUtils;
@@ -97,11 +102,6 @@
import java.util.List;
import java.util.Locale;
-import androidx.annotation.StringRes;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
public final class Utils extends com.android.settingslib.Utils {
private static final String TAG = "Settings";
diff --git a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
index b946e3e..b9713d7 100644
--- a/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
+++ b/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceController.java
@@ -39,7 +39,6 @@
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -82,6 +81,7 @@
};
private final LocalBluetoothManager mLocalBluetoothManager;
+ private final BluetoothAdapter mBluetoothAdapter;
//cache value of supporting hearing aid or not
private boolean mHearingAidProfileSupported;
private FragmentManager mFragmentManager;
@@ -89,6 +89,7 @@
public AccessibilityHearingAidPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
mLocalBluetoothManager = getLocalBluetoothManager();
+ mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
mHearingAidProfileSupported = isHearingAidProfileSupported();
}
@@ -151,8 +152,7 @@
if (!mHearingAidProfileSupported) {
return null;
}
- final LocalBluetoothAdapter localAdapter = mLocalBluetoothManager.getBluetoothAdapter();
- if (!localAdapter.isEnabled()) {
+ if (!mBluetoothAdapter.isEnabled()) {
return null;
}
final List<BluetoothDevice> deviceList = mLocalBluetoothManager.getProfileManager()
@@ -166,8 +166,7 @@
}
private boolean isHearingAidProfileSupported() {
- final LocalBluetoothAdapter localAdapter = mLocalBluetoothManager.getBluetoothAdapter();
- final List<Integer> supportedList = localAdapter.getSupportedProfiles();
+ final List<Integer> supportedList = mBluetoothAdapter.getSupportedProfiles();
if (supportedList.contains(BluetoothProfile.HEARING_AID)) {
return true;
}
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index 95e1643..6360d42 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -16,7 +16,7 @@
package com.android.settings.accessibility;
-import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity;
@@ -35,13 +35,13 @@
import android.widget.TextView;
import android.widget.Toast;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import java.util.List;
import java.util.Locale;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Utility class for creating the dialog that asks users for explicit permission to grant
* all of the requested capabilities to an accessibility service before the service is enabled
@@ -72,7 +72,7 @@
Window window = ad.getWindow();
WindowManager.LayoutParams params = window.getAttributes();
- params.privateFlags |= PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+ params.privateFlags |= SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
window.setAttributes(params);
ad.create();
ad.getButton(AlertDialog.BUTTON_POSITIVE).setOnTouchListener(filterTouchListener);
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index d1b1ad4..65b0e86 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -39,6 +39,14 @@
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;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -47,9 +55,10 @@
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
+import com.android.settings.display.ToggleFontSizePreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.search.SearchIndexable;
@@ -61,14 +70,6 @@
import java.util.Map;
import java.util.Set;
-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;
-import androidx.preference.SwitchPreference;
-
/**
* Activity with the accessibility settings.
*/
@@ -118,8 +119,6 @@
"magnification_preference_screen";
private static final String FONT_SIZE_PREFERENCE_SCREEN =
"font_size_preference_screen";
- private static final String TTS_SETTINGS_PREFERENCE =
- "tts_settings_preference";
private static final String AUTOCLICK_PREFERENCE_SCREEN =
"autoclick_preference";
private static final String VIBRATION_PREFERENCE_SCREEN =
@@ -551,7 +550,7 @@
Drawable icon;
if (resolveInfo.getIconResource() == 0) {
- icon = ContextCompat.getDrawable(getContext(), R.mipmap.ic_accessibility_generic);
+ icon = ContextCompat.getDrawable(getContext(), R.drawable.ic_accessibility_generic);
} else {
icon = resolveInfo.loadIcon(getPackageManager());
}
@@ -586,7 +585,7 @@
permittedServices == null || permittedServices.contains(packageName);
if (!serviceAllowed && !serviceEnabled) {
final EnforcedAdmin admin =
- RestrictedLockUtils.checkIfAccessibilityServiceDisallowed(
+ RestrictedLockUtilsInternal.checkIfAccessibilityServiceDisallowed(
getActivity(), packageName, UserHandle.myUserId());
if (admin != null) {
preference.setDisabledByAdmin(admin);
@@ -887,8 +886,6 @@
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
- public static final String KEY_DISPLAY_SIZE = "accessibility_settings_screen_zoom";
-
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
boolean enabled) {
@@ -898,21 +895,5 @@
indexables.add(indexable);
return indexables;
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- List<String> keys = super.getNonIndexableKeys(context);
- // Duplicates in Display
- keys.add(FONT_SIZE_PREFERENCE_SCREEN);
- keys.add(KEY_DISPLAY_SIZE);
-
- // Duplicates in Language & Input
- keys.add(TTS_SETTINGS_PREFERENCE);
-
- // Duplicates in child page
- keys.add(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
- keys.add(AUTOCLICK_PREFERENCE_SCREEN);
- return keys;
- }
};
}
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
index e6f7a9a..9ee155f 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java
@@ -24,14 +24,14 @@
import android.text.TextUtils;
import android.view.accessibility.AccessibilityManager;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import java.util.List;
-import androidx.preference.Preference;
-
/**
* Activity with the accessibility settings specific to Setup Wizard.
*/
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 1b8e554..9512f01 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -20,15 +20,15 @@
import android.view.Menu;
import android.view.accessibility.AccessibilityEvent;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+
import com.android.settings.SettingsActivity;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.search.actionbar.SearchMenuController;
import com.android.settings.support.actionbar.HelpResourceProvider;
import com.android.settingslib.core.instrumentation.Instrumentable;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-
public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity {
private static final String SAVE_KEY_TITLE = "activity_title";
diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
index 1b773bb..3cd260f 100644
--- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java
@@ -28,6 +28,9 @@
import android.view.accessibility.AccessibilityManager;
import android.widget.Switch;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -36,9 +39,6 @@
import com.android.settingslib.accessibility.AccessibilityUtils;
import com.android.settingslib.search.SearchIndexable;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
/**
* Settings page for accessibility shortcut
*/
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index b1e5ece..33cb95e 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -31,6 +31,11 @@
import android.view.accessibility.CaptioningManager;
import android.view.accessibility.CaptioningManager.CaptionStyle;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceCategory;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.SubtitleView;
import com.android.settings.R;
@@ -44,11 +49,6 @@
import java.util.Locale;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceCategory;
-
/**
* Settings fragment containing captioning properties.
*/
diff --git a/src/com/android/settings/accessibility/ColorInversionPreferenceController.java b/src/com/android/settings/accessibility/ColorInversionPreferenceController.java
index bd989dc..4e4c17b 100644
--- a/src/com/android/settings/accessibility/ColorInversionPreferenceController.java
+++ b/src/com/android/settings/accessibility/ColorInversionPreferenceController.java
@@ -19,10 +19,10 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.TogglePreferenceController;
-
import androidx.annotation.VisibleForTesting;
+import com.android.settings.core.TogglePreferenceController;
+
public class ColorInversionPreferenceController extends TogglePreferenceController {
@VisibleForTesting
static final int ON = 1;
diff --git a/src/com/android/settings/accessibility/ColorPreference.java b/src/com/android/settings/accessibility/ColorPreference.java
index 810f809..e360a9e 100644
--- a/src/com/android/settings/accessibility/ColorPreference.java
+++ b/src/com/android/settings/accessibility/ColorPreference.java
@@ -26,10 +26,10 @@
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.settings.R;
-
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
/**
* Grid preference that allows the user to pick a color from a predefined set of
* colors. Optionally shows a preview in the preference item.
diff --git a/src/com/android/settings/accessibility/ListDialogPreference.java b/src/com/android/settings/accessibility/ListDialogPreference.java
index 8a09512..7abc450 100644
--- a/src/com/android/settings/accessibility/ListDialogPreference.java
+++ b/src/com/android/settings/accessibility/ListDialogPreference.java
@@ -30,10 +30,10 @@
import android.widget.AdapterView;
import android.widget.BaseAdapter;
-import com.android.settingslib.CustomDialogPreferenceCompat;
-
import androidx.appcompat.app.AlertDialog.Builder;
+import com.android.settingslib.CustomDialogPreferenceCompat;
+
/**
* Abstract dialog preference that displays a set of values and optional titles.
*/
diff --git a/src/com/android/settings/accessibility/LocalePreference.java b/src/com/android/settings/accessibility/LocalePreference.java
index 145af9d..a3723fd 100644
--- a/src/com/android/settings/accessibility/LocalePreference.java
+++ b/src/com/android/settings/accessibility/LocalePreference.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.util.AttributeSet;
+import androidx.preference.ListPreference;
+
import com.android.internal.app.LocalePicker;
import com.android.settings.R;
import java.util.List;
-import androidx.preference.ListPreference;
-
/**
* List preference that allows the user to pick a locale from the list of
* supported device locales.
diff --git a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
index 9ffdf8c..f613c69 100644
--- a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
+++ b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java
@@ -18,11 +18,11 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
-import androidx.preference.Preference;
-
public class MagnificationGesturesPreferenceController extends TogglePreferenceController {
private boolean mIsFromSUW = false;
diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
index a2962d4..5af5d93 100644
--- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
+++ b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java
@@ -18,11 +18,11 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
-import androidx.preference.Preference;
-
public class MagnificationNavbarPreferenceController extends TogglePreferenceController {
private boolean mIsFromSUW = false;
diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
index 5f1cee4..31b23fa 100644
--- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java
@@ -27,6 +27,9 @@
import android.text.TextUtils;
import android.view.accessibility.AccessibilityManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -39,9 +42,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
@SearchIndexable
public final class MagnificationPreferenceFragment extends DashboardFragment {
@VisibleForTesting
@@ -172,12 +172,5 @@
protected boolean isPageSearchEnabled(Context context) {
return isApplicable(context.getResources());
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- List<String> keys = super.getNonIndexableKeys(context);
- keys.add(PREFERENCE_TITLE_KEY);
- return keys;
- }
};
}
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index 08a6269..213bfbd 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -16,6 +16,7 @@
package com.android.settings.accessibility;
import static android.content.DialogInterface.BUTTON_POSITIVE;
+
import static com.android.internal.accessibility.AccessibilityShortcutController
.COLOR_INVERSION_COMPONENT_NAME;
import static com.android.internal.accessibility.AccessibilityShortcutController
@@ -38,6 +39,9 @@
import android.text.TextUtils;
import android.view.accessibility.AccessibilityManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.internal.accessibility.AccessibilityShortcutController;
import com.android.internal.accessibility.AccessibilityShortcutController
.ToggleableFrameworkFeatureInfo;
@@ -53,9 +57,6 @@
import java.util.List;
import java.util.Map;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
/**
* Fragment for picking accessibility shortcut service
*/
@@ -257,7 +258,7 @@
public Drawable loadIcon() {
final ResolveInfo resolveInfo = mServiceInfo.getResolveInfo();
return (resolveInfo.getIconResource() == 0)
- ? getContext().getDrawable(R.mipmap.ic_accessibility_generic)
+ ? getContext().getDrawable(R.drawable.ic_accessibility_generic)
: resolveInfo.loadIcon(getContext().getPackageManager());
}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 6738736..c0df6a3 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -35,6 +35,8 @@
import android.view.MenuInflater;
import android.view.accessibility.AccessibilityManager;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
@@ -45,8 +47,6 @@
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-
public class ToggleAccessibilityServicePreferenceFragment
extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
index 97be2b3..a9c7781 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java
@@ -24,6 +24,8 @@
import android.view.accessibility.AccessibilityManager;
import android.widget.Switch;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -35,8 +37,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
/**
* Fragment for preference screen for settings related to Automatically click after mouse stops
* feature.
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index bb7bb9e..184c615 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -23,6 +23,9 @@
import android.view.accessibility.AccessibilityManager;
import android.widget.Switch;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -33,9 +36,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
@SearchIndexable
public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
implements Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener {
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index a466c2f..fba5ddb 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -21,15 +21,15 @@
import android.os.Bundle;
import android.view.View;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment {
protected SwitchBar mSwitchBar;
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index b69c988..99ed7a1 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -33,14 +33,14 @@
import android.widget.Switch;
import android.widget.VideoView;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.widget.SwitchBar;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.widget.SwitchBar;
+
public class ToggleScreenMagnificationPreferenceFragment extends
ToggleFeaturePreferenceFragment implements SwitchBar.OnSwitchChangeListener {
diff --git a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
index 789e28f..d9b1d79 100644
--- a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
+++ b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java
@@ -24,15 +24,15 @@
import android.os.Vibrator;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
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 androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public abstract class VibrationIntensityPreferenceController extends BasePreferenceController
implements LifecycleObserver, OnStart, OnStop {
diff --git a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java
index 288b5fa..1101611 100644
--- a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java
@@ -29,6 +29,8 @@
import android.util.ArrayMap;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settingslib.widget.CandidateInfo;
@@ -38,8 +40,6 @@
import java.util.List;
import java.util.Map;
-import androidx.annotation.VisibleForTesting;
-
/**
* Fragment for changing vibration settings.
*/
diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java
index d8b1008..c1499ce 100644
--- a/src/com/android/settings/accounts/AccountDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDashboardFragment.java
@@ -18,22 +18,16 @@
import static android.provider.Settings.EXTRA_AUTHORITIES;
import android.content.Context;
-import android.icu.text.ListFormatter;
-import android.os.UserHandle;
import android.provider.SearchIndexableResource;
-import android.text.BidiFormatter;
-import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.users.AutoSyncDataPreferenceController;
import com.android.settings.users.AutoSyncPersonalDataPreferenceController;
import com.android.settings.users.AutoSyncWorkDataPreferenceController;
-import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
@@ -89,49 +83,6 @@
return controllers;
}
- private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- final AuthenticatorHelper authHelper = new AuthenticatorHelper(mContext,
- UserHandle.of(UserHandle.myUserId()), null /* OnAccountsUpdateListener */);
- final String[] types = authHelper.getEnabledAccountTypes();
- final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
- final List<CharSequence> summaries = new ArrayList<>();
-
- if (types == null || types.length == 0) {
- summaries.add(mContext.getString(R.string.account_dashboard_default_summary));
- } else {
- // Show up to 3 account types, ignore any null value
- int accountToAdd = Math.min(3, types.length);
-
- for (int i = 0; i < types.length && accountToAdd > 0; i++) {
- final CharSequence label = authHelper.getLabelForType(mContext, types[i]);
- if (TextUtils.isEmpty(label)) {
- continue;
- }
-
- summaries.add(bidiFormatter.unicodeWrap(label));
- accountToAdd--;
- }
- }
- mSummaryLoader.setSummary(this, ListFormatter.getInstance().format(summaries));
- }
- }
- }
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);
-
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
index 14d2fd3..78a8614 100644
--- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
+++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java
@@ -16,12 +16,16 @@
package com.android.settings.accounts;
import android.accounts.Account;
+import android.accounts.AccountManager;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -33,9 +37,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceScreen;
-
public class AccountDetailDashboardFragment extends DashboardFragment {
private static final String TAG = "AccountDetailDashboard";
@@ -89,6 +90,28 @@
updateUi();
}
+ @VisibleForTesting
+ void finishIfAccountMissing() {
+ final Context context = getContext();
+ final UserManager um = context.getSystemService(UserManager.class);
+ final AccountManager accountManager = (AccountManager) context.getSystemService(
+ AccountManager.class);
+ for (UserHandle userHandle : um.getUserProfiles()) {
+ for (Account account : accountManager.getAccountsAsUser(userHandle.getIdentifier())) {
+ if (account.equals(mAccount)) {
+ return;
+ }
+ }
+ }
+ finish();
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ finishIfAccountMissing();
+ }
+
@Override
public int getMetricsCategory() {
return MetricsEvent.ACCOUNT;
@@ -131,8 +154,8 @@
return false;
}
final boolean display = mAccountType.equals(metadata.getString(METADATA_IA_ACCOUNT));
- if (display && tile.intent != null) {
- tile.intent.putExtra(EXTRA_ACCOUNT_NAME, mAccount.name);
+ if (display) {
+ tile.getIntent().putExtra(EXTRA_ACCOUNT_NAME, mAccount.name);
}
return display;
}
@@ -154,4 +177,4 @@
accountTypePreferenceLoader.updatePreferenceIntents(prefs, mAccountType, mAccount);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
index 25a902e..36a7021 100644
--- a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java
@@ -25,6 +25,9 @@
import android.os.Bundle;
import android.os.UserHandle;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.PreferenceControllerMixin;
@@ -35,9 +38,6 @@
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
public class AccountHeaderPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/accounts/AccountPreference.java b/src/com/android/settings/accounts/AccountPreference.java
index 950b987..eea3113 100644
--- a/src/com/android/settings/accounts/AccountPreference.java
+++ b/src/com/android/settings/accounts/AccountPreference.java
@@ -22,13 +22,13 @@
import android.util.Log;
import android.widget.ImageView;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import java.util.ArrayList;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
/**
* AccountPreference is used to display a username, status and provider icon for an account on
* the device.
diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java
index 46a3e6b..7130435 100644
--- a/src/com/android/settings/accounts/AccountPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountPreferenceController.java
@@ -41,6 +41,12 @@
import android.util.Log;
import android.util.SparseArray;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.AccessiblePreferenceCategory;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -62,12 +68,6 @@
import java.util.Comparator;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
public class AccountPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, AuthenticatorHelper.OnAccountsUpdateListener,
OnPreferenceClickListener, LifecycleObserver, OnPause, OnResume {
diff --git a/src/com/android/settings/accounts/AccountRestrictionHelper.java b/src/com/android/settings/accounts/AccountRestrictionHelper.java
index 5fa83b3..05b27aa 100644
--- a/src/com/android/settings/accounts/AccountRestrictionHelper.java
+++ b/src/com/android/settings/accounts/AccountRestrictionHelper.java
@@ -19,7 +19,7 @@
import android.content.Context;
import com.android.settings.AccessiblePreferenceCategory;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import java.util.ArrayList;
@@ -51,7 +51,8 @@
}
public boolean hasBaseUserRestriction(String userRestriction, @UserIdInt int userId) {
- return RestrictedLockUtils.hasBaseUserRestriction(mContext, userRestriction, userId);
+ return RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext, userRestriction,
+ userId);
}
public AccessiblePreferenceCategory createAccessiblePreferenceCategory(Context context) {
diff --git a/src/com/android/settings/accounts/AccountSyncPreferenceController.java b/src/com/android/settings/accounts/AccountSyncPreferenceController.java
index 3ed19d2..6d58bb8 100644
--- a/src/com/android/settings/accounts/AccountSyncPreferenceController.java
+++ b/src/com/android/settings/accounts/AccountSyncPreferenceController.java
@@ -25,6 +25,10 @@
import android.os.Bundle;
import android.os.UserHandle;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
@@ -32,10 +36,6 @@
import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class AccountSyncPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, AuthenticatorHelper.OnAccountsUpdateListener {
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index 58624cd..8a33e6c 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -41,6 +41,9 @@
import android.view.MenuInflater;
import android.view.MenuItem;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -52,9 +55,6 @@
import java.util.Date;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-
public class AccountSyncSettings extends AccountPreferenceBase {
public static final String ACCOUNT_KEY = "account";
diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java
index 81bf2e4..c82a599 100644
--- a/src/com/android/settings/accounts/AccountTypePreference.java
+++ b/src/com/android/settings/accounts/AccountTypePreference.java
@@ -25,13 +25,13 @@
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settings.Utils;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.widget.AppPreference;
-
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
+import com.android.settings.Utils;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.widget.apppreference.AppPreference;
+
public class AccountTypePreference extends AppPreference implements OnPreferenceClickListener {
/**
* Title of the tile that is shown to the user.
diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
index 90bcb5e..d32b630 100644
--- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
+++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java
@@ -32,6 +32,12 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.location.LocationSettings;
@@ -39,12 +45,6 @@
import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.settingslib.core.instrumentation.Instrumentable;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
/**
* Class to load the preference screen to be added to the settings page for the specific account
* type as specified in the account-authenticator.
diff --git a/src/com/android/settings/accounts/AvatarViewMixin.java b/src/com/android/settings/accounts/AvatarViewMixin.java
new file mode 100644
index 0000000..d7f6f8a
--- /dev/null
+++ b/src/com/android/settings/accounts/AvatarViewMixin.java
@@ -0,0 +1,60 @@
+/*
+ * 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.accounts;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.widget.ImageView;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+
+import com.android.settings.R;
+import com.android.settings.homepage.SettingsHomepageActivity;
+import com.android.settings.overlay.FeatureFactory;
+
+/**
+ * Avatar related work to the onStart method of registered observable classes
+ * in {@link SettingsHomepageActivity}.
+ */
+public class AvatarViewMixin implements LifecycleObserver {
+ private Context mContext;
+ private ImageView mAvatarView;
+
+ public AvatarViewMixin(Context context, ImageView avatarView) {
+ mContext = context.getApplicationContext();
+ mAvatarView = avatarView;
+ }
+
+ @OnLifecycleEvent(Lifecycle.Event.ON_START)
+ public void onStart() {
+ if (hasAccount()) {
+ //TODO(b/117509285): To migrate account icon on search bar
+ } else {
+ mAvatarView.setImageResource(R.drawable.ic_account_circle_24dp);
+ }
+ }
+
+ @VisibleForTesting
+ boolean hasAccount() {
+ final Account accounts[] = FeatureFactory.getFactory(
+ mContext).getAccountFeatureProvider().getAccounts(mContext);
+ return (accounts != null) && (accounts.length > 0);
+ }
+}
diff --git a/src/com/android/settings/accounts/ChooseAccountPreferenceController.java b/src/com/android/settings/accounts/ChooseAccountPreferenceController.java
index ded204b..a217f01 100644
--- a/src/com/android/settings/accounts/ChooseAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/ChooseAccountPreferenceController.java
@@ -33,8 +33,13 @@
import android.os.UserHandle;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.android.collect.Maps;
@@ -46,10 +51,6 @@
import java.util.Map;
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* An extra {@link UserHandle} can be specified in the intent as {@link EXTRA_USER}, if the user for
* which the action needs to be performed is different to the one the Settings App will run in.
@@ -167,7 +168,7 @@
// There's only one provider that matches. If it is disabled by admin show the
// support dialog otherwise run it.
final RestrictedLockUtils.EnforcedAdmin admin =
- RestrictedLockUtils.checkIfAccountManagementDisabled(
+ RestrictedLockUtilsInternal.checkIfAccountManagementDisabled(
context, mProviderList.get(0).getType(), mUserHandle.getIdentifier());
if (admin != null) {
mActivity.setResult(RESULT_CANCELED,
diff --git a/src/com/android/settings/accounts/ContactSearchPreferenceController.java b/src/com/android/settings/accounts/ContactSearchPreferenceController.java
index adfa7e1..8b94ba1 100644
--- a/src/com/android/settings/accounts/ContactSearchPreferenceController.java
+++ b/src/com/android/settings/accounts/ContactSearchPreferenceController.java
@@ -19,13 +19,14 @@
import android.os.UserHandle;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.slices.SliceData;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
-import androidx.preference.Preference;
-
public class ContactSearchPreferenceController extends BasePreferenceController implements
Preference.OnPreferenceChangeListener {
@@ -52,7 +53,7 @@
pref.setChecked(isChecked());
if (mManagedUser != null) {
final RestrictedLockUtils.EnforcedAdmin enforcedAdmin =
- RestrictedLockUtils.checkIfRemoteContactSearchDisallowed(
+ RestrictedLockUtilsInternal.checkIfRemoteContactSearchDisallowed(
mContext, mManagedUser.getIdentifier());
pref.setDisabledByAdmin(enforcedAdmin);
}
diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
index a24a04e..31e5613 100644
--- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
+++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java
@@ -23,6 +23,8 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.search.SearchIndexableRaw;
@@ -30,8 +32,6 @@
import java.util.List;
-import androidx.preference.Preference;
-
public class EmergencyInfoPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java b/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
index aad1172..7a6e5fa 100644
--- a/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
+++ b/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceController.java
@@ -18,15 +18,15 @@
import android.content.Context;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
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;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceScreen;
-
public class EnterpriseDisclosurePreferenceController extends BasePreferenceController {
private final EnterprisePrivacyFeatureProvider mFeatureProvider;
diff --git a/src/com/android/settings/accounts/ProviderPreference.java b/src/com/android/settings/accounts/ProviderPreference.java
index 1143f8d..b39f561 100644
--- a/src/com/android/settings/accounts/ProviderPreference.java
+++ b/src/com/android/settings/accounts/ProviderPreference.java
@@ -21,7 +21,7 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
/**
@@ -47,7 +47,7 @@
}
public void checkAccountManagementAndSetDisabled(int userId) {
- EnforcedAdmin admin = RestrictedLockUtils.checkIfAccountManagementDisabled(
+ EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfAccountManagementDisabled(
getContext(), getAccountType(), userId);
setDisabledByAdmin(admin);
}
diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index 3520116..9770332 100644
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -33,6 +33,10 @@
import android.view.View.OnClickListener;
import android.widget.Button;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
@@ -40,14 +44,11 @@
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
import java.io.IOException;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.preference.PreferenceScreen;
-
public class RemoveAccountPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, OnClickListener {
@@ -84,8 +85,8 @@
@Override
public void onClick(View v) {
if (mUserHandle != null) {
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
- UserManager.DISALLOW_MODIFY_ACCOUNTS, mUserHandle.getIdentifier());
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+ mContext, UserManager.DISALLOW_MODIFY_ACCOUNTS, mUserHandle.getIdentifier());
if (admin != null) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, admin);
return;
@@ -156,10 +157,6 @@
new AccountManagerCallback<Bundle>() {
@Override
public void run(AccountManagerFuture<Bundle> future) {
- // If already out of this screen, don't proceed.
- if (!getTargetFragment().isResumed()) {
- return;
- }
boolean failed = true;
try {
if (future.getResult()
diff --git a/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java
index 17cf6b9..9c7f739 100644
--- a/src/com/android/settings/accounts/SyncStateSwitchPreference.java
+++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java
@@ -25,12 +25,12 @@
import android.view.View;
import android.widget.TextView;
-import com.android.settings.R;
-import com.android.settingslib.widget.AnimatedImageView;
-
import androidx.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreference;
+import com.android.settings.R;
+import com.android.settingslib.widget.AnimatedImageView;
+
public class SyncStateSwitchPreference extends SwitchPreference {
private boolean mIsActive = false;
diff --git a/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java b/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java
new file mode 100644
index 0000000..a8d93d5
--- /dev/null
+++ b/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java
@@ -0,0 +1,68 @@
+/*
+ * 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.accounts;
+
+import android.content.Context;
+import android.icu.text.ListFormatter;
+import android.os.UserHandle;
+import android.text.BidiFormatter;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.accounts.AuthenticatorHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TopLevelAccountEntryPreferenceController extends BasePreferenceController {
+ public TopLevelAccountEntryPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE_UNSEARCHABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ final AuthenticatorHelper authHelper = new AuthenticatorHelper(mContext,
+ UserHandle.of(UserHandle.myUserId()), null /* OnAccountsUpdateListener */);
+ final String[] types = authHelper.getEnabledAccountTypes();
+ final BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+ final List<CharSequence> summaries = new ArrayList<>();
+
+ if (types == null || types.length == 0) {
+ summaries.add(mContext.getString(R.string.account_dashboard_default_summary));
+ } else {
+ // Show up to 3 account types, ignore any null value
+ int accountToAdd = Math.min(3, types.length);
+
+ for (int i = 0; i < types.length && accountToAdd > 0; i++) {
+ final CharSequence label = authHelper.getLabelForType(mContext, types[i]);
+ if (TextUtils.isEmpty(label)) {
+ continue;
+ }
+
+ summaries.add(bidiFormatter.unicodeWrap(label));
+ accountToAdd--;
+ }
+ }
+ return ListFormatter.getInstance().format(summaries);
+ }
+}
diff --git a/src/com/android/settings/accounts/WorkModePreferenceController.java b/src/com/android/settings/accounts/WorkModePreferenceController.java
index fd8a6a9..f3a6ed2 100644
--- a/src/com/android/settings/accounts/WorkModePreferenceController.java
+++ b/src/com/android/settings/accounts/WorkModePreferenceController.java
@@ -21,6 +21,11 @@
import android.os.UserManager;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.slices.SliceData;
@@ -28,11 +33,6 @@
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
public class WorkModePreferenceController extends BasePreferenceController implements
Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop {
diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
index e8b7d00..9ac3ecc 100644
--- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
+++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
@@ -21,6 +21,8 @@
import android.content.Context;
import android.provider.SearchIndexableResource;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -33,8 +35,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.fragment.app.Fragment;
-
@SearchIndexable
public class AppAndNotificationDashboardFragment extends DashboardFragment {
@@ -61,6 +61,12 @@
}
@Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ use(SpecialAppAccessPreferenceController.class).setSession(getSettingsLifecycle());
+ }
+
+ @Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final Activity activity = getActivity();
final Application app;
@@ -77,7 +83,6 @@
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new EmergencyBroadcastPreferenceController(context,
"app_and_notif_cell_broadcast_settings"));
- controllers.add(new SpecialAppAccessPreferenceController(context));
controllers.add(new RecentAppsPreferenceController(context, app, host));
return controllers;
}
@@ -97,13 +102,5 @@
Context context) {
return buildPreferenceControllers(context, null, null /* host */);
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- List<String> keys = super.getNonIndexableKeys(context);
- keys.add((new SpecialAppAccessPreferenceController(context))
- .getPreferenceKey());
- return keys;
- }
};
}
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index 0acb046..7fb5787f 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -37,6 +37,10 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -44,24 +48,19 @@
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import java.util.ArrayList;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-
public abstract class AppInfoBase extends SettingsPreferenceFragment
implements ApplicationsState.Callbacks {
public static final String ARG_PACKAGE_NAME = "package";
public static final String ARG_PACKAGE_UID = "uid";
- protected static final String TAG = AppInfoBase.class.getSimpleName();
- protected static final boolean localLOGV = false;
+ private static final String TAG = "AppInfoBase";
protected EnforcedAdmin mAppsControlDisallowedAdmin;
protected boolean mAppsControlDisallowedBySystem;
@@ -107,13 +106,13 @@
@Override
public void onResume() {
super.onResume();
- mAppsControlDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
- UserManager.DISALLOW_APPS_CONTROL, mUserId);
- mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
- UserManager.DISALLOW_APPS_CONTROL, mUserId);
+ mAppsControlDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+ getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
+ mAppsControlDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
+ getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
if (!refreshUi()) {
- setIntentAndFinish(true, true);
+ setIntentAndFinish(true /* appChanged */);
}
}
@@ -159,8 +158,8 @@
return mPackageName;
}
- protected void setIntentAndFinish(boolean finish, boolean appChanged) {
- if (localLOGV) Log.i(TAG, "appChanged=" + appChanged);
+ protected void setIntentAndFinish(boolean appChanged) {
+ Log.i(TAG, "appChanged=" + appChanged);
Intent intent = new Intent();
intent.putExtra(ManageApplications.APP_CHG, appChanged);
SettingsActivity sa = (SettingsActivity) getActivity();
@@ -216,7 +215,7 @@
@Override
public void onPackageListChanged() {
if (!refreshUi()) {
- setIntentAndFinish(true, true);
+ setIntentAndFinish(true /* appChanged */);
}
}
diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java
index 2a4aeb8..9e3842e 100644
--- a/src/com/android/settings/applications/AppInfoWithHeader.java
+++ b/src/com/android/settings/applications/AppInfoWithHeader.java
@@ -23,13 +23,15 @@
import android.util.IconDrawableFactory;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.applications.AppUtils;
-import androidx.preference.Preference;
-
public abstract class AppInfoWithHeader extends AppInfoBase {
+ private static final String TAG = "AppInfoWithHeader";
+
private boolean mCreated;
@Override
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java
index 82ac1b0..0e2e3c7 100644
--- a/src/com/android/settings/applications/AppLaunchSettings.java
+++ b/src/com/android/settings/applications/AppLaunchSettings.java
@@ -35,17 +35,17 @@
import android.view.View;
import android.view.View.OnClickListener;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.DropDownPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.DropDownPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-
public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListener,
Preference.OnPreferenceChangeListener {
private static final String TAG = "AppLaunchSettings";
diff --git a/src/com/android/settings/applications/AppPermissions.java b/src/com/android/settings/applications/AppPermissions.java
deleted file mode 100644
index 6299921..0000000
--- a/src/com/android/settings/applications/AppPermissions.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.applications;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.PermissionInfo;
-import android.os.Build;
-import android.util.ArrayMap;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Based off from
- * packages/apps/PackageInstaller/src/com/android/packageinstaller/permission/AppPermissions.java
- * Except we only care about the number rather than the details.
- */
-public final class AppPermissions {
- private static final String TAG = "AppPermissions";
-
- private final ArrayMap<String, PermissionGroup> mGroups = new ArrayMap<>();
- private final Context mContext;
- private final PackageInfo mPackageInfo;
-
- public AppPermissions(Context context, String packageName) {
- mContext = context;
- mPackageInfo = getPackageInfo(packageName);
- refresh();
- }
-
- private PackageInfo getPackageInfo(String packageName) {
- try {
- return mContext.getPackageManager().getPackageInfo(packageName,
- PackageManager.GET_PERMISSIONS);
- } catch (NameNotFoundException e) {
- Log.e(TAG, "Unable to find " + packageName, e);
- return null;
- }
- }
-
- public void refresh() {
- if (mPackageInfo != null) {
- loadPermissionGroups();
- }
- }
-
- public int getPermissionCount() {
- return mGroups.size();
- }
-
- public int getGrantedPermissionsCount() {
- int ct = 0;
- for (int i = 0; i < mGroups.size(); i++) {
- if (mGroups.valueAt(i).areRuntimePermissionsGranted()) {
- ct++;
- }
- }
- return ct;
- }
-
- private void loadPermissionGroups() {
- mGroups.clear();
- if (mPackageInfo.requestedPermissions == null) {
- return;
- }
-
- final boolean appSupportsRuntimePermissions = appSupportsRuntime(
- mPackageInfo.applicationInfo);
-
- for (int i = 0; i < mPackageInfo.requestedPermissions.length; i++) {
- String requestedPerm = mPackageInfo.requestedPermissions[i];
-
- final PermissionInfo permInfo;
- try {
- permInfo = mContext.getPackageManager().getPermissionInfo(requestedPerm, 0);
- } catch (NameNotFoundException e) {
- Log.w(TAG, "Unknown permission: " + requestedPerm);
- continue;
- }
-
- String permName = permInfo.name;
- String groupName = permInfo.group != null ? permInfo.group : permName;
-
- PermissionGroup group = mGroups.get(groupName);
- if (group == null) {
- group = new PermissionGroup();
- mGroups.put(groupName, group);
- }
-
- final boolean runtime = appSupportsRuntimePermissions
- && permInfo.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS;
- final boolean granted = (mPackageInfo.requestedPermissionsFlags[i]
- & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0;
-
- Permission permission = new Permission(runtime, granted);
- group.addPermission(permission, permName);
- }
- // Only care about runtime perms for now.
- for (int i = mGroups.size() - 1; i >= 0; i--) {
- if (!mGroups.valueAt(i).mHasRuntimePermissions) {
- mGroups.removeAt(i);
- }
- }
- }
-
- public static boolean appSupportsRuntime(ApplicationInfo info) {
- return info.targetSdkVersion > Build.VERSION_CODES.LOLLIPOP_MR1;
- }
-
- private static final class PermissionGroup {
- private final ArrayMap<String, Permission> mPermissions = new ArrayMap<>();
- private boolean mHasRuntimePermissions;
-
- public boolean hasRuntimePermissions() {
- return mHasRuntimePermissions;
- }
-
- public boolean areRuntimePermissionsGranted() {
- final int permissionCount = mPermissions.size();
- for (int i = 0; i < permissionCount; i++) {
- Permission permission = mPermissions.valueAt(i);
- if (permission.runtime && !permission.granted) {
- return false;
- }
- }
- return true;
- }
-
- public List<Permission> getPermissions() {
- return new ArrayList<>(mPermissions.values());
- }
-
- void addPermission(Permission permission, String permName) {
- mPermissions.put(permName, permission);
- if (permission.runtime) {
- mHasRuntimePermissions = true;
- }
- }
- }
-
- private static final class Permission {
- private final boolean runtime;
- private boolean granted;
-
- public Permission(boolean runtime, boolean granted) {
- this.runtime = runtime;
- this.granted = granted;
- }
- }
-}
diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java
index c96197f..0e3ee2d 100755
--- a/src/com/android/settings/applications/AppStateAppOpsBridge.java
+++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java
@@ -29,6 +29,8 @@
import android.util.Log;
import android.util.SparseArray;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -38,8 +40,6 @@
import java.util.List;
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-
/*
* Connects app ops info to the ApplicationsState. Makes use of AppOpsManager to
* determine further permission level.
diff --git a/src/com/android/settings/applications/AppStateBaseBridge.java b/src/com/android/settings/applications/AppStateBaseBridge.java
index 2329b44..1a39483 100644
--- a/src/com/android/settings/applications/AppStateBaseBridge.java
+++ b/src/com/android/settings/applications/AppStateBaseBridge.java
@@ -45,7 +45,7 @@
// the same time as us as well.
mHandler = new BackgroundHandler(mAppState != null ? mAppState.getBackgroundLooper()
: Looper.getMainLooper());
- mMainHandler = new MainHandler();
+ mMainHandler = new MainHandler(Looper.getMainLooper());
}
public void resume() {
@@ -106,11 +106,16 @@
}
protected abstract void loadAllExtraInfo();
+
protected abstract void updateExtraInfo(AppEntry app, String pkg, int uid);
private class MainHandler extends Handler {
private static final int MSG_INFO_UPDATED = 1;
+ public MainHandler(Looper looper) {
+ super(looper);
+ }
+
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
diff --git a/src/com/android/settings/applications/AppStateNotificationBridge.java b/src/com/android/settings/applications/AppStateNotificationBridge.java
index d06aeb1..fc9e14f 100644
--- a/src/com/android/settings/applications/AppStateNotificationBridge.java
+++ b/src/com/android/settings/applications/AppStateNotificationBridge.java
@@ -100,18 +100,20 @@
}
public static CharSequence getSummary(Context context, NotificationsSentState state,
- boolean sortByRecency) {
- if (sortByRecency) {
+ int sortOrder) {
+ if (sortOrder == R.id.sort_order_recent_notification) {
if (state.lastSent == 0) {
return context.getString(R.string.notifications_sent_never);
}
return StringUtil.formatRelativeTime(
context, System.currentTimeMillis() - state.lastSent, true);
- } else {
+ } else if (sortOrder == R.id.sort_order_frequent_notification) {
if (state.avgSentWeekly > 0) {
return context.getString(R.string.notifications_sent_weekly, state.avgSentWeekly);
}
return context.getString(R.string.notifications_sent_daily, state.avgSentDaily);
+ } else {
+ return "";
}
}
@@ -267,6 +269,21 @@
}
};
+ public static final AppFilter FILTER_APP_NOTIFICATION_BLOCKED = new AppFilter() {
+ @Override
+ public void init() {
+ }
+
+ @Override
+ public boolean filterApp(AppEntry info) {
+ NotificationsSentState state = getNotificationsSentState(info);
+ if (state != null) {
+ return state.blocked;
+ }
+ return false;
+ }
+ };
+
public static final Comparator<AppEntry> RECENT_NOTIFICATION_COMPARATOR
= new Comparator<AppEntry>() {
@Override
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index ed5397a..e24a210 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -46,6 +46,13 @@
import android.view.View.OnClickListener;
import android.widget.Button;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -62,13 +69,6 @@
import java.util.Objects;
import java.util.TreeMap;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-
public class AppStorageSettings extends AppInfoWithHeader
implements OnClickListener, Callbacks, DialogInterface.OnClickListener,
LoaderManager.LoaderCallbacks<AppStorageStats> {
@@ -510,7 +510,7 @@
public void onClick(DialogInterface dialog, int which) {
mButtonsPref.setButton1Enabled(false);
//force to recompute changed value
- setIntentAndFinish(false, false);
+ setIntentAndFinish(false /* appChanged */);
}
})
.create();
diff --git a/src/com/android/settings/applications/AppStorageSizesController.java b/src/com/android/settings/applications/AppStorageSizesController.java
index 0031977..43734b2 100644
--- a/src/com/android/settings/applications/AppStorageSizesController.java
+++ b/src/com/android/settings/applications/AppStorageSizesController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.text.format.Formatter;
-import com.android.internal.util.Preconditions;
-import com.android.settingslib.applications.StorageStatsSource;
-
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.preference.Preference;
+import com.android.internal.util.Preconditions;
+import com.android.settingslib.applications.StorageStatsSource;
+
/**
* Handles setting the sizes for the app info screen.
*/
diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java
index 76940e5..768fb4e 100644
--- a/src/com/android/settings/applications/ClearDefaultsPreference.java
+++ b/src/com/android/settings/applications/ClearDefaultsPreference.java
@@ -33,14 +33,14 @@
import android.widget.Button;
import android.widget.TextView;
-import com.android.settings.R;
-import com.android.settingslib.applications.AppUtils;
-import com.android.settingslib.applications.ApplicationsState;
-
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.applications.ApplicationsState;
+
public class ClearDefaultsPreference extends Preference {
protected static final String TAG = ClearDefaultsPreference.class.getSimpleName();
diff --git a/src/com/android/settings/applications/DefaultAppSettings.java b/src/com/android/settings/applications/DefaultAppSettings.java
index 3af5bc2..d8fd9eb 100644
--- a/src/com/android/settings/applications/DefaultAppSettings.java
+++ b/src/com/android/settings/applications/DefaultAppSettings.java
@@ -102,16 +102,6 @@
}
@Override
- public List<String> getNonIndexableKeys(Context context) {
- List<String> keys = super.getNonIndexableKeys(context);
- keys.add(KEY_ASSIST_VOICE_INPUT);
- // TODO (b/38230148) Remove these keys when we can differentiate work results
- keys.add(DefaultWorkPhonePreferenceController.KEY);
- keys.add(DefaultWorkBrowserPreferenceController.KEY);
- return keys;
- }
-
- @Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return buildPreferenceControllers(context);
diff --git a/src/com/android/settings/applications/DirectoryAccessDetails.java b/src/com/android/settings/applications/DirectoryAccessDetails.java
index 8325f0d..f158d81 100644
--- a/src/com/android/settings/applications/DirectoryAccessDetails.java
+++ b/src/com/android/settings/applications/DirectoryAccessDetails.java
@@ -29,6 +29,7 @@
.TABLE_PERMISSIONS_COL_PACKAGE;
import static android.os.storage.StorageVolume.ScopedAccessProviderContract
.TABLE_PERMISSIONS_COL_VOLUME_UUID;
+
import static com.android.settings.applications.AppStateDirectoryAccessBridge.DEBUG;
import static com.android.settings.applications.AppStateDirectoryAccessBridge.VERBOSE;
@@ -46,6 +47,12 @@
import android.util.Log;
import android.util.Pair;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.widget.EntityHeaderController;
@@ -59,12 +66,6 @@
import java.util.Map;
import java.util.Set;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
/**
* Detailed settings for an app's directory access permissions (A.K.A Scoped Directory Access).
*
diff --git a/src/com/android/settings/applications/InstalledAppOpenByDefaultPage.java b/src/com/android/settings/applications/InstalledAppOpenByDefaultActivity.java
similarity index 93%
rename from src/com/android/settings/applications/InstalledAppOpenByDefaultPage.java
rename to src/com/android/settings/applications/InstalledAppOpenByDefaultActivity.java
index 40eef25..cd30d79 100644
--- a/src/com/android/settings/applications/InstalledAppOpenByDefaultPage.java
+++ b/src/com/android/settings/applications/InstalledAppOpenByDefaultActivity.java
@@ -20,7 +20,7 @@
import com.android.settings.SettingsActivity;
-public class InstalledAppOpenByDefaultPage extends SettingsActivity {
+public class InstalledAppOpenByDefaultActivity extends SettingsActivity {
@Override
public Intent getIntent() {
diff --git a/src/com/android/settings/applications/LayoutPreference.java b/src/com/android/settings/applications/LayoutPreference.java
index 393e198..cc077cc 100644
--- a/src/com/android/settings/applications/LayoutPreference.java
+++ b/src/com/android/settings/applications/LayoutPreference.java
@@ -24,14 +24,14 @@
import android.view.ViewGroup;
import android.widget.FrameLayout;
-import com.android.settings.R;
-import com.android.settings.Utils;
-
import androidx.annotation.VisibleForTesting;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+import com.android.settings.Utils;
+
public class LayoutPreference extends Preference {
private final View.OnClickListener mClickListener = v -> performClick(v);
diff --git a/src/com/android/settings/applications/ProcessStatsBase.java b/src/com/android/settings/applications/ProcessStatsBase.java
index f7acef7..67fc4c1 100644
--- a/src/com/android/settings/applications/ProcessStatsBase.java
+++ b/src/com/android/settings/applications/ProcessStatsBase.java
@@ -30,6 +30,7 @@
import com.android.settings.applications.ProcStatsData.MemInfo;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.core.instrumentation.Instrumentable;
+import com.android.settingslib.widget.settingsspinner.SettingsSpinnerAdapter;
public abstract class ProcessStatsBase extends SettingsPreferenceFragment
implements OnItemSelectedListener {
@@ -104,9 +105,8 @@
super.onViewCreated(view, savedInstanceState);
mSpinnerHeader = (ViewGroup) setPinnedHeaderView(R.layout.apps_filter_spinner);
mFilterSpinner = (Spinner) mSpinnerHeader.findViewById(R.id.filter_spinner);
- mFilterAdapter = new ArrayAdapter<String>(mFilterSpinner.getContext(),
- R.layout.filter_spinner_item);
- mFilterAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ mFilterAdapter = new SettingsSpinnerAdapter<String>(mFilterSpinner.getContext());
+
for (int i = 0; i < NUM_DURATIONS; i++) {
mFilterAdapter.add(getString(sDurationLabels[i]));
}
diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java
index e57808f..59de758 100644
--- a/src/com/android/settings/applications/ProcessStatsDetail.java
+++ b/src/com/android/settings/applications/ProcessStatsDetail.java
@@ -43,6 +43,10 @@
import android.view.MenuItem;
import android.view.View;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.CancellablePreference;
import com.android.settings.CancellablePreference.OnCancelListener;
@@ -58,10 +62,6 @@
import java.util.HashMap;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-
public class ProcessStatsDetail extends SettingsPreferenceFragment {
private static final String TAG = "ProcessStatsDetail";
diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java
index 6452198..4249381 100644
--- a/src/com/android/settings/applications/ProcessStatsPreference.java
+++ b/src/com/android/settings/applications/ProcessStatsPreference.java
@@ -22,7 +22,7 @@
import android.text.format.Formatter;
import android.util.Log;
-import com.android.settings.widget.AppPreference;
+import com.android.settingslib.widget.apppreference.AppPreference;
public class ProcessStatsPreference extends AppPreference {
static final String TAG = "ProcessStatsPreference";
diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java
index 03ea490..c32bac7 100644
--- a/src/com/android/settings/applications/ProcessStatsSummary.java
+++ b/src/com/android/settings/applications/ProcessStatsSummary.java
@@ -21,6 +21,9 @@
import android.text.format.Formatter;
import android.text.format.Formatter.BytesResult;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceClickListener;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SummaryPreference;
@@ -29,9 +32,6 @@
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.SummaryLoader;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceClickListener;
-
public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener {
private static final String KEY_STATUS_HEADER = "status_header";
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 774d769..25f9c7e 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -25,6 +25,9 @@
import android.view.MenuInflater;
import android.view.MenuItem;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
import com.android.internal.app.procstats.ProcessStats;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -35,9 +38,6 @@
import java.util.Comparator;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
public class ProcessStatsUi extends ProcessStatsBase {
static final String TAG = "ProcessStatsUi";
static final boolean DEBUG = false;
diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java
index 24ffd14..b6e8f4c 100644
--- a/src/com/android/settings/applications/RecentAppsPreferenceController.java
+++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -25,6 +25,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.os.PowerManager;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.ArrayMap;
@@ -32,14 +33,20 @@
import android.util.IconDrawableFactory;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.utils.StringUtil;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.util.ArrayList;
import java.util.Arrays;
@@ -50,12 +57,6 @@
import java.util.Map;
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
/**
* This controller displays a list of recently used apps and a "See all" button. If there is
* no recently used app, "See all" will be displayed as "App info".
@@ -78,6 +79,7 @@
private final ApplicationsState mApplicationsState;
private final int mUserId;
private final IconDrawableFactory mIconDrawableFactory;
+ private final PowerManager mPowerManager;
private Calendar mCal;
private List<UsageStats> mStats;
@@ -108,6 +110,8 @@
mIconDrawableFactory = IconDrawableFactory.newInstance(context);
mUserId = UserHandle.myUserId();
mPm = context.getPackageManager();
+ mPowerManager = context.getSystemService(PowerManager.class);
+
mHost = host;
mUsageStatsManager =
(UsageStatsManager) context.getSystemService(Context.USAGE_STATS_SERVICE);
@@ -183,9 +187,11 @@
void reloadData() {
mCal = Calendar.getInstance();
mCal.add(Calendar.DAY_OF_YEAR, -1);
- mStats = mUsageStatsManager.queryUsageStats(
- UsageStatsManager.INTERVAL_BEST, mCal.getTimeInMillis(),
- System.currentTimeMillis());
+ mStats = mPowerManager.isPowerSaveMode()
+ ? new ArrayList<>()
+ : mUsageStatsManager.queryUsageStats(
+ UsageStatsManager.INTERVAL_BEST, mCal.getTimeInMillis(),
+ System.currentTimeMillis());
}
private void displayOnlyAppInfo() {
@@ -244,8 +250,8 @@
pref.setOrder(i);
pref.setOnPreferenceClickListener(preference -> {
AppInfoBase.startAppInfoFragment(AppInfoDashboardFragment.class,
- R.string.application_info_label, pkgName, appEntry.info.uid, mHost,
- 1001 /*RequestCode*/, SETTINGS_APP_NOTIF_CATEGORY);
+ R.string.application_info_label, pkgName, appEntry.info.uid, mHost,
+ 1001 /*RequestCode*/, SETTINGS_APP_NOTIF_CATEGORY);
return true;
});
if (!rebindPref) {
@@ -301,7 +307,8 @@
private boolean shouldIncludePkgInRecents(UsageStats stat) {
final String pkgName = stat.getPackageName();
if (stat.getLastTimeUsed() < mCal.getTimeInMillis()) {
- Log.d(TAG, "Invalid timestamp, skipping " + pkgName);
+ Log.d(TAG, "Invalid timestamp (usage time is more than 24 hours ago), skipping "
+ + pkgName);
return false;
}
diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java
index 66fdb08..272945c 100644
--- a/src/com/android/settings/applications/RunningServiceDetails.java
+++ b/src/com/android/settings/applications/RunningServiceDetails.java
@@ -29,6 +29,9 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -43,9 +46,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-
public class RunningServiceDetails extends InstrumentedFragment
implements RunningState.OnRefreshUiListener {
static final String TAG = "RunningServicesDetails";
diff --git a/src/com/android/settings/applications/SpacePreference.java b/src/com/android/settings/applications/SpacePreference.java
index 95343b2..6575ad1 100644
--- a/src/com/android/settings/applications/SpacePreference.java
+++ b/src/com/android/settings/applications/SpacePreference.java
@@ -20,12 +20,12 @@
import android.util.AttributeSet;
import android.view.ViewGroup.LayoutParams;
-import com.android.settings.R;
-
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
/**
* A blank preference that has a specified height by android:layout_height. It can be used
* to fine tune screens that combine custom layouts and standard preferences.
diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
index 16a6cab..1763d84 100644
--- a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
+++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
@@ -13,43 +13,141 @@
*/
package com.android.settings.applications;
+import android.app.Application;
import android.content.Context;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.datausage.DataSaverBackend;
-import com.android.settingslib.core.AbstractPreferenceController;
-
+import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
-public class SpecialAppAccessPreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin {
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.datausage.AppStateDataUsageBridge;
+import com.android.settings.datausage.AppStateDataUsageBridge.DataUsageState;
+import com.android.settings.datausage.DataSaverBackend;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnDestroy;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
- private static final String KEY_SPECIAL_ACCESS = "special_access";
+import java.util.ArrayList;
- private DataSaverBackend mDataSaverBackend;
+public class SpecialAppAccessPreferenceController extends BasePreferenceController implements
+ AppStateBaseBridge.Callback, ApplicationsState.Callbacks, LifecycleObserver, OnStart,
+ OnStop, OnDestroy {
- public SpecialAppAccessPreferenceController(Context context) {
- super(context);
+ @VisibleForTesting
+ ApplicationsState.Session mSession;
+
+ private final ApplicationsState mApplicationsState;
+ private final AppStateDataUsageBridge mDataUsageBridge;
+ private final DataSaverBackend mDataSaverBackend;
+
+ private Preference mPreference;
+ private boolean mExtraLoaded;
+
+
+ public SpecialAppAccessPreferenceController(Context context, String key) {
+ super(context, key);
+ mApplicationsState = ApplicationsState.getInstance(
+ (Application) context.getApplicationContext());
+ mDataSaverBackend = new DataSaverBackend(context);
+ mDataUsageBridge = new AppStateDataUsageBridge(mApplicationsState, this, mDataSaverBackend);
+ }
+
+ public void setSession(Lifecycle lifecycle) {
+ mSession = mApplicationsState.newSession(this, lifecycle);
}
@Override
- public boolean isAvailable() {
- return true;
+ public int getAvailabilityStatus() {
+ return AVAILABLE_UNSEARCHABLE;
}
@Override
- public String getPreferenceKey() {
- return KEY_SPECIAL_ACCESS;
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void onStart() {
+ mDataUsageBridge.resume();
+ }
+
+ @Override
+ public void onStop() {
+ mDataUsageBridge.pause();
+ }
+
+ @Override
+ public void onDestroy() {
+ mDataUsageBridge.release();
}
@Override
public void updateState(Preference preference) {
- if (mDataSaverBackend == null) {
- mDataSaverBackend = new DataSaverBackend(mContext);
- }
- final int count = mDataSaverBackend.getWhitelistedCount();
- preference.setSummary(mContext.getResources().getQuantityString(
- R.plurals.special_access_summary, count, count));
+ updateSummary();
}
+
+ @Override
+ public void onExtraInfoUpdated() {
+ mExtraLoaded = true;
+ updateSummary();
+ }
+
+ private void updateSummary() {
+ if (!mExtraLoaded || mPreference == null) {
+ return;
+ }
+
+ final ArrayList<ApplicationsState.AppEntry> allApps = mSession.getAllApps();
+ int count = 0;
+ for (ApplicationsState.AppEntry entry : allApps) {
+ if (!ApplicationsState.FILTER_DOWNLOADED_AND_LAUNCHER.filterApp(entry)) {
+ continue;
+ }
+ if (entry.extraInfo instanceof DataUsageState
+ && ((DataUsageState) entry.extraInfo).isDataSaverWhitelisted) {
+ count++;
+ }
+ }
+ mPreference.setSummary(mContext.getResources().getQuantityString(
+ R.plurals.special_access_summary, count, count));
+ }
+
+ @Override
+ public void onRunningStateChanged(boolean running) {
+ }
+
+ @Override
+ public void onPackageListChanged() {
+ }
+
+ @Override
+ public void onRebuildComplete(ArrayList<ApplicationsState.AppEntry> apps) {
+ }
+
+ @Override
+ public void onPackageIconChanged() {
+ }
+
+ @Override
+ public void onPackageSizeChanged(String packageName) {
+ }
+
+ @Override
+ public void onAllSizesComputed() {
+ }
+
+ @Override
+ public void onLauncherInfoChanged() {
+ }
+
+ @Override
+ public void onLoadEntriesCompleted() {
+ }
+
}
diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java
index c14ddbc..62ce08e 100644
--- a/src/com/android/settings/applications/UsageAccessDetails.java
+++ b/src/com/android/settings/applications/UsageAccessDetails.java
@@ -25,11 +25,6 @@
import android.os.Bundle;
import android.provider.Settings;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.applications.AppStateUsageBridge.UsageState;
-import com.android.settings.overlay.FeatureFactory;
-
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
@@ -37,6 +32,11 @@
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.SwitchPreference;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.applications.AppStateUsageBridge.UsageState;
+import com.android.settings.overlay.FeatureFactory;
+
public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
OnPreferenceClickListener {
diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
index 4dab72b..6e4818a 100644
--- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java
@@ -22,10 +22,15 @@
import android.os.Bundle;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
-import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.AdvancedPowerUsageDetail;
@@ -40,12 +45,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class AppBatteryPreferenceController extends BasePreferenceController
implements LoaderManager.LoaderCallbacks<BatteryStatsHelper>,
LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
index 69fa71d..12c4d9d 100644
--- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
@@ -40,6 +40,10 @@
import android.view.View;
import android.webkit.IWebViewUpdateService;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -51,6 +55,7 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.ActionButtonPreference;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -63,10 +68,6 @@
import java.util.HashSet;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller to control the uninstall button and forcestop button. All fragments that use
* this controller should implement {@link ButtonActionDialogFragment.AppButtonsDialogListener} and
@@ -181,10 +182,10 @@
@Override
public void onResume() {
if (isAvailable() && !mFinishing) {
- mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(mActivity,
- UserManager.DISALLOW_APPS_CONTROL, mUserId);
- mAppsControlDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(mActivity,
- UserManager.DISALLOW_APPS_CONTROL, mUserId);
+ mAppsControlDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
+ mActivity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
+ mAppsControlDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+ mActivity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
if (!refreshUi()) {
setIntentAndFinish(true);
@@ -214,10 +215,11 @@
return;
}
RestrictedLockUtils.EnforcedAdmin admin =
- RestrictedLockUtils.checkIfUninstallBlocked(mActivity,
+ RestrictedLockUtilsInternal.checkIfUninstallBlocked(mActivity,
packageName, mUserId);
boolean uninstallBlockedBySystem = mAppsControlDisallowedBySystem ||
- RestrictedLockUtils.hasBaseUserRestriction(mActivity, packageName, mUserId);
+ RestrictedLockUtilsInternal.hasBaseUserRestriction(mActivity, packageName,
+ mUserId);
if (admin != null && !uninstallBlockedBySystem) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mActivity, admin);
} else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
index 61502d0..9443c93 100644
--- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java
@@ -25,10 +25,18 @@
import android.os.ServiceManager;
import android.text.format.DateUtils;
import android.text.format.Formatter;
+import android.util.FeatureFlagUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.datausage.AppDataUsage;
import com.android.settings.datausage.DataUsageList;
import com.android.settings.datausage.DataUsageUtils;
@@ -39,12 +47,12 @@
import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoaderCompat;
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
+/**
+ * Deprecated in favor of {@link AppDataUsagePreferenceControllerV2}
+ *
+ * @deprecated
+ */
+@Deprecated
public class AppDataUsagePreferenceController extends AppInfoPreferenceControllerBase
implements LoaderManager.LoaderCallbacks<ChartData>, LifecycleObserver, OnResume, OnPause {
@@ -57,6 +65,9 @@
@Override
public int getAvailabilityStatus() {
+ if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DATA_USAGE_V2)) {
+ return UNSUPPORTED_ON_DEVICE;
+ }
return isBandwidthControlEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}
@@ -93,7 +104,9 @@
@Override
public void onPause() {
- mParent.getLoaderManager().destroyLoader(mParent.LOADER_CHART_DATA);
+ if (mStatsSession != null) {
+ mParent.getLoaderManager().destroyLoader(mParent.LOADER_CHART_DATA);
+ }
}
@Override
@@ -132,7 +145,7 @@
}
private static NetworkTemplate getTemplate(Context context) {
- if (DataUsageList.hasReadyMobileRadio(context)) {
+ if (DataUsageUtils.hasReadyMobileRadio(context)) {
return NetworkTemplate.buildTemplateMobileWildcard();
}
if (DataUsageUtils.hasWifiRadio(context)) {
diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerV2.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerV2.java
new file mode 100644
index 0000000..9bbc5c0
--- /dev/null
+++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerV2.java
@@ -0,0 +1,158 @@
+/*
+ * 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.applications.appinfo;
+
+import android.content.Context;
+import android.net.NetworkTemplate;
+import android.os.Bundle;
+import android.text.format.DateUtils;
+import android.text.format.Formatter;
+import android.util.FeatureFlagUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.datausage.AppDataUsageV2;
+import com.android.settings.datausage.DataUsageUtils;
+import com.android.settingslib.AppItem;
+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.net.NetworkCycleDataForUid;
+import com.android.settingslib.net.NetworkCycleDataForUidLoader;
+
+import java.util.List;
+
+public class AppDataUsagePreferenceControllerV2 extends AppInfoPreferenceControllerBase
+ implements LoaderManager.LoaderCallbacks<List<NetworkCycleDataForUid>>, LifecycleObserver,
+ OnResume, OnPause {
+
+ private List<NetworkCycleDataForUid> mAppUsageData;
+
+ public AppDataUsagePreferenceControllerV2(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ if (!FeatureFlagUtils.isEnabled(mContext, FeatureFlags.DATA_USAGE_V2)) {
+ return UNSUPPORTED_ON_DEVICE;
+ }
+ return isBandwidthControlEnabled() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ preference.setSummary(getDataSummary());
+ }
+
+ @Override
+ public void onResume() {
+ if (isAvailable()) {
+ final int uid = mParent.getAppEntry().info.uid;
+ final AppItem app = new AppItem(uid);
+ app.addUid(uid);
+ mParent.getLoaderManager().restartLoader(mParent.LOADER_CHART_DATA, null /* args */,
+ this);
+ }
+ }
+
+ @Override
+ public void onPause() {
+ if (isAvailable()) {
+ mParent.getLoaderManager().destroyLoader(mParent.LOADER_CHART_DATA);
+ }
+ }
+
+ @Override
+ public Loader<List<NetworkCycleDataForUid>> onCreateLoader(int id, Bundle args) {
+ final NetworkTemplate template = getTemplate(mContext);
+ return NetworkCycleDataForUidLoader.builder(mContext)
+ .setUid(mParent.getAppEntry().info.uid)
+ .setRetrieveDetail(false)
+ .setNetworkTemplate(template)
+ .setSubscriberId(template.getSubscriberId())
+ .build();
+ }
+
+ @Override
+ public void onLoadFinished(Loader<List<NetworkCycleDataForUid>> loader,
+ List<NetworkCycleDataForUid> data) {
+ mAppUsageData = data;
+ updateState(mPreference);
+ }
+
+ @Override
+ public void onLoaderReset(Loader<List<NetworkCycleDataForUid>> loader) {
+ // Leave last result.
+ }
+
+ @Override
+ protected Class<? extends SettingsPreferenceFragment> getDetailFragmentClass() {
+ return AppDataUsageV2.class;
+ }
+
+ private CharSequence getDataSummary() {
+ if (mAppUsageData != null) {
+ long totalBytes = 0;
+ long startTime = System.currentTimeMillis();
+ for (NetworkCycleDataForUid data : mAppUsageData) {
+ totalBytes += data.getTotalUsage();
+ final long cycleStart = data.getStartTime();
+ if (cycleStart < startTime) {
+ startTime = cycleStart;
+ }
+ }
+ if (totalBytes == 0) {
+ return mContext.getString(R.string.no_data_usage);
+ }
+ return mContext.getString(R.string.data_summary_format,
+ Formatter.formatFileSize(mContext, totalBytes),
+ DateUtils.formatDateTime(mContext, startTime,
+ DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_ABBREV_MONTH));
+ }
+ return mContext.getString(R.string.computing_size);
+ }
+
+ private static NetworkTemplate getTemplate(Context context) {
+ if (DataUsageUtils.hasReadyMobileRadio(context)) {
+ return NetworkTemplate.buildTemplateMobileWildcard();
+ }
+ if (DataUsageUtils.hasWifiRadio(context)) {
+ return NetworkTemplate.buildTemplateWifiWildcard();
+ }
+ return NetworkTemplate.buildTemplateEthernet();
+ }
+
+ @VisibleForTesting
+ boolean isBandwidthControlEnabled() {
+ return Utils.isBandwidthControlEnabled();
+ }
+
+}
diff --git a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
index 7fd8fe5..c861175 100644
--- a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java
@@ -20,6 +20,8 @@
import android.content.Context;
import android.content.pm.PackageInfo;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.LayoutPreference;
@@ -31,8 +33,6 @@
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
-import androidx.preference.PreferenceScreen;
-
public class AppHeaderViewPreferenceController extends BasePreferenceController
implements AppInfoDashboardFragment.Callback, LifecycleObserver, OnStart {
diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 4ef5b03..64fd36d 100755
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -34,11 +34,14 @@
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -46,9 +49,10 @@
import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.applications.specialaccess.pictureinpicture
.PictureInPictureDetailPreferenceController;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -59,8 +63,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Dashboard fragment to display application information from Settings. This activity presents
* extended information associated with a package like code, data, total size, permissions
@@ -139,7 +141,11 @@
final String packageName = getPackageName();
use(TimeSpentInAppPreferenceController.class).setPackageName(packageName);
- use(AppDataUsagePreferenceController.class).setParentFragment(this);
+ if (FeatureFlagUtils.isEnabled(context, FeatureFlags.DATA_USAGE_V2)) {
+ use(AppDataUsagePreferenceControllerV2.class).setParentFragment(this);
+ } else {
+ use(AppDataUsagePreferenceController.class).setParentFragment(this);
+ }
final AppInstallerInfoPreferenceController installer =
use(AppInstallerInfoPreferenceController.class);
installer.setPackageName(packageName);
@@ -185,17 +191,23 @@
mDpm = (DevicePolicyManager) activity.getSystemService(Context.DEVICE_POLICY_SERVICE);
mUserManager = (UserManager) activity.getSystemService(Context.USER_SERVICE);
mPm = activity.getPackageManager();
-
if (!ensurePackageInfoAvailable(activity)) {
return;
}
-
startListeningToPackageRemove();
setHasOptionsMenu(true);
}
@Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+ if (!ensurePackageInfoAvailable(getActivity())) {
+ return;
+ }
+ super.onCreatePreferences(savedInstanceState, rootKey);
+ }
+
+ @Override
public void onDestroy() {
stopListeningToPackageRemove();
super.onDestroy();
@@ -210,10 +222,10 @@
public void onResume() {
super.onResume();
final Activity activity = getActivity();
- mAppsControlDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(activity,
- UserManager.DISALLOW_APPS_CONTROL, mUserId);
- mAppsControlDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(activity,
- UserManager.DISALLOW_APPS_CONTROL, mUserId);
+ mAppsControlDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+ activity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
+ mAppsControlDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
+ activity, UserManager.DISALLOW_APPS_CONTROL, mUserId);
if (!refreshUi()) {
setIntentAndFinish(true, true);
@@ -338,7 +350,7 @@
&& !mAppsControlDisallowedBySystem
&& !uninstallUpdateDisabled);
if (uninstallUpdatesItem.isVisible()) {
- RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getActivity(),
+ RestrictedLockUtilsInternal.setMenuItemAsDisabledByAdmin(getActivity(),
uninstallUpdatesItem, mAppsControlDisallowedAdmin);
}
}
diff --git a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java
index ce8dd44..c495cbc 100644
--- a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java
@@ -20,12 +20,12 @@
import android.os.Bundle;
import android.text.TextUtils;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.BasePreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.BasePreferenceController;
+
/*
* Abstract base controller for the app detail preferences that refresh the state when the app state
* changes and launch a specific detail fragment when the preference is clicked.
diff --git a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java
index 2a8217a..bf85676 100644
--- a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java
@@ -20,13 +20,13 @@
import android.content.Intent;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.AppStoreUtil;
import com.android.settingslib.applications.AppUtils;
-import androidx.preference.Preference;
-
public class AppInstallerInfoPreferenceController extends AppInfoPreferenceControllerBase {
private String mPackageName;
diff --git a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java
index d847d49..19e8ebb 100644
--- a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java
@@ -22,6 +22,9 @@
import android.os.AsyncTask;
import android.text.format.Formatter;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.ProcStatsData;
@@ -34,9 +37,6 @@
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class AppMemoryPreferenceController extends BasePreferenceController
implements LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
index 0d34d51..07e14d4 100644
--- a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
@@ -21,14 +21,14 @@
import android.content.Context;
import android.os.Bundle;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.applications.ApplicationsState;
-import androidx.preference.Preference;
-
public class AppNotificationPreferenceController extends AppInfoPreferenceControllerBase {
private String mChannelId = null;
diff --git a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java
index 1901dd2..7f64e3b 100644
--- a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java
@@ -23,14 +23,14 @@
import android.hardware.usb.IUsbManager;
import android.os.ServiceManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.AppLaunchSettings;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class AppOpenByDefaultPreferenceController extends AppInfoPreferenceControllerBase {
private IUsbManager mUsbManager;
diff --git a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
index 7b14af4..12393ad 100644
--- a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java
@@ -23,15 +23,15 @@
import android.icu.text.ListFormatter;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settingslib.applications.PermissionsSummaryHelper;
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class AppPermissionPreferenceController extends AppInfoPreferenceControllerBase {
private static final String TAG = "PermissionPrefControl";
@@ -46,11 +46,8 @@
public void onPermissionSummaryResult(int standardGrantedPermissionCount,
int requestedPermissionCount, int additionalGrantedPermissionCount,
List<CharSequence> grantedGroupLabels) {
- if (mParent.getActivity() == null) {
- return;
- }
final Resources res = mContext.getResources();
- CharSequence summary = null;
+ CharSequence summary;
if (requestedPermissionCount == 0) {
summary = res.getString(
diff --git a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java
index d20fe55..f5ce18e 100644
--- a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java
@@ -23,10 +23,10 @@
import android.content.pm.ResolveInfo;
import android.text.TextUtils;
-import com.android.settings.overlay.FeatureFactory;
-
import androidx.preference.Preference;
+import com.android.settings.overlay.FeatureFactory;
+
public class AppSettingPreferenceController extends AppInfoPreferenceControllerBase {
private String mPackageName;
diff --git a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java
index 7ff1301..d887634 100644
--- a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java
@@ -22,6 +22,11 @@
import android.os.UserHandle;
import android.text.format.Formatter;
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.AppStorageSettings;
@@ -31,11 +36,6 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.preference.Preference;
-
public class AppStoragePreferenceController extends AppInfoPreferenceControllerBase
implements LoaderManager.LoaderCallbacks<StorageStatsSource.AppStorageStats>,
LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java b/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java
index eeeb205..a0a8fb6 100644
--- a/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java
+++ b/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java
@@ -20,6 +20,10 @@
import android.content.DialogInterface;
import android.os.Bundle;
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -27,10 +31,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import androidx.annotation.IntDef;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Fragment to show the dialog for uninstall or forcestop. This fragment uses function in
* target fragment to handle the dialog button click.
diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
index 2683e16..fbded33 100644
--- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
+++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
@@ -19,6 +19,8 @@
import android.os.UserManager;
import android.text.TextUtils;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -26,8 +28,6 @@
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.SubSettingLauncher;
-import androidx.preference.Preference;
-
/*
* Abstract base controller for the default app shortcut preferences that launches the default app
* settings with the corresponding default app highlighted.
diff --git a/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceController.java b/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceController.java
index 64af3c2..4c7dd81 100644
--- a/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceController.java
@@ -30,7 +30,8 @@
@Override
protected boolean hasAppCapability() {
- return DefaultBrowserPreferenceController.hasBrowserPreference(mPackageName, mContext);
+ return DefaultBrowserPreferenceController
+ .hasBrowserPreference(mPackageName, mContext, UserHandle.myUserId());
}
@Override
diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java
index 8c572af..8405c61 100644
--- a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java
+++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java
@@ -15,7 +15,7 @@
*/
package com.android.settings.applications.appinfo;
-import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
import android.app.AppOpsManager;
import android.content.Context;
@@ -27,6 +27,13 @@
import android.view.Window;
import android.view.WindowManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
@@ -36,13 +43,6 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.SwitchPreference;
-
public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
OnPreferenceClickListener {
@@ -83,7 +83,7 @@
@Override
public void onResume() {
super.onResume();
- getActivity().getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+ getActivity().getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
}
@Override
@@ -91,7 +91,7 @@
super.onPause();
Window window = getActivity().getWindow();
WindowManager.LayoutParams attrs = window.getAttributes();
- attrs.privateFlags &= ~PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+ attrs.privateFlags &= ~SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
window.setAttributes(attrs);
}
diff --git a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java
index 16f0299..ec2508f 100644
--- a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java
@@ -20,12 +20,12 @@
import android.content.pm.PackageInfo;
import android.os.UserManager;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.applications.AppStateInstallAppsBridge;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.applications.AppStateInstallAppsBridge;
+
public class ExternalSourceDetailPreferenceController extends AppInfoPreferenceControllerBase {
private String mPackageName;
diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
index 224072c..38e70d1 100644
--- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
+++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
@@ -24,6 +24,10 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings;
@@ -33,10 +37,6 @@
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-
public class ExternalSourcesDetails extends AppInfoWithHeader
implements OnPreferenceChangeListener {
@@ -80,21 +80,20 @@
}
public static CharSequence getPreferenceSummary(Context context, AppEntry entry) {
+ final UserHandle userHandle = UserHandle.getUserHandleForUid(entry.info.uid);
final UserManager um = UserManager.get(context);
final int userRestrictionSource = um.getUserRestrictionSource(
- UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,
- UserHandle.getUserHandleForUid(entry.info.uid));
- switch (userRestrictionSource) {
- case UserManager.RESTRICTION_SOURCE_DEVICE_OWNER:
- case UserManager.RESTRICTION_SOURCE_PROFILE_OWNER:
- return context.getString(R.string.disabled_by_admin);
- case UserManager.RESTRICTION_SOURCE_SYSTEM:
- return context.getString(R.string.disabled);
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, userHandle)
+ | um.getUserRestrictionSource(
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
+ userHandle);
+ if ((userRestrictionSource & UserManager.RESTRICTION_SOURCE_SYSTEM) != 0) {
+ return context.getString(R.string.disabled_by_admin);
+ } else if (userRestrictionSource != 0) {
+ return context.getString(R.string.disabled);
}
-
final InstallAppsState appsState = new AppStateInstallAppsBridge(context, null, null)
.createInstallAppsStateFor(entry.info.packageName, entry.info.uid);
-
return context.getString(appsState.canInstallApps()
? R.string.app_permission_summary_allowed
: R.string.app_permission_summary_not_allowed);
@@ -119,6 +118,10 @@
return true;
}
mSwitchPref.checkRestrictionAndSetDisabled(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
+ if (!mSwitchPref.isDisabledByAdmin()) {
+ mSwitchPref.checkRestrictionAndSetDisabled(
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY);
+ }
if (mSwitchPref.isDisabledByAdmin()) {
return true;
}
diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java b/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java
index 683a764..808d018 100644
--- a/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java
+++ b/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java
@@ -22,13 +22,13 @@
import android.os.Bundle;
import android.os.UserHandle;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.overlay.FeatureFactory;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Fragment to show the dialog for clearing the instant app.
*/
diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java
index 87f6cef..f710f2e 100644
--- a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java
@@ -29,6 +29,9 @@
import android.view.View;
import android.widget.Button;
+import androidx.fragment.app.DialogFragment;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.AppStoreUtil;
import com.android.settings.applications.LayoutPreference;
@@ -42,9 +45,6 @@
import java.util.List;
-import androidx.fragment.app.DialogFragment;
-import androidx.preference.PreferenceScreen;
-
public class InstantAppButtonsPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnCreateOptionsMenu, OnPrepareOptionsMenu, OnOptionsItemSelected {
diff --git a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
index e102518..cbb805f 100644
--- a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
@@ -19,14 +19,14 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import androidx.preference.Preference;
+
import com.android.settings.Utils;
import com.android.settings.applications.AppDomainsPreference;
import com.android.settingslib.applications.AppUtils;
import java.util.Set;
-import androidx.preference.Preference;
-
public class InstantAppDomainsPreferenceController extends AppInfoPreferenceControllerBase {
private PackageManager mPackageManager;
diff --git a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java
index 16a1535fe..70ffcb3 100644
--- a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java
@@ -21,21 +21,21 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.provider.Settings;
import android.text.TextUtils;
-import com.android.settings.core.BasePreferenceController;
-
-import java.util.List;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.List;
+
public class TimeSpentInAppPreferenceController extends BasePreferenceController {
@VisibleForTesting
- static final Intent SEE_TIME_IN_APP_TEMPLATE =
- new Intent("com.android.settings.action.TIME_SPENT_IN_APP");
+ static final Intent SEE_TIME_IN_APP_TEMPLATE = new Intent(Settings.ACTION_APP_USAGE_SETTINGS);
private final PackageManager mPackageManager;
diff --git a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java
index aed263f..e126b5e 100644
--- a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java
+++ b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java
@@ -23,6 +23,12 @@
import android.os.Bundle;
import android.provider.Settings;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
@@ -32,12 +38,6 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.SwitchPreference;
-
public class WriteSettingsDetails extends AppInfoWithHeader implements OnPreferenceChangeListener,
OnPreferenceClickListener {
diff --git a/src/com/android/settings/applications/appops/AppOpsCategory.java b/src/com/android/settings/applications/appops/AppOpsCategory.java
index bdc9689..57d7dc4 100644
--- a/src/com/android/settings/applications/appops/AppOpsCategory.java
+++ b/src/com/android/settings/applications/appops/AppOpsCategory.java
@@ -34,16 +34,16 @@
import android.widget.Switch;
import android.widget.TextView;
-import com.android.settings.R;
-import com.android.settings.applications.appops.AppOpsState.AppOpEntry;
-
-import java.util.List;
-
import androidx.fragment.app.ListFragment;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.AsyncTaskLoader;
import androidx.loader.content.Loader;
+import com.android.settings.R;
+import com.android.settings.applications.appops.AppOpsState.AppOpEntry;
+
+import java.util.List;
+
public class AppOpsCategory extends ListFragment implements
LoaderManager.LoaderCallbacks<List<AppOpEntry>> {
diff --git a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java
index 1d804ce..601a566 100644
--- a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java
+++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java
@@ -23,12 +23,12 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.FragmentTransaction;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
-import androidx.fragment.app.FragmentTransaction;
-
public class BackgroundCheckSummary extends InstrumentedPreferenceFragment {
// layout inflater object used to inflate views
private LayoutInflater mInflater;
diff --git a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
index 786fc85..3e5c4ec 100644
--- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java
@@ -21,6 +21,10 @@
import android.os.UserHandle;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.internal.app.AssistUtils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -32,10 +36,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
public class AssistContextPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
index d8ab609..1880acc 100644
--- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
@@ -22,6 +22,11 @@
import android.os.UserHandle;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.internal.app.AssistUtils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -33,11 +38,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
public class AssistFlashScreenPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
index a2a8f28..5947943 100644
--- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
+++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
@@ -21,6 +21,10 @@
import android.os.UserHandle;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.internal.app.AssistUtils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -32,10 +36,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
public class AssistScreenshotPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/applications/assist/AssistSettingObserver.java b/src/com/android/settings/applications/assist/AssistSettingObserver.java
index 917552a..f0da694 100644
--- a/src/com/android/settings/applications/assist/AssistSettingObserver.java
+++ b/src/com/android/settings/applications/assist/AssistSettingObserver.java
@@ -21,12 +21,12 @@
import android.net.Uri;
import android.provider.Settings;
+import androidx.annotation.MainThread;
+
import com.android.settingslib.utils.ThreadUtils;
import java.util.List;
-import androidx.annotation.MainThread;
-
public abstract class AssistSettingObserver extends ContentObserver {
private final Uri ASSIST_URI =
diff --git a/src/com/android/settings/applications/assist/DefaultAssistPicker.java b/src/com/android/settings/applications/assist/DefaultAssistPicker.java
index f1b3269..d867070 100644
--- a/src/com/android/settings/applications/assist/DefaultAssistPicker.java
+++ b/src/com/android/settings/applications/assist/DefaultAssistPicker.java
@@ -29,6 +29,8 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.app.AssistUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
@@ -39,8 +41,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
public class DefaultAssistPicker extends DefaultAppPickerFragment {
private static final String TAG = "DefaultAssistPicker";
diff --git a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
index 1c900b8..f95f96a 100644
--- a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
@@ -24,6 +24,8 @@
import android.service.voice.VoiceInteractionService;
import android.service.voice.VoiceInteractionServiceInfo;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.app.AssistUtils;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
@@ -31,8 +33,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
public class DefaultAssistPreferenceController extends DefaultAppPreferenceController {
private final AssistUtils mAssistUtils;
diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
index 0f0ebe8..1f8b9d1 100644
--- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
+++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
@@ -22,6 +22,9 @@
import android.net.Uri;
import android.text.TextUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.app.AssistUtils;
import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -32,9 +35,6 @@
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceController
implements LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/applications/autofill/AutofillPickerTrampolineActivity.java b/src/com/android/settings/applications/autofill/AutofillPickerTrampolineActivity.java
index 1db3c82..ee58bfe 100644
--- a/src/com/android/settings/applications/autofill/AutofillPickerTrampolineActivity.java
+++ b/src/com/android/settings/applications/autofill/AutofillPickerTrampolineActivity.java
@@ -14,6 +14,7 @@
package com.android.settings.applications.autofill;
import android.app.Activity;
+import android.content.ComponentName;
import android.content.Intent;
import android.os.Bundle;
import android.view.autofill.AutofillManager;
@@ -33,22 +34,23 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- // First check if the current user's service already belongs to the app...
- final Intent intent = getIntent();
- final String packageName = intent.getData().getSchemeSpecificPart();
- final String currentService = DefaultAutofillPicker.getDefaultKey(this);
- if (currentService != null && currentService.startsWith(packageName)) {
- // ...and succeed right away if it does.
- setResult(RESULT_OK);
+ final AutofillManager afm = getSystemService(AutofillManager.class);
+
+ // First check if the Autofill is available for the current user...
+ if (afm == null || !afm.hasAutofillFeature() || !afm.isAutofillSupported()) {
+ // ... and fail right away if it is not.
+ setResult(RESULT_CANCELED);
finish();
return;
}
- // Then check if the Autofill is available for the current user...
- final AutofillManager afm = getSystemService(AutofillManager.class);
- if (afm == null || !afm.hasAutofillFeature() || !afm.isAutofillSupported()) {
- // ... and fail right away if it is not.
- setResult(RESULT_CANCELED);
+ // Then check if the current user's service already belongs to the app...
+ final Intent intent = getIntent();
+ final String packageName = intent.getData().getSchemeSpecificPart();
+ final ComponentName currentService = afm.getAutofillServiceComponentName();
+ if (currentService != null && currentService.getPackageName().equals(packageName)) {
+ // ...and succeed right away if it does.
+ setResult(RESULT_OK);
finish();
return;
}
diff --git a/src/com/android/settings/applications/defaultapps/AutofillPicker.java b/src/com/android/settings/applications/defaultapps/AutofillPicker.java
new file mode 100644
index 0000000..6691d2f
--- /dev/null
+++ b/src/com/android/settings/applications/defaultapps/AutofillPicker.java
@@ -0,0 +1,80 @@
+/*
+ * 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.applications.defaultapps;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+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.Arrays;
+import java.util.List;
+
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class AutofillPicker extends DashboardFragment {
+ private static final String TAG = "AutofillPicker";
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.DEFAULT_AUTOFILL_PICKER;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.default_autofill_picker_settings;
+ }
+
+ @Override
+ protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+ return buildPreferenceControllers(context);
+ }
+
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ SearchIndexableResource searchIndexableResource =
+ new SearchIndexableResource(context);
+ searchIndexableResource.xmlResId = R.xml.default_autofill_picker_settings;
+ return Arrays.asList(searchIndexableResource);
+ }
+
+ @Override
+ public List<AbstractPreferenceController> getPreferenceControllers(Context
+ context) {
+ return buildPreferenceControllers(context);
+ }
+ };
+
+ private static List<AbstractPreferenceController> buildPreferenceControllers(Context context) {
+ return Arrays.asList(
+ new DefaultAutofillPreferenceController(context),
+ new DefaultWorkAutofillPreferenceController(context));
+ }
+}
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index 395ea64..9a337a5 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -24,6 +24,11 @@
import android.text.TextUtils;
import android.util.Pair;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -33,11 +38,6 @@
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.CandidateInfo;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
/**
* A generic app picker fragment that shows a list of app as radio button group.
*/
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
index 6016dbc..73d80a3 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
@@ -27,6 +27,8 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
@@ -35,8 +37,6 @@
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public abstract class DefaultAppPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
@@ -82,12 +82,16 @@
final Intent settingIntent = getSettingIntent(app);
if (settingIntent != null) {
((GearPreference) preference).setOnGearClickListener(
- p -> mContext.startActivity(settingIntent));
+ p -> startActivity(settingIntent));
} else {
((GearPreference) preference).setOnGearClickListener(null);
}
}
+ protected void startActivity(Intent intent) {
+ mContext.startActivity(intent);
+ }
+
protected abstract DefaultAppInfo getDefaultAppInfo();
/**
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
index 9bb82d4..459a5b7 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
@@ -27,6 +27,7 @@
import android.content.pm.ServiceInfo;
import android.net.Uri;
import android.os.Bundle;
+import android.os.UserHandle;
import android.provider.Settings;
import android.service.autofill.AutofillService;
import android.service.autofill.AutofillServiceInfo;
@@ -34,6 +35,8 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.internal.content.PackageMonitor;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
@@ -44,8 +47,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
public class DefaultAutofillPicker extends DefaultAppPickerFragment {
private static final String TAG = "DefaultAutofillPicker";
@@ -73,8 +74,10 @@
activity.setResult(Activity.RESULT_CANCELED);
activity.finish();
};
+ // If mCancelListener is not null, fragment is started from
+ // ACTION_REQUEST_SET_AUTOFILL_SERVICE and we should always use the calling uid.
+ mUserId = UserHandle.myUserId();
}
-
mSettingsPackageMonitor.register(activity, activity.getMainLooper(), false);
update();
}
@@ -159,18 +162,24 @@
* @return The preference or {@code null} if no service can be added
*/
private Preference newAddServicePreferenceOrNull() {
- final String searchUri = Settings.Secure.getString(getActivity().getContentResolver(),
- Settings.Secure.AUTOFILL_SERVICE_SEARCH_URI);
+ final String searchUri = Settings.Secure.getStringForUser(
+ getActivity().getContentResolver(),
+ Settings.Secure.AUTOFILL_SERVICE_SEARCH_URI,
+ mUserId);
if (TextUtils.isEmpty(searchUri)) {
return null;
}
final Intent addNewServiceIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(searchUri));
- Preference preference = new Preference(getPrefContext());
+ final Context context = getPrefContext();
+ final Preference preference = new Preference(context);
+ preference.setOnPreferenceClickListener(p -> {
+ context.startActivityAsUser(addNewServiceIntent, UserHandle.of(mUserId));
+ return true;
+ });
preference.setTitle(R.string.print_menu_item_add_service);
preference.setIcon(R.drawable.ic_menu_add);
preference.setOrder(Integer.MAX_VALUE -1);
- preference.setIntent(addNewServiceIntent);
preference.setPersistent(false);
return preference;
}
@@ -189,8 +198,8 @@
@Override
protected List<DefaultAppInfo> getCandidates() {
final List<DefaultAppInfo> candidates = new ArrayList<>();
- final List<ResolveInfo> resolveInfos = mPm.queryIntentServices(
- AUTOFILL_PROBE, PackageManager.GET_META_DATA);
+ final List<ResolveInfo> resolveInfos = mPm.queryIntentServicesAsUser(
+ AUTOFILL_PROBE, PackageManager.GET_META_DATA, mUserId);
final Context context = getContext();
for (ResolveInfo info : resolveInfos) {
final String permission = info.serviceInfo.permission;
@@ -210,8 +219,9 @@
return candidates;
}
- public static String getDefaultKey(Context context) {
- String setting = Settings.Secure.getString(context.getContentResolver(), SETTING);
+ public static String getDefaultKey(Context context, int userId) {
+ String setting = Settings.Secure.getStringForUser(
+ context.getContentResolver(), SETTING, userId);
if (setting != null) {
ComponentName componentName = ComponentName.unflattenFromString(setting);
if (componentName != null) {
@@ -223,7 +233,7 @@
@Override
protected String getDefaultKey() {
- return getDefaultKey(getContext());
+ return getDefaultKey(getContext(), mUserId);
}
@Override
@@ -239,7 +249,7 @@
@Override
protected boolean setDefaultKey(String key) {
- Settings.Secure.putString(getContext().getContentResolver(), SETTING, key);
+ Settings.Secure.putStringForUser(getContext().getContentResolver(), SETTING, key, mUserId);
// Check if activity was launched from Settings.ACTION_REQUEST_SET_AUTOFILL_SERVICE
// intent, and set proper result if so...
@@ -263,16 +273,19 @@
private final String mSelectedKey;
private final Context mContext;
+ private final int mUserId;
- public AutofillSettingIntentProvider(Context context, String key) {
+ public AutofillSettingIntentProvider(Context context, int userId, String key) {
mSelectedKey = key;
mContext = context;
+ mUserId = userId;
}
@Override
public Intent getIntent() {
- final List<ResolveInfo> resolveInfos = mContext.getPackageManager().queryIntentServices(
- AUTOFILL_PROBE, PackageManager.GET_META_DATA);
+ final List<ResolveInfo> resolveInfos = mContext.getPackageManager()
+ .queryIntentServicesAsUser(
+ AUTOFILL_PROBE, PackageManager.GET_META_DATA, mUserId);
for (ResolveInfo resolveInfo : resolveInfos) {
final ServiceInfo serviceInfo = resolveInfo.serviceInfo;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
index bab1d16..d32322b 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
@@ -44,7 +44,7 @@
@Override
public String getPreferenceKey() {
- return "default_autofill";
+ return "default_autofill_main";
}
@Override
@@ -54,7 +54,7 @@
}
final DefaultAutofillPicker.AutofillSettingIntentProvider intentProvider =
new DefaultAutofillPicker.AutofillSettingIntentProvider(
- mContext, info.getKey());
+ mContext, mUserId, info.getKey());
return intentProvider.getIntent();
}
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
index 626048d..cfaac3a 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java
@@ -62,7 +62,7 @@
for (ResolveInfo info : list) {
try {
- candidates.add(new DefaultAppInfo(context, mPm,
+ candidates.add(new DefaultAppInfo(context, mPm, mUserId,
mPm.getApplicationInfoAsUser(info.activityInfo.packageName, 0, mUserId)));
} catch (PackageManager.NameNotFoundException e) {
// Skip unknown packages.
diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
index d3c52b5..24b4dcd 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java
@@ -29,14 +29,15 @@
import android.util.IconDrawableFactory;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settingslib.applications.DefaultAppInfo;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import androidx.preference.Preference;
-
public class DefaultBrowserPreferenceController extends DefaultAppPreferenceController {
private static final String TAG = "BrowserPrefCtrl";
@@ -75,8 +76,8 @@
try {
final String packageName = mPackageManager.getDefaultBrowserPackageNameAsUser(mUserId);
Log.d(TAG, "Get default browser package: " + packageName);
- return new DefaultAppInfo(mContext, mPackageManager,
- mPackageManager.getApplicationInfo(packageName, 0));
+ return new DefaultAppInfo(mContext, mPackageManager, mUserId,
+ mPackageManager.getApplicationInfoAsUser(packageName, 0, mUserId));
} catch (PackageManager.NameNotFoundException e) {
return null;
}
@@ -111,7 +112,7 @@
final List<ResolveInfo> candidates = new ArrayList<>();
// Resolve that intent and check that the handleAllWebDataURI boolean is set
final List<ResolveInfo> list = packageManager.queryIntentActivitiesAsUser(
- BROWSE_PROBE, PackageManager.MATCH_ALL, userId);
+ BROWSE_PROBE, 0 /* flags */, userId);
if (list != null) {
final Set<String> addedPackages = new ArraySet<>();
for (ResolveInfo info : list) {
@@ -143,7 +144,8 @@
return null;
}
- private Drawable getOnlyAppIcon() {
+ @VisibleForTesting
+ Drawable getOnlyAppIcon() {
final List<ResolveInfo> list = getCandidates(mPackageManager, mUserId);
if (list != null && list.size() == 1) {
final ResolveInfo info = list.get(0);
@@ -154,7 +156,7 @@
}
final ApplicationInfo appInfo;
try {
- appInfo = mPackageManager.getApplicationInfo(packageName, 0);
+ appInfo = mPackageManager.getApplicationInfoAsUser(packageName, 0, mUserId);
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Error getting app info for " + packageName);
return null;
@@ -169,11 +171,11 @@
/**
* Whether or not the pkg contains browser capability
*/
- public static boolean hasBrowserPreference(String pkg, Context context) {
+ public static boolean hasBrowserPreference(String pkg, Context context, int userId) {
final Intent intent = new Intent(BROWSE_PROBE);
intent.setPackage(pkg);
- final List<ResolveInfo> resolveInfos =
- context.getPackageManager().queryIntentActivities(intent, 0);
+ final List<ResolveInfo> resolveInfos = context.getPackageManager()
+ .queryIntentActivitiesAsUser(intent, 0 /* flags */, userId);
return resolveInfos != null && resolveInfos.size() != 0;
}
@@ -181,13 +183,12 @@
* Whether or not the pkg is the default browser
*/
public boolean isBrowserDefault(String pkg, int userId) {
- String defaultPackage = mPackageManager.getDefaultBrowserPackageNameAsUser(userId);
+ final String defaultPackage = mPackageManager.getDefaultBrowserPackageNameAsUser(userId);
if (defaultPackage != null) {
return defaultPackage.equals(pkg);
}
- final List<ResolveInfo> list = mPackageManager.queryIntentActivitiesAsUser(BROWSE_PROBE,
- PackageManager.MATCH_ALL, userId);
+ final List<ResolveInfo> list = getCandidates(mPackageManager, userId);
// There is only 1 app, it must be the default browser.
return list != null && list.size() == 1;
}
diff --git a/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java b/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
index f6f8a56..76e93cc 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultEmergencyPicker.java
@@ -58,7 +58,7 @@
final PackageInfo packageInfo =
mPm.getPackageInfo(info.activityInfo.packageName, 0);
final ApplicationInfo appInfo = packageInfo.applicationInfo;
- candidates.add(new DefaultAppInfo(context, mPm, appInfo));
+ candidates.add(new DefaultAppInfo(context, mPm, mUserId, appInfo));
// Get earliest installed system app.
if (isSystemApp(appInfo) && (bestMatch == null ||
bestMatch.firstInstallTime > packageInfo.firstInstallTime)) {
diff --git a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
index 872f5a3..9fbde3e 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceController.java
@@ -105,7 +105,7 @@
Intent intent = new Intent(Intent.ACTION_APPLICATION_PREFERENCES)
.setPackage(packageName)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
- return mPackageManager.queryIntentActivities(intent, 0).size() == 1 ? intent : null;
+ return intent.resolveActivity(mPackageManager) != null ? intent : null;
}
public static boolean hasHomePreference(String pkg, Context context) {
diff --git a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java
index 5e06d6c..55803c5 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java
@@ -21,13 +21,13 @@
import android.nfc.NfcAdapter;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.nfc.PaymentBackend;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class DefaultPaymentSettingsPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java b/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
index 0bda2ec..72f1cc5 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultPhonePicker.java
@@ -58,7 +58,7 @@
final Context context = getContext();
for (String packageName : dialerPackages) {
try {
- candidates.add(new DefaultAppInfo(context, mPm,
+ candidates.add(new DefaultAppInfo(context, mPm, mUserId,
mPm.getApplicationInfoAsUser(packageName, 0, mUserId)));
} catch (PackageManager.NameNotFoundException e) {
// Skip unknown packages.
diff --git a/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
index 95264b1..7b7755d 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultPhonePreferenceController.java
@@ -59,7 +59,8 @@
@Override
protected DefaultAppInfo getDefaultAppInfo() {
try {
- return new DefaultAppInfo(mContext, mPackageManager, mPackageManager.getApplicationInfo(
+ return new DefaultAppInfo(mContext, mPackageManager, mUserId,
+ mPackageManager.getApplicationInfo(
DefaultDialerManager.getDefaultDialerApplication(mContext, mUserId), 0));
} catch (PackageManager.NameNotFoundException e) {
return null;
diff --git a/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java b/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
index b5a2880..6d1e21d 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultSmsPicker.java
@@ -16,7 +16,6 @@
package com.android.settings.applications.defaultapps;
-import android.app.AppOpsManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
@@ -26,7 +25,6 @@
import com.android.internal.telephony.SmsApplication;
import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.CandidateInfo;
@@ -57,7 +55,7 @@
for (SmsApplication.SmsApplicationData smsApplicationData : smsApplications) {
try {
- candidates.add(new DefaultAppInfo(context, mPm,
+ candidates.add(new DefaultAppInfo(context, mPm, mUserId,
mPm.getApplicationInfoAsUser(smsApplicationData.mPackageName, 0, mUserId)));
} catch (PackageManager.NameNotFoundException e) {
// Skip unknown packages.
diff --git a/src/com/android/settings/applications/defaultapps/DefaultWorkAutofillPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultWorkAutofillPreferenceController.java
new file mode 100644
index 0000000..47735ac
--- /dev/null
+++ b/src/com/android/settings/applications/defaultapps/DefaultWorkAutofillPreferenceController.java
@@ -0,0 +1,83 @@
+/*
+ * 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.applications.defaultapps;
+
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.settings.Utils;
+import com.android.settingslib.applications.DefaultAppInfo;
+
+public class DefaultWorkAutofillPreferenceController extends DefaultAutofillPreferenceController {
+ private final UserHandle mUserHandle;
+
+ public DefaultWorkAutofillPreferenceController(Context context) {
+ super(context);
+ mUserHandle = Utils.getManagedProfile(mUserManager);
+ }
+
+ @Override
+ public boolean isAvailable() {
+ if (mUserHandle == null) {
+ return false;
+ }
+ return super.isAvailable();
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return "default_autofill_work";
+ }
+
+ @Override
+ protected DefaultAppInfo getDefaultAppInfo() {
+ final String flattenComponent = Settings.Secure.getStringForUser(
+ mContext.getContentResolver(),
+ DefaultAutofillPicker.SETTING,
+ mUserHandle.getIdentifier());
+ if (!TextUtils.isEmpty(flattenComponent)) {
+ DefaultAppInfo appInfo = new DefaultAppInfo(
+ mContext,
+ mPackageManager,
+ mUserHandle.getIdentifier(),
+ ComponentName.unflattenFromString(flattenComponent));
+ return appInfo;
+ }
+ return null;
+ }
+
+ @Override
+ protected Intent getSettingIntent(DefaultAppInfo info) {
+ if (info == null) {
+ return null;
+ }
+ final DefaultAutofillPicker.AutofillSettingIntentProvider intentProvider =
+ new DefaultAutofillPicker.AutofillSettingIntentProvider(
+ mContext, mUserHandle.getIdentifier(), info.getKey());
+ return intentProvider.getIntent();
+ }
+
+ @Override
+ protected void startActivity(Intent intent) {
+ mContext.startActivityAsUser(intent, mUserHandle);
+ }
+}
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterItem.java b/src/com/android/settings/applications/manageapplications/AppFilterItem.java
index 09f8834..8ba7a4c 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterItem.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterItem.java
@@ -16,12 +16,12 @@
package com.android.settings.applications.manageapplications;
+import androidx.annotation.StringRes;
+
import com.android.settingslib.applications.ApplicationsState;
import java.util.Objects;
-import androidx.annotation.StringRes;
-
/**
* Data model for a displayable app filter.
*/
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index dc4f224..7d1e159 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -16,6 +16,8 @@
package com.android.settings.applications.manageapplications;
+import androidx.annotation.IntDef;
+
import com.android.settings.R;
import com.android.settings.applications.AppStateDirectoryAccessBridge;
import com.android.settings.applications.AppStateInstallAppsBridge;
@@ -27,8 +29,6 @@
import com.android.settings.wifi.AppStateChangeWifiStateBridge;
import com.android.settingslib.applications.ApplicationsState;
-import androidx.annotation.IntDef;
-
/**
* A registry and helper class that manages all {@link AppFilterItem}s for ManageApplications UI.
*/
@@ -49,6 +49,7 @@
FILTER_APPS_WITH_OVERLAY,
FILTER_APPS_WRITE_SETTINGS,
FILTER_APPS_INSTALL_SOURCES,
+ FILTER_APPS_BLOCKED,
})
@interface FilterType {
}
@@ -71,14 +72,15 @@
public static final int FILTER_APPS_INSTALL_SOURCES = 13;
public static final int FILTER_APP_HAS_DIRECTORY_ACCESS = 14;
public static final int FILTER_APP_CAN_CHANGE_WIFI_STATE = 15;
- // Next id: 16
+ public static final int FILTER_APPS_BLOCKED = 16;
+ // Next id: 17
private static AppFilterRegistry sRegistry;
private final AppFilterItem[] mFilters;
private AppFilterRegistry() {
- mFilters = new AppFilterItem[16];
+ mFilters = new AppFilterItem[17];
// High power whitelist, on
mFilters[FILTER_APPS_POWER_WHITELIST] = new AppFilterItem(
@@ -178,6 +180,12 @@
AppStateChangeWifiStateBridge.FILTER_CHANGE_WIFI_STATE,
FILTER_APP_CAN_CHANGE_WIFI_STATE,
R.string.filter_write_settings_apps);
+
+ // Blocked Notifications
+ mFilters[FILTER_APPS_BLOCKED] = new AppFilterItem(
+ AppStateNotificationBridge.FILTER_APP_NOTIFICATION_BLOCKED,
+ FILTER_APPS_BLOCKED,
+ R.string.filter_notif_blocked_apps);
}
public static AppFilterRegistry getInstance() {
diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
index 5e1c710..e46f294 100644
--- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
+++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
@@ -28,14 +28,14 @@
import android.widget.Switch;
import android.widget.TextView;
-import com.android.settings.R;
-import com.android.settingslib.applications.ApplicationsState;
-import com.android.settingslib.applications.ApplicationsState.AppEntry;
-
import androidx.annotation.StringRes;
import androidx.annotation.VisibleForTesting;
import androidx.recyclerview.widget.RecyclerView;
+import com.android.settings.R;
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
public class ApplicationViewHolder extends RecyclerView.ViewHolder {
private final TextView mAppName;
@@ -73,8 +73,8 @@
static View newView(ViewGroup parent, boolean twoTarget) {
ViewGroup view = (ViewGroup) LayoutInflater.from(parent.getContext())
.inflate(R.layout.preference_app, parent, false);
+ final ViewGroup widgetFrame = view.findViewById(android.R.id.widget_frame);
if (twoTarget) {
- final ViewGroup widgetFrame = view.findViewById(android.R.id.widget_frame);
if (widgetFrame != null) {
LayoutInflater.from(parent.getContext())
.inflate(R.layout.preference_widget_master_switch, widgetFrame, true);
@@ -84,6 +84,8 @@
// second to last, before widget frame
view.addView(divider, view.getChildCount() - 1);
}
+ } else if (widgetFrame != null) {
+ widgetFrame.setVisibility(View.GONE);
}
return view;
}
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index a64f461..44ea575 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -17,9 +17,12 @@
package com.android.settings.applications.manageapplications;
import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_ALL;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
+ .FILTER_APPS_BLOCKED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_DISABLED;
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_ENABLED;
@@ -64,10 +67,14 @@
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
-import android.widget.ArrayAdapter;
import android.widget.FrameLayout;
import android.widget.Spinner;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings;
@@ -120,6 +127,7 @@
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
import com.android.settingslib.utils.ThreadUtils;
+import com.android.settingslib.widget.settingsspinner.SettingsSpinnerAdapter;
import java.util.ArrayList;
import java.util.Arrays;
@@ -127,11 +135,6 @@
import java.util.Comparator;
import java.util.Set;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* Activity to pick an application that will be used to display installation information and
* options to uninstall/delete user data for system applications. This activity
@@ -408,6 +411,7 @@
if (mListType == LIST_TYPE_NOTIFICATION) {
mFilterAdapter.enableFilter(FILTER_APPS_RECENT);
mFilterAdapter.enableFilter(FILTER_APPS_FREQUENT);
+ mFilterAdapter.enableFilter(FILTER_APPS_BLOCKED);
mFilterAdapter.disableFilter(FILTER_APPS_ALL);
}
if (mListType == LIST_TYPE_HIGH_POWER) {
@@ -753,7 +757,7 @@
}
}
- static class FilterSpinnerAdapter extends ArrayAdapter<CharSequence> {
+ static class FilterSpinnerAdapter extends SettingsSpinnerAdapter<CharSequence> {
private final ManageApplications mManageApplications;
private final Context mContext;
@@ -763,10 +767,9 @@
private final ArrayList<AppFilterItem> mFilterOptions = new ArrayList<>();
public FilterSpinnerAdapter(ManageApplications manageApplications) {
- super(manageApplications.getContext(), R.layout.filter_spinner_item);
+ super(manageApplications.getContext());
mContext = manageApplications.getContext();
mManageApplications = manageApplications;
- setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
}
public AppFilterItem getFilter(int position) {
@@ -954,6 +957,8 @@
rebuild(R.id.sort_order_frequent_notification);
} else if (FILTER_APPS_RECENT == appFilter.getFilterType()) {
rebuild(R.id.sort_order_recent_notification);
+ } else if (FILTER_APPS_BLOCKED == appFilter.getFilterType()) {
+ rebuild(R.id.sort_order_alpha);
} else {
rebuild();
}
@@ -1110,16 +1115,7 @@
@VisibleForTesting
static boolean shouldUseStableItemHeight(int listType) {
- switch (listType) {
- case LIST_TYPE_NOTIFICATION:
- // Most entries in notification type has no summary. Don't use stable height
- // so height is short for most entries.
- return false;
- default:
- // Other types have non-empty summary, so keep the height as we expect summary
- // to fill in.
- return true;
- }
+ return true;
}
private static boolean packageNameEquals(PackageItemInfo info1, PackageItemInfo info2) {
@@ -1334,10 +1330,10 @@
private void updateSummary(ApplicationViewHolder holder, AppEntry entry) {
switch (mManageApplications.mListType) {
case LIST_TYPE_NOTIFICATION:
- if (entry.extraInfo != null) {
+ if (entry.extraInfo != null
+ && entry.extraInfo instanceof NotificationsSentState) {
holder.setSummary(AppStateNotificationBridge.getSummary(mContext,
- (NotificationsSentState) entry.extraInfo,
- (mLastSortMode == R.id.sort_order_recent_notification)));
+ (NotificationsSentState) entry.extraInfo, mLastSortMode));
} else {
holder.setSummary(null);
}
@@ -1383,10 +1379,10 @@
.getSwitchOnClickListener(entry),
AppStateNotificationBridge.enableSwitch(entry),
AppStateNotificationBridge.checkSwitch(entry));
- if (entry.extraInfo != null) {
+ if (entry.extraInfo != null
+ && entry.extraInfo instanceof NotificationsSentState) {
holder.setSummary(AppStateNotificationBridge.getSummary(mContext,
- (NotificationsSentState) entry.extraInfo,
- (mLastSortMode == R.id.sort_order_recent_notification)));
+ (NotificationsSentState) entry.extraInfo, mLastSortMode));
} else {
holder.setSummary(null);
}
diff --git a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
index c93ae13..53c778c 100644
--- a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
+++ b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java
@@ -23,15 +23,15 @@
import android.text.format.Formatter;
import android.util.Log;
+import androidx.annotation.WorkerThread;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.applications.StorageStatsSource;
import java.io.IOException;
-import androidx.annotation.WorkerThread;
-import androidx.fragment.app.Fragment;
-
/**
* MusicViewHolderController controls an Audio/Music file view in the ManageApplications view.
*/
diff --git a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
index 55fbc52..c7a1a1c 100644
--- a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
+++ b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java
@@ -22,15 +22,15 @@
import android.text.format.Formatter;
import android.util.Log;
+import androidx.annotation.WorkerThread;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.applications.StorageStatsSource;
import java.io.IOException;
-import androidx.annotation.WorkerThread;
-import androidx.fragment.app.Fragment;
-
/** PhotosViewHolderController controls an Audio/Music file view in the ManageApplications view. */
public class PhotosViewHolderController implements FileViewHolderController {
private static final String TAG = "PhotosViewHolderCtrl";
diff --git a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java
index 17c2f5a..6ef4593 100644
--- a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java
+++ b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java
@@ -20,6 +20,8 @@
import android.os.Bundle;
import android.text.TextUtils;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -27,8 +29,6 @@
import com.android.settingslib.core.lifecycle.events.OnCreate;
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
-import androidx.preference.Preference;
-
public class ResetAppPrefPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {
diff --git a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
index 4e38f4e..3af3500 100644
--- a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
+++ b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
@@ -34,12 +34,12 @@
import android.os.UserHandle;
import android.webkit.IWebViewUpdateService;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-
public class ResetAppsHelper implements DialogInterface.OnClickListener,
DialogInterface.OnDismissListener {
@@ -117,7 +117,7 @@
for (int i = 0; i < apps.size(); i++) {
ApplicationInfo app = apps.get(i);
try {
- mNm.setNotificationsEnabledForPackage(app.packageName, app.uid, true);
+ mNm.clearData(app.packageName, app.uid, false);
} catch (android.os.RemoteException ex) {
}
if (!app.enabled) {
diff --git a/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java b/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
index a9feedc..94d2818 100644
--- a/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
+++ b/src/com/android/settings/applications/managedomainurls/DomainAppPreference.java
@@ -23,12 +23,12 @@
import android.util.IconDrawableFactory;
import android.view.View;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
-
-import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.apppreference.AppPreference;
public class DomainAppPreference extends AppPreference {
diff --git a/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java b/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java
index cb89c9a..12d1512 100644
--- a/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java
+++ b/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceController.java
@@ -22,6 +22,10 @@
import android.util.ArrayMap;
import android.util.IconDrawableFactory;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.applications.AppLaunchSettings;
@@ -32,10 +36,6 @@
import java.util.ArrayList;
import java.util.Map;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
public class DomainAppPreferenceController extends BasePreferenceController implements
ApplicationsState.Callbacks {
diff --git a/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java b/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java
index 36fd788..86c88c9 100644
--- a/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java
+++ b/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceController.java
@@ -20,10 +20,10 @@
import android.content.Context;
import android.content.Intent;
-import com.android.settings.core.BasePreferenceController;
-
import androidx.preference.Preference;
+import com.android.settings.core.BasePreferenceController;
+
public class InstantAppAccountPreferenceController extends BasePreferenceController {
private Intent mLaunchIntent;
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index c7e93b8..7c05bab 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -57,6 +57,8 @@
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.EventLogTags;
import com.android.settings.R;
@@ -65,6 +67,7 @@
import com.android.settings.users.UserDialogs;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import org.xmlpull.v1.XmlPullParserException;
@@ -73,8 +76,6 @@
import java.util.List;
import java.util.Optional;
-import androidx.appcompat.app.AlertDialog;
-
public class DeviceAdminAdd extends Activity {
static final String TAG = "DeviceAdminAdd";
@@ -645,12 +646,12 @@
private EnforcedAdmin getAdminEnforcingCantRemoveProfile() {
// Removing a managed profile is disallowed if DISALLOW_REMOVE_MANAGED_PROFILE
// is set in the parent rather than the user itself.
- return RestrictedLockUtils.checkIfRestrictionEnforced(this,
+ return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(this,
UserManager.DISALLOW_REMOVE_MANAGED_PROFILE, getParentUserId());
}
private boolean hasBaseCantRemoveProfileRestriction() {
- return RestrictedLockUtils.hasBaseUserRestriction(this,
+ return RestrictedLockUtilsInternal.hasBaseUserRestriction(this,
UserManager.DISALLOW_REMOVE_MANAGED_PROFILE, getParentUserId());
}
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
index fe4ae1d..0ff4233 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
@@ -39,6 +39,12 @@
import android.util.Log;
import android.util.SparseArray;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+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;
@@ -53,12 +59,6 @@
import java.util.List;
import java.util.Map;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
public class DeviceAdminListPreferenceController extends BasePreferenceController
implements LifecycleObserver, OnStart, OnStop {
diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceController.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceController.java
index a2ece72..1f94ed1 100644
--- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceController.java
@@ -22,12 +22,12 @@
import android.os.UserHandle;
import android.util.Log;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.applications.appinfo.AppInfoPreferenceControllerBase;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.applications.appinfo.AppInfoPreferenceControllerBase;
+
public class PictureInPictureDetailPreferenceController extends AppInfoPreferenceControllerBase {
private static final String TAG = "PicInPicDetailControl";
diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java
index 79606ee..33a779f 100644
--- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java
+++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetails.java
@@ -23,17 +23,17 @@
import android.content.Context;
import android.os.Bundle;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.applications.AppInfoWithHeader;
-import com.android.settings.overlay.FeatureFactory;
-
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.SwitchPreference;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.applications.AppInfoWithHeader;
+import com.android.settings.overlay.FeatureFactory;
+
public class PictureInPictureDetails extends AppInfoWithHeader
implements OnPreferenceChangeListener {
diff --git a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
index a399752..d2cb2a7 100644
--- a/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
+++ b/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettings.java
@@ -32,14 +32,19 @@
import android.util.Pair;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
-import com.android.settings.widget.AppPreference;
import com.android.settings.widget.EmptyTextSettings;
import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.text.Collator;
import java.util.ArrayList;
@@ -47,11 +52,6 @@
import java.util.Comparator;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceScreen;
-
@SearchIndexable
public class PictureInPictureSettings extends EmptyTextSettings {
diff --git a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
index e5907ce..5c0d4b1 100644
--- a/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
+++ b/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccess.java
@@ -23,6 +23,13 @@
import android.provider.SearchIndexableResource;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.DropDownPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.telephony.SmsUsageMonitor;
import com.android.settings.R;
@@ -43,13 +50,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.DropDownPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-
@SearchIndexable
public class PremiumSmsAccess extends EmptyTextSettings
implements Callback, Callbacks, OnPreferenceChangeListener {
diff --git a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
index 6cf52ec..cad5957 100644
--- a/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
+++ b/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerSettings.java
@@ -21,6 +21,8 @@
import android.provider.Settings;
import android.service.vr.VrListenerService;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
@@ -32,8 +34,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
@SearchIndexable
public class VrListenerSettings extends ManagedServiceSettings {
private static final String TAG = VrListenerSettings.class.getSimpleName();
diff --git a/src/com/android/settings/backup/AutoRestorePreferenceController.java b/src/com/android/settings/backup/AutoRestorePreferenceController.java
index 4680299..4dd2eb6 100644
--- a/src/com/android/settings/backup/AutoRestorePreferenceController.java
+++ b/src/com/android/settings/backup/AutoRestorePreferenceController.java
@@ -24,11 +24,11 @@
import android.provider.Settings;
import android.util.Log;
-import com.android.settings.core.TogglePreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.TogglePreferenceController;
+
public class AutoRestorePreferenceController extends TogglePreferenceController {
private static final String TAG = "AutoRestorePrefCtrler";
diff --git a/src/com/android/settings/backup/BackupDataPreferenceController.java b/src/com/android/settings/backup/BackupDataPreferenceController.java
index 3ad3e80..25ef58c 100644
--- a/src/com/android/settings/backup/BackupDataPreferenceController.java
+++ b/src/com/android/settings/backup/BackupDataPreferenceController.java
@@ -18,11 +18,11 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
-import androidx.preference.Preference;
-
public class BackupDataPreferenceController extends BasePreferenceController {
private PrivacySettingsConfigData mPSCD;
diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java
index c17d1e7..615dbf3 100644
--- a/src/com/android/settings/backup/BackupSettingsActivity.java
+++ b/src/com/android/settings/backup/BackupSettingsActivity.java
@@ -23,6 +23,10 @@
import android.os.UserHandle;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -32,10 +36,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-
/**
* The activity used to launch the configured Backup activity or the preference screen
diff --git a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
index 4a99f5a..1af80d9 100644
--- a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
+++ b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
@@ -26,13 +26,12 @@
public class BackupSettingsActivityPreferenceController extends BasePreferenceController {
private static final String TAG = "BackupSettingActivityPC";
- private static final String KEY_BACKUP_SETTINGS = "backup_settings";
private final UserManager mUm;
private final BackupManager mBackupManager;
- public BackupSettingsActivityPreferenceController(Context context) {
- super(context, KEY_BACKUP_SETTINGS);
+ public BackupSettingsActivityPreferenceController(Context context, String key) {
+ super(context, key);
mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
mBackupManager = new BackupManager(context);
}
@@ -40,7 +39,7 @@
@Override
public int getAvailabilityStatus() {
return mUm.isAdminUser()
- ? AVAILABLE
+ ? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
}
diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java
index 3383216..b35d6b2 100644
--- a/src/com/android/settings/backup/BackupSettingsHelper.java
+++ b/src/com/android/settings/backup/BackupSettingsHelper.java
@@ -26,13 +26,13 @@
import android.os.UserHandle;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.Settings.PrivacySettingsActivity;
import java.net.URISyntaxException;
-import androidx.annotation.VisibleForTesting;
-
/**
* Helper class for {@link BackupSettingsActivity} that interacts with {@link IBackupManager}.
*/
diff --git a/src/com/android/settings/backup/BackupSettingsPreferenceController.java b/src/com/android/settings/backup/BackupSettingsPreferenceController.java
index 49ee1e5..2a657ea 100644
--- a/src/com/android/settings/backup/BackupSettingsPreferenceController.java
+++ b/src/com/android/settings/backup/BackupSettingsPreferenceController.java
@@ -20,12 +20,12 @@
import android.content.Context;
import android.content.Intent;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public class BackupSettingsPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
private static final String BACKUP_SETTINGS = "backup_settings";
diff --git a/src/com/android/settings/backup/ConfigureAccountPreferenceController.java b/src/com/android/settings/backup/ConfigureAccountPreferenceController.java
index 6b80d7c..553edc2 100644
--- a/src/com/android/settings/backup/ConfigureAccountPreferenceController.java
+++ b/src/com/android/settings/backup/ConfigureAccountPreferenceController.java
@@ -19,11 +19,11 @@
import android.content.Context;
import android.content.Intent;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
-import androidx.preference.Preference;
-
public class ConfigureAccountPreferenceController extends BasePreferenceController {
private PrivacySettingsConfigData mPSCD;
diff --git a/src/com/android/settings/backup/DataManagementPreferenceController.java b/src/com/android/settings/backup/DataManagementPreferenceController.java
index b69acfa..d19b866 100644
--- a/src/com/android/settings/backup/DataManagementPreferenceController.java
+++ b/src/com/android/settings/backup/DataManagementPreferenceController.java
@@ -18,10 +18,10 @@
import android.content.Context;
-import com.android.settings.core.BasePreferenceController;
-
import androidx.preference.Preference;
+import com.android.settings.core.BasePreferenceController;
+
public class DataManagementPreferenceController extends BasePreferenceController {
private PrivacySettingsConfigData mPSCD;
diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java
index fb24542..70ab68a 100644
--- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java
+++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java
@@ -12,6 +12,11 @@
import android.view.View;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -19,11 +24,6 @@
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-
/**
* Fragment to display a bunch of text about backup and restore, and allow the user to enable/
* disable it.
diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
new file mode 100644
index 0000000..ee35945
--- /dev/null
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -0,0 +1,60 @@
+/*
+ * 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.biometrics;
+
+import android.app.settings.SettingsEnums;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+
+import com.android.settings.biometrics.face.FaceEnrollIntroduction;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
+import com.android.settings.core.InstrumentedActivity;
+
+/**
+ * Trampoline activity launched by the {@code android.settings.BIOMETRIC_ENROLL} action which
+ * shows the user an appropriate enrollment flow depending on the device's biometric hardware.
+ * This activity must only allow enrollment of biometrics that can be used by
+ * {@link android.hardware.biometrics.BiometricPrompt}.
+ */
+public class BiometricEnrollActivity extends InstrumentedActivity {
+
+ private static final String SETTINGS_PACKAGE = "com.android.settings";
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ final PackageManager pm = getApplicationContext().getPackageManager();
+ final Intent intent = new Intent();
+
+ // This logic may have to be modified on devices with multiple biometrics.
+ if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
+ intent.setClassName(SETTINGS_PACKAGE, FingerprintEnrollIntroduction.class.getName());
+ } else if (pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {
+ intent.setClassName(SETTINGS_PACKAGE, FaceEnrollIntroduction.class.getName());
+ }
+
+ startActivity(intent);
+ finish();
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.BIOMETRIC_ENROLL_ACTIVITY;
+ }
+}
diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java
index 130f20f..f5a1b5e 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -16,8 +16,6 @@
package com.android.settings.biometrics;
-import static android.app.Activity.RESULT_FIRST_USER;
-
import android.annotation.Nullable;
import android.content.Intent;
import android.content.res.Resources;
diff --git a/src/com/android/settings/biometrics/BiometricEnrollSidecar.java b/src/com/android/settings/biometrics/BiometricEnrollSidecar.java
index 111fecd..cedbec1 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollSidecar.java
@@ -37,7 +37,7 @@
public abstract class BiometricEnrollSidecar extends InstrumentedFragment {
public interface Listener {
- void onEnrollmentHelp(CharSequence helpString);
+ void onEnrollmentHelp(int helpMsgId, CharSequence helpString);
void onEnrollmentError(int errMsgId, CharSequence errString);
void onEnrollmentProgressChange(int steps, int remaining);
}
@@ -82,7 +82,7 @@
@Override
public void send(Listener listener) {
- listener.onEnrollmentHelp(helpString);
+ listener.onEnrollmentHelp(helpMsgId, helpString);
}
}
@@ -174,7 +174,7 @@
protected void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
if (mListener != null) {
- mListener.onEnrollmentHelp(helpString);
+ mListener.onEnrollmentHelp(helpMsgId, helpString);
} else {
mQueuedEvents.add(new QueuedEnrollmentHelp(helpMsgId, helpString));
}
diff --git a/src/com/android/settings/biometrics/BiometricErrorDialog.java b/src/com/android/settings/biometrics/BiometricErrorDialog.java
index 6e5a221..d8cb123 100644
--- a/src/com/android/settings/biometrics/BiometricErrorDialog.java
+++ b/src/com/android/settings/biometrics/BiometricErrorDialog.java
@@ -25,10 +25,10 @@
import android.hardware.biometrics.BiometricConstants;
import android.os.Bundle;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.appcompat.app.AlertDialog;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
/**
* Abstract dialog, shown when an error occurs during biometric enrollment.
*/
diff --git a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java
index 4a52ef3..379a02b 100644
--- a/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/BiometricStatusPreferenceController.java
@@ -21,19 +21,19 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
-import androidx.preference.Preference;
-
public abstract class BiometricStatusPreferenceController extends BasePreferenceController {
protected final UserManager mUm;
protected final LockPatternUtils mLockPatternUtils;
- protected final int mUserId = UserHandle.myUserId();
+ private final int mUserId = UserHandle.myUserId();
protected final int mProfileChallengeUserId;
/**
diff --git a/src/com/android/settings/biometrics/face/AnimationParticle.java b/src/com/android/settings/biometrics/face/AnimationParticle.java
new file mode 100644
index 0000000..a192e9f
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/AnimationParticle.java
@@ -0,0 +1,236 @@
+/*
+ * 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.biometrics.face;
+
+import android.animation.ArgbEvaluator;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.util.Log;
+
+import com.android.settings.R;
+
+import java.util.List;
+
+/**
+ * Class containing the state for an individual feedback dot / path. The dots are assigned colors
+ * based on their index.
+ */
+public class AnimationParticle {
+
+ private static final String TAG = "AnimationParticle";
+
+ private static final int MIN_STROKE_WIDTH = 10;
+ private static final int MAX_STROKE_WIDTH = 20; // Be careful that this doesn't get clipped
+ private static final int FINAL_RING_STROKE_WIDTH = 15;
+
+ private static final float ROTATION_SPEED_NORMAL = 0.8f; // radians per second, 1 = ~57 degrees
+ private static final float ROTATION_ACCELERATION_SPEED = 2.0f;
+ private static final float PULSE_SPEED_NORMAL = 1 * 2 * (float) Math.PI; // 1 cycle per second
+ private static final float RING_SWEEP_GROW_RATE_PRIMARY = 480; // degrees per second
+ private static final float RING_SWEEP_GROW_RATE_SECONDARY = 240; // degrees per second
+ private static final float RING_SIZE_FINALIZATION_TIME = 0.1f; // seconds
+
+ private final Rect mBounds; // bounds for the canvas
+ private final int mBorderWidth; // amount of padding from the edges
+ private final ArgbEvaluator mEvaluator;
+ private final int mErrorColor;
+ private final int mIndex;
+ private final Listener mListener;
+
+ private final Paint mPaint;
+ private final int mAssignedColor;
+ private final float mOffsetTimeSec; // stagger particle size to make a wave effect
+
+ private int mLastAnimationState;
+ private int mAnimationState;
+ private float mCurrentSize = MIN_STROKE_WIDTH;
+ private float mCurrentAngle; // 0 is to the right, in radians
+ private float mRotationSpeed = ROTATION_SPEED_NORMAL; // speed of dot rotation
+ private float mSweepAngle = 0; // ring sweep, degrees per second
+ private float mSweepRate = RING_SWEEP_GROW_RATE_SECONDARY; // acceleration
+ private float mRingAdjustRate; // rate at which ring should grow/shrink to final size
+ private float mRingCompletionTime; // time at which ring should be completed
+
+ public interface Listener {
+ void onRingCompleted(int index);
+ }
+
+ public AnimationParticle(Context context, Listener listener, Rect bounds, int borderWidth,
+ int index, int totalParticles, List<Integer> colors) {
+ mBounds = bounds;
+ mBorderWidth = borderWidth;
+ mEvaluator = new ArgbEvaluator();
+ mErrorColor = context.getResources()
+ .getColor(R.color.face_anim_particle_error, context.getTheme());
+ mIndex = index;
+ mListener = listener;
+
+ mCurrentAngle = (float) index / totalParticles * 2 * (float) Math.PI;
+ mOffsetTimeSec = (float) index / totalParticles
+ * (1 / ROTATION_SPEED_NORMAL) * 2 * (float) Math.PI;
+
+ mPaint = new Paint();
+ mAssignedColor = colors.get(index % colors.size());
+ mPaint.setColor(mAssignedColor);
+ mPaint.setAntiAlias(true);
+ mPaint.setStrokeWidth(mCurrentSize);
+ mPaint.setStyle(Paint.Style.FILL);
+ mPaint.setStrokeCap(Paint.Cap.ROUND);
+ }
+
+ public void updateState(int animationState) {
+ if (mAnimationState == animationState) {
+ Log.w(TAG, "Already in state " + animationState);
+ return;
+ }
+ if (animationState == ParticleCollection.STATE_COMPLETE) {
+ mPaint.setStyle(Paint.Style.STROKE);
+ }
+ mLastAnimationState = mAnimationState;
+ mAnimationState = animationState;
+ }
+
+ // There are two types of particles, secondary and primary. Primary particles accelerate faster
+ // during the "completed" animation. Particles are secondary by default.
+ public void setAsPrimary() {
+ mSweepRate = RING_SWEEP_GROW_RATE_PRIMARY;
+ }
+
+ public void update(long t, long dt) {
+ if (mAnimationState != ParticleCollection.STATE_COMPLETE) {
+ updateDot(t, dt);
+ } else {
+ updateRing(t, dt);
+ }
+ }
+
+ private void updateDot(long t, long dt) {
+ final float dtSec = 0.001f * dt;
+ final float tSec = 0.001f * t;
+
+ final float multiplier = mRotationSpeed / ROTATION_SPEED_NORMAL;
+
+ // Calculate rotation speed / angle
+ if ((mAnimationState == ParticleCollection.STATE_STOPPED_COLORFUL
+ || mAnimationState == ParticleCollection.STATE_STOPPED_GRAY)
+ && mRotationSpeed > 0) {
+ // Linear slow down for now
+ mRotationSpeed = Math.max(mRotationSpeed - ROTATION_ACCELERATION_SPEED * dtSec, 0);
+ } else if (mAnimationState == ParticleCollection.STATE_STARTED
+ && mRotationSpeed < ROTATION_SPEED_NORMAL) {
+ // Linear speed up for now
+ mRotationSpeed += ROTATION_ACCELERATION_SPEED * dtSec;
+ }
+
+ mCurrentAngle += dtSec * mRotationSpeed;
+
+ // Calculate dot / ring size; linearly proportional with rotation speed
+ mCurrentSize =
+ (MAX_STROKE_WIDTH - MIN_STROKE_WIDTH) / 2
+ * (float) Math.sin(tSec * PULSE_SPEED_NORMAL + mOffsetTimeSec)
+ + (MAX_STROKE_WIDTH + MIN_STROKE_WIDTH) / 2;
+ mCurrentSize = (mCurrentSize - MIN_STROKE_WIDTH) * multiplier + MIN_STROKE_WIDTH;
+
+ // Calculate paint color; linearly proportional to rotation speed
+ int color = mAssignedColor;
+ if (mAnimationState == ParticleCollection.STATE_STOPPED_GRAY) {
+ color = (int) mEvaluator.evaluate(1 - multiplier, mAssignedColor, mErrorColor);
+ } else if (mLastAnimationState == ParticleCollection.STATE_STOPPED_GRAY) {
+ color = (int) mEvaluator.evaluate(1 - multiplier, mAssignedColor, mErrorColor);
+ }
+
+ mPaint.setColor(color);
+ mPaint.setStrokeWidth(mCurrentSize);
+ }
+
+ private void updateRing(long t, long dt) {
+ final float dtSec = 0.001f * dt;
+ final float tSec = 0.001f * t;
+
+ // Store the start time, since we need to guarantee all rings reach final size at same time
+ // independent of current size. The magic 0 check is safe.
+ if (mRingAdjustRate == 0) {
+ mRingAdjustRate =
+ (FINAL_RING_STROKE_WIDTH - mCurrentSize) / RING_SIZE_FINALIZATION_TIME;
+ if (mRingCompletionTime == 0) {
+ mRingCompletionTime = tSec + RING_SIZE_FINALIZATION_TIME;
+ }
+ }
+
+ // Accelerate to attack speed.. jk, back to normal speed
+ if (mRotationSpeed < ROTATION_SPEED_NORMAL) {
+ mRotationSpeed += ROTATION_ACCELERATION_SPEED * dtSec;
+ }
+
+ // For arcs, this is the "start"
+ mCurrentAngle += dtSec * mRotationSpeed;
+
+ // Update the sweep angle until it fills entire circle
+ if (mSweepAngle < 360) {
+ final float sweepGrowth = mSweepRate * dtSec;
+ mSweepAngle = mSweepAngle + sweepGrowth;
+ mSweepRate = mSweepRate + sweepGrowth;
+ }
+ if (mSweepAngle > 360) {
+ mSweepAngle = 360;
+ mListener.onRingCompleted(mIndex);
+ }
+
+ // Animate stroke width to final size.
+ if (tSec < RING_SIZE_FINALIZATION_TIME) {
+ mCurrentSize = mCurrentSize + mRingAdjustRate * dtSec;
+ mPaint.setStrokeWidth(mCurrentSize);
+ } else {
+ // There should be small to no discontinuity in this if/else
+ mCurrentSize = FINAL_RING_STROKE_WIDTH;
+ mPaint.setStrokeWidth(mCurrentSize);
+ }
+
+ }
+
+ public void draw(Canvas canvas) {
+ if (mAnimationState != ParticleCollection.STATE_COMPLETE) {
+ drawDot(canvas);
+ } else {
+ drawRing(canvas);
+ }
+ }
+
+ // Draws a dot at the current position on the circumference of the path.
+ private void drawDot(Canvas canvas) {
+ final float w = mBounds.right - mBounds.exactCenterX() - mBorderWidth;
+ final float h = mBounds.bottom - mBounds.exactCenterY() - mBorderWidth;
+ canvas.drawCircle(
+ mBounds.exactCenterX() + w * (float) Math.cos(mCurrentAngle),
+ mBounds.exactCenterY() + h * (float) Math.sin(mCurrentAngle),
+ mCurrentSize,
+ mPaint);
+ }
+
+ private void drawRing(Canvas canvas) {
+ RectF arc = new RectF(
+ mBorderWidth, mBorderWidth,
+ mBounds.width() - mBorderWidth, mBounds.height() - mBorderWidth);
+ Path path = new Path();
+ path.arcTo(arc, (float) Math.toDegrees(mCurrentAngle), mSweepAngle);
+ canvas.drawPath(path, mPaint);
+ }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollAnimationDrawable.java b/src/com/android/settings/biometrics/face/FaceEnrollAnimationDrawable.java
new file mode 100644
index 0000000..5be7c53
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceEnrollAnimationDrawable.java
@@ -0,0 +1,143 @@
+/*
+ * 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.biometrics.face;
+
+import android.animation.TimeAnimator;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+
+import com.android.settings.biometrics.BiometricEnrollSidecar;
+
+/**
+ * A drawable containing the circle cutout as well as the animations.
+ */
+public class FaceEnrollAnimationDrawable extends Drawable
+ implements BiometricEnrollSidecar.Listener {
+
+ // Tune this parameter so the UI looks nice - and so that we don't have to draw the animations
+ // outside our bounds. A fraction of each rotating dot should be overlapping the camera preview.
+ private static final int BORDER_BOUNDS = 20;
+
+ private final Context mContext;
+ private final ParticleCollection.Listener mListener;
+ private Rect mBounds;
+ private final Paint mSquarePaint;
+ private final Paint mCircleCutoutPaint;
+
+ private ParticleCollection mParticleCollection;
+
+ private TimeAnimator mTimeAnimator;
+
+ private final ParticleCollection.Listener mAnimationListener
+ = new ParticleCollection.Listener() {
+ @Override
+ public void onEnrolled() {
+ if (mTimeAnimator != null && mTimeAnimator.isStarted()) {
+ mTimeAnimator.end();
+ mListener.onEnrolled();
+ }
+ }
+ };
+
+ public FaceEnrollAnimationDrawable(Context context, ParticleCollection.Listener listener) {
+ mContext = context;
+ mListener = listener;
+
+ mSquarePaint = new Paint();
+ mSquarePaint.setColor(Color.WHITE);
+ mSquarePaint.setAntiAlias(true);
+
+ mCircleCutoutPaint = new Paint();
+ mCircleCutoutPaint.setColor(Color.TRANSPARENT);
+ mCircleCutoutPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
+ mCircleCutoutPaint.setAntiAlias(true);
+ }
+
+ @Override
+ public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
+ mParticleCollection.onEnrollmentHelp(helpMsgId, helpString);
+ }
+
+ @Override
+ public void onEnrollmentError(int errMsgId, CharSequence errString) {
+ mParticleCollection.onEnrollmentError(errMsgId, errString);
+ }
+
+ @Override
+ public void onEnrollmentProgressChange(int steps, int remaining) {
+ mParticleCollection.onEnrollmentProgressChange(steps, remaining);
+ }
+
+ @Override
+ protected void onBoundsChange(Rect bounds) {
+ mBounds = bounds;
+ mParticleCollection =
+ new ParticleCollection(mContext, mAnimationListener, bounds, BORDER_BOUNDS);
+
+ if (mTimeAnimator == null) {
+ mTimeAnimator = new TimeAnimator();
+ mTimeAnimator.setTimeListener((animation, totalTimeMs, deltaTimeMs) -> {
+ mParticleCollection.update(totalTimeMs, deltaTimeMs);
+ FaceEnrollAnimationDrawable.this.invalidateSelf();
+ });
+ mTimeAnimator.start();
+ }
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ if (mBounds == null) {
+ return;
+ }
+ canvas.save();
+
+ // Draw a rectangle covering the whole view
+ canvas.drawRect(0, 0, mBounds.width(), mBounds.height(), mSquarePaint);
+
+ // Clear a circle in the middle for the camera preview
+ canvas.drawCircle(mBounds.exactCenterX(), mBounds.exactCenterY(),
+ mBounds.height() / 2 - BORDER_BOUNDS, mCircleCutoutPaint);
+
+ // Draw the animation
+ mParticleCollection.draw(canvas);
+
+ canvas.restore();
+ }
+
+ @Override
+ public void setAlpha(int alpha) {
+
+ }
+
+ @Override
+ public void setColorFilter(ColorFilter colorFilter) {
+
+ }
+
+ @Override
+ public int getOpacity() {
+ return PixelFormat.TRANSLUCENT;
+ }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
index 9786363..b09d0aa 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEnrolling.java
@@ -40,10 +40,19 @@
private static final String TAG = "FaceEnrollEnrolling";
private static final boolean DEBUG = true;
+ private static final String TAG_FACE_PREVIEW = "tag_preview";
private TextView mErrorText;
private Interpolator mLinearOutSlowInInterpolator;
private boolean mShouldFinishOnStop = true;
+ private FaceEnrollPreviewFragment mPreviewFragment;
+
+ private ParticleCollection.Listener mListener = new ParticleCollection.Listener() {
+ @Override
+ public void onEnrolled() {
+ FaceEnrollEnrolling.this.launchFinish(mToken);
+ }
+ };
public static class FaceErrorDialog extends BiometricErrorDialog {
static FaceErrorDialog newInstance(CharSequence msg, int msgId) {
@@ -85,7 +94,7 @@
if (shouldLaunchConfirmLock()) {
launchConfirmLock(R.string.security_settings_face_preference_title,
- Utils.getFaceManagerOrNull(this).preEnroll());
+ Utils.getFingerprintManagerOrNull(this).preEnroll());
mShouldFinishOnStop = false;
} else {
startEnrollment();
@@ -93,6 +102,19 @@
}
@Override
+ public void startEnrollment() {
+ super.startEnrollment();
+ mPreviewFragment = (FaceEnrollPreviewFragment) getSupportFragmentManager()
+ .findFragmentByTag(TAG_FACE_PREVIEW);
+ if (mPreviewFragment == null) {
+ mPreviewFragment = new FaceEnrollPreviewFragment();
+ getSupportFragmentManager().beginTransaction().add(mPreviewFragment, TAG_FACE_PREVIEW)
+ .commitAllowingStateLoss();
+ }
+ mPreviewFragment.setListener(mListener);
+ }
+
+ @Override
protected Intent getFinishIntent() {
return new Intent(this, FaceEnrollFinish.class);
}
@@ -118,10 +140,11 @@
}
@Override
- public void onEnrollmentHelp(CharSequence helpString) {
+ public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
if (!TextUtils.isEmpty(helpString)) {
showError(helpString);
}
+ mPreviewFragment.onEnrollmentHelp(helpMsgId, helpString);
}
@Override
@@ -135,6 +158,7 @@
msgId = R.string.security_settings_face_enroll_error_generic_dialog_message;
break;
}
+ mPreviewFragment.onEnrollmentError(errMsgId, errString);
showErrorDialog(getText(msgId), errMsgId);
}
@@ -143,8 +167,15 @@
if (DEBUG) {
Log.v(TAG, "Steps: " + steps + " Remaining: " + remaining);
}
+ mPreviewFragment.onEnrollmentProgressChange(steps, remaining);
+
// TODO: Update the actual animation
showError("Steps: " + steps + " Remaining: " + remaining);
+
+ // TODO: Have this match any animations that UX comes up with
+ if (remaining == 0) {
+ launchFinish(mToken);
+ }
}
@Override
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index cd04b22..748f874 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -28,7 +28,7 @@
import com.android.settings.Utils;
import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.password.ChooseLockSettingsHelper;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.span.LinkSpan;
public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
@@ -45,7 +45,7 @@
@Override
protected boolean isDisabledByAdmin() {
- return RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+ return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
this, DevicePolicyManager.KEYGUARD_DISABLE_FACE, mUserId) != null;
}
@@ -104,7 +104,7 @@
if (mFaceManager == null) {
return 0;
}
- return mFaceManager.preEnroll();
+ return mFaceManager.generateChallenge();
}
@Override
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java b/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java
new file mode 100644
index 0000000..1861e10
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceEnrollPreviewFragment.java
@@ -0,0 +1,379 @@
+/*
+ * 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.biometrics.face;
+
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.SurfaceTexture;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.params.StreamConfigurationMap;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.util.Size;
+import android.view.Surface;
+import android.view.TextureView;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.biometrics.BiometricEnrollSidecar;
+import com.android.settings.core.InstrumentedPreferenceFragment;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Fragment that contains the logic for showing and controlling the camera preview, circular
+ * overlay, as well as the enrollment animations.
+ */
+public class FaceEnrollPreviewFragment extends InstrumentedPreferenceFragment
+ implements BiometricEnrollSidecar.Listener {
+
+ private static final String TAG = "FaceEnrollPreviewFragment";
+
+ private static final int MAX_PREVIEW_WIDTH = 1920;
+ private static final int MAX_PREVIEW_HEIGHT = 1080;
+
+ private Handler mHandler = new Handler(Looper.getMainLooper());
+ private CameraManager mCameraManager;
+ private String mCameraId;
+ private CameraDevice mCameraDevice;
+ private CaptureRequest.Builder mPreviewRequestBuilder;
+ private CameraCaptureSession mCaptureSession;
+ private CaptureRequest mPreviewRequest;
+ private Size mPreviewSize;
+ private ParticleCollection.Listener mListener;
+
+ // View used to contain the circular cutout and enrollment animation drawable
+ private ImageView mCircleView;
+
+ // Drawable containing the circular cutout and enrollment animations
+ private FaceEnrollAnimationDrawable mAnimationDrawable;
+
+ // Texture used for showing the camera preview
+ private FaceSquareTextureView mTextureView;
+
+ // Listener sent to the animation drawable
+ private final ParticleCollection.Listener mAnimationListener
+ = new ParticleCollection.Listener() {
+ @Override
+ public void onEnrolled() {
+ mListener.onEnrolled();
+ }
+ };
+
+ private final TextureView.SurfaceTextureListener mSurfaceTextureListener =
+ new TextureView.SurfaceTextureListener() {
+
+ @Override
+ public void onSurfaceTextureAvailable(
+ SurfaceTexture surfaceTexture, int width, int height) {
+ openCamera(width, height);
+ }
+
+ @Override
+ public void onSurfaceTextureSizeChanged(
+ SurfaceTexture surfaceTexture, int width, int height) {
+ // Shouldn't be called, but do this for completeness.
+ configureTransform(width, height);
+ }
+
+ @Override
+ public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture) {
+ return true;
+ }
+
+ @Override
+ public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture) {
+
+ }
+ };
+
+ private final CameraDevice.StateCallback mCameraStateCallback =
+ new CameraDevice.StateCallback() {
+
+ @Override
+ public void onOpened(CameraDevice cameraDevice) {
+ mCameraDevice = cameraDevice;
+
+ try {
+ // Configure the size of default buffer
+ SurfaceTexture texture = mTextureView.getSurfaceTexture();
+ texture.setDefaultBufferSize(mPreviewSize.getWidth(), mPreviewSize.getHeight());
+
+ // This is the output Surface we need to start preview
+ Surface surface = new Surface(texture);
+
+ // Set up a CaptureRequest.Builder with the output Surface
+ mPreviewRequestBuilder =
+ mCameraDevice.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+ mPreviewRequestBuilder.addTarget(surface);
+
+ // Create a CameraCaptureSession for camera preview
+ mCameraDevice.createCaptureSession(Arrays.asList(surface),
+ new CameraCaptureSession.StateCallback() {
+
+ @Override
+ public void onConfigured(CameraCaptureSession cameraCaptureSession) {
+ // The camera is already closed
+ if (null == mCameraDevice) {
+ return;
+ }
+ // When the session is ready, we start displaying the preview.
+ mCaptureSession = cameraCaptureSession;
+ try {
+ // Auto focus should be continuous for camera preview.
+ mPreviewRequestBuilder.set(CaptureRequest.CONTROL_AF_MODE,
+ CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
+
+ // Finally, we start displaying the camera preview.
+ mPreviewRequest = mPreviewRequestBuilder.build();
+ mCaptureSession.setRepeatingRequest(mPreviewRequest,
+ null /* listener */, mHandler);
+ } catch (CameraAccessException e) {
+ Log.e(TAG, "Unable to access camera", e);
+ }
+ }
+
+ @Override
+ public void onConfigureFailed(CameraCaptureSession cameraCaptureSession) {
+ Log.e(TAG, "Unable to configure camera");
+ }
+ }, null /* handler */);
+ } catch (CameraAccessException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
+ public void onDisconnected(CameraDevice cameraDevice) {
+ cameraDevice.close();
+ mCameraDevice = null;
+ }
+
+ @Override
+ public void onError(CameraDevice cameraDevice, int error) {
+ cameraDevice.close();
+ mCameraDevice = null;
+ }
+ };
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.FACE_ENROLL_PREVIEW;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mTextureView = getActivity().findViewById(R.id.texture_view);
+ mCircleView = getActivity().findViewById(R.id.circle_view);
+
+ // Must disable hardware acceleration for this view, otherwise transparency breaks
+ mCircleView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+
+ mAnimationDrawable = new FaceEnrollAnimationDrawable(getContext(), mAnimationListener);
+ mCircleView.setImageDrawable(mAnimationDrawable);
+
+ mCameraManager = (CameraManager) getContext().getSystemService(Context.CAMERA_SERVICE);
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+
+ // When the screen is turned off and turned back on, the SurfaceTexture is already
+ // available, and "onSurfaceTextureAvailable" will not be called. In that case, we can open
+ // a camera and start preview from here (otherwise, we wait until the surface is ready in
+ // the SurfaceTextureListener).
+ if (mTextureView.isAvailable()) {
+ openCamera(mTextureView.getWidth(), mTextureView.getHeight());
+ } else {
+ mTextureView.setSurfaceTextureListener(mSurfaceTextureListener);
+ }
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ closeCamera();
+ }
+
+ @Override
+ public void onEnrollmentError(int errMsgId, CharSequence errString) {
+ mAnimationDrawable.onEnrollmentError(errMsgId, errString);
+ }
+
+ @Override
+ public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
+ mAnimationDrawable.onEnrollmentHelp(helpMsgId, helpString);
+ }
+
+ @Override
+ public void onEnrollmentProgressChange(int steps, int remaining) {
+ mAnimationDrawable.onEnrollmentProgressChange(steps, remaining);
+ }
+
+ public void setListener(ParticleCollection.Listener listener) {
+ mListener = listener;
+ }
+
+ /**
+ * Sets up member variables related to camera.
+ *
+ * @param width The width of available size for camera preview
+ * @param height The height of available size for camera preview
+ */
+ private void setUpCameraOutputs(int width, int height) {
+ try {
+ for (String cameraId : mCameraManager.getCameraIdList()) {
+ CameraCharacteristics characteristics =
+ mCameraManager.getCameraCharacteristics(cameraId);
+
+ // Find front facing camera
+ Integer facing = characteristics.get(CameraCharacteristics.LENS_FACING);
+ if (facing == null || facing != CameraCharacteristics.LENS_FACING_FRONT) {
+ continue;
+ }
+ mCameraId = cameraId;
+
+ // Get the stream configurations
+ StreamConfigurationMap map = characteristics.get(
+ CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+ mPreviewSize = chooseOptimalSize(map.getOutputSizes(SurfaceTexture.class),
+ width, height, MAX_PREVIEW_WIDTH, MAX_PREVIEW_HEIGHT);
+ break;
+ }
+ } catch (CameraAccessException e) {
+ Log.e(TAG, "Unable to access camera", e);
+ }
+ }
+
+ /**
+ * Opens the camera specified by mCameraId.
+ * @param width The width of the texture view
+ * @param height The height of the texture view
+ */
+ private void openCamera(int width, int height) {
+ try {
+ setUpCameraOutputs(width, height);
+ mCameraManager.openCamera(mCameraId, mCameraStateCallback, mHandler);
+ configureTransform(width, height);
+ } catch (CameraAccessException e) {
+ Log.e(TAG, "Unable to open camera", e);
+ }
+ }
+
+ /**
+ * Chooses the optimal resolution for the camera to open.
+ */
+ private Size chooseOptimalSize(Size[] choices, int textureViewWidth, int textureViewHeight,
+ int maxWidth, int maxHeight) {
+ // Collect the supported resolutions that are at least as big as the preview Surface
+ List<Size> bigEnough = new ArrayList<>();
+ // Collect the supported resolutions that are smaller than the preview Surface
+ List<Size> notBigEnough = new ArrayList<>();
+
+ for (Size option : choices) {
+ if (option.getWidth() <= maxWidth && option.getHeight() <= maxHeight &&
+ option.getHeight() == option.getWidth()) {
+ if (option.getWidth() >= textureViewWidth &&
+ option.getHeight() >= textureViewHeight) {
+ bigEnough.add(option);
+ } else {
+ notBigEnough.add(option);
+ }
+ }
+ }
+
+ // Pick the smallest of those big enough. If there is no one big enough, pick the
+ // largest of those not big enough.
+ if (bigEnough.size() > 0) {
+ return Collections.min(bigEnough, new CompareSizesByArea());
+ } else if (notBigEnough.size() > 0) {
+ return Collections.max(notBigEnough, new CompareSizesByArea());
+ } else {
+ Log.e(TAG, "Couldn't find any suitable preview size");
+ return choices[0];
+ }
+ }
+
+ /**
+ * Configures the necessary {@link android.graphics.Matrix} transformation to `mTextureView`.
+ * This method should be called after the camera preview size is determined in
+ * setUpCameraOutputs and also the size of `mTextureView` is fixed.
+ *
+ * @param viewWidth The width of `mTextureView`
+ * @param viewHeight The height of `mTextureView`
+ */
+ private void configureTransform(int viewWidth, int viewHeight) {
+ if (mTextureView == null) {
+ return;
+ }
+
+ // Fix the aspect ratio
+ Matrix matrix = new Matrix();
+ float scaleX = (float) viewWidth / mPreviewSize.getWidth();
+ float scaleY = (float) viewHeight / mPreviewSize.getHeight();
+
+ // Now divide by smaller one so it fills up the original space
+ float smaller = Math.min(scaleX, scaleY);
+ scaleX = scaleX / smaller;
+ scaleY = scaleY / smaller;
+
+ // Apply the scale
+ matrix.setScale(scaleX, scaleY);
+
+ mTextureView.setTransform(matrix);
+ }
+
+ private void closeCamera() {
+ if (mCaptureSession != null) {
+ mCaptureSession.close();
+ mCaptureSession = null;
+ }
+ if (mCameraDevice != null) {
+ mCameraDevice.close();
+ mCameraDevice = null;
+ }
+ }
+
+ /**
+ * Compares two {@code Size}s based on their areas.
+ */
+ private static class CompareSizesByArea implements Comparator<Size> {
+ @Override
+ public int compare(Size lhs, Size rhs) {
+ // We cast here to ensure the multiplications won't overflow
+ return Long.signum((long) lhs.getWidth() * lhs.getHeight() -
+ (long) rhs.getWidth() * rhs.getHeight());
+ }
+
+ }
+
+}
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 4944c7f..d7dc9f8 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -16,11 +16,16 @@
package com.android.settings.biometrics.face;
+import static android.app.Activity.RESULT_OK;
+
import static com.android.settings.biometrics.BiometricEnrollBase.CONFIRM_REQUEST;
+import static com.android.settings.biometrics.BiometricEnrollBase.RESULT_FINISHED;
import android.content.Context;
+import android.content.Intent;
import android.hardware.face.FaceManager;
import android.os.Bundle;
+import android.os.UserHandle;
import android.provider.SearchIndexableResource;
import android.util.Log;
@@ -30,6 +35,7 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.widget.VideoPreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
@@ -47,7 +53,11 @@
private static final String TAG = "FaceSettings";
private static final String KEY_LAUNCHED_CONFIRM = "key_launched_confirm";
+ private FaceManager mFaceManager;
+ private int mUserId;
private boolean mLaunchedConfirm;
+ private byte[] mToken;
+ private FaceSettingsAttentionPreferenceController mAttentionController;
public static boolean isAvailable(Context context) {
FaceManager manager = Utils.getFaceManagerOrNull(context);
@@ -79,14 +89,20 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ mFaceManager = getPrefContext().getSystemService(FaceManager.class);
+ mUserId = getActivity().getIntent().getIntExtra(
+ Intent.EXTRA_USER_ID, UserHandle.myUserId());
+
if (savedInstanceState != null) {
mLaunchedConfirm = savedInstanceState.getBoolean(KEY_LAUNCHED_CONFIRM, false);
}
if (!mLaunchedConfirm) {
+ final long challenge = mFaceManager.generateChallenge();
ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
if (!helper.launchConfirmationActivity(CONFIRM_REQUEST,
- getString(R.string.security_settings_face_preference_title))) {
+ getString(R.string.security_settings_face_preference_title),
+ null, null, challenge, mUserId)) {
Log.e(TAG, "Password not set");
finish();
}
@@ -94,16 +110,59 @@
}
@Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == CONFIRM_REQUEST) {
+ if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
+ // The pin/pattern/password was set.
+ if (data != null) {
+ mToken = data.getByteArrayExtra(
+ ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+ if (mToken != null) {
+ mAttentionController.setToken(mToken);
+ }
+ }
+ }
+ }
+
+ if (mToken == null) {
+ // Didn't get an authentication, finishing
+ getActivity().finish();
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ if (getActivity().isFinishing()) {
+ final int result = mFaceManager.revokeChallenge();
+ if (result < 0) {
+ Log.w(TAG, "revokeChallenge failed, result: " + result);
+ }
+ }
+ }
+
+ @Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, getSettingsLifecycle());
+ final List<AbstractPreferenceController> controllers =
+ buildPreferenceControllers(context, getSettingsLifecycle());
+ for (AbstractPreferenceController controller : controllers) {
+ if (controller instanceof FaceSettingsAttentionPreferenceController) {
+ mAttentionController = (FaceSettingsAttentionPreferenceController) controller;
+ break;
+ }
+ }
+
+ return controllers;
}
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new FaceSettingsVideoPreferenceController(context));
controllers.add(new FaceSettingsImprovePreferenceController(context));
- controllers.add(new FaceSettingsUnlockPreferenceController(context));
+ controllers.add(new FaceSettingsKeyguardPreferenceController(context));
+ controllers.add(new FaceSettingsAppPreferenceController(context));
+ controllers.add(new FaceSettingsAttentionPreferenceController(context));
controllers.add(new FaceSettingsRemoveButtonPreferenceController(context));
controllers.add(new FaceSettingsFooterPreferenceController(context));
return controllers;
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java
new file mode 100644
index 0000000..038dbd8
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceSettingsAppPreferenceController.java
@@ -0,0 +1,65 @@
+/*
+ * 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.biometrics.face;
+
+import static android.provider.Settings.Secure.FACE_UNLOCK_APP_ENABLED;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Preference controller for Face settings page controlling the ability to use
+ * Face authentication in apps (through BiometricPrompt).
+ */
+public class FaceSettingsAppPreferenceController extends TogglePreferenceController {
+
+ private static final String KEY = "security_settings_face_app";
+
+ private static final int ON = 1;
+ private static final int OFF = 0;
+ private static final int DEFAULT = ON; // face unlock is enabled for BiometricPrompt by default
+
+ public FaceSettingsAppPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ public FaceSettingsAppPreferenceController(Context context) {
+ this(context, KEY);
+ }
+
+ @Override
+ public boolean isChecked() {
+ if (!FaceSettings.isAvailable(mContext)) {
+ return false;
+ }
+ return Settings.Secure.getInt(
+ mContext.getContentResolver(), FACE_UNLOCK_APP_ENABLED, DEFAULT) == ON;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.Secure.putInt(mContext.getContentResolver(), FACE_UNLOCK_APP_ENABLED,
+ isChecked ? ON : OFF);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
new file mode 100644
index 0000000..9c4f964
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceController.java
@@ -0,0 +1,86 @@
+/*
+ * 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.biometrics.face;
+
+import android.content.Context;
+import android.hardware.face.FaceManager;
+
+import com.android.settings.Utils;
+import com.android.settings.core.TogglePreferenceController;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+/**
+ * Preference controller that manages the ability to use face authentication with/without
+ * user attention. See {@link FaceManager#setRequireAttention(boolean, byte[])}.
+ */
+public class FaceSettingsAttentionPreferenceController extends TogglePreferenceController {
+
+ public static final String KEY = "security_settings_face_require_attention";
+
+ private byte[] mToken;
+ private FaceManager mFaceManager;
+ private SwitchPreference mPreference;
+
+ public FaceSettingsAttentionPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mFaceManager = Utils.getFaceManagerOrNull(context);
+ }
+
+ public FaceSettingsAttentionPreferenceController(Context context) {
+ this(context, KEY);
+ }
+
+ public void setToken(byte[] token) {
+ mToken = token;
+ mPreference.setChecked(mFaceManager.getRequireAttention(mToken));
+ }
+
+ /**
+ * Displays preference in this controller.
+ */
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = (SwitchPreference) screen.findPreference(KEY);
+ }
+
+ @Override
+ public boolean isChecked() {
+ if (!FaceSettings.isAvailable(mContext)) {
+ return true;
+ } else if (mToken == null) {
+ // The token will be null when the controller is first created, since CC has not been
+ // completed by the user. Once it's completed, FaceSettings will use setToken which
+ // will retrieve the correct value from FaceService
+ return true;
+ }
+ return mFaceManager.getRequireAttention(mToken);
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ mFaceManager.setRequireAttention(isChecked, mToken);
+ return true;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
index 855b169..838dc0d 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
@@ -19,14 +19,14 @@
import android.content.Context;
import android.content.Intent;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.utils.AnnotationSpan;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.widget.FooterPreference;
-import androidx.preference.Preference;
-
/**
* Footer for face settings showing the help text and help link.
*/
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java
index 94b14b5..0d841dc 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsImprovePreferenceController.java
@@ -18,10 +18,10 @@
import android.content.Context;
-import com.android.settings.core.BasePreferenceController;
-
import androidx.preference.Preference;
+import com.android.settings.core.BasePreferenceController;
+
/**
* Preference controller which allows the user to update their enrolled face.
*/
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
similarity index 89%
rename from src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java
rename to src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
index b483dc6..fe7d398 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsUnlockPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsKeyguardPreferenceController.java
@@ -23,27 +23,27 @@
import android.os.UserHandle;
import android.provider.Settings;
-import com.android.settings.core.TogglePreferenceController;
-
import androidx.preference.Preference;
+import com.android.settings.core.TogglePreferenceController;
+
/**
* Preference controller for Face settings page controlling the ability to unlock the phone
* with face.
*/
-public class FaceSettingsUnlockPreferenceController extends TogglePreferenceController {
+public class FaceSettingsKeyguardPreferenceController extends TogglePreferenceController {
- private static final String KEY = "security_settings_face_unlock";
+ private static final String KEY = "security_settings_face_keyguard";
private static final int ON = 1;
private static final int OFF = 0;
private static final int DEFAULT = ON; // face unlock is enabled on keyguard by default
- public FaceSettingsUnlockPreferenceController(Context context, String preferenceKey) {
+ public FaceSettingsKeyguardPreferenceController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
- public FaceSettingsUnlockPreferenceController(Context context) {
+ public FaceSettingsKeyguardPreferenceController(Context context) {
this(context, KEY);
}
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
index b1dcce0..d1fdc48 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsRemoveButtonPreferenceController.java
@@ -20,12 +20,12 @@
import android.view.View;
import android.widget.Button;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.BasePreferenceController;
-import androidx.preference.Preference;
-
/**
* Controller for the remove button.
*/
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsVideoPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsVideoPreferenceController.java
deleted file mode 100644
index 6fbb9c4..0000000
--- a/src/com/android/settings/biometrics/face/FaceSettingsVideoPreferenceController.java
+++ /dev/null
@@ -1,40 +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.biometrics.face;
-
-import android.content.Context;
-
-import com.android.settings.core.BasePreferenceController;
-
-public class FaceSettingsVideoPreferenceController extends BasePreferenceController {
-
- private static final String PREF_KEY_VIDEO = "security_settings_face_video";
-
- public FaceSettingsVideoPreferenceController(Context context,
- String preferenceKey) {
- super(context, preferenceKey);
- }
-
- public FaceSettingsVideoPreferenceController(Context context) {
- this(context, PREF_KEY_VIDEO);
- }
-
- @Override
- public int getAvailabilityStatus() {
- return AVAILABLE;
- }
-}
diff --git a/src/com/android/settings/biometrics/face/FaceSquareFrameLayout.java b/src/com/android/settings/biometrics/face/FaceSquareFrameLayout.java
new file mode 100644
index 0000000..3aed524
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceSquareFrameLayout.java
@@ -0,0 +1,60 @@
+/*
+ * 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.biometrics.face;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+/**
+ * Square layout that sets the height to be the same as width.
+ */
+public class FaceSquareFrameLayout extends FrameLayout {
+
+ public FaceSquareFrameLayout(Context context) {
+ super(context);
+ }
+
+ public FaceSquareFrameLayout(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public FaceSquareFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ }
+
+ public FaceSquareFrameLayout(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ }
+
+ @Override
+ public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ // Don't call super, manually set their size below
+ int size = MeasureSpec.getSize(widthMeasureSpec);
+
+ // Set this frame layout to be a square
+ setMeasuredDimension(size, size);
+
+ // Set the children to be the same size (square) as well
+ final int numChildren = getChildCount();
+ for (int i = 0; i < numChildren; i++) {
+ int spec = MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY);
+ this.getChildAt(i).measure(spec, spec);
+ }
+ }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceSquareTextureView.java b/src/com/android/settings/biometrics/face/FaceSquareTextureView.java
new file mode 100644
index 0000000..ebbbc27
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceSquareTextureView.java
@@ -0,0 +1,52 @@
+/*
+ * 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.biometrics.face;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.TextureView;
+
+/**
+ * A square {@link TextureView}.
+ */
+public class FaceSquareTextureView extends TextureView {
+
+ public FaceSquareTextureView(Context context) {
+ this(context, null);
+ }
+
+ public FaceSquareTextureView(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public FaceSquareTextureView(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ int width = MeasureSpec.getSize(widthMeasureSpec);
+ int height = MeasureSpec.getSize(heightMeasureSpec);
+
+ if (width < height) {
+ setMeasuredDimension(width, width);
+ } else {
+ setMeasuredDimension(height, height);
+ }
+ }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
index 9a14660..8450577 100644
--- a/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceStatusPreferenceController.java
@@ -46,7 +46,7 @@
@Override
protected boolean hasEnrolledBiometrics() {
- return mFaceManager.hasEnrolledFaces(mUserId);
+ return mFaceManager.hasEnrolledTemplates(getUserId());
}
@Override
diff --git a/src/com/android/settings/biometrics/face/ParticleCollection.java b/src/com/android/settings/biometrics/face/ParticleCollection.java
new file mode 100644
index 0000000..399beec
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/ParticleCollection.java
@@ -0,0 +1,143 @@
+/*
+ * 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.biometrics.face;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+
+import com.android.settings.R;
+import com.android.settings.biometrics.BiometricEnrollSidecar;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Class that's used to create, maintain, and update the state of each animation particle. Particles
+ * should have their colors assigned based on their index. Particles are split into primary and
+ * secondary types - primary types animate twice as fast during the completion effect. The particles
+ * are updated/drawn in a special order so that the overlap is correct during the final completion
+ * effect.
+ */
+public class ParticleCollection implements BiometricEnrollSidecar.Listener {
+
+ private static final String TAG = "AnimationController";
+
+ private static final int NUM_PARTICLES = 12;
+
+ public static final int STATE_STARTED = 1; // dots are rotating
+ public static final int STATE_STOPPED_COLORFUL = 2; // dots are not rotating but colorful
+ public static final int STATE_STOPPED_GRAY = 3; // dots are not rotating and also gray (error)
+ public static final int STATE_COMPLETE = 4; // face is enrolled
+
+ private final List<AnimationParticle> mParticleList;
+ private final List<Integer> mPrimariesInProgress; // primary particles not done animating yet
+ private int mState;
+ private Listener mListener;
+
+ public interface Listener {
+ void onEnrolled();
+ }
+
+ private final AnimationParticle.Listener mParticleListener = new AnimationParticle.Listener() {
+ @Override
+ public void onRingCompleted(int index) {
+ final boolean wasEmpty = mPrimariesInProgress.isEmpty();
+ // We can stop the time animator once the three primary particles have finished
+ for (int i = 0; i < mPrimariesInProgress.size(); i++) {
+ if (mPrimariesInProgress.get(i).intValue() == index) {
+ mPrimariesInProgress.remove(i);
+ break;
+ }
+ }
+ if (mPrimariesInProgress.isEmpty() && !wasEmpty) {
+ mListener.onEnrolled();
+ }
+ }
+ };
+
+ public ParticleCollection(Context context, Listener listener, Rect bounds, int borderWidth) {
+ mParticleList = new ArrayList<>();
+ mListener = listener;
+
+ final List<Integer> colors = new ArrayList<>();
+ final Resources.Theme theme = context.getTheme();
+ final Resources resources = context.getResources();
+ colors.add(resources.getColor(R.color.face_anim_particle_color_1, theme));
+ colors.add(resources.getColor(R.color.face_anim_particle_color_2, theme));
+ colors.add(resources.getColor(R.color.face_anim_particle_color_3, theme));
+ colors.add(resources.getColor(R.color.face_anim_particle_color_4, theme));
+
+ // Primary particles expand faster during the completion animation
+ mPrimariesInProgress = new ArrayList<>(Arrays.asList(0, 4, 8));
+
+ // Order in which to draw the particles. This is so the final "completion" animation has
+ // the correct behavior.
+ final int[] order = {3, 7, 11, 2, 6, 10, 1, 5, 9, 0, 4, 8};
+
+ for (int i = 0; i < NUM_PARTICLES; i++) {
+ AnimationParticle particle = new AnimationParticle(context, mParticleListener, bounds,
+ borderWidth, order[i], NUM_PARTICLES, colors);
+ if (mPrimariesInProgress.contains(order[i])) {
+ particle.setAsPrimary();
+ }
+ mParticleList.add(particle);
+ }
+
+ updateState(STATE_STARTED);
+ }
+
+ public void update(long t, long dt) {
+ for (int i = 0; i < mParticleList.size(); i++) {
+ mParticleList.get(i).update(t, dt);
+ }
+ }
+
+ public void draw(Canvas canvas) {
+ for (int i = 0; i < mParticleList.size(); i++) {
+ mParticleList.get(i).draw(canvas);
+ }
+ }
+
+ private void updateState(int state) {
+ if (mState != state) {
+ for (int i = 0; i < mParticleList.size(); i++) {
+ mParticleList.get(i).updateState(state);
+ }
+ mState = state;
+ }
+ }
+
+ @Override
+ public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
+
+ }
+
+ @Override
+ public void onEnrollmentError(int errMsgId, CharSequence errString) {
+
+ }
+
+ @Override
+ public void onEnrollmentProgressChange(int steps, int remaining) {
+ if (remaining == 0) {
+ updateState(STATE_COMPLETE);
+ }
+ }
+}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 38ef2c1..fb6a221 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -39,6 +39,8 @@
import android.widget.ProgressBar;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.biometrics.BiometricEnrollSidecar;
@@ -46,8 +48,6 @@
import com.android.settings.biometrics.BiometricsEnrollEnrolling;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Activity which handles the actual enrolling for fingerprint.
*/
@@ -245,7 +245,7 @@
}
@Override
- public void onEnrollmentHelp(CharSequence helpString) {
+ public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
if (!TextUtils.isEmpty(helpString)) {
mErrorText.removeCallbacks(mTouchAgainRunnable);
showError(helpString);
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index 927b5eb..4b4f65a 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -22,6 +22,8 @@
import android.view.View;
import android.widget.Button;
+import androidx.annotation.Nullable;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -29,8 +31,6 @@
import com.android.settings.biometrics.BiometricEnrollSidecar.Listener;
import com.android.settings.password.ChooseLockSettingsHelper;
-import androidx.annotation.Nullable;
-
/**
* Activity explaining the fingerprint sensor location for fingerprint enrollment.
*/
@@ -94,7 +94,7 @@
}
@Override
- public void onEnrollmentHelp(CharSequence helpString) {
+ public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
}
@Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index 41bf86f..241545d 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -31,7 +31,7 @@
import com.android.settings.biometrics.BiometricEnrollIntroduction;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.HelpUtils;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.setupwizardlib.span.LinkSpan;
public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
@@ -48,7 +48,7 @@
@Override
protected boolean isDisabledByAdmin() {
- return RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+ return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
this, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId) != null;
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
index c79ed49..1d8e779 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintLocationAnimationVideoView.java
@@ -29,10 +29,10 @@
import android.view.TextureView;
import android.view.View;
-import com.android.settings.R;
-
import androidx.annotation.VisibleForTesting;
+import com.android.settings.R;
+
/**
* A view containing a VideoView for showing the user how to enroll a fingerprint
*/
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 3309b78..2e67ec3 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -37,6 +37,14 @@
import android.widget.EditText;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -47,23 +55,17 @@
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.utils.AnnotationSpan;
+import com.android.settings.widget.ImeAwareEditText;
import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.widget.FooterPreference;
import java.util.HashMap;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-
/**
* Settings screen for fingerprints
*/
@@ -319,7 +321,7 @@
}
final FooterPreference pref = mFooterPreferenceMixin.createFooterPreference();
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
activity, DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT, mUserId);
final AnnotationSpan.LinkInfo adminLinkInfo = new AnnotationSpan.LinkInfo(
ANNOTATION_ADMIN_DETAILS, (view) -> {
@@ -707,11 +709,7 @@
public static class RenameDialog extends InstrumentedDialogFragment {
private Fingerprint mFp;
- private EditText mDialogTextField;
- private String mFingerName;
- private Boolean mTextHadFocus;
- private int mTextSelectionStart;
- private int mTextSelectionEnd;
+ private ImeAwareEditText mDialogTextField;
private AlertDialog mAlertDialog;
private boolean mDeleteInProgress;
@@ -722,11 +720,17 @@
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
mFp = getArguments().getParcelable("fingerprint");
+ final String fingerName;
+ final int textSelectionStart;
+ final int textSelectionEnd;
if (savedInstanceState != null) {
- mFingerName = savedInstanceState.getString("fingerName");
- mTextHadFocus = savedInstanceState.getBoolean("textHadFocus");
- mTextSelectionStart = savedInstanceState.getInt("startSelection");
- mTextSelectionEnd = savedInstanceState.getInt("endSelection");
+ fingerName = savedInstanceState.getString("fingerName");
+ textSelectionStart = savedInstanceState.getInt("startSelection", -1);
+ textSelectionEnd = savedInstanceState.getInt("endSelection", -1);
+ } else {
+ fingerName = null;
+ textSelectionStart = -1;
+ textSelectionEnd = -1;
}
mAlertDialog = new AlertDialog.Builder(getActivity())
.setView(R.layout.fingerprint_rename_dialog)
@@ -755,26 +759,21 @@
mAlertDialog.setOnShowListener(new DialogInterface.OnShowListener() {
@Override
public void onShow(DialogInterface dialog) {
- mDialogTextField = (EditText) mAlertDialog.findViewById(
- R.id.fingerprint_rename_field);
- CharSequence name = mFingerName == null ? mFp.getName() : mFingerName;
+ mDialogTextField = mAlertDialog.findViewById(R.id.fingerprint_rename_field);
+ CharSequence name = fingerName == null ? mFp.getName() : fingerName;
mDialogTextField.setText(name);
- if (mTextHadFocus == null) {
- mDialogTextField.selectAll();
+ if (textSelectionStart != -1 && textSelectionEnd != -1) {
+ mDialogTextField.setSelection(textSelectionStart, textSelectionEnd);
} else {
- mDialogTextField.setSelection(mTextSelectionStart, mTextSelectionEnd);
+ mDialogTextField.selectAll();
}
if (mDeleteInProgress) {
mAlertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);
}
mDialogTextField.requestFocus();
+ mDialogTextField.scheduleShowSoftInput();
}
});
- if (mTextHadFocus == null || mTextHadFocus) {
- // Request the IME
- mAlertDialog.getWindow().setSoftInputMode(
- WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
- }
return mAlertDialog;
}
@@ -790,7 +789,6 @@
super.onSaveInstanceState(outState);
if (mDialogTextField != null) {
outState.putString("fingerName", mDialogTextField.getText().toString());
- outState.putBoolean("textHadFocus", mDialogTextField.hasFocus());
outState.putInt("startSelection", mDialogTextField.getSelectionStart());
outState.putInt("endSelection", mDialogTextField.getSelectionEnd());
}
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
index 2fcff5c..0e1ccd7 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceController.java
@@ -45,12 +45,12 @@
@Override
protected boolean hasEnrolledBiometrics() {
- return mFingerprintManager.hasEnrolledFingerprints(mUserId);
+ return mFingerprintManager.hasEnrolledFingerprints(getUserId());
}
@Override
protected String getSummaryTextEnrolled() {
- final int numEnrolled = mFingerprintManager.getEnrolledFingerprints(mUserId).size();
+ final int numEnrolled = mFingerprintManager.getEnrolledFingerprints(getUserId()).size();
return mContext.getResources().getQuantityString(
R.plurals.security_settings_fingerprint_preference_summary,
numEnrolled, numEnrolled);
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java b/src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java
deleted file mode 100644
index 012f802..0000000
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintUiHelper.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * 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
- */
-
-package com.android.settings.biometrics.fingerprint;
-
-import android.hardware.fingerprint.FingerprintManager;
-import android.os.CancellationSignal;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-
-/**
- * Small helper class to manage text/icon around fingerprint authentication UI.
- */
-public class FingerprintUiHelper extends FingerprintManager.AuthenticationCallback {
-
- private static final long ERROR_TIMEOUT = 1300;
-
- private ImageView mIcon;
- private TextView mErrorTextView;
- private CancellationSignal mCancellationSignal;
- private int mUserId;
-
- private Callback mCallback;
- private FingerprintManager mFingerprintManager;
-
- public FingerprintUiHelper(ImageView icon, TextView errorTextView, Callback callback,
- int userId) {
- mFingerprintManager = Utils.getFingerprintManagerOrNull(icon.getContext());
- mIcon = icon;
- mErrorTextView = errorTextView;
- mCallback = callback;
- mUserId = userId;
- }
-
- public void startListening() {
- if (mFingerprintManager != null && mFingerprintManager.isHardwareDetected()
- && mFingerprintManager.getEnrolledFingerprints(mUserId).size() > 0) {
- mCancellationSignal = new CancellationSignal();
- mFingerprintManager.setActiveUser(mUserId);
- mFingerprintManager.authenticate(
- null, mCancellationSignal, 0 /* flags */, this, null, mUserId);
- setFingerprintIconVisibility(true);
- mIcon.setImageResource(R.drawable.ic_fingerprint);
- }
- }
-
- public void stopListening() {
- if (mCancellationSignal != null) {
- mCancellationSignal.cancel();
- mCancellationSignal = null;
- }
- }
-
- public boolean isListening() {
- return mCancellationSignal != null && !mCancellationSignal.isCanceled();
- }
-
- private void setFingerprintIconVisibility(boolean visible) {
- mIcon.setVisibility(visible ? View.VISIBLE : View.GONE);
- mCallback.onFingerprintIconVisibilityChanged(visible);
- }
-
- @Override
- public void onAuthenticationError(int errMsgId, CharSequence errString) {
- if (errMsgId == FingerprintManager.FINGERPRINT_ERROR_CANCELED) {
- // Only happens if we get preempted by another activity. Ignored.
- return;
- }
- showError(errString);
- setFingerprintIconVisibility(false);
- }
-
- @Override
- public void onAuthenticationHelp(int helpMsgId, CharSequence helpString) {
- showError(helpString);
- }
-
- @Override
- public void onAuthenticationFailed() {
- showError(mIcon.getResources().getString(
- R.string.fingerprint_not_recognized));
- }
-
- @Override
- public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
- mIcon.setImageResource(R.drawable.ic_fingerprint_success);
- mCallback.onAuthenticated();
- }
-
- private void showError(CharSequence error) {
- if (!isListening()) {
- return;
- }
-
- mIcon.setImageResource(R.drawable.ic_fingerprint_error);
- mErrorTextView.setText(error);
- mErrorTextView.removeCallbacks(mResetErrorTextRunnable);
- mErrorTextView.postDelayed(mResetErrorTextRunnable, ERROR_TIMEOUT);
- }
-
- private Runnable mResetErrorTextRunnable = new Runnable() {
- @Override
- public void run() {
- mErrorTextView.setText("");
- mIcon.setImageResource(R.drawable.ic_fingerprint);
- }
- };
-
- public interface Callback {
- void onAuthenticated();
- void onFingerprintIconVisibilityChanged(boolean visible);
- }
-}
diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
index febffa6..8ab9252 100644
--- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java
@@ -23,6 +23,10 @@
import android.os.Bundle;
import android.os.UserHandle;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentManager;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -30,10 +34,6 @@
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockSettingsHelper;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentManager;
-
public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
@Override
diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
index 6ffc096..08f5c7e 100644
--- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -22,6 +22,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
+import android.os.storage.StorageManager;
import android.widget.Button;
import android.widget.TextView;
@@ -32,7 +33,6 @@
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.settings.password.SetupChooseLockGeneric;
import com.android.settings.password.SetupSkipDialog;
-import com.android.settings.password.StorageManagerWrapper;
public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntroduction {
private static final String KEY_LOCK_SCREEN_PRESENT = "wasLockScreenPresent";
@@ -59,7 +59,7 @@
protected Intent getChooseLockIntent() {
Intent intent = new Intent(this, SetupChooseLockGeneric.class);
- if (StorageManagerWrapper.isFileEncryptedNativeOrEmulated()) {
+ if (StorageManager.isFileEncryptedNativeOrEmulated()) {
intent.putExtra(
LockPatternUtils.PASSWORD_TYPE_KEY,
DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
index 2b9c2cb..ae759cd 100644
--- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java
@@ -20,13 +20,11 @@
import android.media.AudioManager;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
/**
* Controller to maintain available media Bluetooth devices
@@ -45,15 +43,6 @@
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
}
- @VisibleForTesting
- AvailableMediaBluetoothDeviceUpdater(DashboardFragment fragment,
- DevicePreferenceCallback devicePreferenceCallback,
- LocalBluetoothManager localBluetoothManager) {
- super(fragment, devicePreferenceCallback, localBluetoothManager);
- mAudioManager = (AudioManager) fragment.getContext().
- getSystemService(Context.AUDIO_SERVICE);
- }
-
@Override
public void onAudioModeChanged() {
forceUpdate();
@@ -92,10 +81,10 @@
// show the bluetooth device that have headset profile.
switch (currentAudioProfile) {
case BluetoothProfile.A2DP:
- isFilterMatched = cachedDevice.isA2dpDevice();
+ isFilterMatched = cachedDevice.isConnectedA2dpDevice();
break;
case BluetoothProfile.HEADSET:
- isFilterMatched = cachedDevice.isHfpDevice();
+ isFilterMatched = cachedDevice.isConnectedHfpDevice();
break;
}
if (DBG) {
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
index d7249b3..09632df 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
@@ -18,14 +18,14 @@
import android.content.Context;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.widget.ActionButtonPreference;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
/**
* This class adds two buttons: one to connect/disconnect from a device (depending on the current
* connected state), and one to "forget" (ie unpair) the device.
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
index deb38fd..af5a628 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java
@@ -18,6 +18,9 @@
import android.content.Context;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -26,9 +29,6 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
/**
* This class provides common lifecycle and bluetooth device event registration for Bluetooth device
* details controllers.
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
index 3c10e6d..1795c07 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
@@ -20,6 +20,10 @@
import android.graphics.drawable.Drawable;
import android.util.Pair;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.widget.EntityHeaderController;
@@ -29,10 +33,6 @@
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
/**
* This class adds a header with device name and status (connected/disconnected, etc.).
*/
@@ -65,12 +65,10 @@
.getBtClassDrawableWithDescription(mContext, mCachedDevice,
mContext.getResources().getFraction(R.fraction.bt_battery_scale_fraction, 1, 1));
String summaryText = mCachedDevice.getConnectionSummary();
- // If both the hearing aids are connected, two battery status should be shown.
- final String pairDeviceSummary = mDeviceManager
- .getHearingAidPairDeviceSummary(mCachedDevice);
- if (pairDeviceSummary != null) {
- mHeaderController.setSecondSummary(pairDeviceSummary);
- }
+ // 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));
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 b48a59f..987dbe4 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
@@ -18,15 +18,15 @@
import android.content.Context;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
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;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
/**
* This class adds the device MAC address to a footer.
*/
@@ -51,6 +51,8 @@
@Override
protected void refresh() {
+ mFooterPreference.setTitle(mContext.getString(
+ R.string.bluetooth_device_mac_address, mCachedDevice.getAddress()));
}
@Override
diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
index a26e961..88cebcb 100644
--- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
@@ -21,6 +21,13 @@
import android.content.Context;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -33,13 +40,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
/**
* This class adds switches for toggling the individual profiles that a Bluetooth device
* supports, such as "Phone audio", "Media audio", "Contact sharing", etc.
@@ -98,11 +98,11 @@
BluetoothDevice device = mCachedDevice.getDevice();
profilePref.setEnabled(!mCachedDevice.isBusy());
if (profile instanceof MapProfile) {
- profilePref.setChecked(mCachedDevice.getMessagePermissionChoice()
- == CachedBluetoothDevice.ACCESS_ALLOWED);
+ profilePref.setChecked(device.getMessageAccessPermission()
+ == BluetoothDevice.ACCESS_ALLOWED);
} else if (profile instanceof PbapServerProfile) {
- profilePref.setChecked(mCachedDevice.getPhonebookPermissionChoice()
- == CachedBluetoothDevice.ACCESS_ALLOWED);
+ profilePref.setChecked(device.getPhonebookAccessPermission()
+ == BluetoothDevice.ACCESS_ALLOWED);
} else if (profile instanceof PanProfile) {
profilePref.setChecked(profile.getConnectionStatus(device) ==
BluetoothProfile.STATE_CONNECTED);
@@ -130,34 +130,31 @@
/**
* Helper method to enable a profile for a device.
*/
- private void enableProfile(LocalBluetoothProfile profile, BluetoothDevice device,
- SwitchPreference profilePref) {
+ private void enableProfile(LocalBluetoothProfile profile) {
+ final BluetoothDevice bluetoothDevice = mCachedDevice.getDevice();
if (profile instanceof PbapServerProfile) {
- mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
+ bluetoothDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
// We don't need to do the additional steps below for this profile.
return;
}
if (profile instanceof MapProfile) {
- mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
+ bluetoothDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
}
- profile.setPreferred(device, true);
+ profile.setPreferred(bluetoothDevice, true);
mCachedDevice.connectProfile(profile);
}
/**
* Helper method to disable a profile for a device
*/
- private void disableProfile(LocalBluetoothProfile profile, BluetoothDevice device,
- SwitchPreference profilePref) {
- if (profile instanceof PbapServerProfile) {
- mCachedDevice.setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
- // We don't need to do the additional steps below for this profile.
- return;
- }
+ private void disableProfile(LocalBluetoothProfile profile) {
+ final BluetoothDevice bluetoothDevice = mCachedDevice.getDevice();
mCachedDevice.disconnect(profile);
- profile.setPreferred(device, false);
+ profile.setPreferred(bluetoothDevice, false);
if (profile instanceof MapProfile) {
- mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_REJECTED);
+ bluetoothDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+ } else if (profile instanceof PbapServerProfile) {
+ bluetoothDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
}
}
@@ -178,11 +175,10 @@
}
}
SwitchPreference profilePref = (SwitchPreference) preference;
- BluetoothDevice device = mCachedDevice.getDevice();
if (profilePref.isChecked()) {
- enableProfile(profile, device, profilePref);
+ enableProfile(profile);
} else {
- disableProfile(profile, device, profilePref);
+ disableProfile(profile);
}
refreshProfilePreference(profilePref, profile);
return true;
@@ -194,17 +190,18 @@
*/
private List<LocalBluetoothProfile> getProfiles() {
List<LocalBluetoothProfile> result = mCachedDevice.getConnectableProfiles();
+ final BluetoothDevice device = mCachedDevice.getDevice();
- final int pbapPermission = mCachedDevice.getPhonebookPermissionChoice();
+ final int pbapPermission = device.getPhonebookAccessPermission();
// Only provide PBAP cabability if the client device has requested PBAP.
- if (pbapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN) {
+ if (pbapPermission != BluetoothDevice.ACCESS_UNKNOWN) {
final PbapServerProfile psp = mManager.getProfileManager().getPbapProfile();
result.add(psp);
}
final MapProfile mapProfile = mManager.getProfileManager().getMapProfile();
- final int mapPermission = mCachedDevice.getMessagePermissionChoice();
- if (mapPermission != CachedBluetoothDevice.ACCESS_UNKNOWN) {
+ final int mapPermission = device.getMessageAccessPermission();
+ if (mapPermission != BluetoothDevice.ACCESS_UNKNOWN) {
result.add(mapProfile);
}
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
index 719a61b..df32111 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
@@ -22,6 +22,8 @@
import android.content.Context;
import android.os.Bundle;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment;
@@ -33,8 +35,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment {
public static final String KEY_DEVICE_ADDRESS = "device_address";
private static final String TAG = "BTDeviceDetailsFrg";
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
index b9154f5..129b218 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java
@@ -25,16 +25,16 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
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 androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller that shows and updates the bluetooth device name
*/
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index eb1cd52..5f71948 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -30,6 +30,10 @@
import android.util.TypedValue;
import android.widget.ImageView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
@@ -38,10 +42,6 @@
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
/**
* BluetoothDevicePreference is the preference type used to display each remote
* Bluetooth device in the Bluetooth Settings screen.
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
index 24fcf6a..1d782b1 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java
@@ -16,18 +16,17 @@
package com.android.settings.bluetooth;
-import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.text.TextUtils;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
public class BluetoothDeviceRenamePreferenceController extends
BluetoothDeviceNamePreferenceController {
diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
index dece0cc..eab2a28 100644
--- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
@@ -15,12 +15,16 @@
*/
package com.android.settings.bluetooth;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.os.Bundle;
import android.os.SystemProperties;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.core.SubSettingLauncher;
@@ -36,9 +40,6 @@
import java.util.HashMap;
import java.util.Map;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
/**
* Update the bluetooth devices. It gets bluetooth event from {@link LocalBluetoothManager} using
* {@link BluetoothCallback}. It notifies the upper level whether to add/remove the preference
@@ -115,22 +116,33 @@
* Force to update the list of bluetooth devices
*/
public void forceUpdate() {
- Collection<CachedBluetoothDevice> cachedDevices =
+ if (BluetoothAdapter.getDefaultAdapter().isEnabled()) {
+ final Collection<CachedBluetoothDevice> cachedDevices =
+ mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
+ for (CachedBluetoothDevice cachedBluetoothDevice : cachedDevices) {
+ update(cachedBluetoothDevice);
+ }
+ }
+ }
+
+ public void removeAllDevicesFromPreference() {
+ final Collection<CachedBluetoothDevice> cachedDevices =
mLocalManager.getCachedDeviceManager().getCachedDevicesCopy();
for (CachedBluetoothDevice cachedBluetoothDevice : cachedDevices) {
- update(cachedBluetoothDevice);
+ removePreference(cachedBluetoothDevice);
}
}
@Override
public void onBluetoothStateChanged(int bluetoothState) {
- forceUpdate();
+ if (BluetoothAdapter.STATE_ON == bluetoothState) {
+ forceUpdate();
+ } else if (BluetoothAdapter.STATE_OFF == bluetoothState) {
+ removeAllDevicesFromPreference();
+ }
}
@Override
- public void onScanningStateChanged(boolean started) {}
-
- @Override
public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
update(cachedDevice);
}
@@ -149,17 +161,6 @@
}
@Override
- public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {}
-
- @Override
- public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
- }
-
- @Override
- public void onAudioModeChanged() {
- }
-
- @Override
public void onProfileConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state,
int bluetoothProfile) {
if (DBG) {
@@ -170,6 +171,15 @@
}
@Override
+ public void onAclConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
+ if (DBG) {
+ Log.d(TAG, "onAclConnectionStateChanged() device: " + cachedDevice.getName()
+ + ", state: " + state);
+ }
+ update(cachedDevice);
+ }
+
+ @Override
public void onServiceConnected() {
// When bluetooth service connected update the UI
forceUpdate();
@@ -229,9 +239,19 @@
*/
protected void removePreference(CachedBluetoothDevice cachedDevice) {
final BluetoothDevice device = cachedDevice.getDevice();
+ final CachedBluetoothDevice subCachedDevice = cachedDevice.getSubDevice();
if (mPreferenceMap.containsKey(device)) {
mDevicePreferenceCallback.onDeviceRemoved(mPreferenceMap.get(device));
mPreferenceMap.remove(device);
+ } else if (subCachedDevice != null) {
+ // When doing remove, to check if preference maps to sub device.
+ // This would happen when connection state is changed in detail page that there is no
+ // callback from SettingsLib.
+ final BluetoothDevice subDevice = subCachedDevice.getDevice();
+ if (mPreferenceMap.containsKey(subDevice)) {
+ mDevicePreferenceCallback.onDeviceRemoved(mPreferenceMap.get(subDevice));
+ mPreferenceMap.remove(subDevice);
+ }
}
}
@@ -268,7 +288,8 @@
final BluetoothDevice device = cachedDevice.getDevice();
if (DBG) {
Log.d(TAG, "isDeviceConnected() device name : " + cachedDevice.getName() +
- ", is connected : " + device.isConnected());
+ ", is connected : " + device.isConnected() + " , is profile connected : "
+ + cachedDevice.isConnected());
}
return device.getBondState() == BluetoothDevice.BOND_BONDED && device.isConnected();
}
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index aec6d2d..0a9003d 100755
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -26,11 +26,11 @@
import android.os.SystemProperties;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver;
-import androidx.preference.Preference;
-
/**
* BluetoothDiscoverableEnabler is a helper to manage the "Discoverable"
* checkbox. It sets/unsets discoverability and keeps track of how much time
diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index 9c00a50..2da9eea 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -25,14 +25,14 @@
import android.provider.Settings;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.WirelessUtils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import androidx.annotation.VisibleForTesting;
-
/**
* BluetoothEnabler is a helper to manage the Bluetooth on/off checkbox
* preference. It turns on/off Bluetooth and ensures the summary of the
diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
index 73c02ab..3f566f0 100644
--- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java
@@ -20,15 +20,15 @@
import android.content.Intent;
import android.content.pm.PackageManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
/**
* Controller that shows received files
*/
diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
index 6f737e0..74c39b6 100644
--- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java
@@ -34,17 +34,24 @@
import android.widget.EditText;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Dialog fragment for renaming a Bluetooth device.
*/
abstract class BluetoothNameDialogFragment extends InstrumentedDialogFragment
- implements TextWatcher {
- private AlertDialog mAlertDialog;
+ implements TextWatcher, TextView.OnEditorActionListener {
+
+ // Key to save the edited name and edit status for restoring after rotation
+ private static final String KEY_NAME = "device_name";
+ private static final String KEY_NAME_EDITED = "device_name_edited";
+
+ @VisibleForTesting
+ AlertDialog mAlertDialog;
private Button mOkButton;
EditText mDeviceNameView;
@@ -55,10 +62,6 @@
// This flag is set when the user edits the name (preserved on rotation)
private boolean mDeviceNameEdited;
- // Key to save the edited name and edit status for restoring after rotation
- private static final String KEY_NAME = "device_name";
- private static final String KEY_NAME_EDITED = "device_name_edited";
-
/**
* @return the title to use for the dialog.
*/
@@ -123,22 +126,24 @@
}
mDeviceNameView.addTextChangedListener(this);
com.android.settings.Utils.setEditTextCursorPosition(mDeviceNameView);
- mDeviceNameView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
- @Override
- public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
- if (actionId == EditorInfo.IME_ACTION_DONE) {
- setDeviceName(v.getText().toString());
- mAlertDialog.dismiss();
- return true; // action handled
- } else {
- return false; // not handled
- }
- }
- });
+ mDeviceNameView.setOnEditorActionListener(this);
return view;
}
@Override
+ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+ if (actionId == EditorInfo.IME_ACTION_DONE) {
+ setDeviceName(v.getText().toString());
+ if (mAlertDialog != null && mAlertDialog.isShowing()) {
+ mAlertDialog.dismiss();
+ }
+ return true; // action handled
+ } else {
+ return false; // not handled
+ }
+ }
+
+ @Override
public void onDestroy() {
super.onDestroy();
mAlertDialog = null;
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index 3c343c7..94bdfe8 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -24,6 +24,8 @@
import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
@@ -31,8 +33,6 @@
import java.util.Locale;
-import androidx.annotation.VisibleForTesting;
-
/**
* A controller used by {@link BluetoothPairingDialog} to manage connection state while we try to
* pair with a bluetooth device. It includes methods that allow the
@@ -54,8 +54,7 @@
// Bluetooth dependencies for the connection we are trying to establish
private LocalBluetoothManager mBluetoothManager;
- @VisibleForTesting
- BluetoothDevice mDevice;
+ private BluetoothDevice mDevice;
@VisibleForTesting
int mType;
private String mUserInput;
@@ -189,16 +188,16 @@
*
*/
public void setContactSharingState() {
- if ((mDevice.getPhonebookAccessPermission() != BluetoothDevice.ACCESS_ALLOWED)
- && (mDevice.getPhonebookAccessPermission() != BluetoothDevice.ACCESS_REJECTED)) {
- if (mDevice.getBluetoothClass().getDeviceClass()
- == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
- onCheckedChanged(null, true);
- } else {
- onCheckedChanged(null, false);
- }
- }
- }
+ final int permission = mDevice.getPhonebookAccessPermission();
+ if (permission == BluetoothDevice.ACCESS_ALLOWED
+ || (permission == BluetoothDevice.ACCESS_UNKNOWN && mDevice.getBluetoothClass().
+ getDeviceClass() == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE)) {
+ onCheckedChanged(null, true);
+ } else {
+ onCheckedChanged(null, false);
+ }
+
+ }
/**
* A method for querying if the provided editable is a valid passkey/pin format for this device.
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
index 905327d..688ac00 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java
@@ -25,6 +25,8 @@
import android.util.Log;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.Indexable;
@@ -32,8 +34,6 @@
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.widget.FooterPreference;
-import androidx.annotation.VisibleForTesting;
-
/**
* BluetoothPairingDetail is a page to scan bluetooth devices and pair them.
*/
@@ -152,7 +152,7 @@
addDeviceCategory(mAvailableDevicesCategory,
R.string.bluetooth_preference_found_media_devices,
- BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, mInitialScanStarted);
+ BluetoothDeviceFilter.ALL_FILTER, mInitialScanStarted);
updateFooterPreference(mFooterPreference);
mAlwaysDiscoverable.start();
enableScanning();
@@ -191,6 +191,17 @@
}
@Override
+ public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
+ if (mSelectedDevice != null) {
+ BluetoothDevice device = cachedDevice.getDevice();
+ if (device != null && mSelectedDevice.equals(device)
+ && state == BluetoothAdapter.STATE_CONNECTED) {
+ finish();
+ }
+ }
+ }
+
+ @Override
public int getHelpResource() {
return R.string.help_url_bluetooth;
}
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
index e5d2aa7..f8a2bbe 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -34,13 +34,13 @@
import android.widget.EditText;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
/**
* A dialogFragment used by {@link BluetoothPairingDialog} to create an appropriately styled dialog
* for the bluetooth device.
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
index a8b545f..514c70f 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
@@ -18,14 +18,14 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
/**
* Controller that shows and updates the bluetooth device name
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
index 74a5f24..de8902a 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
@@ -28,6 +28,8 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.preference.Preference;
+
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
import com.android.settings.R;
@@ -35,8 +37,6 @@
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import androidx.preference.Preference;
-
/**
* BluetoothPermissionActivity shows a dialog for accepting incoming
* profile connection request from untrusted devices.
@@ -207,8 +207,7 @@
bluetoothManager.getCachedDeviceManager();
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
if (cachedDevice == null) {
- cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
- mDevice);
+ cachedDevice = cachedDeviceManager.addDevice(mDevice);
}
always = cachedDevice.checkAndIncreaseMessageRejectionCount();
}
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index bbf3fff..c5f62b8 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -231,49 +231,48 @@
bluetoothManager.getCachedDeviceManager();
CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
if (cachedDevice == null) {
- cachedDevice = cachedDeviceManager.addDevice(bluetoothManager.getBluetoothAdapter(),
- mDevice);
+ cachedDevice = cachedDeviceManager.addDevice(mDevice);
}
String intentName = BluetoothDevice.ACTION_CONNECTION_ACCESS_REPLY;
if (mRequestType == BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS) {
- int phonebookPermission = cachedDevice.getPhonebookPermissionChoice();
+ int phonebookPermission = mDevice.getPhonebookAccessPermission();
- if (phonebookPermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
+ if (phonebookPermission == BluetoothDevice.ACCESS_UNKNOWN) {
// Leave 'processed' as false.
- } else if (phonebookPermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
+ } else if (phonebookPermission == BluetoothDevice.ACCESS_ALLOWED) {
sendReplyIntentToReceiver(true);
processed = true;
- } else if (phonebookPermission == CachedBluetoothDevice.ACCESS_REJECTED) {
+ } else if (phonebookPermission == BluetoothDevice.ACCESS_REJECTED) {
sendReplyIntentToReceiver(false);
processed = true;
} else {
Log.e(TAG, "Bad phonebookPermission: " + phonebookPermission);
}
} else if (mRequestType == BluetoothDevice.REQUEST_TYPE_MESSAGE_ACCESS) {
- int messagePermission = cachedDevice.getMessagePermissionChoice();
+ int messagePermission = mDevice.getMessageAccessPermission();
- if (messagePermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
+ if (messagePermission == BluetoothDevice.ACCESS_UNKNOWN) {
// Leave 'processed' as false.
- } else if (messagePermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
+ } else if (messagePermission == BluetoothDevice.ACCESS_ALLOWED) {
sendReplyIntentToReceiver(true);
processed = true;
- } else if (messagePermission == CachedBluetoothDevice.ACCESS_REJECTED) {
+ } else if (messagePermission == BluetoothDevice.ACCESS_REJECTED) {
sendReplyIntentToReceiver(false);
processed = true;
} else {
Log.e(TAG, "Bad messagePermission: " + messagePermission);
}
} else if(mRequestType == BluetoothDevice.REQUEST_TYPE_SIM_ACCESS) {
- int simPermission = cachedDevice.getSimPermissionChoice();
+ int simPermission = mDevice.getSimAccessPermission();
- if (simPermission == CachedBluetoothDevice.ACCESS_UNKNOWN) {
+ if (simPermission == BluetoothDevice.ACCESS_UNKNOWN) {
// Leave 'processed' as false.
- } else if (simPermission == CachedBluetoothDevice.ACCESS_ALLOWED) {
+ } else if (simPermission == BluetoothDevice.ACCESS_ALLOWED) {
sendReplyIntentToReceiver(true);
processed = true;
- } else if (simPermission == CachedBluetoothDevice.ACCESS_REJECTED) {
+ } else if (simPermission == BluetoothDevice.ACCESS_REJECTED) {
sendReplyIntentToReceiver(false);
processed = true;
} else {
diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
index 7a56994..1462f91 100644
--- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
+++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -27,6 +27,12 @@
import android.net.Uri;
import android.provider.SettingsSlicesContract;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SubSettings;
@@ -34,11 +40,6 @@
import com.android.settings.slices.SliceBroadcastReceiver;
import com.android.settings.slices.SliceBuilderUtils;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
/**
* Utility class to build a Bluetooth Slice, and handle all associated actions.
*/
@@ -93,7 +94,7 @@
return new ListBuilder(context, BLUETOOTH_URI, ListBuilder.INFINITY)
.setAccentColor(color)
- .addRow(b -> b
+ .addRow(new RowBuilder()
.setTitle(title)
.addEndItem(toggleSliceAction)
.setPrimaryAction(primarySliceAction))
diff --git a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
index 03fffa4..6e82649 100644
--- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
+++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java
@@ -21,6 +21,8 @@
import android.content.Context;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.widget.SummaryUpdater;
import com.android.settingslib.bluetooth.BluetoothCallback;
@@ -29,8 +31,6 @@
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-
/**
* Helper class that listeners to bluetooth callback and notify client when there is update in
* bluetooth summary info.
@@ -59,30 +59,6 @@
}
@Override
- public void onScanningStateChanged(boolean started) {
- }
-
- @Override
- public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
- }
-
- @Override
- public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
- }
-
- @Override
- public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
- }
-
- @Override
- public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
- }
-
- @Override
- public void onAudioModeChanged() {
- }
-
- @Override
public void register(boolean listening) {
if (mBluetoothAdapter == null) {
return;
diff --git a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
index d828302..e0aa9e9 100644
--- a/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
+++ b/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceController.java
@@ -18,6 +18,8 @@
import android.content.Context;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -31,8 +33,6 @@
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.widget.FooterPreference;
-import androidx.annotation.VisibleForTesting;
-
/**
* PreferenceController to update of bluetooth state. All behavior except managing the footer text
* is delegated to the SwitchWidgetController it uses.
diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
index 259a403..d2cfa43 100644
--- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java
@@ -21,13 +21,11 @@
import android.media.AudioManager;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
/**
* Controller to maintain connected bluetooth devices
@@ -45,15 +43,6 @@
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
}
- @VisibleForTesting
- ConnectedBluetoothDeviceUpdater(DashboardFragment fragment,
- DevicePreferenceCallback devicePreferenceCallback,
- LocalBluetoothManager localBluetoothManager) {
- super(fragment, devicePreferenceCallback, localBluetoothManager);
- mAudioManager = (AudioManager) fragment.getContext().
- getSystemService(Context.AUDIO_SERVICE);
- }
-
@Override
public void onAudioModeChanged() {
forceUpdate();
@@ -93,10 +82,10 @@
// show the bluetooth device that doesn't have headset profile.
switch (currentAudioProfile) {
case BluetoothProfile.A2DP:
- isFilterMatched = !cachedDevice.isA2dpDevice();
+ isFilterMatched = !cachedDevice.isConnectedA2dpDevice();
break;
case BluetoothProfile.HEADSET:
- isFilterMatched = !cachedDevice.isHfpDevice();
+ isFilterMatched = !cachedDevice.isConnectedHfpDevice();
break;
}
if (DBG) {
diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
index 7c4224e..385b5d9 100644
--- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
+++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java
@@ -23,6 +23,11 @@
import android.text.BidiFormatter;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+
import com.android.settings.R;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settingslib.bluetooth.BluetoothCallback;
@@ -33,11 +38,6 @@
import java.util.Collection;
import java.util.WeakHashMap;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceGroup;
-
/**
* Parent class for settings fragments that contain a list of Bluetooth
* devices.
@@ -192,6 +192,8 @@
preference = new BluetoothDevicePreference(getPrefContext(), cachedDevice,
mShowDevicesWithoutNames);
preference.setKey(key);
+ //Set hideSecondTarget is true if it's bonded device.
+ preference.hideSecondTarget(true);
mDeviceListGroup.addPreference(preference);
} else {
// Tell the preference it is being re-used in case there is new info in the
@@ -244,9 +246,6 @@
}
}
- @Override
- public void onBluetoothStateChanged(int bluetoothState) {}
-
/**
* Add bluetooth device preferences to {@code preferenceGroup} which satisfy the {@code filter}
*
@@ -262,22 +261,16 @@
cacheRemoveAllPrefs(preferenceGroup);
preferenceGroup.setTitle(titleId);
mDeviceListGroup = preferenceGroup;
- setFilter(filter);
if (addCachedDevices) {
+ // Don't show bonded devices when screen turned back on
+ setFilter(BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER);
addCachedDevices();
}
+ setFilter(filter);
preferenceGroup.setEnabled(true);
removeCachedPrefs(preferenceGroup);
}
- public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) { }
-
- @Override
- public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) { }
-
- @Override
- public void onAudioModeChanged() { }
-
/**
* Return the key of the {@link PreferenceGroup} that contains the bluetooth devices
*/
diff --git a/src/com/android/settings/bluetooth/DevicePickerActivity.java b/src/com/android/settings/bluetooth/DevicePickerActivity.java
index 5228cd8..77e8ba4 100644
--- a/src/com/android/settings/bluetooth/DevicePickerActivity.java
+++ b/src/com/android/settings/bluetooth/DevicePickerActivity.java
@@ -18,10 +18,10 @@
import android.os.Bundle;
-import com.android.settings.R;
-
import androidx.fragment.app.FragmentActivity;
+import com.android.settings.R;
+
/**
* Activity for Bluetooth device picker dialog. The device picker logic
* is implemented in the {@link BluetoothPairingDetail} fragment.
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 097fba7..38936f5 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -28,6 +28,8 @@
import android.view.Menu;
import android.view.MenuInflater;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -35,8 +37,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* BluetoothSettings is the Settings screen for Bluetooth configuration and
* connection management.
diff --git a/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java
index e660691..33e2ab3 100644
--- a/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java
+++ b/src/com/android/settings/bluetooth/ForgetDeviceDialogFragment.java
@@ -23,15 +23,15 @@
import android.content.DialogInterface;
import android.os.Bundle;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
/** Implements an AlertDialog for confirming that a user wishes to unpair or "forget" a paired
* device*/
public class ForgetDeviceDialogFragment extends InstrumentedDialogFragment {
diff --git a/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java b/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java
index 44e3a91..7894ed6 100644
--- a/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java
+++ b/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragment.java
@@ -20,13 +20,13 @@
import android.content.Context;
import android.os.Bundle;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import androidx.annotation.VisibleForTesting;
-
/** Provides a dialog for changing the display name of a remote bluetooth device. */
public class RemoteDeviceNameDialogFragment extends BluetoothNameDialogFragment {
public static final String TAG = "RemoteDeviceName";
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index fff6f12..5485406 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -32,17 +32,17 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver;
-import androidx.appcompat.app.AlertDialog;
-
/**
* RequestPermissionActivity asks the user whether to enable discovery. This is
* usually started by an application wanted to start bluetooth and or discovery
*/
public class RequestPermissionActivity extends Activity implements
- DialogInterface.OnClickListener {
+ DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
// Command line to test this
// adb shell am start -a android.bluetooth.adapter.action.REQUEST_ENABLE
// adb shell am start -a android.bluetooth.adapter.action.REQUEST_DISCOVERABLE
@@ -188,6 +188,7 @@
builder.setNegativeButton(getString(R.string.deny), this);
}
+ builder.setOnDismissListener(this);
mDialog = builder.create();
mDialog.show();
}
@@ -238,12 +239,16 @@
break;
case DialogInterface.BUTTON_NEGATIVE:
- setResult(RESULT_CANCELED);
- finish();
+ cancelAndFinish();
break;
}
}
+ @Override
+ public void onDismiss(final DialogInterface dialog) {
+ cancelAndFinish();
+ }
+
private void proceedAndFinish() {
int returnCode;
diff --git a/src/com/android/settings/bluetooth/RestrictionUtils.java b/src/com/android/settings/bluetooth/RestrictionUtils.java
index 9c0c481..21b00cd 100644
--- a/src/com/android/settings/bluetooth/RestrictionUtils.java
+++ b/src/com/android/settings/bluetooth/RestrictionUtils.java
@@ -19,8 +19,8 @@
import android.content.Context;
import android.os.UserHandle;
-import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* A utility class to aid testing.
@@ -36,7 +36,7 @@
* API.
*/
public EnforcedAdmin checkIfRestrictionEnforced(Context context, String restriction) {
- return RestrictedLockUtils.checkIfRestrictionEnforced(
+ return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
context, restriction, UserHandle.myUserId());
}
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index 059a920..6d034fd 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -16,17 +16,14 @@
package com.android.settings.bluetooth;
import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothProfile;
import android.content.Context;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
/**
* Maintain and update saved bluetooth devices(bonded but not connected)
@@ -41,19 +38,13 @@
super(context, fragment, devicePreferenceCallback);
}
- @VisibleForTesting
- SavedBluetoothDeviceUpdater(DashboardFragment fragment,
- DevicePreferenceCallback devicePreferenceCallback,
- LocalBluetoothManager localBluetoothManager) {
- super(fragment, devicePreferenceCallback, localBluetoothManager);
- }
-
@Override
public boolean isFilterMatched(CachedBluetoothDevice cachedDevice) {
final BluetoothDevice device = cachedDevice.getDevice();
if (DBG) {
Log.d(TAG, "isFilterMatched() device name : " + cachedDevice.getName() +
- ", is connected : " + device.isConnected());
+ ", is connected : " + device.isConnected() + ", is profile connected : "
+ + cachedDevice.isConnected());
}
return device.getBondState() == BluetoothDevice.BOND_BONDED && !device.isConnected();
}
diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java
index 567aa93..fd6bbc3 100755
--- a/src/com/android/settings/bluetooth/Utils.java
+++ b/src/com/android/settings/bluetooth/Utils.java
@@ -24,6 +24,9 @@
import android.util.Log;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
@@ -32,9 +35,6 @@
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothManager.BluetoothManagerCallback;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Utils is a helper class that contains constants for various
* Android resource IDs, debug logging flags, and static methods
diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
index 2849d71..3239dd5 100644
--- a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
@@ -22,15 +22,15 @@
import android.content.IntentFilter;
import android.content.pm.PackageManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
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 androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller to maintain the {@link androidx.preference.Preference} for add
* device. It monitor Bluetooth's status(on/off) and decide if need to show summary or not.
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
index de6548d..26c3e34 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java
@@ -18,12 +18,12 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.nfc.NfcPreferenceController;
-import androidx.annotation.VisibleForTesting;
-
/**
* Controller that used to show which component is available
*/
diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
index e58ac1f..5c678a9 100644
--- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java
@@ -108,9 +108,6 @@
keys.add(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
}
- // Parent duplicate
- keys.add(KEY_BLUETOOTH);
-
return keys;
}
diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
index 5959414..2681288 100644
--- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
@@ -21,6 +21,11 @@
import android.content.pm.PackageManager;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater;
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
@@ -28,17 +33,11 @@
import com.android.settings.core.BasePreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.bluetooth.BluetoothCallback;
-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 androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller to maintain the {@link androidx.preference.PreferenceGroup} for all
* available media devices. It uses {@link DevicePreferenceCallback}
@@ -96,7 +95,7 @@
@Override
public int getAvailabilityStatus() {
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
- ? AVAILABLE
+ ? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
}
@@ -132,41 +131,6 @@
}
@Override
- public void onBluetoothStateChanged(int bluetoothState) {
- // do nothing
- }
-
- @Override
- public void onScanningStateChanged(boolean started) {
- // do nothing
- }
-
- @Override
- public void onDeviceAdded(CachedBluetoothDevice cachedDevice) {
- // do nothing
- }
-
- @Override
- public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
- // do nothing
- }
-
- @Override
- public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
- // do nothing
- }
-
- @Override
- public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
- // do nothing
- }
-
- @Override
- public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
- // do nothing
- }
-
- @Override
public void onAudioModeChanged() {
updateTitle();
}
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index 380e8a5..223b78f 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -15,14 +15,14 @@
*/
package com.android.settings.connecteddevice;
-import android.app.Activity;
import android.content.Context;
import android.provider.SearchIndexableResource;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -32,8 +32,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class ConnectedDeviceDashboardFragment extends DashboardFragment {
@@ -92,35 +90,6 @@
use(DiscoverableFooterPreferenceController.class).init(this);
}
- @VisibleForTesting
- static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- mSummaryLoader.setSummary(this, mContext.getText(AdvancedConnectedDeviceController.
- getConnectedDevicesSummaryResourceId(mContext)));
- }
- }
- }
-
- 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);
- }
- };
-
/**
* For Search.
*/
@@ -139,14 +108,5 @@
context) {
return buildPreferenceControllers(context, null /* lifecycle */);
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- List<String> keys = super.getNonIndexableKeys(context);
- // Disable because they show dynamic data
- keys.add(KEY_AVAILABLE_DEVICES);
- keys.add(KEY_CONNECTED_DEVICES);
- return keys;
- }
};
}
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
index 143b72d..daa9932 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
@@ -18,6 +18,11 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
@@ -31,11 +36,6 @@
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller to maintain the {@link androidx.preference.PreferenceGroup} for all
* connected devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference}
@@ -89,7 +89,7 @@
@Override
public int getAvailabilityStatus() {
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
- ? AVAILABLE
+ ? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
}
diff --git a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
index feb64b5..ead3307 100644
--- a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
@@ -25,6 +25,9 @@
import android.text.BidiFormatter;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.bluetooth.AlwaysDiscoverable;
import com.android.settings.bluetooth.Utils;
@@ -37,9 +40,6 @@
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller that shows and updates the bluetooth device name
*/
diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
index eff97c3..ffcd1fc 100644
--- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
@@ -18,6 +18,11 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
@@ -28,14 +33,12 @@
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController
implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback {
- private Preference mPreference;
+ private static final int MAX_DEVICE_NUM = 3;
+
+ private PreferenceGroup mPreferenceGroup;
private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
private DockUpdater mSavedDockUpdater;
private int mPreferenceSize;
@@ -57,8 +60,10 @@
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
+ mPreferenceGroup = (PreferenceGroup) screen.findPreference(getPreferenceKey());
+ mPreferenceGroup.setVisible(false);
+
if (isAvailable()) {
- mPreference = screen.findPreference(getPreferenceKey());
final Context context = screen.getContext();
mBluetoothDeviceUpdater.setPrefContext(context);
mSavedDockUpdater.setPreferenceContext(context);
@@ -69,7 +74,6 @@
public void onStart() {
mBluetoothDeviceUpdater.registerCallback();
mSavedDockUpdater.registerCallback();
- updatePreferenceOnSizeChanged();
}
@Override
@@ -86,13 +90,17 @@
@Override
public void onDeviceAdded(Preference preference) {
mPreferenceSize++;
- updatePreferenceOnSizeChanged();
+ if (mPreferenceSize <= MAX_DEVICE_NUM) {
+ mPreferenceGroup.addPreference(preference);
+ }
+ updatePreferenceVisiblity();
}
@Override
public void onDeviceRemoved(Preference preference) {
mPreferenceSize--;
- updatePreferenceOnSizeChanged();
+ mPreferenceGroup.removePreference(preference);
+ updatePreferenceVisiblity();
}
@VisibleForTesting
@@ -106,18 +114,12 @@
}
@VisibleForTesting
- void setPreferenceSize(int size) {
- mPreferenceSize = size;
+ void setPreferenceGroup(PreferenceGroup preferenceGroup) {
+ mPreferenceGroup = preferenceGroup;
}
@VisibleForTesting
- void setPreference(Preference preference) {
- mPreference = preference;
- }
-
- private void updatePreferenceOnSizeChanged() {
- if (isAvailable()) {
- mPreference.setEnabled(mPreferenceSize != 0);
- }
+ void updatePreferenceVisiblity() {
+ mPreferenceGroup.setVisible(mPreferenceSize > 0);
}
}
diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
index c857135..951f3d1 100644
--- a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
+++ b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java
@@ -18,6 +18,11 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
@@ -30,11 +35,6 @@
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller to maintain the {@link PreferenceGroup} for all
* saved devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference}
diff --git a/src/com/android/settings/dream/DreamEntryPreferenceController.java b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
similarity index 65%
rename from src/com/android/settings/dream/DreamEntryPreferenceController.java
rename to src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
index 097fa3a..6f16db6 100644
--- a/src/com/android/settings/dream/DreamEntryPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
@@ -14,15 +14,16 @@
* limitations under the License.
*/
-package com.android.settings.dream;
+package com.android.settings.connecteddevice;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
-public class DreamEntryPreferenceController extends BasePreferenceController {
+public class TopLevelConnectedDevicesPreferenceController extends BasePreferenceController {
- public DreamEntryPreferenceController(Context context, String preferenceKey) {
+ public TopLevelConnectedDevicesPreferenceController(Context context,
+ String preferenceKey) {
super(context, preferenceKey);
}
@@ -30,4 +31,10 @@
public int getAvailabilityStatus() {
return AVAILABLE_UNSEARCHABLE;
}
+
+ @Override
+ public CharSequence getSummary() {
+ return mContext.getText(
+ AdvancedConnectedDeviceController.getConnectedDevicesSummaryResourceId(mContext));
+ }
}
diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
index df5a8fb..befdf29 100644
--- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
@@ -19,14 +19,14 @@
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
/**
* Controller to maintain connected usb device
*/
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
index 471486b..5057abe 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
@@ -16,9 +16,16 @@
package com.android.settings.connecteddevice.usb;
+import static android.net.ConnectivityManager.TETHERING_USB;
+
import android.content.Context;
import android.graphics.drawable.Drawable;
+import android.hardware.usb.UsbManager;
+import android.net.ConnectivityManager;
import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
@@ -32,19 +39,24 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Provides options for selecting the default USB mode.
*/
public class UsbDefaultFragment extends RadioButtonPickerFragment {
@VisibleForTesting
UsbBackend mUsbBackend;
+ @VisibleForTesting
+ ConnectivityManager mConnectivityManager;
+ @VisibleForTesting
+ OnStartTetheringCallback mOnStartTetheringCallback = new OnStartTetheringCallback();
+ @VisibleForTesting
+ long mPreviousFunctions;
@Override
public void onAttach(Context context) {
super.onAttach(context);
mUsbBackend = new UsbBackend(context);
+ mConnectivityManager = context.getSystemService(ConnectivityManager.class);
}
@Override
@@ -105,9 +117,37 @@
@Override
protected boolean setDefaultKey(String key) {
long functions = UsbBackend.usbFunctionsFromString(key);
+ mPreviousFunctions = mUsbBackend.getCurrentFunctions();
if (!Utils.isMonkeyRunning()) {
- mUsbBackend.setDefaultUsbFunctions(functions);
+ if (functions == UsbManager.FUNCTION_RNDIS) {
+ // We need to have entitlement check for usb tethering, so use API in
+ // ConnectivityManager.
+ mConnectivityManager.startTethering(TETHERING_USB, true /* showProvisioningUi */,
+ mOnStartTetheringCallback);
+ } else {
+ mUsbBackend.setDefaultUsbFunctions(functions);
+ }
+
}
return true;
}
+
+ @VisibleForTesting
+ final class OnStartTetheringCallback extends
+ ConnectivityManager.OnStartTetheringCallback {
+
+ @Override
+ public void onTetheringStarted() {
+ super.onTetheringStarted();
+ // Set default usb functions again to make internal data persistent
+ mUsbBackend.setDefaultUsbFunctions(UsbManager.FUNCTION_RNDIS);
+ }
+
+ @Override
+ public void onTetheringFailed() {
+ super.onTetheringFailed();
+ mUsbBackend.setDefaultUsbFunctions(mPreviousFunctions);
+ updateCandidates();
+ }
+ }
}
\ No newline at end of file
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java
index bd0cd8a..1219211 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java
@@ -19,12 +19,12 @@
import android.content.Context;
import android.os.Handler;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.annotation.UiThread;
import androidx.annotation.VisibleForTesting;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
/**
* This class provides common members and refresh functionality for usb controllers.
*/
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
index e1ffac9..84576b1 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.hardware.usb.UsbPort;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.widget.RadioButtonPreference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
/**
* This class controls the radio buttons for switching between
* USB device and host mode.
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
index 8fd0902..936a4c0 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java
@@ -17,9 +17,10 @@
package com.android.settings.connecteddevice.usb;
import android.content.Context;
-import android.os.Bundle;
import android.provider.SearchIndexableResource;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -33,8 +34,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Controls the USB device details and provides updates to individual controllers.
*/
@@ -71,15 +70,6 @@
}
@Override
- public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
- super.onCreatePreferences(savedInstanceState, rootKey);
- }
-
- public boolean isConnected() {
- return mUsbReceiver.isConnected();
- }
-
- @Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
mUsbBackend = new UsbBackend(context);
mControllers = createControllerList(context, mUsbBackend, this);
@@ -114,11 +104,6 @@
}
@Override
- public List<String> getNonIndexableKeys(Context context) {
- return super.getNonIndexableKeys(context);
- }
-
- @Override
public List<AbstractPreferenceController> createPreferenceControllers(
Context context) {
return new ArrayList<>(
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
index 4bdb60b..f74dc0f 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
@@ -16,9 +16,16 @@
package com.android.settings.connecteddevice.usb;
+import static android.net.ConnectivityManager.TETHERING_USB;
+
import android.content.Context;
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
+import android.net.ConnectivityManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -27,9 +34,6 @@
import java.util.LinkedHashMap;
import java.util.Map;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
/**
* This class controls the radio buttons for choosing between different USB functions.
*/
@@ -47,10 +51,18 @@
}
private PreferenceCategory mProfilesContainer;
+ private ConnectivityManager mConnectivityManager;
+ @VisibleForTesting
+ OnStartTetheringCallback mOnStartTetheringCallback;
+ @VisibleForTesting
+ long mPreviousFunction;
public UsbDetailsFunctionsController(Context context, UsbDetailsFragment fragment,
UsbBackend backend) {
super(context, fragment, backend);
+ mConnectivityManager = context.getSystemService(ConnectivityManager.class);
+ mOnStartTetheringCallback = new OnStartTetheringCallback();
+ mPreviousFunction = mUsbBackend.getCurrentFunctions();
}
@Override
@@ -97,9 +109,28 @@
@Override
public void onRadioButtonClicked(RadioButtonPreference preference) {
- long function = UsbBackend.usbFunctionsFromString(preference.getKey());
- if (function != mUsbBackend.getCurrentFunctions() && !Utils.isMonkeyRunning()) {
- mUsbBackend.setCurrentFunctions(function);
+ final long function = UsbBackend.usbFunctionsFromString(preference.getKey());
+ final long previousFunction = mUsbBackend.getCurrentFunctions();
+ if (function != previousFunction && !Utils.isMonkeyRunning()) {
+ mPreviousFunction = previousFunction;
+
+ if (function == UsbManager.FUNCTION_RNDIS) {
+ //Update the UI in advance to make it looks smooth
+ final RadioButtonPreference prevPref =
+ (RadioButtonPreference) mProfilesContainer.findPreference(
+ UsbBackend.usbFunctionsToString(mPreviousFunction));
+ if (prevPref != null) {
+ prevPref.setChecked(false);
+ preference.setChecked(true);
+ }
+
+ // We need to have entitlement check for usb tethering, so use API in
+ // ConnectivityManager.
+ mConnectivityManager.startTethering(TETHERING_USB, true /* showProvisioningUi */,
+ mOnStartTetheringCallback);
+ } else {
+ mUsbBackend.setCurrentFunctions(function);
+ }
}
}
@@ -112,4 +143,15 @@
public String getPreferenceKey() {
return "usb_details_functions";
}
+
+ @VisibleForTesting
+ final class OnStartTetheringCallback extends
+ ConnectivityManager.OnStartTetheringCallback {
+
+ @Override
+ public void onTetheringFailed() {
+ super.onTetheringFailed();
+ mUsbBackend.setCurrentFunctions(mPreviousFunction);
+ }
+ }
}
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java
index a664812..0e1811d 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java
@@ -18,12 +18,12 @@
import android.content.Context;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.widget.EntityHeaderController;
-import androidx.preference.PreferenceScreen;
-
/**
* This class adds a header with device name.
*/
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
index c6efd19..30314f6 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java
@@ -19,15 +19,15 @@
import android.content.Context;
import android.hardware.usb.UsbPort;
-import com.android.settings.R;
-import com.android.settings.Utils;
-
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
+import com.android.settings.R;
+import com.android.settings.Utils;
+
/**
* This class controls the switch for changing USB power direction.
*/
diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java
index 6cceaf3..facec4a 100644
--- a/src/com/android/settings/core/BasePreferenceController.java
+++ b/src/com/android/settings/core/BasePreferenceController.java
@@ -19,6 +19,9 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.slices.SliceData;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -29,9 +32,6 @@
import java.lang.reflect.InvocationTargetException;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Abstract class to consolidate utility between preference controllers and act as an interface
* for Slices. The abstract classes that inherit from this class will act as the direct interfaces
@@ -274,6 +274,10 @@
Log.w(TAG, "Skipping updateNonIndexableKeys due to empty key " + toString());
return;
}
+ if (keys.contains(key)) {
+ Log.w(TAG, "Skipping updateNonIndexableKeys, key already in list. " + toString());
+ return;
+ }
keys.add(key);
}
}
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index c6b9d83..811f7ad 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -20,9 +20,12 @@
* This class keeps track of all feature flags in Settings.
*/
public class FeatureFlags {
- public static final String BATTERY_DISPLAY_APP_LIST = "settings_battery_display_app_list";
public static final String BLUETOOTH_WHILE_DRIVING = "settings_bluetooth_while_driving";
public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher";
public static final String DYNAMIC_HOMEPAGE = "settings_dynamic_homepage";
public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
+ public static final String MOBILE_NETWORK_V2 = "settings_mobile_network_v2";
+ public static final String DATA_USAGE_V2 = "settings_data_usage_v2";
+ public static final String WIFI_MAC_RANDOMIZATION = "settings_wifi_mac_randomization";
+ public static final String NETWORK_INTERNET_V2 = "settings_network_and_internet_v2";
}
diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
index 2bcf895..cafef00 100644
--- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java
+++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java
@@ -21,6 +21,9 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.XmlRes;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.survey.SurveyMixin;
import com.android.settingslib.core.instrumentation.Instrumentable;
@@ -28,9 +31,6 @@
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
-import androidx.annotation.XmlRes;
-import androidx.preference.PreferenceScreen;
-
/**
* Instrumented fragment that logs visibility state.
*/
diff --git a/src/com/android/settings/core/PreferenceControllerMixin.java b/src/com/android/settings/core/PreferenceControllerMixin.java
index 3310df2..da0b7e7 100644
--- a/src/com/android/settings/core/PreferenceControllerMixin.java
+++ b/src/com/android/settings/core/PreferenceControllerMixin.java
@@ -42,7 +42,12 @@
final String key = ((AbstractPreferenceController) this).getPreferenceKey();
if (TextUtils.isEmpty(key)) {
Log.w(TAG,
- "Skipping updateNonIndexableKeys due to empty key " + this.toString());
+ "Skipping updateNonIndexableKeys due to empty key " + toString());
+ return;
+ }
+ if (keys.contains(key)) {
+ Log.w(TAG, "Skipping updateNonIndexableKeys, key already in list. "
+ + toString());
return;
}
keys.add(key);
diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java
index ff196dc..9fdeeef 100644
--- a/src/com/android/settings/core/PreferenceXmlParserUtils.java
+++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java
@@ -29,6 +29,9 @@
import android.util.TypedValue;
import android.util.Xml;
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import org.xmlpull.v1.XmlPullParser;
@@ -41,9 +44,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.IntDef;
-import androidx.annotation.VisibleForTesting;
-
/**
* Utility class to parse elements of XML preferences
*/
@@ -53,7 +53,8 @@
@VisibleForTesting
static final String PREF_SCREEN_TAG = "PreferenceScreen";
private static final List<String> SUPPORTED_PREF_TYPES = Arrays.asList(
- "Preference", "PreferenceCategory", "PreferenceScreen");
+ "Preference", "PreferenceCategory", "PreferenceScreen",
+ "com.android.settings.widget.WorkOnlyCategory");
/**
* Flag definition to indicate which metadata should be extracted when
@@ -67,7 +68,9 @@
MetadataFlag.FLAG_NEED_PREF_CONTROLLER,
MetadataFlag.FLAG_NEED_PREF_TITLE,
MetadataFlag.FLAG_NEED_PREF_SUMMARY,
- MetadataFlag.FLAG_NEED_PREF_ICON})
+ MetadataFlag.FLAG_NEED_PREF_ICON,
+ MetadataFlag.FLAG_NEED_SEARCHABLE,
+ MetadataFlag.FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE})
@Retention(RetentionPolicy.SOURCE)
public @interface MetadataFlag {
int FLAG_INCLUDE_PREF_SCREEN = 1;
@@ -79,6 +82,8 @@
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_ALLOW_DYNAMIC_SUMMARY_IN_SLICE = 1 << 10;
}
public static final String METADATA_PREF_TYPE = "type";
@@ -89,6 +94,9 @@
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_ALLOW_DYNAMIC_SUMMARY_IN_SLICE =
+ "allow_dynamic_summary_in_slice";
private static final String ENTRIES_SEPARATOR = "|";
@@ -155,18 +163,6 @@
}
/**
- * Call {@link #extractMetadata(Context, int, int)} with {@link #METADATA_ICON} instead.
- */
- @Deprecated
- public static int getDataIcon(Context context, AttributeSet attrs) {
- final TypedArray ta = context.obtainStyledAttributes(attrs,
- com.android.internal.R.styleable.Preference);
- final int dataIcon = ta.getResourceId(com.android.internal.R.styleable.Icon_icon, 0);
- ta.recycle();
- return dataIcon;
- }
-
- /**
* Extracts metadata from preference xml and put them into a {@link Bundle}.
*
* @param xmlResId xml res id of a preference screen
@@ -232,6 +228,14 @@
if (hasFlag(flags, MetadataFlag.FLAG_NEED_KEYWORDS)) {
preferenceMetadata.putString(METADATA_KEYWORDS, getKeywords(preferenceAttributes));
}
+ if (hasFlag(flags, MetadataFlag.FLAG_NEED_SEARCHABLE)) {
+ preferenceMetadata.putBoolean(METADATA_SEARCHABLE,
+ isSearchable(preferenceAttributes));
+ }
+ if (hasFlag(flags, MetadataFlag.FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE)) {
+ preferenceMetadata.putBoolean(METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE,
+ isDynamicSummaryAllowed(preferenceAttributes));
+ }
metadata.add(preferenceMetadata);
preferenceAttributes.recycle();
@@ -312,6 +316,15 @@
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 */);
+ }
+
+ private static boolean isDynamicSummaryAllowed(TypedArray styledAttributes) {
+ return styledAttributes.getBoolean(R.styleable.Preference_allowDynamicSummaryInSlice,
+ false /* default */);
+ }
+
private static String getKeywords(TypedArray styleAttributes) {
return styleAttributes.getString(R.styleable.Preference_keywords);
}
diff --git a/src/com/android/settings/core/SliderPreferenceController.java b/src/com/android/settings/core/SliderPreferenceController.java
index 8cae29a..0ea6be3 100644
--- a/src/com/android/settings/core/SliderPreferenceController.java
+++ b/src/com/android/settings/core/SliderPreferenceController.java
@@ -16,10 +16,10 @@
import android.content.Context;
-import com.android.settings.slices.SliceData;
-
import androidx.preference.Preference;
+import com.android.settings.slices.SliceData;
+
public abstract class SliderPreferenceController extends BasePreferenceController implements
Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/core/SubSettingLauncher.java b/src/com/android/settings/core/SubSettingLauncher.java
index f3f3748..1df6bb9 100644
--- a/src/com/android/settings/core/SubSettingLauncher.java
+++ b/src/com/android/settings/core/SubSettingLauncher.java
@@ -23,13 +23,13 @@
import android.os.UserHandle;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-
public class SubSettingLauncher {
private final Context mContext;
diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java
index 6c9df2a..165d7eb 100644
--- a/src/com/android/settings/core/TogglePreferenceController.java
+++ b/src/com/android/settings/core/TogglePreferenceController.java
@@ -15,12 +15,12 @@
import android.content.Context;
-import com.android.settings.slices.SliceData;
-import com.android.settings.widget.MasterSwitchPreference;
-
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
+import com.android.settings.slices.SliceData;
+import com.android.settings.widget.MasterSwitchPreference;
+
/**
* Abstract class that consolidates logic for updating toggle controllers.
* It automatically handles the getting and setting of the switch UI element.
diff --git a/src/com/android/settings/dashboard/CategoryManager.java b/src/com/android/settings/dashboard/CategoryManager.java
index baabe28..5cc75c8 100644
--- a/src/com/android/settings/dashboard/CategoryManager.java
+++ b/src/com/android/settings/dashboard/CategoryManager.java
@@ -51,25 +51,19 @@
private final Map<String, DashboardCategory> mCategoryByKeyMap;
private List<DashboardCategory> mCategories;
- private String mExtraAction;
public static CategoryManager get(Context context) {
- return get(context, null);
- }
-
- public static CategoryManager get(Context context, String action) {
if (sInstance == null) {
- sInstance = new CategoryManager(context, action);
+ sInstance = new CategoryManager(context);
}
return sInstance;
}
- CategoryManager(Context context, String action) {
+ CategoryManager(Context context) {
mTileByComponentCache = new ArrayMap<>();
mCategoryByKeyMap = new ArrayMap<>();
mInterestingConfigChanges = new InterestingConfigChanges();
mInterestingConfigChanges.applyNewConfig(context.getResources());
- mExtraAction = action;
}
public synchronized DashboardCategory getTilesByCategory(Context context, String categoryKey) {
@@ -98,7 +92,7 @@
DashboardCategory category = mCategories.get(i);
for (int j = 0; j < category.getTilesCount(); j++) {
Tile tile = category.getTile(j);
- if (tileBlacklist.contains(tile.intent.getComponent())) {
+ if (tileBlacklist.contains(tile.getIntent().getComponent())) {
category.removeTile(j--);
}
}
@@ -117,7 +111,7 @@
mTileByComponentCache.clear();
}
mCategoryByKeyMap.clear();
- mCategories = TileUtils.getCategories(context, mTileByComponentCache, mExtraAction);
+ mCategories = TileUtils.getCategories(context, mTileByComponentCache);
for (DashboardCategory category : mCategories) {
mCategoryByKeyMap.put(category.key, category);
}
@@ -205,10 +199,7 @@
final Set<ComponentName> components = new ArraySet<>();
for (int i = count - 1; i >= 0; i--) {
final Tile tile = category.getTile(i);
- if (tile.intent == null) {
- continue;
- }
- final ComponentName tileComponent = tile.intent.getComponent();
+ final ComponentName tileComponent = tile.getIntent().getComponent();
if (components.contains(tileComponent)) {
category.removeTile(i);
} else {
diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java
deleted file mode 100644
index 7273567..0000000
--- a/src/com/android/settings/dashboard/DashboardAdapter.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- * 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.
- */
-package com.android.settings.dashboard;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
-import android.os.Bundle;
-import android.service.settings.suggestions.Suggestion;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.DiffUtil;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.R.id;
-import com.android.settings.dashboard.DashboardData.ConditionHeaderData;
-import com.android.settings.dashboard.conditional.Condition;
-import com.android.settings.dashboard.conditional.ConditionAdapter;
-import com.android.settings.dashboard.suggestions.SuggestionAdapter;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-import com.android.settingslib.drawer.TileUtils;
-import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
-import com.android.settingslib.utils.IconCache;
-
-import java.util.List;
-
-public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.DashboardItemHolder>
- implements SummaryLoader.SummaryConsumer, SuggestionAdapter.Callback, LifecycleObserver,
- OnSaveInstanceState {
- public static final String TAG = "DashboardAdapter";
- private static final String STATE_CATEGORY_LIST = "category_list";
-
- @VisibleForTesting
- static final String STATE_CONDITION_EXPANDED = "condition_expanded";
- static final String META_DATA_PREFERENCE_ICON_BACKGROUND_ARGB = "com.android.settings.bg.argb";
- private final IconCache mCache;
- private final Context mContext;
- private final MetricsFeatureProvider mMetricsFeatureProvider;
- private final DashboardFeatureProvider mDashboardFeatureProvider;
- private boolean mFirstFrameDrawn;
- private RecyclerView mRecyclerView;
- private SuggestionAdapter mSuggestionAdapter;
-
- @VisibleForTesting
- DashboardData mDashboardData;
-
- private View.OnClickListener mTileClickListener = new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- //TODO: get rid of setTag/getTag
- mDashboardFeatureProvider.openTileIntent((Activity) mContext, (Tile) v.getTag());
- }
- };
-
- public DashboardAdapter(Context context, Bundle savedInstanceState,
- List<Condition> conditions, SuggestionControllerMixinCompat suggestionControllerMixin,
- Lifecycle lifecycle) {
-
- DashboardCategory category = null;
- boolean conditionExpanded = false;
-
- mContext = context;
- final FeatureFactory factory = FeatureFactory.getFactory(context);
- mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
- mDashboardFeatureProvider = factory.getDashboardFeatureProvider(context);
- mCache = new IconCache(context);
- mSuggestionAdapter = new SuggestionAdapter(mContext, suggestionControllerMixin,
- savedInstanceState, this /* callback */, lifecycle);
-
- setHasStableIds(true);
-
- if (savedInstanceState != null) {
- category = savedInstanceState.getParcelable(STATE_CATEGORY_LIST);
- conditionExpanded = savedInstanceState.getBoolean(
- STATE_CONDITION_EXPANDED, conditionExpanded);
- }
-
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
-
- mDashboardData = new DashboardData.Builder()
- .setConditions(conditions)
- .setSuggestions(mSuggestionAdapter.getSuggestions())
- .setCategory(category)
- .setConditionExpanded(conditionExpanded)
- .build();
- }
-
- public void setSuggestions(List<Suggestion> data) {
- final DashboardData prevData = mDashboardData;
- mDashboardData = new DashboardData.Builder(prevData)
- .setSuggestions(data)
- .build();
- notifyDashboardDataChanged(prevData);
- }
-
- public void setCategory(DashboardCategory category) {
- final DashboardData prevData = mDashboardData;
- Log.d(TAG, "adapter setCategory called");
- mDashboardData = new DashboardData.Builder(prevData)
- .setCategory(category)
- .build();
- notifyDashboardDataChanged(prevData);
- }
-
- public void setConditions(List<Condition> conditions) {
- final DashboardData prevData = mDashboardData;
- Log.d(TAG, "adapter setConditions called");
- mDashboardData = new DashboardData.Builder(prevData)
- .setConditions(conditions)
- .build();
- notifyDashboardDataChanged(prevData);
- }
-
- @Override
- public void onSuggestionClosed(Suggestion suggestion) {
- final List<Suggestion> list = mDashboardData.getSuggestions();
- if (list == null || list.size() == 0 || !list.remove(suggestion)) {
- return;
- }
- if (list.isEmpty()) {
- // The only suggestion is dismissed, and the the empty suggestion container will
- // remain as the dashboard item. Need to refresh the dashboard list.
- setSuggestions(null);
- } else {
- setSuggestions(list);
- }
- }
-
- @Override
- public void notifySummaryChanged(Tile tile) {
- final int position = mDashboardData.getPositionByTile(tile);
- if (position != DashboardData.POSITION_NOT_FOUND) {
- // Since usually tile in parameter and tile in mCategories are same instance,
- // which is hard to be detected by DiffUtil, so we notifyItemChanged directly.
- notifyItemChanged(position, mDashboardData.getItemTypeByPosition(position));
- }
- }
-
- @Override
- public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- final View view = LayoutInflater.from(parent.getContext()).inflate(viewType, parent, false);
- if (viewType == R.layout.condition_header) {
- return new ConditionHeaderHolder(view);
- }
- if (viewType == R.layout.condition_container) {
- return new ConditionContainerHolder(view);
- }
- if (viewType == R.layout.suggestion_container) {
- return new SuggestionContainerHolder(view);
- }
- return new DashboardItemHolder(view);
- }
-
- @Override
- public void onBindViewHolder(DashboardItemHolder holder, int position) {
- final int type = mDashboardData.getItemTypeByPosition(position);
- switch (type) {
- case R.layout.dashboard_tile:
- final Tile tile = (Tile) mDashboardData.getItemEntityByPosition(position);
- onBindTile(holder, tile);
- holder.itemView.setTag(tile);
- holder.itemView.setOnClickListener(mTileClickListener);
- break;
- case R.layout.suggestion_container:
- onBindSuggestion((SuggestionContainerHolder) holder, position);
- break;
- case R.layout.condition_container:
- onBindCondition((ConditionContainerHolder) holder, position);
- break;
- case R.layout.condition_header:
- onBindConditionHeader((ConditionHeaderHolder) holder,
- (ConditionHeaderData) mDashboardData.getItemEntityByPosition(position));
- break;
- case R.layout.condition_footer:
- holder.itemView.setOnClickListener(v -> {
- mMetricsFeatureProvider.action(mContext,
- MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, false);
- DashboardData prevData = mDashboardData;
- mDashboardData = new DashboardData.Builder(prevData).
- setConditionExpanded(false).build();
- notifyDashboardDataChanged(prevData);
- scrollToTopOfConditions();
- });
- break;
- }
- }
-
- @Override
- public long getItemId(int position) {
- return mDashboardData.getItemIdByPosition(position);
- }
-
- @Override
- public int getItemViewType(int position) {
- return mDashboardData.getItemTypeByPosition(position);
- }
-
- @Override
- public int getItemCount() {
- return mDashboardData.size();
- }
-
- @Override
- public void onAttachedToRecyclerView(RecyclerView recyclerView) {
- super.onAttachedToRecyclerView(recyclerView);
- // save the view so that we can scroll it when expanding/collapsing the suggestion and
- // conditions.
- mRecyclerView = recyclerView;
- }
-
- public Object getItem(long itemId) {
- return mDashboardData.getItemEntityById(itemId);
- }
-
- public Suggestion getSuggestion(int position) {
- return mSuggestionAdapter.getSuggestion(position);
- }
-
- @VisibleForTesting
- void notifyDashboardDataChanged(DashboardData prevData) {
- if (mFirstFrameDrawn && prevData != null) {
- final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(new DashboardData
- .ItemsDataDiffCallback(prevData.getItemList(), mDashboardData.getItemList()));
- diffResult.dispatchUpdatesTo(this);
- } else {
- mFirstFrameDrawn = true;
- notifyDataSetChanged();
- }
- }
-
- @VisibleForTesting
- void onBindConditionHeader(final ConditionHeaderHolder holder, ConditionHeaderData data) {
- holder.icon.setImageDrawable(data.conditionIcons.get(0));
- if (data.conditionCount == 1) {
- holder.title.setText(data.title);
- holder.summary.setText(null);
- holder.icons.setVisibility(View.INVISIBLE);
- } else {
- holder.title.setText(null);
- holder.summary.setText(
- mContext.getString(R.string.condition_summary, data.conditionCount));
- updateConditionIcons(data.conditionIcons, holder.icons);
- holder.icons.setVisibility(View.VISIBLE);
- }
-
- holder.itemView.setOnClickListener(v -> {
- mMetricsFeatureProvider.action(mContext,
- MetricsEvent.ACTION_SETTINGS_CONDITION_EXPAND, true);
- final DashboardData prevData = mDashboardData;
- mDashboardData = new DashboardData.Builder(prevData)
- .setConditionExpanded(true).build();
- notifyDashboardDataChanged(prevData);
- scrollToTopOfConditions();
- });
- }
-
- @VisibleForTesting
- void onBindCondition(final ConditionContainerHolder holder, int position) {
- final ConditionAdapter adapter = new ConditionAdapter(mContext,
- (List<Condition>) mDashboardData.getItemEntityByPosition(position),
- mDashboardData.isConditionExpanded());
- adapter.addDismissHandling(holder.data);
- holder.data.setAdapter(adapter);
- holder.data.setLayoutManager(new LinearLayoutManager(mContext));
- }
-
- @VisibleForTesting
- void onBindSuggestion(final SuggestionContainerHolder holder, int position) {
- // If there is suggestions to show, it will be at position 0 as we don't show the suggestion
- // header anymore.
- final List<Suggestion> suggestions =
- (List<Suggestion>) mDashboardData.getItemEntityByPosition(position);
- if (suggestions != null && suggestions.size() > 0) {
- mSuggestionAdapter.setSuggestions(suggestions);
- holder.data.setAdapter(mSuggestionAdapter);
- }
- final LinearLayoutManager layoutManager = new LinearLayoutManager(mContext);
- layoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
- holder.data.setLayoutManager(layoutManager);
- }
-
- @VisibleForTesting
- void onBindTile(DashboardItemHolder holder, Tile tile) {
- Icon tileIcon = tile.getIcon(mContext);
- Drawable icon = mCache.getIcon(tileIcon);
- if (!TextUtils.equals(tileIcon.getResPackage(), mContext.getPackageName())
- && !(icon instanceof RoundedHomepageIcon)) {
- icon = new RoundedHomepageIcon(mContext, icon);
- final Bundle metaData = tile.getMetaData();
- try {
- if (metaData != null) {
- // Load from bg.argb first
- int bgColor = metaData.getInt(META_DATA_PREFERENCE_ICON_BACKGROUND_ARGB,
- 0 /* default */);
- // Not found, load from bg.hint
- if (bgColor == 0) {
- final int colorRes = metaData.getInt(
- TileUtils.META_DATA_PREFERENCE_ICON_BACKGROUND_HINT,
- 0 /* default */);
- if (colorRes != 0) {
- bgColor = mContext.getPackageManager()
- .getResourcesForApplication(tileIcon.getResPackage())
- .getColor(colorRes, null /* theme */);
- }
- }
- // If found anything, use it.
- if (bgColor != 0) {
- ((RoundedHomepageIcon) icon).setBackgroundColor(bgColor);
- }
- }
- } catch (PackageManager.NameNotFoundException e) {
- Log.e(TAG, "Failed to set background color for " + tile.intent.getPackage());
- }
- mCache.updateIcon(tileIcon, icon);
- }
- holder.icon.setImageDrawable(icon);
- holder.title.setText(tile.title);
- if (!TextUtils.isEmpty(tile.summary)) {
- holder.summary.setText(tile.summary);
- holder.summary.setVisibility(View.VISIBLE);
- } else {
- holder.summary.setVisibility(View.GONE);
- }
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- final DashboardCategory category = mDashboardData.getCategory();
- if (category != null) {
- outState.putParcelable(STATE_CATEGORY_LIST, category);
- }
- outState.putBoolean(STATE_CONDITION_EXPANDED, mDashboardData.isConditionExpanded());
- }
-
- private void updateConditionIcons(List<Drawable> icons, ViewGroup parent) {
- if (icons == null || icons.size() < 2) {
- parent.setVisibility(View.INVISIBLE);
- return;
- }
- final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
- parent.removeAllViews();
- for (int i = 1, size = icons.size(); i < size; i++) {
- ImageView icon = (ImageView) inflater.inflate(
- R.layout.condition_header_icon, parent, false);
- icon.setImageDrawable(icons.get(i));
- parent.addView(icon);
- }
- parent.setVisibility(View.VISIBLE);
- }
-
- private void scrollToTopOfConditions() {
- mRecyclerView.scrollToPosition(mDashboardData.hasSuggestion() ? 1 : 0);
- }
-
- public static class DashboardItemHolder extends RecyclerView.ViewHolder {
- public final ImageView icon;
- public final TextView title;
- public final TextView summary;
-
- public DashboardItemHolder(View itemView) {
- super(itemView);
- icon = itemView.findViewById(android.R.id.icon);
- title = itemView.findViewById(android.R.id.title);
- summary = itemView.findViewById(android.R.id.summary);
- }
- }
-
- public static class ConditionHeaderHolder extends DashboardItemHolder {
- public final LinearLayout icons;
- public final ImageView expandIndicator;
-
- public ConditionHeaderHolder(View itemView) {
- super(itemView);
- icons = itemView.findViewById(id.additional_icons);
- expandIndicator = itemView.findViewById(id.expand_indicator);
- }
- }
-
- public static class ConditionContainerHolder extends DashboardItemHolder {
- public final RecyclerView data;
-
- public ConditionContainerHolder(View itemView) {
- super(itemView);
- data = itemView.findViewById(id.data);
- }
- }
-
- public static class SuggestionContainerHolder extends DashboardItemHolder {
- public final RecyclerView data;
-
- public SuggestionContainerHolder(View itemView) {
- super(itemView);
- data = itemView.findViewById(id.suggestion_list);
- }
- }
-
-}
diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java
deleted file mode 100644
index 182d79b..0000000
--- a/src/com/android/settings/dashboard/DashboardData.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard;
-
-import android.annotation.IntDef;
-import android.graphics.drawable.Drawable;
-import android.service.settings.suggestions.Suggestion;
-import android.text.TextUtils;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.DiffUtil;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.conditional.Condition;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Description about data list used in the DashboardAdapter. In the data list each item can be
- * Condition, suggestion or category tile.
- * <p>
- * ItemsData has inner class Item, which represents the Item in data list.
- */
-public class DashboardData {
- public static final int POSITION_NOT_FOUND = -1;
- public static final int MAX_SUGGESTION_COUNT = 2;
-
- // stable id for different type of items.
- @VisibleForTesting
- static final int STABLE_ID_SUGGESTION_CONTAINER = 0;
- static final int STABLE_ID_SUGGESTION_CONDITION_DIVIDER = 1;
- @VisibleForTesting
- static final int STABLE_ID_CONDITION_HEADER = 2;
- @VisibleForTesting
- static final int STABLE_ID_CONDITION_FOOTER = 3;
- @VisibleForTesting
- static final int STABLE_ID_CONDITION_CONTAINER = 4;
-
- private final List<Item> mItems;
- private final DashboardCategory mCategory;
- private final List<Condition> mConditions;
- private final List<Suggestion> mSuggestions;
- private final boolean mConditionExpanded;
-
- private DashboardData(Builder builder) {
- mCategory = builder.mCategory;
- mConditions = builder.mConditions;
- mSuggestions = builder.mSuggestions;
- mConditionExpanded = builder.mConditionExpanded;
- mItems = new ArrayList<>();
-
- buildItemsData();
- }
-
- public int getItemIdByPosition(int position) {
- return mItems.get(position).id;
- }
-
- public int getItemTypeByPosition(int position) {
- return mItems.get(position).type;
- }
-
- public Object getItemEntityByPosition(int position) {
- return mItems.get(position).entity;
- }
-
- public List<Item> getItemList() {
- return mItems;
- }
-
- public int size() {
- return mItems.size();
- }
-
- public Object getItemEntityById(long id) {
- for (final Item item : mItems) {
- if (item.id == id) {
- return item.entity;
- }
- }
- return null;
- }
-
- public DashboardCategory getCategory() {
- return mCategory;
- }
-
- public List<Condition> getConditions() {
- return mConditions;
- }
-
- public List<Suggestion> getSuggestions() {
- return mSuggestions;
- }
-
- public boolean hasSuggestion() {
- return sizeOf(mSuggestions) > 0;
- }
-
- public boolean isConditionExpanded() {
- return mConditionExpanded;
- }
-
- /**
- * Find the position of the object in mItems list, using the equals method to compare
- *
- * @param entity the object that need to be found in list
- * @return position of the object, return POSITION_NOT_FOUND if object isn't in the list
- */
- public int getPositionByEntity(Object entity) {
- if (entity == null) return POSITION_NOT_FOUND;
-
- final int size = mItems.size();
- for (int i = 0; i < size; i++) {
- final Object item = mItems.get(i).entity;
- if (entity.equals(item)) {
- return i;
- }
- }
-
- return POSITION_NOT_FOUND;
- }
-
- /**
- * Find the position of the Tile object.
- * <p>
- * First, try to find the exact identical instance of the tile object, if not found,
- * then try to find a tile has the same title.
- *
- * @param tile tile that need to be found
- * @return position of the object, return INDEX_NOT_FOUND if object isn't in the list
- */
- public int getPositionByTile(Tile tile) {
- final int size = mItems.size();
- for (int i = 0; i < size; i++) {
- final Object entity = mItems.get(i).entity;
- if (entity == tile) {
- return i;
- } else if (entity instanceof Tile && tile.title.equals(((Tile) entity).title)) {
- return i;
- }
- }
-
- return POSITION_NOT_FOUND;
- }
-
- /**
- * Add item into list when {@paramref add} is true.
- *
- * @param item maybe {@link Condition}, {@link Tile}, {@link DashboardCategory} or null
- * @param type type of the item, and value is the layout id
- * @param stableId The stable id for this item
- * @param add flag about whether to add item into list
- */
- private void addToItemList(Object item, int type, int stableId, boolean add) {
- if (add) {
- mItems.add(new Item(item, type, stableId));
- }
- }
-
- /**
- * Build the mItems list using mConditions, mSuggestions, mCategories data
- * and mIsShowingAll, mConditionExpanded flag.
- */
- private void buildItemsData() {
- final List<Condition> conditions = getConditionsToShow(mConditions);
- final boolean hasConditions = sizeOf(conditions) > 0;
-
- final List<Suggestion> suggestions = getSuggestionsToShow(mSuggestions);
- final boolean hasSuggestions = sizeOf(suggestions) > 0;
-
- /* Suggestion container. This is the card view that contains the list of suggestions.
- * This will be added whenever the suggestion list is not empty */
- addToItemList(suggestions, R.layout.suggestion_container,
- STABLE_ID_SUGGESTION_CONTAINER, hasSuggestions);
-
- /* Divider between suggestion and conditions if both are present. */
- addToItemList(null /* item */, R.layout.horizontal_divider,
- STABLE_ID_SUGGESTION_CONDITION_DIVIDER, hasSuggestions && hasConditions);
-
- /* Condition header. This will be present when there is condition and it is collapsed */
- addToItemList(new ConditionHeaderData(conditions),
- R.layout.condition_header,
- STABLE_ID_CONDITION_HEADER, hasConditions && !mConditionExpanded);
-
- /* Condition container. This is the card view that contains the list of conditions.
- * This will be added whenever the condition list is not empty and expanded */
- addToItemList(conditions, R.layout.condition_container,
- STABLE_ID_CONDITION_CONTAINER, hasConditions && mConditionExpanded);
-
- /* Condition footer. This will be present when there is condition and it is expanded */
- addToItemList(null /* item */, R.layout.condition_footer,
- STABLE_ID_CONDITION_FOOTER, hasConditions && mConditionExpanded);
-
- if (mCategory != null) {
- final List<Tile> tiles = mCategory.getTiles();
- for (int i = 0; i < tiles.size(); i++) {
- final Tile tile = tiles.get(i);
- addToItemList(tile, R.layout.dashboard_tile, Objects.hash(tile.title),
- true /* add */);
- }
- }
- }
-
- private static int sizeOf(List<?> list) {
- return list == null ? 0 : list.size();
- }
-
- private List<Condition> getConditionsToShow(List<Condition> conditions) {
- if (conditions == null) {
- return null;
- }
- List<Condition> result = new ArrayList<>();
- final int size = conditions == null ? 0 : conditions.size();
- for (int i = 0; i < size; i++) {
- final Condition condition = conditions.get(i);
- if (condition.shouldShow()) {
- result.add(condition);
- }
- }
- return result;
- }
-
- private List<Suggestion> getSuggestionsToShow(List<Suggestion> suggestions) {
- if (suggestions == null) {
- return null;
- }
- if (suggestions.size() <= MAX_SUGGESTION_COUNT) {
- return suggestions;
- }
- final List<Suggestion> suggestionsToShow = new ArrayList<>(MAX_SUGGESTION_COUNT);
- for (int i = 0; i < MAX_SUGGESTION_COUNT; i++) {
- suggestionsToShow.add(suggestions.get(i));
- }
- return suggestionsToShow;
- }
-
- /**
- * Builder used to build the ItemsData
- */
- public static class Builder {
- private DashboardCategory mCategory;
- private List<Condition> mConditions;
- private List<Suggestion> mSuggestions;
- private boolean mConditionExpanded;
-
- public Builder() {
- }
-
- public Builder(DashboardData dashboardData) {
- mCategory = dashboardData.mCategory;
- mConditions = dashboardData.mConditions;
- mSuggestions = dashboardData.mSuggestions;
- mConditionExpanded = dashboardData.mConditionExpanded;
- }
-
- public Builder setCategory(DashboardCategory category) {
- this.mCategory = category;
- return this;
- }
-
- public Builder setConditions(List<Condition> conditions) {
- this.mConditions = conditions;
- return this;
- }
-
- public Builder setSuggestions(List<Suggestion> suggestions) {
- this.mSuggestions = suggestions;
- return this;
- }
-
- public Builder setConditionExpanded(boolean expanded) {
- this.mConditionExpanded = expanded;
- return this;
- }
-
- public DashboardData build() {
- return new DashboardData(this);
- }
- }
-
- /**
- * A DiffCallback to calculate the difference between old and new Item
- * List in DashboardData
- */
- public static class ItemsDataDiffCallback extends DiffUtil.Callback {
- final private List<Item> mOldItems;
- final private List<Item> mNewItems;
-
- public ItemsDataDiffCallback(List<Item> oldItems, List<Item> newItems) {
- mOldItems = oldItems;
- mNewItems = newItems;
- }
-
- @Override
- public int getOldListSize() {
- return mOldItems.size();
- }
-
- @Override
- public int getNewListSize() {
- return mNewItems.size();
- }
-
- @Override
- public boolean areItemsTheSame(int oldItemPosition, int newItemPosition) {
- return mOldItems.get(oldItemPosition).id == mNewItems.get(newItemPosition).id;
- }
-
- @Override
- public boolean areContentsTheSame(int oldItemPosition, int newItemPosition) {
- return mOldItems.get(oldItemPosition).equals(mNewItems.get(newItemPosition));
- }
-
- }
-
- /**
- * An item contains the data needed in the DashboardData.
- */
- static class Item {
- // valid types in field type
- private static final int TYPE_DASHBOARD_TILE = R.layout.dashboard_tile;
- private static final int TYPE_SUGGESTION_CONTAINER =
- R.layout.suggestion_container;
- private static final int TYPE_CONDITION_CONTAINER =
- R.layout.condition_container;
- private static final int TYPE_CONDITION_HEADER =
- R.layout.condition_header;
- private static final int TYPE_CONDITION_FOOTER =
- R.layout.condition_footer;
- private static final int TYPE_SUGGESTION_CONDITION_DIVIDER = R.layout.horizontal_divider;
-
- @IntDef({TYPE_DASHBOARD_TILE, TYPE_SUGGESTION_CONTAINER, TYPE_CONDITION_CONTAINER,
- TYPE_CONDITION_HEADER, TYPE_CONDITION_FOOTER, TYPE_SUGGESTION_CONDITION_DIVIDER})
- @Retention(RetentionPolicy.SOURCE)
- public @interface ItemTypes {
- }
-
- /**
- * The main data object in item, usually is a {@link Tile}, {@link Condition}
- * object. This object can also be null when the
- * item is an divider line. Please refer to {@link #buildItemsData()} for
- * detail usage of the Item.
- */
- public final Object entity;
-
- /**
- * The type of item, value inside is the layout id(e.g. R.layout.dashboard_tile)
- */
- @ItemTypes
- public final int type;
-
- /**
- * Id of this item, used in the {@link ItemsDataDiffCallback} to identify the same item.
- */
- public final int id;
-
- public Item(Object entity, @ItemTypes int type, int id) {
- this.entity = entity;
- this.type = type;
- this.id = id;
- }
-
- /**
- * Override it to make comparision in the {@link ItemsDataDiffCallback}
- *
- * @param obj object to compared with
- * @return true if the same object or has equal value.
- */
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
-
- if (!(obj instanceof Item)) {
- return false;
- }
-
- final Item targetItem = (Item) obj;
- if (type != targetItem.type || id != targetItem.id) {
- return false;
- }
-
- switch (type) {
- case TYPE_DASHBOARD_TILE:
- final Tile localTile = (Tile) entity;
- final Tile targetTile = (Tile) targetItem.entity;
-
- // Only check title and summary for dashboard tile
- return TextUtils.equals(localTile.title, targetTile.title)
- && TextUtils.equals(localTile.summary, targetTile.summary);
- case TYPE_SUGGESTION_CONTAINER:
- case TYPE_CONDITION_CONTAINER:
- // Fall through to default
- default:
- return entity == null ? targetItem.entity == null
- : entity.equals(targetItem.entity);
- }
- }
- }
-
- /**
- * This class contains the data needed to build the suggestion/condition header. The data can
- * also be used to check the diff in DiffUtil.Callback
- */
- public static class ConditionHeaderData {
- public final List<Drawable> conditionIcons;
- public final CharSequence title;
- public final int conditionCount;
-
- public ConditionHeaderData(List<Condition> conditions) {
- conditionCount = sizeOf(conditions);
- title = conditionCount > 0 ? conditions.get(0).getTitle() : null;
- conditionIcons = new ArrayList<>();
- for (int i = 0; conditions != null && i < conditions.size(); i++) {
- final Condition condition = conditions.get(i);
- conditionIcons.add(condition.getIcon());
- }
- }
- }
-
-}
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
index 35d50fb..9f562a0 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java
@@ -15,16 +15,14 @@
*/
package com.android.settings.dashboard;
-import android.app.Activity;
-import android.content.Context;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
import java.util.List;
-import androidx.preference.Preference;
-
/**
* FeatureProvider for dashboard (aka settings homepage).
*/
@@ -36,33 +34,11 @@
DashboardCategory getTilesForCategory(String key);
/**
- * Get tiles (wrapped as a list of Preference) for key defined in CategoryKey.
- *
- * @param activity Activity hosting the preference
- * @param context UI context to inflate preference
- * @param sourceMetricsCategory The context (source) from which an action is performed
- * @param key Value from CategoryKey
- * @deprecated Pages implementing {@code DashboardFragment} should use
- * {@link #getTilesForCategory(String)} instead. Using this method will not get the benefit
- * of auto-ordering, progressive disclosure, auto-refreshing summary text etc.
- */
- @Deprecated
- List<Preference> getPreferencesForCategory(Activity activity, Context context,
- int sourceMetricsCategory, String key);
-
- /**
* Get all tiles, grouped by category.
*/
List<DashboardCategory> getAllCategories();
/**
- * Whether or not we should tint icons in setting pages.
- * @deprecated in favor of color icons in homepage
- */
- @Deprecated
- boolean shouldTintIcon();
-
- /**
* Returns an unique string key for the tile.
*/
String getDashboardKeyForTile(Tile tile);
@@ -71,6 +47,7 @@
* Binds preference to data provided by tile.
*
* @param activity If tile contains intent to launch, it will be launched from this activity
+ * @param forceRoundedIcon Whether or not injected tiles from other packages should be forced to rounded icon.
* @param sourceMetricsCategory The context (source) from which an action is performed
* @param pref The preference to bind data
* @param tile The binding data
@@ -78,17 +55,12 @@
* @param baseOrder The order offset value. When binding, pref's order is determined by
* both this value and tile's own priority.
*/
- void bindPreferenceToTile(Activity activity, int sourceMetricsCategory, Preference pref,
- Tile tile, String key, int baseOrder);
-
- /**
- * Returns additional intent filter action for dashboard tiles
- */
- String getExtraIntentAction();
+ void bindPreferenceToTile(FragmentActivity activity, boolean forceRoundedIcon,
+ int sourceMetricsCategory, Preference pref, Tile tile, String key, int baseOrder);
/**
* Opens a tile to its destination intent.
*/
- void openTileIntent(Activity activity, Tile tile);
+ void openTileIntent(FragmentActivity activity, Tile tile);
}
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 42bc777..2267311 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -20,12 +20,12 @@
import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY;
import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY_URI;
-import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
import android.content.IContentProvider;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.os.Bundle;
import android.provider.Settings;
@@ -35,6 +35,7 @@
import android.util.Pair;
import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -42,6 +43,7 @@
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.RoundedHomepageIcon;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.drawer.DashboardCategory;
@@ -49,7 +51,6 @@
import com.android.settingslib.drawer.TileUtils;
import com.android.settingslib.utils.ThreadUtils;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -61,8 +62,6 @@
private static final String TAG = "DashboardFeatureImpl";
private static final String DASHBOARD_TILE_PREF_KEY_PREFIX = "dashboard_tile_pref_";
private static final String META_DATA_KEY_INTENT_ACTION = "com.android.settings.intent.action";
- @VisibleForTesting
- static final String META_DATA_KEY_ORDER = "com.android.settings.order";
protected final Context mContext;
@@ -72,7 +71,7 @@
public DashboardFeatureProviderImpl(Context context) {
mContext = context.getApplicationContext();
- mCategoryManager = CategoryManager.get(context, getExtraIntentAction());
+ mCategoryManager = CategoryManager.get(context);
mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
mPackageManager = context.getPackageManager();
}
@@ -83,82 +82,50 @@
}
@Override
- public List<Preference> getPreferencesForCategory(Activity activity, Context context,
- int sourceMetricsCategory, String key) {
- final DashboardCategory category = getTilesForCategory(key);
- if (category == null) {
- Log.d(TAG, "NO dashboard tiles for " + TAG);
- return null;
- }
- final List<Tile> tiles = category.getTiles();
- if (tiles == null || tiles.isEmpty()) {
- Log.d(TAG, "tile list is empty, skipping category " + category.key);
- return null;
- }
- final List<Preference> preferences = new ArrayList<>();
- for (Tile tile : tiles) {
- final Preference pref = new Preference(context);
- bindPreferenceToTile(activity, sourceMetricsCategory, pref, tile, null /* key */,
- Preference.DEFAULT_ORDER /* baseOrder */);
- preferences.add(pref);
- }
- return preferences;
- }
-
- @Override
public List<DashboardCategory> getAllCategories() {
return mCategoryManager.getCategories(mContext);
}
@Override
- public boolean shouldTintIcon() {
- return mContext.getResources().getBoolean(R.bool.config_tintSettingIcon);
- }
-
- @Override
public String getDashboardKeyForTile(Tile tile) {
- if (tile == null || tile.intent == null) {
+ if (tile == null) {
return null;
}
- if (!TextUtils.isEmpty(tile.key)) {
- return tile.key;
+ if (tile.hasKey()) {
+ return tile.getKey(mContext);
}
final StringBuilder sb = new StringBuilder(DASHBOARD_TILE_PREF_KEY_PREFIX);
- final ComponentName component = tile.intent.getComponent();
+ final ComponentName component = tile.getIntent().getComponent();
sb.append(component.getClassName());
return sb.toString();
}
@Override
- public void bindPreferenceToTile(Activity activity, int sourceMetricsCategory, Preference pref,
- Tile tile, String key, int baseOrder) {
+ public void bindPreferenceToTile(FragmentActivity activity, boolean forceRoundedIcon,
+ int sourceMetricsCategory, Preference pref, Tile tile, String key, int baseOrder) {
if (pref == null) {
return;
}
- pref.setTitle(tile.title);
+ pref.setTitle(tile.getTitle(activity.getApplicationContext()));
if (!TextUtils.isEmpty(key)) {
pref.setKey(key);
} else {
pref.setKey(getDashboardKeyForTile(tile));
}
bindSummary(pref, tile);
- bindIcon(pref, tile);
+ bindIcon(pref, tile, forceRoundedIcon);
final Bundle metadata = tile.getMetaData();
String clsName = null;
String action = null;
- Integer order = null;
+
if (metadata != null) {
clsName = metadata.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS);
action = metadata.getString(META_DATA_KEY_INTENT_ACTION);
- if (metadata.containsKey(META_DATA_KEY_ORDER)
- && metadata.get(META_DATA_KEY_ORDER) instanceof Integer) {
- order = metadata.getInt(META_DATA_KEY_ORDER);
- }
}
if (!TextUtils.isEmpty(clsName)) {
pref.setFragment(clsName);
- } else if (tile.intent != null) {
- final Intent intent = new Intent(tile.intent);
+ } else {
+ final Intent intent = new Intent(tile.getIntent());
intent.putExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY,
sourceMetricsCategory);
if (action != null) {
@@ -170,19 +137,12 @@
});
}
final String skipOffsetPackageName = activity.getPackageName();
- // If order is set in the meta data, use that order. Otherwise, check the intent priority.
- if (order == null && tile.priority != 0) {
- // Use negated priority for order, because tile priority is based on intent-filter
- // (larger value has higher priority). However pref order defines smaller value has
- // higher priority.
- order = -tile.priority;
- }
- if (order != null) {
- boolean shouldSkipBaseOrderOffset = false;
- if (tile.intent != null) {
- shouldSkipBaseOrderOffset = TextUtils.equals(
- skipOffsetPackageName, tile.intent.getComponent().getPackageName());
- }
+
+
+ if (tile.hasOrder()) {
+ final int order = tile.getOrder();
+ boolean shouldSkipBaseOrderOffset = TextUtils.equals(
+ skipOffsetPackageName, tile.getIntent().getComponent().getPackageName());
if (shouldSkipBaseOrderOffset || baseOrder == Preference.DEFAULT_ORDER) {
pref.setOrder(order);
} else {
@@ -192,23 +152,14 @@
}
@Override
- public String getExtraIntentAction() {
- return null;
- }
-
- @Override
- public void openTileIntent(Activity activity, Tile tile) {
+ public void openTileIntent(FragmentActivity activity, Tile tile) {
if (tile == null) {
Intent intent = new Intent(Settings.ACTION_SETTINGS).addFlags(
Intent.FLAG_ACTIVITY_CLEAR_TASK);
mContext.startActivity(intent);
return;
}
-
- if (tile.intent == null) {
- return;
- }
- final Intent intent = new Intent(tile.intent)
+ final Intent intent = new Intent(tile.getIntent())
.putExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY,
MetricsEvent.DASHBOARD_SUMMARY)
.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
@@ -216,8 +167,9 @@
}
private void bindSummary(Preference preference, Tile tile) {
- if (tile.summary != null) {
- preference.setSummary(tile.summary);
+ final CharSequence summary = tile.getSummary(mContext);
+ if (summary != null) {
+ preference.setSummary(summary);
} else if (tile.getMetaData() != null
&& tile.getMetaData().containsKey(META_DATA_PREFERENCE_SUMMARY_URI)) {
// Set a placeholder summary before starting to fetch real summary, this is necessary
@@ -227,9 +179,9 @@
ThreadUtils.postOnBackgroundThread(() -> {
final Map<String, IContentProvider> providerMap = new ArrayMap<>();
final String uri = tile.getMetaData().getString(META_DATA_PREFERENCE_SUMMARY_URI);
- final String summary = TileUtils.getTextFromUri(
+ final String summaryFromUri = TileUtils.getTextFromUri(
mContext, uri, providerMap, META_DATA_PREFERENCE_SUMMARY);
- ThreadUtils.postOnMainThread(() -> preference.setSummary(summary));
+ ThreadUtils.postOnMainThread(() -> preference.setSummary(summaryFromUri));
});
} else {
preference.setSummary(R.string.summary_placeholder);
@@ -237,21 +189,25 @@
}
@VisibleForTesting
- void bindIcon(Preference preference, Tile tile) {
+ void bindIcon(Preference preference, Tile tile, boolean forceRoundedIcon) {
final Icon tileIcon = tile.getIcon(mContext);
if (tileIcon != null) {
- preference.setIcon(tileIcon.loadDrawable(preference.getContext()));
+ Drawable iconDrawable = tileIcon.loadDrawable(preference.getContext());
+ if (forceRoundedIcon
+ && !TextUtils.equals(mContext.getPackageName(), tile.getPackageName())) {
+ iconDrawable = new RoundedHomepageIcon(mContext, iconDrawable);
+ ((RoundedHomepageIcon) iconDrawable).setBackgroundColor(mContext, tile);
+ }
+ preference.setIcon(iconDrawable);
} else if (tile.getMetaData() != null
&& tile.getMetaData().containsKey(META_DATA_PREFERENCE_ICON_URI)) {
ThreadUtils.postOnBackgroundThread(() -> {
+ final Intent intent = tile.getIntent();
String packageName = null;
- if (tile.intent != null) {
- Intent intent = tile.intent;
- if (!TextUtils.isEmpty(intent.getPackage())) {
- packageName = intent.getPackage();
- } else if (intent.getComponent() != null) {
- packageName = intent.getComponent().getPackageName();
- }
+ if (!TextUtils.isEmpty(intent.getPackage())) {
+ packageName = intent.getPackage();
+ } else if (intent.getComponent() != null) {
+ packageName = intent.getComponent().getPackageName();
}
final Map<String, IContentProvider> providerMap = new ArrayMap<>();
final String uri = tile.getMetaData().getString(META_DATA_PREFERENCE_ICON_URI);
@@ -269,7 +225,7 @@
}
}
- private void launchIntentOrSelectProfile(Activity activity, Tile tile, Intent intent,
+ private void launchIntentOrSelectProfile(FragmentActivity activity, Tile tile, Intent intent,
int sourceMetricCategory) {
if (!isIntentResolvable(intent)) {
Log.w(TAG, "Cannot resolve intent, skipping. " + intent);
@@ -284,7 +240,7 @@
mMetricsFeatureProvider.logDashboardStartIntent(mContext, intent, sourceMetricCategory);
activity.startActivityForResultAsUser(intent, 0, tile.userHandle.get(0));
} else {
- ProfileSelectDialog.show(activity.getFragmentManager(), tile);
+ ProfileSelectDialog.show(activity.getSupportFragmentManager(), tile);
}
}
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index acf885d..0cda9ee 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -27,9 +27,11 @@
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerListHelper;
@@ -53,7 +55,7 @@
*/
public abstract class DashboardFragment extends SettingsPreferenceFragment
implements SettingsBaseActivity.CategoryListener, Indexable,
- SummaryLoader.SummaryConsumer {
+ SummaryLoader.SummaryConsumer, PreferenceGroup.OnExpandButtonClickListener {
private static final String TAG = "DashboardFragment";
private final Map<Class, List<AbstractPreferenceController>> mPreferenceControllers =
@@ -156,12 +158,12 @@
final String key = mDashboardFeatureProvider.getDashboardKeyForTile(tile);
final Preference pref = getPreferenceScreen().findPreference(key);
if (pref == null) {
- Log.d(getLogTag(),
- String.format("Can't find pref by key %s, skipping update summary %s/%s",
- key, tile.title, tile.summary));
+ Log.d(getLogTag(), String.format(
+ "Can't find pref by key %s, skipping update summary %s",
+ key, tile.getDescription()));
return;
}
- pref.setSummary(tile.summary);
+ pref.setSummary(tile.getSummary(pref.getContext()));
}
@Override
@@ -207,6 +209,16 @@
@Override
protected abstract int getPreferenceScreenResId();
+ @Override
+ public void onExpandButtonClick() {
+ mMetricsFeatureProvider.actionWithSource(getContext(), getMetricsCategory(),
+ MetricsEvent.ACTION_SETTINGS_ADVANCED_BUTTON_EXPAND);
+ }
+
+ protected boolean shouldForceRoundedIcon() {
+ return false;
+ }
+
protected <T extends AbstractPreferenceController> T use(Class<T> clazz) {
List<AbstractPreferenceController> controllerList = mPreferenceControllers.get(clazz);
if (controllerList != null) {
@@ -264,6 +276,7 @@
}
addPreferencesFromResource(resId);
final PreferenceScreen screen = getPreferenceScreen();
+ screen.setOnExpandButtonClickListener(this);
mPreferenceControllers.values().stream().flatMap(Collection::stream).forEach(
controller -> controller.displayPreference(screen));
}
@@ -308,6 +321,12 @@
displayResourceTiles();
refreshDashboardTiles(TAG);
+
+ final Activity activity = getActivity();
+ if (activity != null) {
+ Log.d(TAG, "All preferences added, reporting fully drawn");
+ activity.reportFullyDrawn();
+ }
}
/**
@@ -343,6 +362,7 @@
final int tintColor = a.getColor(0, context.getColor(android.R.color.white));
a.recycle();
// Install dashboard tiles.
+ final boolean forceRoundedIcons = shouldForceRoundedIcon();
for (Tile tile : tiles) {
final String key = mDashboardFeatureProvider.getDashboardKeyForTile(tile);
if (TextUtils.isEmpty(key)) {
@@ -361,13 +381,15 @@
if (mDashboardTilePrefKeys.contains(key)) {
// Have the key already, will rebind.
final Preference preference = screen.findPreference(key);
- mDashboardFeatureProvider.bindPreferenceToTile(getActivity(), getMetricsCategory(),
- preference, tile, key, mPlaceholderPreferenceController.getOrder());
+ mDashboardFeatureProvider.bindPreferenceToTile(getActivity(), forceRoundedIcons,
+ getMetricsCategory(), preference, tile, key,
+ mPlaceholderPreferenceController.getOrder());
} else {
// Don't have this key, add it.
final Preference pref = new Preference(getPrefContext());
- mDashboardFeatureProvider.bindPreferenceToTile(getActivity(), getMetricsCategory(),
- pref, tile, key, mPlaceholderPreferenceController.getOrder());
+ mDashboardFeatureProvider.bindPreferenceToTile(getActivity(), forceRoundedIcons,
+ getMetricsCategory(), pref, tile, key,
+ mPlaceholderPreferenceController.getOrder());
screen.addPreference(pref);
mDashboardTilePrefKeys.add(key);
}
diff --git a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
index cd478fc..4c371dd 100644
--- a/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
+++ b/src/com/android/settings/dashboard/DashboardFragmentRegistry.java
@@ -30,6 +30,7 @@
import com.android.settings.display.NightDisplaySettings;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.gestures.GestureSettings;
+import com.android.settings.homepage.TopLevelSettings;
import com.android.settings.language.LanguageAndInputSettings;
import com.android.settings.network.NetworkDashboardFragment;
import com.android.settings.notification.ConfigureNotificationSettings;
@@ -61,6 +62,8 @@
static {
PARENT_TO_CATEGORY_KEY_MAP = new ArrayMap<>();
+ PARENT_TO_CATEGORY_KEY_MAP.put(TopLevelSettings.class.getName(),
+ CategoryKey.CATEGORY_HOMEPAGE);
PARENT_TO_CATEGORY_KEY_MAP.put(
NetworkDashboardFragment.class.getName(), CategoryKey.CATEGORY_NETWORK);
PARENT_TO_CATEGORY_KEY_MAP.put(ConnectedDeviceDashboardFragment.class.getName(),
@@ -98,9 +101,9 @@
PARENT_TO_CATEGORY_KEY_MAP.put(ZenModeSettings.class.getName(),
CategoryKey.CATEGORY_DO_NOT_DISTURB);
PARENT_TO_CATEGORY_KEY_MAP.put(GestureSettings.class.getName(),
- CategoryKey.CATEGORY_GESTURES);
+ CategoryKey.CATEGORY_GESTURES);
PARENT_TO_CATEGORY_KEY_MAP.put(NightDisplaySettings.class.getName(),
- CategoryKey.CATEGORY_NIGHT_DISPLAY);
+ CategoryKey.CATEGORY_NIGHT_DISPLAY);
CATEGORY_KEY_TO_PARENT_MAP = new ArrayMap<>(PARENT_TO_CATEGORY_KEY_MAP.size());
diff --git a/src/com/android/settings/dashboard/DashboardItemAnimator.java b/src/com/android/settings/dashboard/DashboardItemAnimator.java
deleted file mode 100644
index 332e915..0000000
--- a/src/com/android/settings/dashboard/DashboardItemAnimator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.dashboard;
-
-import com.android.settingslib.drawer.Tile;
-
-import androidx.core.view.ViewCompat;
-import androidx.recyclerview.widget.DefaultItemAnimator;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
-
-public class DashboardItemAnimator extends DefaultItemAnimator {
-
- @Override
- public boolean animateChange(ViewHolder oldHolder, ViewHolder newHolder, int fromX, int fromY,
- int toX, int toY) {
- final Object tag = oldHolder.itemView.getTag();
- if (tag instanceof Tile && oldHolder == newHolder) {
- // When this view has other move animation running, skip this value to avoid
- // animations interrupt each other.
- if (!isRunning()) {
- fromX += ViewCompat.getTranslationX(oldHolder.itemView);
- fromY += ViewCompat.getTranslationY(oldHolder.itemView);
- }
-
- if (fromX == toX && fromY == toY) {
- dispatchMoveFinished(oldHolder);
- return false;
- }
- }
- return super.animateChange(oldHolder, newHolder, fromX, fromY, toX, toY);
- }
-}
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
deleted file mode 100644
index c6b69e9..0000000
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.dashboard;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Handler;
-import android.service.settings.suggestions.Suggestion;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.core.SettingsBaseActivity;
-import com.android.settings.core.SettingsBaseActivity.CategoryListener;
-import com.android.settings.dashboard.conditional.Condition;
-import com.android.settings.dashboard.conditional.ConditionManager;
-import com.android.settings.dashboard.conditional.ConditionManager.ConditionListener;
-import com.android.settings.dashboard.conditional.FocusRecyclerView;
-import com.android.settings.dashboard.conditional.FocusRecyclerView.FocusListener;
-import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.ActionBarShadowController;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
-import com.android.settingslib.utils.ThreadUtils;
-
-import java.util.List;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-import androidx.loader.app.LoaderManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
-public class DashboardSummary extends InstrumentedFragment
- implements CategoryListener, ConditionListener,
- FocusListener, SuggestionControllerMixinCompat.SuggestionControllerHost {
- public static final boolean DEBUG = false;
- private static final boolean DEBUG_TIMING = false;
- private static final int MAX_WAIT_MILLIS = 3000;
- private static final String TAG = "DashboardSummary";
-
- private static final String STATE_SCROLL_POSITION = "scroll_position";
- private static final String STATE_CATEGORIES_CHANGE_CALLED = "categories_change_called";
-
- private final Handler mHandler = new Handler();
-
- private FocusRecyclerView mDashboard;
- private DashboardAdapter mAdapter;
- private SummaryLoader mSummaryLoader;
- private ConditionManager mConditionManager;
- private LinearLayoutManager mLayoutManager;
- private SuggestionControllerMixinCompat mSuggestionControllerMixin;
- private DashboardFeatureProvider mDashboardFeatureProvider;
- @VisibleForTesting
- boolean mIsOnCategoriesChangedCalled;
- private boolean mOnConditionsChangedCalled;
-
- private DashboardCategory mStagingCategory;
- private List<Suggestion> mStagingSuggestions;
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.DASHBOARD_SUMMARY;
- }
-
- @Override
- public void onAttach(Context context) {
- super.onAttach(context);
- Log.d(TAG, "Creating SuggestionControllerMixinCompat");
- final SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory
- .getFactory(context)
- .getSuggestionFeatureProvider(context);
- if (suggestionFeatureProvider.isSuggestionEnabled(context)) {
- mSuggestionControllerMixin = new SuggestionControllerMixinCompat(
- context, this /* host */, getSettingsLifecycle(),
- suggestionFeatureProvider.getSuggestionServiceComponent());
- }
- }
-
- @Override
- public LoaderManager getLoaderManager() {
- if (!isAdded()) {
- return null;
- }
- return super.getLoaderManager();
- }
-
- @Override
- public void onCreate(Bundle savedInstanceState) {
- long startTime = System.currentTimeMillis();
- super.onCreate(savedInstanceState);
- Log.d(TAG, "Starting DashboardSummary");
- final Activity activity = getActivity();
- mDashboardFeatureProvider = FeatureFactory.getFactory(activity)
- .getDashboardFeatureProvider(activity);
-
- mSummaryLoader = new SummaryLoader(activity, CategoryKey.CATEGORY_HOMEPAGE);
-
- mConditionManager = ConditionManager.get(activity, false);
- getSettingsLifecycle().addObserver(mConditionManager);
- if (savedInstanceState != null) {
- mIsOnCategoriesChangedCalled =
- savedInstanceState.getBoolean(STATE_CATEGORIES_CHANGE_CALLED);
- }
- if (DEBUG_TIMING) {
- Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime) + " ms");
- }
- }
-
- @Override
- public void onDestroy() {
- mSummaryLoader.release();
- super.onDestroy();
- }
-
- @Override
- public void onResume() {
- long startTime = System.currentTimeMillis();
- super.onResume();
-
- ((SettingsBaseActivity) getActivity()).addCategoryListener(this);
- mSummaryLoader.setListening(true);
- final int metricsCategory = getMetricsCategory();
- for (Condition c : mConditionManager.getConditions()) {
- if (c.shouldShow()) {
- mMetricsFeatureProvider.visible(getContext(), metricsCategory,
- c.getMetricsConstant());
- }
- }
- if (DEBUG_TIMING) {
- Log.d(TAG, "onResume took " + (System.currentTimeMillis() - startTime) + " ms");
- }
- }
-
- @Override
- public void onPause() {
- super.onPause();
-
- ((SettingsBaseActivity) getActivity()).remCategoryListener(this);
- mSummaryLoader.setListening(false);
- for (Condition c : mConditionManager.getConditions()) {
- if (c.shouldShow()) {
- mMetricsFeatureProvider.hidden(getContext(), c.getMetricsConstant());
- }
- }
- }
-
- @Override
- public void onWindowFocusChanged(boolean hasWindowFocus) {
- long startTime = System.currentTimeMillis();
- if (hasWindowFocus) {
- Log.d(TAG, "Listening for condition changes");
- mConditionManager.addListener(this);
- Log.d(TAG, "conditions refreshed");
- mConditionManager.refreshAll();
- } else {
- Log.d(TAG, "Stopped listening for condition changes");
- mConditionManager.remListener(this);
- }
- if (DEBUG_TIMING) {
- Log.d(TAG, "onWindowFocusChanged took "
- + (System.currentTimeMillis() - startTime) + " ms");
- }
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- super.onSaveInstanceState(outState);
- if (mLayoutManager == null) {
- return;
- }
- outState.putBoolean(STATE_CATEGORIES_CHANGE_CALLED, mIsOnCategoriesChangedCalled);
- outState.putInt(STATE_SCROLL_POSITION, mLayoutManager.findFirstVisibleItemPosition());
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
- long startTime = System.currentTimeMillis();
- final View root = inflater.inflate(R.layout.dashboard, container, false);
- mDashboard = root.findViewById(R.id.dashboard_container);
- mLayoutManager = new LinearLayoutManager(getContext());
- mLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
- if (bundle != null) {
- int scrollPosition = bundle.getInt(STATE_SCROLL_POSITION);
- mLayoutManager.scrollToPosition(scrollPosition);
- }
- mDashboard.setLayoutManager(mLayoutManager);
- mDashboard.setHasFixedSize(true);
- mDashboard.setListener(this);
- mDashboard.setItemAnimator(new DashboardItemAnimator());
- mAdapter = new DashboardAdapter(getContext(), bundle,
- mConditionManager.getConditions(), mSuggestionControllerMixin,
- getSettingsLifecycle());
- mDashboard.setAdapter(mAdapter);
- mSummaryLoader.setSummaryConsumer(mAdapter);
- ActionBarShadowController.attachToRecyclerView(
- getActivity().findViewById(R.id.search_bar_container), getSettingsLifecycle(),
- mDashboard);
- rebuildUI();
- if (DEBUG_TIMING) {
- Log.d(TAG, "onCreateView took "
- + (System.currentTimeMillis() - startTime) + " ms");
- }
- return root;
- }
-
- @VisibleForTesting
- void rebuildUI() {
- ThreadUtils.postOnBackgroundThread(() -> updateCategory());
- }
-
- @Override
- public void onCategoriesChanged() {
- // Bypass rebuildUI() on the first call of onCategoriesChanged, since rebuildUI() happens
- // in onViewCreated as well when app starts. But, on the subsequent calls we need to
- // rebuildUI() because there might be some changes to suggestions and categories.
- if (mIsOnCategoriesChangedCalled) {
- rebuildUI();
- }
- mIsOnCategoriesChangedCalled = true;
- }
-
- @Override
- public void onConditionsChanged() {
- Log.d(TAG, "onConditionsChanged");
- // Bypass refreshing the conditions on the first call of onConditionsChanged.
- // onConditionsChanged is called immediately everytime we start listening to the conditions
- // change when we gain window focus. Since the conditions are passed to the adapter's
- // constructor when we create the view, the first handling is not necessary.
- // But, on the subsequent calls we need to handle it because there might be real changes to
- // conditions.
- if (mOnConditionsChangedCalled) {
- final boolean scrollToTop =
- mLayoutManager.findFirstCompletelyVisibleItemPosition() <= 1;
- mAdapter.setConditions(mConditionManager.getConditions());
- if (scrollToTop) {
- mDashboard.scrollToPosition(0);
- }
- } else {
- mOnConditionsChangedCalled = true;
- }
- }
-
- @Override
- public void onSuggestionReady(List<Suggestion> suggestions) {
- mStagingSuggestions = suggestions;
- mAdapter.setSuggestions(suggestions);
- if (mStagingCategory != null) {
- Log.d(TAG, "Category has loaded, setting category from suggestionReady");
- mHandler.removeCallbacksAndMessages(null);
- mAdapter.setCategory(mStagingCategory);
- }
- }
-
- @WorkerThread
- void updateCategory() {
- final DashboardCategory category = mDashboardFeatureProvider.getTilesForCategory(
- CategoryKey.CATEGORY_HOMEPAGE);
- mSummaryLoader.updateSummaryToCache(category);
- mStagingCategory = category;
- if (mSuggestionControllerMixin == null) {
- ThreadUtils.postOnMainThread(() -> mAdapter.setCategory(mStagingCategory));
- return;
- }
- if (mSuggestionControllerMixin.isSuggestionLoaded()) {
- Log.d(TAG, "Suggestion has loaded, setting suggestion/category");
- ThreadUtils.postOnMainThread(() -> {
- if (mStagingSuggestions != null) {
- mAdapter.setSuggestions(mStagingSuggestions);
- }
- mAdapter.setCategory(mStagingCategory);
- });
- } else {
- Log.d(TAG, "Suggestion NOT loaded, delaying setCategory by " + MAX_WAIT_MILLIS + "ms");
- mHandler.postDelayed(() -> mAdapter.setCategory(mStagingCategory), MAX_WAIT_MILLIS);
- }
- }
-}
diff --git a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java
index 8bae151..fc26e55 100644
--- a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java
+++ b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java
@@ -18,12 +18,12 @@
import android.content.Context;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
/**
* PreferenceController for a dashboard_tile_placeholder, a special preference marking where
* dynamic dashboard tiles should be injected in a screen. It is optional when building
diff --git a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
index 927385b..f43445b 100644
--- a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
+++ b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java
@@ -31,12 +31,12 @@
import android.view.View;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
-import com.android.settingslib.RestrictedLockUtils;
-
-import androidx.appcompat.app.AlertDialog;
+import com.android.settingslib.RestrictedLockUtilsInternal;
/**
* Base class for settings screens that should be pin protected when in restricted mode or
@@ -213,10 +213,10 @@
}
public EnforcedAdmin getRestrictionEnforcedAdmin() {
- mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(getActivity(),
+ mEnforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getActivity(),
mRestrictionKey, UserHandle.myUserId());
- if (mEnforcedAdmin != null && mEnforcedAdmin.userId == UserHandle.USER_NULL) {
- mEnforcedAdmin.userId = UserHandle.myUserId();
+ if (mEnforcedAdmin != null && mEnforcedAdmin.user == null) {
+ mEnforcedAdmin.user = UserHandle.of(UserHandle.myUserId());
}
return mEnforcedAdmin;
}
diff --git a/src/com/android/settings/dashboard/RoundedHomepageIcon.java b/src/com/android/settings/dashboard/RoundedHomepageIcon.java
deleted file mode 100644
index 9848034..0000000
--- a/src/com/android/settings/dashboard/RoundedHomepageIcon.java
+++ /dev/null
@@ -1,53 +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.dashboard;
-
-import static androidx.annotation.VisibleForTesting.NONE;
-
-import android.content.Context;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.util.Log;
-
-import com.android.settings.R;
-
-import androidx.annotation.VisibleForTesting;
-
-public class RoundedHomepageIcon extends LayerDrawable {
-
- private static final String TAG = "RoundedHomepageIcon";
-
- @VisibleForTesting(otherwise = NONE)
- int mBackgroundColor = -1;
-
- public RoundedHomepageIcon(Context context, Drawable foreground) {
- super(new Drawable[] {
- context.getDrawable(R.drawable.ic_homepage_generic_background),
- foreground
- });
- final int insetPx = context.getResources()
- .getDimensionPixelSize(R.dimen.dashboard_tile_foreground_image_inset);
- setLayerInset(1 /* index */, insetPx, insetPx, insetPx, insetPx);
- }
-
- public void setBackgroundColor(int color) {
- mBackgroundColor = color;
- getDrawable(0).setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
- Log.d(TAG, "Setting background color " + mBackgroundColor);
- }
-}
diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java
index d8694f2..059cb93 100644
--- a/src/com/android/settings/dashboard/SummaryLoader.java
+++ b/src/com/android/settings/dashboard/SummaryLoader.java
@@ -18,6 +18,8 @@
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import android.os.Handler;
@@ -42,7 +44,7 @@
import java.util.List;
public class SummaryLoader {
- private static final boolean DEBUG = DashboardSummary.DEBUG;
+ private static final boolean DEBUG = false;
private static final String TAG = "SummaryLoader";
public static final String SUMMARY_PROVIDER_FACTORY = "SUMMARY_PROVIDER_FACTORY";
@@ -95,29 +97,30 @@
return;
}
if (DEBUG) {
- Log.d(TAG, "setSummary " + tile.title + " - " + summary);
+ Log.d(TAG, "setSummary " + tile.getDescription() + " - " + summary);
}
- updateSummaryIfNeeded(tile, summary);
+ updateSummaryIfNeeded(mActivity.getApplicationContext(), tile, summary);
});
}
@VisibleForTesting
- void updateSummaryIfNeeded(Tile tile, CharSequence summary) {
- if (TextUtils.equals(tile.summary, summary)) {
+ void updateSummaryIfNeeded(Context context, Tile tile, CharSequence summary) {
+ if (TextUtils.equals(tile.getSummary(context), summary)) {
if (DEBUG) {
- Log.d(TAG, "Summary doesn't change, skipping summary update for " + tile.title);
+ Log.d(TAG, "Summary doesn't change, skipping summary update for "
+ + tile.getDescription());
}
return;
}
mSummaryTextMap.put(mDashboardFeatureProvider.getDashboardKeyForTile(tile), summary);
- tile.summary = summary;
+ tile.overrideSummary(summary);
if (mSummaryConsumer != null) {
mSummaryConsumer.notifySummaryChanged(tile);
} else {
if (DEBUG) {
Log.d(TAG, "SummaryConsumer is null, skipping summary update for "
- + tile.title);
+ + tile.getDescription());
}
}
}
@@ -155,19 +158,20 @@
}
private SummaryProvider getSummaryProvider(Tile tile) {
- if (!mActivity.getPackageName().equals(tile.intent.getComponent().getPackageName())) {
+ if (!mActivity.getPackageName().equals(tile.getPackageName())) {
// Not within Settings, can't load Summary directly.
// TODO: Load summary indirectly.
return null;
}
final Bundle metaData = tile.getMetaData();
+ final Intent intent = tile.getIntent();
if (metaData == null) {
- if (DEBUG) Log.d(TAG, "No metadata specified for " + tile.intent.getComponent());
+ Log.d(TAG, "No metadata specified for " + intent.getComponent());
return null;
}
- String clsName = metaData.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS);
+ final String clsName = metaData.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS);
if (clsName == null) {
- if (DEBUG) Log.d(TAG, "No fragment specified for " + tile.intent.getComponent());
+ Log.d(TAG, "No fragment specified for " + intent.getComponent());
return null;
}
try {
@@ -193,15 +197,12 @@
* operations are asynchronous.
*/
public void registerReceiver(final BroadcastReceiver receiver, final IntentFilter filter) {
- mActivity.runOnUiThread(new Runnable() {
- @Override
- public void run() {
- if (!mListening) {
- return;
- }
- mReceivers.add(receiver);
- mActivity.registerReceiver(receiver, filter);
+ mActivity.runOnUiThread(() -> {
+ if (!mListening) {
+ return;
}
+ mReceivers.add(receiver);
+ mActivity.registerReceiver(receiver, filter);
});
}
@@ -216,7 +217,7 @@
for (Tile tile : category.getTiles()) {
final String key = mDashboardFeatureProvider.getDashboardKeyForTile(tile);
if (mSummaryTextMap.containsKey(key)) {
- tile.summary = mSummaryTextMap.get(key);
+ tile.overrideSummary(mSummaryTextMap.get(key));
}
}
}
@@ -242,7 +243,7 @@
SummaryProvider provider = getSummaryProvider(tile);
if (provider != null) {
if (DEBUG) Log.d(TAG, "Creating " + tile);
- mSummaryProviderMap.put(provider, tile.intent.getComponent());
+ mSummaryProviderMap.put(provider, tile.getIntent().getComponent());
}
}
@@ -254,7 +255,7 @@
final int tileCount = tiles.size();
for (int j = 0; j < tileCount; j++) {
final Tile tile = tiles.get(j);
- if (component.equals(tile.intent.getComponent())) {
+ if (component.equals(tile.getIntent().getComponent())) {
return tile;
}
}
diff --git a/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBase.java b/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBase.java
deleted file mode 100644
index eaec6d0..0000000
--- a/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBase.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard.conditional;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.media.AudioManager;
-import android.provider.Settings;
-
-import com.android.settings.R;
-
-public abstract class AbnormalRingerConditionBase extends Condition {
-
- private final IntentFilter mFilter;
-
- protected final AudioManager mAudioManager;
-
- private final RingerModeChangeReceiver mReceiver;
-
- AbnormalRingerConditionBase(ConditionManager manager) {
- super(manager);
- mAudioManager =
- (AudioManager) mManager.getContext().getSystemService(Context.AUDIO_SERVICE);
- mReceiver = new RingerModeChangeReceiver(this);
-
- mFilter = new IntentFilter(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);
- manager.getContext().registerReceiver(mReceiver, mFilter);
- }
-
- @Override
- public CharSequence[] getActions() {
- return new CharSequence[] {
- mManager.getContext().getText(R.string.condition_device_muted_action_turn_on_sound)
- };
- }
-
- @Override
- public void onPrimaryClick() {
- mManager.getContext().startActivity(
- new Intent(Settings.ACTION_SOUND_SETTINGS)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
- }
-
- @Override
- public void onActionClick(int index) {
- mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL);
- mAudioManager.setStreamVolume(AudioManager.STREAM_RING, 1, 0 /* flags */);
- refreshState();
- }
-
- static class RingerModeChangeReceiver extends BroadcastReceiver {
-
- private final AbnormalRingerConditionBase mCondition;
-
- public RingerModeChangeReceiver(AbnormalRingerConditionBase condition) {
- mCondition = condition;
- }
-
- @Override
- public void onReceive(Context context, Intent intent) {
- final String action = intent.getAction();
- if (AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION.equals(action)) {
- mCondition.refreshState();
- }
- }
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java b/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
deleted file mode 100644
index 792a090..0000000
--- a/src/com/android/settings/dashboard/conditional/AirplaneModeCondition.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.
- */
-package com.android.settings.dashboard.conditional;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.provider.Settings;
-import android.util.Log;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settingslib.WirelessUtils;
-
-public class AirplaneModeCondition extends Condition {
- public static String TAG = "APM_Condition";
-
- private final Receiver mReceiver;
-
- private static final IntentFilter AIRPLANE_MODE_FILTER =
- new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED);
-
- public AirplaneModeCondition(ConditionManager conditionManager) {
- super(conditionManager);
- mReceiver = new Receiver();
- }
-
- @Override
- public void refreshState() {
- Log.d(TAG, "APM condition refreshed");
- setActive(WirelessUtils.isAirplaneModeOn(mManager.getContext()));
- }
-
- @Override
- protected BroadcastReceiver getReceiver() {
- return mReceiver;
- }
-
- @Override
- protected IntentFilter getIntentFilter() {
- return AIRPLANE_MODE_FILTER;
- }
-
- @Override
- public Drawable getIcon() {
- return mManager.getContext().getDrawable(R.drawable.ic_airplane);
- }
-
- @Override
- protected void setActive(boolean active) {
- super.setActive(active);
- Log.d(TAG, "setActive was called with " + active);
- }
-
- @Override
- public CharSequence getTitle() {
- return mManager.getContext().getString(R.string.condition_airplane_title);
- }
-
- @Override
- public CharSequence getSummary() {
- return mManager.getContext().getString(R.string.condition_airplane_summary);
- }
-
- @Override
- public CharSequence[] getActions() {
- return new CharSequence[] {mManager.getContext().getString(R.string.condition_turn_off)};
- }
-
- @Override
- public void onPrimaryClick() {
- mManager.getContext().startActivity(
- new Intent(Settings.ACTION_WIRELESS_SETTINGS)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
- }
-
- @Override
- public void onActionClick(int index) {
- if (index == 0) {
- ConnectivityManager.from(mManager.getContext()).setAirplaneMode(false);
- setActive(false);
- } else {
- throw new IllegalArgumentException("Unexpected index " + index);
- }
- }
-
- @Override
- public int getMetricsConstant() {
- return MetricsEvent.SETTINGS_CONDITION_AIRPLANE_MODE;
- }
-
- public static class Receiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(intent.getAction())) {
- ConditionManager.get(context).getCondition(AirplaneModeCondition.class)
- .refreshState();
- }
- }
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java b/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
deleted file mode 100644
index d5372a2..0000000
--- a/src/com/android/settings/dashboard/conditional/BackgroundDataCondition.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.
- */
-package com.android.settings.dashboard.conditional;
-
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.net.NetworkPolicyManager;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.Settings;
-
-public class BackgroundDataCondition extends Condition {
-
- public BackgroundDataCondition(ConditionManager manager) {
- super(manager);
- }
-
- @Override
- public void refreshState() {
- setActive(NetworkPolicyManager.from(mManager.getContext()).getRestrictBackground());
- }
-
- @Override
- public Drawable getIcon() {
- return mManager.getContext().getDrawable(R.drawable.ic_data_saver);
- }
-
- @Override
- public CharSequence getTitle() {
- return mManager.getContext().getString(R.string.condition_bg_data_title);
- }
-
- @Override
- public CharSequence getSummary() {
- return mManager.getContext().getString(R.string.condition_bg_data_summary);
- }
-
- @Override
- public CharSequence[] getActions() {
- return new CharSequence[] {mManager.getContext().getString(R.string.condition_turn_off)};
- }
-
- @Override
- public void onPrimaryClick() {
- mManager.getContext().startActivity(new Intent(mManager.getContext(),
- Settings.DataUsageSummaryActivity.class)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
- }
-
- @Override
- public int getMetricsConstant() {
- return MetricsEvent.SETTINGS_CONDITION_BACKGROUND_DATA;
- }
-
- @Override
- public void onActionClick(int index) {
- if (index == 0) {
- NetworkPolicyManager.from(mManager.getContext()).setRestrictBackground(false);
- setActive(false);
- } else {
- throw new IllegalArgumentException("Unexpected index " + index);
- }
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java
deleted file mode 100644
index b0c1de4..0000000
--- a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.
- */
-package com.android.settings.dashboard.conditional;
-
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.os.PowerManager;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.fuelgauge.BatterySaverReceiver;
-import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
-import com.android.settingslib.fuelgauge.BatterySaverUtils;
-
-public class BatterySaverCondition extends Condition implements
- BatterySaverReceiver.BatterySaverListener {
-
- private final BatterySaverReceiver mReceiver;
-
- public BatterySaverCondition(ConditionManager manager) {
- super(manager);
-
- mReceiver = new BatterySaverReceiver(manager.getContext());
- mReceiver.setBatterySaverListener(this);
- }
-
- @Override
- public void refreshState() {
- PowerManager powerManager = mManager.getContext().getSystemService(PowerManager.class);
- setActive(powerManager.isPowerSaveMode());
- }
-
- @Override
- public Drawable getIcon() {
- return mManager.getContext().getDrawable(R.drawable.ic_battery_saver_accent_24dp);
- }
-
- @Override
- public CharSequence getTitle() {
- return mManager.getContext().getString(R.string.condition_battery_title);
- }
-
- @Override
- public CharSequence getSummary() {
- return mManager.getContext().getString(R.string.condition_battery_summary);
- }
-
- @Override
- public CharSequence[] getActions() {
- return new CharSequence[]{mManager.getContext().getString(R.string.condition_turn_off)};
- }
-
- @Override
- public void onPrimaryClick() {
- new SubSettingLauncher(mManager.getContext())
- .setDestination(BatterySaverSettings.class.getName())
- .setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY)
- .setTitleRes(R.string.battery_saver)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
- .launch();
- }
-
- @Override
- public void onActionClick(int index) {
- if (index == 0) {
- BatterySaverUtils.setPowerSaveMode(mManager.getContext(), false,
- /*needFirstTimeWarning*/ false);
- refreshState();
- } else {
- throw new IllegalArgumentException("Unexpected index " + index);
- }
- }
-
- @Override
- public int getMetricsConstant() {
- return MetricsEvent.SETTINGS_CONDITION_BATTERY_SAVER;
- }
-
- @Override
- public void onResume() {
- mReceiver.setListening(true);
- }
-
- @Override
- public void onPause() {
- mReceiver.setListening(false);
- }
-
- @Override
- public void onPowerSaveModeChanged() {
- ConditionManager.get(mManager.getContext()).getCondition(BatterySaverCondition.class)
- .refreshState();
- }
-
- @Override
- public void onBatteryChanged(boolean pluggedIn) {
- // do nothing
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java b/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
deleted file mode 100644
index bc0cbd5..0000000
--- a/src/com/android/settings/dashboard/conditional/CellularDataCondition.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.dashboard.conditional;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.telephony.TelephonyManager;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.telephony.TelephonyIntents;
-import com.android.settings.R;
-import com.android.settings.Settings;
-
-public class CellularDataCondition extends Condition {
-
- private final Receiver mReceiver;
-
- private static final IntentFilter DATA_CONNECTION_FILTER =
- new IntentFilter(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
-
- public CellularDataCondition(ConditionManager manager) {
- super(manager);
- mReceiver = new Receiver();
- }
-
- @Override
- public void refreshState() {
- ConnectivityManager connectivity = mManager.getContext().getSystemService(
- ConnectivityManager.class);
- TelephonyManager telephony = mManager.getContext().getSystemService(TelephonyManager.class);
- if (!connectivity.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)
- || telephony.getSimState() != TelephonyManager.SIM_STATE_READY) {
- setActive(false);
- return;
- }
- setActive(!telephony.isDataEnabled());
- }
-
- @Override
- protected BroadcastReceiver getReceiver() {
- return mReceiver;
- }
-
- @Override
- protected IntentFilter getIntentFilter() {
- return DATA_CONNECTION_FILTER;
- }
-
- @Override
- public Drawable getIcon() {
- return mManager.getContext().getDrawable(R.drawable.ic_cellular_off);
- }
-
- @Override
- public CharSequence getTitle() {
- return mManager.getContext().getString(R.string.condition_cellular_title);
- }
-
- @Override
- public CharSequence getSummary() {
- return mManager.getContext().getString(R.string.condition_cellular_summary);
- }
-
- @Override
- public CharSequence[] getActions() {
- return new CharSequence[] { mManager.getContext().getString(R.string.condition_turn_on) };
- }
-
- @Override
- public void onPrimaryClick() {
- mManager.getContext().startActivity(new Intent(mManager.getContext(),
- Settings.DataUsageSummaryActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
- }
-
- @Override
- public void onActionClick(int index) {
- if (index == 0) {
- TelephonyManager telephony = mManager.getContext().getSystemService(
- TelephonyManager.class);
- telephony.setDataEnabled(true);
- setActive(false);
- } else {
- throw new IllegalArgumentException("Unexpected index " + index);
- }
- }
-
- @Override
- public int getMetricsConstant() {
- return MetricsEvent.SETTINGS_CONDITION_CELLULAR_DATA;
- }
-
- public static class Receiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED.equals(
- intent.getAction())) {
- CellularDataCondition condition = ConditionManager.get(context).getCondition(
- CellularDataCondition.class);
- if (condition != null) {
- condition.refreshState();
- }
- }
- }
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/Condition.java b/src/com/android/settings/dashboard/conditional/Condition.java
deleted file mode 100644
index 82452ff..0000000
--- a/src/com/android/settings/dashboard/conditional/Condition.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.
- */
-
-package com.android.settings.dashboard.conditional;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.IntentFilter;
-import android.graphics.drawable.Drawable;
-import android.os.PersistableBundle;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-
-import androidx.annotation.VisibleForTesting;
-
-public abstract class Condition {
-
- private static final String KEY_SILENCE = "silence";
- private static final String KEY_ACTIVE = "active";
- private static final String KEY_LAST_STATE = "last_state";
-
- protected final ConditionManager mManager;
- protected final MetricsFeatureProvider mMetricsFeatureProvider;
- protected boolean mReceiverRegistered;
-
- private boolean mIsSilenced;
- private boolean mIsActive;
- private long mLastStateChange;
-
- // All conditions must live in this package.
- Condition(ConditionManager manager) {
- this(manager, FeatureFactory.getFactory(manager.getContext()).getMetricsFeatureProvider());
- }
-
- Condition(ConditionManager manager, MetricsFeatureProvider metricsFeatureProvider) {
- mManager = manager;
- mMetricsFeatureProvider = metricsFeatureProvider;
- }
-
- void restoreState(PersistableBundle bundle) {
- mIsSilenced = bundle.getBoolean(KEY_SILENCE);
- mIsActive = bundle.getBoolean(KEY_ACTIVE);
- mLastStateChange = bundle.getLong(KEY_LAST_STATE);
- }
-
- boolean saveState(PersistableBundle bundle) {
- if (mIsSilenced) {
- bundle.putBoolean(KEY_SILENCE, mIsSilenced);
- }
- if (mIsActive) {
- bundle.putBoolean(KEY_ACTIVE, mIsActive);
- bundle.putLong(KEY_LAST_STATE, mLastStateChange);
- }
- return mIsSilenced || mIsActive;
- }
-
- protected void notifyChanged() {
- mManager.notifyChanged(this);
- }
-
- public boolean isSilenced() {
- return mIsSilenced;
- }
-
- public boolean isActive() {
- return mIsActive;
- }
-
- protected void setActive(boolean active) {
- if (mIsActive == active) {
- return;
- }
- mIsActive = active;
- mLastStateChange = System.currentTimeMillis();
- if (mIsSilenced && !active) {
- mIsSilenced = false;
- onSilenceChanged(mIsSilenced);
- }
- notifyChanged();
- }
-
- public void silence() {
- if (!mIsSilenced) {
- mIsSilenced = true;
- Context context = mManager.getContext();
- mMetricsFeatureProvider.action(context, MetricsEvent.ACTION_SETTINGS_CONDITION_DISMISS,
- getMetricsConstant());
- onSilenceChanged(mIsSilenced);
- notifyChanged();
- }
- }
-
- @VisibleForTesting
- void onSilenceChanged(boolean silenced) {
- final BroadcastReceiver receiver = getReceiver();
- if (receiver == null) {
- return;
- }
- if (silenced) {
- if (!mReceiverRegistered) {
- mManager.getContext().registerReceiver(receiver, getIntentFilter());
- mReceiverRegistered = true;
- }
- } else {
- if (mReceiverRegistered) {
- mManager.getContext().unregisterReceiver(receiver);
- mReceiverRegistered = false;
- }
- }
- }
-
- protected BroadcastReceiver getReceiver() {
- return null;
- }
-
- protected IntentFilter getIntentFilter() {
- return null;
- }
-
- public boolean shouldShow() {
- return isActive() && !isSilenced();
- }
-
- long getLastChange() {
- return mLastStateChange;
- }
-
- public void onResume() {
- }
-
- public void onPause() {
- }
-
- // State.
- public abstract void refreshState();
-
- public abstract int getMetricsConstant();
-
- // UI.
- public abstract Drawable getIcon();
- public abstract CharSequence getTitle();
- public abstract CharSequence getSummary();
- public abstract CharSequence[] getActions();
-
- public abstract void onPrimaryClick();
- public abstract void onActionClick(int index);
-}
diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
deleted file mode 100644
index a6478e2..0000000
--- a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java
+++ /dev/null
@@ -1,187 +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.dashboard.conditional;
-
-import android.content.Context;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.WirelessUtils;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-
-import java.util.List;
-import java.util.Objects;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.RecyclerView;
-
-public class ConditionAdapter extends RecyclerView.Adapter<DashboardItemHolder> {
- public static final String TAG = "ConditionAdapter";
-
- private final Context mContext;
- private final MetricsFeatureProvider mMetricsFeatureProvider;
- private List<Condition> mConditions;
- private boolean mExpanded;
-
- private View.OnClickListener mConditionClickListener = new View.OnClickListener() {
-
- @Override
- public void onClick(View v) {
- //TODO: get rid of setTag/getTag
- Condition condition = (Condition) v.getTag();
- mMetricsFeatureProvider.action(mContext,
- MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
- condition.getMetricsConstant());
- condition.onPrimaryClick();
- }
- };
-
- @VisibleForTesting
- ItemTouchHelper.SimpleCallback mSwipeCallback = new ItemTouchHelper.SimpleCallback(0,
- ItemTouchHelper.START | ItemTouchHelper.END) {
- @Override
- public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder,
- RecyclerView.ViewHolder target) {
- return true;
- }
-
- @Override
- public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
- return viewHolder.getItemViewType() == R.layout.condition_tile
- ? super.getSwipeDirs(recyclerView, viewHolder) : 0;
- }
-
- @Override
- public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
- Object item = getItem(viewHolder.getItemId());
- // item can become null when running monkey
- if (item != null) {
- ((Condition) item).silence();
- }
- }
- };
-
- public ConditionAdapter(Context context, List<Condition> conditions, boolean expanded) {
- mContext = context;
- mConditions = conditions;
- mExpanded = expanded;
- mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
-
- setHasStableIds(true);
- }
-
- public Object getItem(long itemId) {
- for (Condition condition : mConditions) {
- if (Objects.hash(condition.getTitle()) == itemId) {
- return condition;
- }
- }
- return null;
- }
-
- @Override
- public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
- viewType, parent, false));
- }
-
- @Override
- public void onBindViewHolder(DashboardItemHolder holder, int position) {
- bindViews(mConditions.get(position), holder,
- position == mConditions.size() - 1, mConditionClickListener);
- }
-
- @Override
- public long getItemId(int position) {
- return Objects.hash(mConditions.get(position).getTitle());
- }
-
- @Override
- public int getItemViewType(int position) {
- return R.layout.condition_tile;
- }
-
- @Override
- public int getItemCount() {
- if (mExpanded) {
- return mConditions.size();
- }
- return 0;
- }
-
- public void addDismissHandling(final RecyclerView recyclerView) {
- final ItemTouchHelper itemTouchHelper = new ItemTouchHelper(mSwipeCallback);
- itemTouchHelper.attachToRecyclerView(recyclerView);
- }
-
- private void bindViews(final Condition condition,
- DashboardItemHolder view, boolean isLastItem,
- View.OnClickListener onClickListener) {
- if (condition instanceof AirplaneModeCondition) {
- Log.d(TAG, "Airplane mode condition has been bound with "
- + "isActive=" + condition.isActive() + ". Airplane mode is currently " +
- WirelessUtils.isAirplaneModeOn(condition.mManager.getContext()));
- }
- View card = view.itemView.findViewById(R.id.content);
- card.setTag(condition);
- card.setOnClickListener(onClickListener);
- view.icon.setImageDrawable(condition.getIcon());
- view.title.setText(condition.getTitle());
-
- CharSequence[] actions = condition.getActions();
- final boolean hasButtons = actions.length > 0;
- setViewVisibility(view.itemView, R.id.buttonBar, hasButtons);
-
- view.summary.setText(condition.getSummary());
- for (int i = 0; i < 2; i++) {
- Button button = (Button) view.itemView.findViewById(i == 0
- ? R.id.first_action : R.id.second_action);
- if (actions.length > i) {
- button.setVisibility(View.VISIBLE);
- button.setText(actions[i]);
- final int index = i;
- button.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Context context = v.getContext();
- FeatureFactory.getFactory(context).getMetricsFeatureProvider()
- .action(context, MetricsEvent.ACTION_SETTINGS_CONDITION_BUTTON,
- condition.getMetricsConstant());
- condition.onActionClick(index);
- }
- });
- } else {
- button.setVisibility(View.GONE);
- }
- }
- setViewVisibility(view.itemView, R.id.divider, !isLastItem);
- }
-
- private void setViewVisibility(View containerView, int viewId, boolean visible) {
- View view = containerView.findViewById(viewId);
- if (view != null) {
- view.setVisibility(visible ? View.VISIBLE : View.GONE);
- }
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/ConditionManager.java b/src/com/android/settings/dashboard/conditional/ConditionManager.java
deleted file mode 100644
index 2754d8a..0000000
--- a/src/com/android/settings/dashboard/conditional/ConditionManager.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * 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.
- */
-package com.android.settings.dashboard.conditional;
-
-import android.content.Context;
-import android.os.AsyncTask;
-import android.os.PersistableBundle;
-import android.util.Log;
-import android.util.Xml;
-
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlSerializer;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-public class ConditionManager implements LifecycleObserver, OnResume, OnPause {
-
- private static final String TAG = "ConditionManager";
-
- private static final boolean DEBUG = false;
-
- private static final String PKG = "com.android.settings.dashboard.conditional.";
-
- private static final String FILE_NAME = "condition_state.xml";
- private static final String TAG_CONDITIONS = "cs";
- private static final String TAG_CONDITION = "c";
- private static final String ATTR_CLASS = "cls";
-
- private static ConditionManager sInstance;
-
- private final Context mContext;
- private final ArrayList<Condition> mConditions;
- private File mXmlFile;
-
- private final ArrayList<ConditionListener> mListeners = new ArrayList<>();
-
- private ConditionManager(Context context, boolean loadConditionsNow) {
- mContext = context;
- mConditions = new ArrayList<>();
- if (loadConditionsNow) {
- Log.d(TAG, "conditions loading synchronously");
- ConditionLoader loader = new ConditionLoader();
- loader.onPostExecute(loader.doInBackground());
- } else {
- Log.d(TAG, "conditions loading asychronously");
- new ConditionLoader().execute();
- }
- }
-
- public void refreshAll() {
- final int N = mConditions.size();
- for (int i = 0; i < N; i++) {
- mConditions.get(i).refreshState();
- }
- }
-
- private void readFromXml(File xmlFile, ArrayList<Condition> conditions) {
- if (DEBUG) Log.d(TAG, "Reading from " + xmlFile.toString());
- try {
- XmlPullParser parser = Xml.newPullParser();
- FileReader in = new FileReader(xmlFile);
- parser.setInput(in);
- int state = parser.getEventType();
-
- while (state != XmlPullParser.END_DOCUMENT) {
- if (TAG_CONDITION.equals(parser.getName())) {
- int depth = parser.getDepth();
- String clz = parser.getAttributeValue("", ATTR_CLASS);
- if (!clz.startsWith(PKG)) {
- clz = PKG + clz;
- }
- Condition condition = createCondition(Class.forName(clz));
- PersistableBundle bundle = PersistableBundle.restoreFromXml(parser);
- if (DEBUG) Log.d(TAG, "Reading " + clz + " -- " + bundle);
- if (condition != null) {
- condition.restoreState(bundle);
- conditions.add(condition);
- } else {
- Log.e(TAG, "failed to add condition: " + clz);
- }
- while (parser.getDepth() > depth) {
- parser.next();
- }
- }
- state = parser.next();
- }
- in.close();
- } catch (XmlPullParserException | IOException | ClassNotFoundException e) {
- Log.w(TAG, "Problem reading " + FILE_NAME, e);
- }
- }
-
- private void saveToXml() {
- if (DEBUG) Log.d(TAG, "Writing to " + mXmlFile.toString());
- try {
- XmlSerializer serializer = Xml.newSerializer();
- FileWriter writer = new FileWriter(mXmlFile);
- serializer.setOutput(writer);
-
- serializer.startDocument("UTF-8", true);
- serializer.startTag("", TAG_CONDITIONS);
-
- final int N = mConditions.size();
- for (int i = 0; i < N; i++) {
- PersistableBundle bundle = new PersistableBundle();
- if (mConditions.get(i).saveState(bundle)) {
- serializer.startTag("", TAG_CONDITION);
- final String clz = mConditions.get(i).getClass().getSimpleName();
- serializer.attribute("", ATTR_CLASS, clz);
- bundle.saveToXml(serializer);
- serializer.endTag("", TAG_CONDITION);
- }
- }
-
- serializer.endTag("", TAG_CONDITIONS);
- serializer.flush();
- writer.close();
- } catch (XmlPullParserException | IOException e) {
- Log.w(TAG, "Problem writing " + FILE_NAME, e);
- }
- }
-
- private void addMissingConditions(ArrayList<Condition> conditions) {
- addIfMissing(AirplaneModeCondition.class, conditions);
- addIfMissing(HotspotCondition.class, conditions);
- addIfMissing(DndCondition.class, conditions);
- addIfMissing(BatterySaverCondition.class, conditions);
- addIfMissing(CellularDataCondition.class, conditions);
- addIfMissing(BackgroundDataCondition.class, conditions);
- addIfMissing(WorkModeCondition.class, conditions);
- addIfMissing(NightDisplayCondition.class, conditions);
- addIfMissing(RingerMutedCondition.class, conditions);
- addIfMissing(RingerVibrateCondition.class, conditions);
- Collections.sort(conditions, CONDITION_COMPARATOR);
- }
-
- private void addIfMissing(Class<? extends Condition> clz, ArrayList<Condition> conditions) {
- if (getCondition(clz, conditions) == null) {
- if (DEBUG) Log.d(TAG, "Adding missing " + clz.getName());
- Condition condition = createCondition(clz);
- if (condition != null) {
- conditions.add(condition);
- }
- }
- }
-
- private Condition createCondition(Class<?> clz) {
- if (AirplaneModeCondition.class == clz) {
- return new AirplaneModeCondition(this);
- } else if (HotspotCondition.class == clz) {
- return new HotspotCondition(this);
- } else if (DndCondition.class == clz) {
- return new DndCondition(this);
- } else if (BatterySaverCondition.class == clz) {
- return new BatterySaverCondition(this);
- } else if (CellularDataCondition.class == clz) {
- return new CellularDataCondition(this);
- } else if (BackgroundDataCondition.class == clz) {
- return new BackgroundDataCondition(this);
- } else if (WorkModeCondition.class == clz) {
- return new WorkModeCondition(this);
- } else if (NightDisplayCondition.class == clz) {
- return new NightDisplayCondition(this);
- } else if (RingerMutedCondition.class == clz) {
- return new RingerMutedCondition(this);
- } else if (RingerVibrateCondition.class == clz) {
- return new RingerVibrateCondition(this);
- }
- Log.e(TAG, "unknown condition class: " + clz.getSimpleName());
- return null;
- }
-
- Context getContext() {
- return mContext;
- }
-
- public <T extends Condition> T getCondition(Class<T> clz) {
- return getCondition(clz, mConditions);
- }
-
- private <T extends Condition> T getCondition(Class<T> clz, List<Condition> conditions) {
- final int N = conditions.size();
- for (int i = 0; i < N; i++) {
- if (clz.equals(conditions.get(i).getClass())) {
- return (T) conditions.get(i);
- }
- }
- return null;
- }
-
- public List<Condition> getConditions() {
- return mConditions;
- }
-
- public List<Condition> getVisibleConditions() {
- List<Condition> conditions = new ArrayList<>();
- final int N = mConditions.size();
- for (int i = 0; i < N; i++) {
- if (mConditions.get(i).shouldShow()) {
- conditions.add(mConditions.get(i));
- }
- }
- return conditions;
- }
-
- public void notifyChanged(Condition condition) {
- saveToXml();
- Collections.sort(mConditions, CONDITION_COMPARATOR);
- final int N = mListeners.size();
- for (int i = 0; i < N; i++) {
- mListeners.get(i).onConditionsChanged();
- }
- }
-
- public void addListener(ConditionListener listener) {
- mListeners.add(listener);
- listener.onConditionsChanged();
- }
-
- public void remListener(ConditionListener listener) {
- mListeners.remove(listener);
- }
-
- @Override
- public void onResume() {
- for (int i = 0, size = mConditions.size(); i < size; i++) {
- mConditions.get(i).onResume();
- }
- }
-
- @Override
- public void onPause() {
- for (int i = 0, size = mConditions.size(); i < size; i++) {
- mConditions.get(i).onPause();
- }
- }
-
- private class ConditionLoader extends AsyncTask<Void, Void, ArrayList<Condition>> {
- @Override
- protected ArrayList<Condition> doInBackground(Void... params) {
- Log.d(TAG, "loading conditions from xml");
- ArrayList<Condition> conditions = new ArrayList<>();
- mXmlFile = new File(mContext.getFilesDir(), FILE_NAME);
- if (mXmlFile.exists()) {
- readFromXml(mXmlFile, conditions);
- }
- addMissingConditions(conditions);
- return conditions;
- }
-
- @Override
- protected void onPostExecute(ArrayList<Condition> conditions) {
- Log.d(TAG, "conditions loaded from xml, refreshing conditions");
- mConditions.clear();
- mConditions.addAll(conditions);
- refreshAll();
- }
- }
-
- public static ConditionManager get(Context context) {
- return get(context, true);
- }
-
- public static ConditionManager get(Context context, boolean loadConditionsNow) {
- if (sInstance == null) {
- sInstance = new ConditionManager(context.getApplicationContext(), loadConditionsNow);
- }
- return sInstance;
- }
-
- public interface ConditionListener {
- void onConditionsChanged();
- }
-
- private static final Comparator<Condition> CONDITION_COMPARATOR = new Comparator<Condition>() {
- @Override
- public int compare(Condition lhs, Condition rhs) {
- return Long.compare(lhs.getLastChange(), rhs.getLastChange());
- }
- };
-}
diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/dashboard/conditional/DndCondition.java
deleted file mode 100644
index 32184e1..0000000
--- a/src/com/android/settings/dashboard/conditional/DndCondition.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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.
- */
-package com.android.settings.dashboard.conditional;
-
-import android.app.NotificationManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.drawable.Drawable;
-import android.os.PersistableBundle;
-import android.provider.Settings;
-import android.provider.Settings.Global;
-import android.service.notification.ZenModeConfig;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.notification.ZenModeSettings;
-
-import androidx.annotation.VisibleForTesting;
-
-public class DndCondition extends Condition {
-
- private static final String TAG = "DndCondition";
- private static final String KEY_STATE = "state";
-
- private boolean mRegistered;
-
- @VisibleForTesting
- static final IntentFilter DND_FILTER =
- new IntentFilter(NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED_INTERNAL);
- @VisibleForTesting
- protected ZenModeConfig mConfig;
-
- private int mZen;
- private final Receiver mReceiver;
-
- public DndCondition(ConditionManager manager) {
- super(manager);
- mReceiver = new Receiver();
- mManager.getContext().registerReceiver(mReceiver, DND_FILTER);
- mRegistered = true;
- }
-
- @Override
- public void refreshState() {
- NotificationManager notificationManager =
- mManager.getContext().getSystemService(NotificationManager.class);
- mZen = notificationManager.getZenMode();
- boolean zenModeEnabled = mZen != Settings.Global.ZEN_MODE_OFF;
- if (zenModeEnabled) {
- mConfig = notificationManager.getZenModeConfig();
- } else {
- mConfig = null;
- }
- setActive(zenModeEnabled);
- }
-
- @Override
- boolean saveState(PersistableBundle bundle) {
- bundle.putInt(KEY_STATE, mZen);
- return super.saveState(bundle);
- }
-
- @Override
- void restoreState(PersistableBundle bundle) {
- super.restoreState(bundle);
- mZen = bundle.getInt(KEY_STATE, Global.ZEN_MODE_OFF);
- }
-
- @Override
- public Drawable getIcon() {
- return mManager.getContext().getDrawable(R.drawable.ic_do_not_disturb_on_24dp);
- }
-
- @Override
- public CharSequence getTitle() {
- return mManager.getContext().getString(R.string.condition_zen_title);
- }
-
- @Override
- public CharSequence getSummary() {
- return ZenModeConfig.getDescription(mManager.getContext(), mZen != Global.ZEN_MODE_OFF,
- mConfig, true);
- }
-
- @Override
- public CharSequence[] getActions() {
- return new CharSequence[] { mManager.getContext().getString(R.string.condition_turn_off) };
- }
-
- @Override
- public void onPrimaryClick() {
- new SubSettingLauncher(mManager.getContext())
- .setDestination(ZenModeSettings.class.getName())
- .setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY)
- .setTitleRes(R.string.zen_mode_settings_title)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
- .launch();
- }
-
- @Override
- public void onActionClick(int index) {
- if (index == 0) {
- NotificationManager notificationManager = mManager.getContext().getSystemService(
- NotificationManager.class);
- notificationManager.setZenMode(Settings.Global.ZEN_MODE_OFF, null, TAG);
- setActive(false);
- } else {
- throw new IllegalArgumentException("Unexpected index " + index);
- }
- }
-
- @Override
- public int getMetricsConstant() {
- return MetricsEvent.SETTINGS_CONDITION_DND;
- }
-
- public static class Receiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED_INTERNAL
- .equals(intent.getAction())) {
- final Condition condition =
- ConditionManager.get(context).getCondition(DndCondition.class);
- if (condition != null) {
- condition.refreshState();
- }
- }
- }
- }
-
- @Override
- public void onResume() {
- if (!mRegistered) {
- mManager.getContext().registerReceiver(mReceiver, DND_FILTER);
- mRegistered = true;
- }
- }
-
- @Override
- public void onPause() {
- if (mRegistered) {
- mManager.getContext().unregisterReceiver(mReceiver);
- mRegistered = false;
- }
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java b/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java
deleted file mode 100644
index abe4743..0000000
--- a/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 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.
- */
-package com.android.settings.dashboard.conditional;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
-/**
- * Version of RecyclerView that can have listeners for onWindowFocusChanged.
- */
-public class FocusRecyclerView extends RecyclerView {
-
- private FocusListener mListener;
-
- public FocusRecyclerView(Context context, @Nullable AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- public void onWindowFocusChanged(boolean hasWindowFocus) {
- super.onWindowFocusChanged(hasWindowFocus);
- if (mListener != null) {
- mListener.onWindowFocusChanged(hasWindowFocus);
- }
- }
-
- public void setListener(FocusListener listener) {
- mListener = listener;
- }
-
- public interface FocusListener {
- void onWindowFocusChanged(boolean hasWindowFocus);
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/HotspotCondition.java b/src/com/android/settings/dashboard/conditional/HotspotCondition.java
deleted file mode 100644
index 68f2382..0000000
--- a/src/com/android/settings/dashboard/conditional/HotspotCondition.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * 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.
- */
-package com.android.settings.dashboard.conditional;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.TetherSettings;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-public class HotspotCondition extends Condition {
-
- private final WifiManager mWifiManager;
- private final Receiver mReceiver;
-
- private static final IntentFilter WIFI_AP_STATE_FILTER =
- new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
-
- public HotspotCondition(ConditionManager manager) {
- super(manager);
- mWifiManager = mManager.getContext().getSystemService(WifiManager.class);
- mReceiver = new Receiver();
- }
-
- @Override
- public void refreshState() {
- boolean wifiTetherEnabled = mWifiManager.isWifiApEnabled();
- setActive(wifiTetherEnabled);
- }
-
- @Override
- protected BroadcastReceiver getReceiver() {
- return mReceiver;
- }
-
- @Override
- protected IntentFilter getIntentFilter() {
- return WIFI_AP_STATE_FILTER;
- }
-
- @Override
- public Drawable getIcon() {
- return mManager.getContext().getDrawable(R.drawable.ic_hotspot);
- }
-
- private String getSsid() {
- WifiConfiguration wifiConfig = mWifiManager.getWifiApConfiguration();
- if (wifiConfig == null) {
- return mManager.getContext().getString(
- com.android.internal.R.string.wifi_tether_configure_ssid_default);
- } else {
- return wifiConfig.SSID;
- }
- }
-
- @Override
- public CharSequence getTitle() {
- return mManager.getContext().getString(R.string.condition_hotspot_title);
- }
-
- @Override
- public CharSequence getSummary() {
- return mManager.getContext().getString(R.string.condition_hotspot_summary, getSsid());
- }
-
- @Override
- public CharSequence[] getActions() {
- final Context context = mManager.getContext();
- if (RestrictedLockUtils.hasBaseUserRestriction(context,
- UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId())) {
- return new CharSequence[0];
- }
- return new CharSequence[] {context.getString(R.string.condition_turn_off)};
- }
-
- @Override
- public void onPrimaryClick() {
- new SubSettingLauncher(mManager.getContext())
- .setDestination(TetherSettings.class.getName())
- .setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY)
- .setTitleRes(R.string.tether_settings_title_all)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
- .launch();
- }
-
- @Override
- public void onActionClick(int index) {
- if (index == 0) {
- final Context context = mManager.getContext();
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(context,
- UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId());
- if (admin != null) {
- RestrictedLockUtils.sendShowAdminSupportDetailsIntent(context, admin);
- } else {
- ConnectivityManager cm = (ConnectivityManager) context.getSystemService(
- Context.CONNECTIVITY_SERVICE);
- cm.stopTethering(ConnectivityManager.TETHERING_WIFI);
- setActive(false);
- }
- } else {
- throw new IllegalArgumentException("Unexpected index " + index);
- }
- }
-
- @Override
- public int getMetricsConstant() {
- return MetricsEvent.SETTINGS_CONDITION_HOTSPOT;
- }
-
- public static class Receiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (WifiManager.WIFI_AP_STATE_CHANGED_ACTION.equals(intent.getAction())) {
- ConditionManager.get(context).getCondition(HotspotCondition.class)
- .refreshState();
- }
- }
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java b/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
deleted file mode 100644
index c3ba534..0000000
--- a/src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard.conditional;
-
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-
-import com.android.internal.app.ColorDisplayController;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.display.NightDisplaySettings;
-
-public final class NightDisplayCondition extends Condition
- implements ColorDisplayController.Callback {
-
- private ColorDisplayController mController;
-
- NightDisplayCondition(ConditionManager manager) {
- super(manager);
- mController = new ColorDisplayController(manager.getContext());
- mController.setListener(this);
- }
-
- @Override
- public int getMetricsConstant() {
- return MetricsEvent.SETTINGS_CONDITION_NIGHT_DISPLAY;
- }
-
- @Override
- public Drawable getIcon() {
- return mManager.getContext().getDrawable(R.drawable.ic_settings_night_display);
- }
-
- @Override
- public CharSequence getTitle() {
- return mManager.getContext().getString(R.string.condition_night_display_title);
- }
-
- @Override
- public CharSequence getSummary() {
- return mManager.getContext().getString(R.string.condition_night_display_summary);
- }
-
- @Override
- public CharSequence[] getActions() {
- return new CharSequence[] {mManager.getContext().getString(R.string.condition_turn_off)};
- }
-
- @Override
- public void onPrimaryClick() {
- new SubSettingLauncher(mManager.getContext())
- .setDestination(NightDisplaySettings.class.getName())
- .setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY)
- .setTitleRes(R.string.night_display_title)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
- .launch();
- }
-
- @Override
- public void onActionClick(int index) {
- if (index == 0) {
- mController.setActivated(false);
- } else {
- throw new IllegalArgumentException("Unexpected index " + index);
- }
- }
-
- @Override
- public void refreshState() {
- setActive(mController.isActivated());
- }
-
- @Override
- public void onActivated(boolean activated) {
- refreshState();
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java b/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java
deleted file mode 100644
index 7f7bc2b..0000000
--- a/src/com/android/settings/dashboard/conditional/RingerMutedCondition.java
+++ /dev/null
@@ -1,70 +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.dashboard.conditional;
-
-import static android.content.Context.NOTIFICATION_SERVICE;
-
-import android.app.NotificationManager;
-import android.graphics.drawable.Drawable;
-import android.media.AudioManager;
-import android.provider.Settings;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-
-public class RingerMutedCondition extends AbnormalRingerConditionBase {
-
- private final NotificationManager mNotificationManager;
-
- RingerMutedCondition(ConditionManager manager) {
- super(manager);
- mNotificationManager =
- (NotificationManager) mManager.getContext().getSystemService(NOTIFICATION_SERVICE);
- }
-
- @Override
- public void refreshState() {
- int zen = Settings.Global.ZEN_MODE_OFF;
- if (mNotificationManager != null) {
- zen = mNotificationManager.getZenMode();
- }
- final boolean zenModeEnabled = zen != Settings.Global.ZEN_MODE_OFF;
- final boolean isSilent =
- mAudioManager.getRingerModeInternal() == AudioManager.RINGER_MODE_SILENT;
- setActive(isSilent && !zenModeEnabled);
- }
-
- @Override
- public int getMetricsConstant() {
- return MetricsProto.MetricsEvent.SETTINGS_CONDITION_DEVICE_MUTED;
- }
-
- @Override
- public Drawable getIcon() {
- return mManager.getContext().getDrawable(R.drawable.ic_notifications_off_24dp);
- }
-
- @Override
- public CharSequence getTitle() {
- return mManager.getContext().getText(R.string.condition_device_muted_title);
- }
-
- @Override
- public CharSequence getSummary() {
- return mManager.getContext().getText(R.string.condition_device_muted_summary);
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/RingerVibrateCondition.java b/src/com/android/settings/dashboard/conditional/RingerVibrateCondition.java
deleted file mode 100644
index 6af05c1..0000000
--- a/src/com/android/settings/dashboard/conditional/RingerVibrateCondition.java
+++ /dev/null
@@ -1,55 +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.dashboard.conditional;
-
-import android.graphics.drawable.Drawable;
-import android.media.AudioManager;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-
-public class RingerVibrateCondition extends AbnormalRingerConditionBase {
-
- RingerVibrateCondition(ConditionManager manager) {
- super(manager);
- }
-
- @Override
- public void refreshState() {
- setActive(mAudioManager.getRingerModeInternal() == AudioManager.RINGER_MODE_VIBRATE);
- }
-
- @Override
- public int getMetricsConstant() {
- return MetricsProto.MetricsEvent.SETTINGS_CONDITION_DEVICE_VIBRATE;
- }
-
- @Override
- public Drawable getIcon() {
- return mManager.getContext().getDrawable(R.drawable.ic_volume_ringer_vibrate);
- }
-
- @Override
- public CharSequence getTitle() {
- return mManager.getContext().getText(R.string.condition_device_vibrate_title);
- }
-
- @Override
- public CharSequence getSummary() {
- return mManager.getContext().getText(R.string.condition_device_vibrate_summary);
- }
-}
diff --git a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java b/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
deleted file mode 100644
index 941d5b0..0000000
--- a/src/com/android/settings/dashboard/conditional/WorkModeCondition.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard.conditional;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.UserInfo;
-import android.graphics.drawable.Drawable;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.Settings;
-
-import java.util.List;
-
-public class WorkModeCondition extends Condition {
-
- private UserManager mUm;
- private UserHandle mUserHandle;
-
- public WorkModeCondition(ConditionManager conditionManager) {
- super(conditionManager);
- mUm = (UserManager) mManager.getContext().getSystemService(Context.USER_SERVICE);
- }
-
- private void updateUserHandle() {
- List<UserInfo> profiles = mUm.getProfiles(UserHandle.myUserId());
- final int profilesCount = profiles.size();
- mUserHandle = null;
- for (int i = 0; i < profilesCount; i++) {
- UserInfo userInfo = profiles.get(i);
- if (userInfo.isManagedProfile()) {
- // We assume there's only one managed profile, otherwise UI needs to change.
- mUserHandle = userInfo.getUserHandle();
- break;
- }
- }
- }
-
- @Override
- public void refreshState() {
- updateUserHandle();
- setActive(mUserHandle != null && mUm.isQuietModeEnabled(mUserHandle));
- }
-
- @Override
- public Drawable getIcon() {
- return mManager.getContext().getDrawable(R.drawable.ic_signal_workmode_enable);
- }
-
- @Override
- public CharSequence getTitle() {
- return mManager.getContext().getString(R.string.condition_work_title);
- }
-
- @Override
- public CharSequence getSummary() {
- return mManager.getContext().getString(R.string.condition_work_summary);
- }
-
- @Override
- public CharSequence[] getActions() {
- return new CharSequence[] {
- mManager.getContext().getString(R.string.condition_turn_on)
- };
- }
-
- @Override
- public void onPrimaryClick() {
- mManager.getContext().startActivity(new Intent(mManager.getContext(),
- Settings.AccountDashboardActivity.class)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
- }
-
- @Override
- public void onActionClick(int index) {
- if (index == 0) {
- if (mUserHandle != null) {
- mUm.requestQuietModeEnabled(false, mUserHandle);
- }
- setActive(false);
- } else {
- throw new IllegalArgumentException("Unexpected index " + index);
- }
- }
-
- @Override
- public int getMetricsConstant() {
- return MetricsEvent.SETTINGS_CONDITION_WORK_MODE;
- }
-}
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
index e56c58b..7e38d6a 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
@@ -16,10 +16,7 @@
package com.android.settings.dashboard.profileselector;
-import android.app.AlertDialog;
import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
@@ -29,6 +26,10 @@
import android.os.UserManager;
import android.util.Log;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
+
import com.android.settingslib.drawer.Tile;
import java.util.List;
@@ -71,8 +72,9 @@
public void onClick(DialogInterface dialog, int which) {
UserHandle user = mSelectedTile.userHandle.get(which);
// Show menu on top level items.
- mSelectedTile.intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
- getActivity().startActivityAsUser(mSelectedTile.intent, user);
+ final Intent intent = mSelectedTile.getIntent();
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+ getActivity().startActivityAsUser(intent, user);
}
public static void updateUserHandlesIfNeeded(Context context, Tile tile) {
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
deleted file mode 100644
index 95d1502..0000000
--- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java
+++ /dev/null
@@ -1,277 +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.dashboard.suggestions;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
-import android.os.Bundle;
-import android.service.settings.suggestions.Suggestion;
-import android.text.TextUtils;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.LinearLayout;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.Utils;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
-import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
-import com.android.settingslib.utils.IconCache;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.RecyclerView;
-
-public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder> implements
- LifecycleObserver, OnSaveInstanceState {
- public static final String TAG = "SuggestionAdapter";
-
- private static final String STATE_SUGGESTIONS_SHOWN_LOGGED = "suggestions_shown_logged";
- private static final String STATE_SUGGESTION_LIST = "suggestion_list";
-
- private final Context mContext;
- private final MetricsFeatureProvider mMetricsFeatureProvider;
- private final IconCache mCache;
- private final ArrayList<String> mSuggestionsShownLogged;
- private final SuggestionFeatureProvider mSuggestionFeatureProvider;
- private final SuggestionControllerMixinCompat mSuggestionControllerMixin;
- private final Callback mCallback;
- private final CardConfig mConfig;
-
- private List<Suggestion> mSuggestions;
-
- public interface Callback {
- /**
- * Called when the close button of the suggestion card is clicked.
- */
- void onSuggestionClosed(Suggestion suggestion);
- }
-
- public SuggestionAdapter(Context context,
- SuggestionControllerMixinCompat suggestionControllerMixin, Bundle savedInstanceState,
- Callback callback, Lifecycle lifecycle) {
- mContext = context;
- mSuggestionControllerMixin = suggestionControllerMixin;
- mCache = new IconCache(context);
- final FeatureFactory factory = FeatureFactory.getFactory(context);
- mMetricsFeatureProvider = factory.getMetricsFeatureProvider();
- mSuggestionFeatureProvider = factory.getSuggestionFeatureProvider(context);
- mCallback = callback;
- if (savedInstanceState != null) {
- mSuggestions = savedInstanceState.getParcelableArrayList(STATE_SUGGESTION_LIST);
- mSuggestionsShownLogged = savedInstanceState.getStringArrayList(
- STATE_SUGGESTIONS_SHOWN_LOGGED);
- } else {
- mSuggestionsShownLogged = new ArrayList<>();
- }
-
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
- mConfig = CardConfig.get(context);
-
- setHasStableIds(true);
- }
-
- @Override
- public DashboardItemHolder onCreateViewHolder(ViewGroup parent, int viewType) {
- return new DashboardItemHolder(LayoutInflater.from(parent.getContext()).inflate(
- viewType, parent, false));
- }
-
- @Override
- public void onBindViewHolder(DashboardItemHolder holder, int position) {
- final Suggestion suggestion = mSuggestions.get(position);
- final String id = suggestion.getId();
- final int suggestionCount = mSuggestions.size();
- if (!mSuggestionsShownLogged.contains(id)) {
- mMetricsFeatureProvider.action(
- mContext, MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION, id);
- mSuggestionsShownLogged.add(id);
- }
- final Icon icon = suggestion.getIcon();
- final Drawable drawable = mCache.getIcon(icon);
- if (drawable != null && (suggestion.getFlags() & Suggestion.FLAG_ICON_TINTABLE) != 0) {
- drawable.setTintList(Utils.getColorAccent(mContext));
- }
- holder.icon.setImageDrawable(drawable);
- holder.title.setText(suggestion.getTitle());
- holder.title.setTypeface(Typeface.create(
- mContext.getString(com.android.internal.R.string.config_headlineFontFamily),
- Typeface.NORMAL));
-
- if (suggestionCount == 1) {
- final CharSequence summary = suggestion.getSummary();
- if (!TextUtils.isEmpty(summary)) {
- holder.summary.setText(summary);
- holder.summary.setVisibility(View.VISIBLE);
- } else {
- holder.summary.setVisibility(View.GONE);
- }
- } else {
- mConfig.setCardLayout(holder, position);
- }
-
- final View closeButton = holder.itemView.findViewById(R.id.close_button);
- if (closeButton != null) {
- closeButton.setOnClickListener(v -> {
- mSuggestionFeatureProvider.dismissSuggestion(
- mContext, mSuggestionControllerMixin, suggestion);
- if (mCallback != null) {
- mCallback.onSuggestionClosed(suggestion);
- }
- });
- }
-
- View clickHandler = holder.itemView;
- // If a view with @android:id/primary is defined, use that as the click handler
- // instead.
- final View primaryAction = holder.itemView.findViewById(android.R.id.primary);
- if (primaryAction != null) {
- clickHandler = primaryAction;
- }
- clickHandler.setOnClickListener(v -> {
- mMetricsFeatureProvider.action(mContext, MetricsEvent.ACTION_SETTINGS_SUGGESTION, id);
- try {
- suggestion.getPendingIntent().send();
- mSuggestionControllerMixin.launchSuggestion(suggestion);
- } catch (PendingIntent.CanceledException e) {
- Log.w(TAG, "Failed to start suggestion " + suggestion.getTitle());
- }
- });
- }
-
- @Override
- public long getItemId(int position) {
- return Objects.hash(mSuggestions.get(position).getId());
- }
-
- @Override
- public int getItemViewType(int position) {
- final Suggestion suggestion = getSuggestion(position);
- if ((suggestion.getFlags() & Suggestion.FLAG_HAS_BUTTON) != 0) {
- return R.layout.suggestion_tile_with_button;
- }
- if (getItemCount() == 1) {
- return R.layout.suggestion_tile;
- }
- return R.layout.suggestion_tile_two_cards;
- }
-
- @Override
- public int getItemCount() {
- return mSuggestions.size();
- }
-
- public Suggestion getSuggestion(int position) {
- final long itemId = getItemId(position);
- if (mSuggestions == null) {
- return null;
- }
- for (Suggestion suggestion : mSuggestions) {
- if (Objects.hash(suggestion.getId()) == itemId) {
- return suggestion;
- }
- }
- return null;
- }
-
- public void removeSuggestion(Suggestion suggestion) {
- final int position = mSuggestions.indexOf(suggestion);
- mSuggestions.remove(suggestion);
- notifyItemRemoved(position);
- }
-
- @Override
- public void onSaveInstanceState(Bundle outState) {
- if (mSuggestions != null) {
- outState.putParcelableArrayList(STATE_SUGGESTION_LIST,
- new ArrayList<>(mSuggestions));
- }
- outState.putStringArrayList(STATE_SUGGESTIONS_SHOWN_LOGGED, mSuggestionsShownLogged);
- }
-
- public void setSuggestions(List<Suggestion> suggestions) {
- mSuggestions = suggestions;
- }
-
- public List<Suggestion> getSuggestions() {
- return mSuggestions;
- }
-
- @VisibleForTesting
- static class CardConfig {
- // Card start/end margin
- private final int mMarginInner;
- private final int mMarginOuter;
- private final WindowManager mWindowManager;
-
- private static CardConfig sConfig;
-
- private CardConfig(Context context) {
- mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
- final Resources res = context.getResources();
- mMarginInner =
- res.getDimensionPixelOffset(R.dimen.suggestion_card_inner_margin);
- mMarginOuter =
- res.getDimensionPixelOffset(R.dimen.suggestion_card_outer_margin);
- }
-
- public static CardConfig get(Context context) {
- if (sConfig == null) {
- sConfig = new CardConfig(context);
- }
- return sConfig;
- }
-
- @VisibleForTesting
- void setCardLayout(DashboardItemHolder holder, int position) {
- final LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
- getWidthForTwoCrads(), LinearLayout.LayoutParams.WRAP_CONTENT);
- params.setMarginStart(position == 0 ? mMarginOuter : mMarginInner);
- params.setMarginEnd(position != 0 ? mMarginOuter : 0);
- holder.itemView.setLayoutParams(params);
- }
-
- private int getWidthForTwoCrads() {
- return (getScreenWidth() - mMarginInner - mMarginOuter * 2) / 2;
- }
-
- @VisibleForTesting
- int getScreenWidth() {
- final DisplayMetrics metrics = new DisplayMetrics();
- mWindowManager.getDefaultDisplay().getMetrics(metrics);
- return metrics.widthPixels;
- }
- }
-
-}
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index 92744ae..0011177 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -23,11 +23,8 @@
import androidx.annotation.NonNull;
-import com.android.settingslib.drawer.Tile;
import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
-import java.util.List;
-
/** Interface should be implemented if you have added new suggestions */
public interface SuggestionFeatureProvider {
@@ -50,11 +47,6 @@
SharedPreferences getSharedPrefs(Context context);
/**
- * Only keep top few suggestions from exclusive suggestions.
- */
- void filterExclusiveSuggestions(List<Tile> suggestions);
-
- /**
* Dismisses a suggestion.
*/
void dismissSuggestion(Context context, SuggestionControllerMixinCompat suggestionMixin,
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 4dd0a5c..39d0299 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -45,7 +45,6 @@
public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider {
private static final String TAG = "SuggestionFeature";
- private static final int EXCLUSIVE_SUGGESTION_MAX_COUNT = 3;
private static final String SHARED_PREF_FILENAME = "suggestions";
@@ -98,17 +97,6 @@
}
@Override
- public void filterExclusiveSuggestions(List<Tile> suggestions) {
- if (suggestions == null) {
- return;
- }
- for (int i = suggestions.size() - 1; i >= EXCLUSIVE_SUGGESTION_MAX_COUNT; i--) {
- Log.d(TAG, "Removing exclusive suggestion");
- suggestions.remove(i);
- }
- }
-
- @Override
public void dismissSuggestion(Context context, SuggestionControllerMixinCompat mixin,
Suggestion suggestion) {
if (mixin == null || suggestion == null || context == null) {
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java
index 4b47dfd..8547db0 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java
@@ -27,10 +27,10 @@
import android.os.Bundle;
import android.util.Log;
-import com.android.settings.overlay.FeatureFactory;
-
import androidx.annotation.VisibleForTesting;
+import com.android.settings.overlay.FeatureFactory;
+
public class SuggestionStateProvider extends ContentProvider {
private static final String TAG = "SugstStatusProvider";
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index ed1920c..78aa6c2 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -36,26 +36,27 @@
import android.view.View;
import android.widget.AdapterView;
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceCategory;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.AppItem;
-import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.net.ChartData;
import com.android.settingslib.net.ChartDataLoaderCompat;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-
-public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener,
+public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceChangeListener,
DataSaverBackend.Listener {
private static final String TAG = "AppDataUsage";
@@ -137,14 +138,13 @@
addUid(mAppItem.uids.keyAt(i));
}
}
- addPreferencesFromResource(R.xml.app_data_usage);
mTotalUsage = findPreference(KEY_TOTAL_USAGE);
mForegroundUsage = findPreference(KEY_FOREGROUND_USAGE);
mBackgroundUsage = findPreference(KEY_BACKGROUND_USAGE);
mCycle = (SpinnerPreference) findPreference(KEY_CYCLE);
- mCycleAdapter = new CycleAdapter(getContext(), mCycle, mCycleListener, false);
+ mCycleAdapter = new CycleAdapter(getContext(), mCycle, mCycleListener);
if (mAppItem.key > 0) {
if (mPackages.size() != 0) {
@@ -190,7 +190,8 @@
if (mPackages.size() > 1) {
mAppList = (PreferenceCategory) findPreference(KEY_APP_LIST);
- getLoaderManager().initLoader(LOADER_APP_PREF, Bundle.EMPTY, mAppPrefCallbacks);
+ LoaderManager.getInstance(this).restartLoader(LOADER_APP_PREF, Bundle.EMPTY,
+ mAppPrefCallbacks);
} else {
removePreference(KEY_APP_LIST);
}
@@ -221,7 +222,7 @@
mDataSaverBackend.addListener(this);
}
mPolicy = services.mPolicyEditor.getPolicy(mTemplate);
- getLoaderManager().restartLoader(LOADER_CHART_DATA,
+ LoaderManager.getInstance(this).restartLoader(LOADER_CHART_DATA,
ChartDataLoaderCompat.buildArgs(mTemplate, mAppItem), mChartDataCallbacks);
updatePrefs();
}
@@ -258,13 +259,23 @@
return super.onPreferenceTreeClick(preference);
}
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.app_data_usage;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
@VisibleForTesting
void updatePrefs() {
updatePrefs(getAppRestrictBackground(), getUnrestrictData());
}
private void updatePrefs(boolean restrictBackground, boolean unrestrictData) {
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfMeteredDataRestricted(
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted(
getContext(), mPackageName, UserHandle.getUserId(mAppItem.key));
if (mRestrictBackground != null) {
mRestrictBackground.setChecked(!restrictBackground);
diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java
index a8168c4..f5a204a 100644
--- a/src/com/android/settings/datausage/AppDataUsagePreference.java
+++ b/src/com/android/settings/datausage/AppDataUsagePreference.java
@@ -18,13 +18,13 @@
import android.view.View;
import android.widget.ProgressBar;
-import com.android.settings.widget.AppPreference;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settingslib.AppItem;
import com.android.settingslib.net.UidDetail;
import com.android.settingslib.net.UidDetailProvider;
import com.android.settingslib.utils.ThreadUtils;
-
-import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.apppreference.AppPreference;
public class AppDataUsagePreference extends AppPreference {
diff --git a/src/com/android/settings/datausage/AppDataUsageV2.java b/src/com/android/settings/datausage/AppDataUsageV2.java
new file mode 100644
index 0000000..6a31726
--- /dev/null
+++ b/src/com/android/settings/datausage/AppDataUsageV2.java
@@ -0,0 +1,432 @@
+/*
+ * 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.datausage;
+
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.net.NetworkTemplate;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.util.ArraySet;
+import android.util.IconDrawableFactory;
+import android.util.Log;
+import android.view.View;
+import android.widget.AdapterView;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceCategory;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.AppItem;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.net.NetworkCycleDataForUid;
+import com.android.settingslib.net.NetworkCycleDataForUidLoader;
+import com.android.settingslib.net.UidDetail;
+import com.android.settingslib.net.UidDetailProvider;
+
+import java.util.List;
+
+public class AppDataUsageV2 extends DataUsageBaseFragment implements OnPreferenceChangeListener,
+ DataSaverBackend.Listener {
+
+ private static final String TAG = "AppDataUsageV2";
+
+ public static final String ARG_APP_ITEM = "app_item";
+ public static final String ARG_NETWORK_TEMPLATE = "network_template";
+
+ private static final String KEY_TOTAL_USAGE = "total_usage";
+ private static final String KEY_FOREGROUND_USAGE = "foreground_usage";
+ private static final String KEY_BACKGROUND_USAGE = "background_usage";
+ private static final String KEY_APP_SETTINGS = "app_settings";
+ private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
+ private static final String KEY_APP_LIST = "app_list";
+ private static final String KEY_CYCLE = "cycle";
+ private static final String KEY_UNRESTRICTED_DATA = "unrestricted_data_saver";
+
+ private static final int LOADER_APP_USAGE_DATA = 2;
+ private static final int LOADER_APP_PREF = 3;
+
+ private PackageManager mPackageManager;
+ private final ArraySet<String> mPackages = new ArraySet<>();
+ private Preference mTotalUsage;
+ private Preference mForegroundUsage;
+ private Preference mBackgroundUsage;
+ private Preference mAppSettings;
+ private RestrictedSwitchPreference mRestrictBackground;
+ private PreferenceCategory mAppList;
+
+ private Drawable mIcon;
+ private CharSequence mLabel;
+ private String mPackageName;
+ private CycleAdapter mCycleAdapter;
+
+ private List<NetworkCycleDataForUid> mUsageData;
+ private NetworkTemplate mTemplate;
+ private AppItem mAppItem;
+ private Intent mAppSettingsIntent;
+ private SpinnerPreference mCycle;
+ private RestrictedSwitchPreference mUnrestrictedData;
+ private DataSaverBackend mDataSaverBackend;
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ mPackageManager = getPackageManager();
+ final Bundle args = getArguments();
+
+ mAppItem = (args != null) ? (AppItem) args.getParcelable(ARG_APP_ITEM) : null;
+ mTemplate = (args != null) ? (NetworkTemplate) args.getParcelable(ARG_NETWORK_TEMPLATE)
+ : null;
+ if (mTemplate == null) {
+ Context context = getContext();
+ mTemplate = DataUsageUtils.getDefaultTemplate(context,
+ DataUsageUtils.getDefaultSubscriptionId(context));
+ }
+ if (mAppItem == null) {
+ int uid = (args != null) ? args.getInt(AppInfoBase.ARG_PACKAGE_UID, -1)
+ : getActivity().getIntent().getIntExtra(AppInfoBase.ARG_PACKAGE_UID, -1);
+ if (uid == -1) {
+ // TODO: Log error.
+ getActivity().finish();
+ } else {
+ addUid(uid);
+ mAppItem = new AppItem(uid);
+ mAppItem.addUid(uid);
+ }
+ } else {
+ for (int i = 0; i < mAppItem.uids.size(); i++) {
+ addUid(mAppItem.uids.keyAt(i));
+ }
+ }
+
+ mTotalUsage = findPreference(KEY_TOTAL_USAGE);
+ mForegroundUsage = findPreference(KEY_FOREGROUND_USAGE);
+ mBackgroundUsage = findPreference(KEY_BACKGROUND_USAGE);
+
+ mCycle = (SpinnerPreference) findPreference(KEY_CYCLE);
+ mCycleAdapter = new CycleAdapter(getContext(), mCycle, mCycleListener);
+
+ if (mAppItem.key > 0) {
+ if (mPackages.size() != 0) {
+ try {
+ ApplicationInfo info = mPackageManager.getApplicationInfoAsUser(
+ mPackages.valueAt(0), 0, UserHandle.getUserId(mAppItem.key));
+ mIcon = IconDrawableFactory.newInstance(getActivity()).getBadgedIcon(info);
+ mLabel = info.loadLabel(mPackageManager);
+ mPackageName = info.packageName;
+ } catch (PackageManager.NameNotFoundException e) {
+ }
+ }
+ if (!UserHandle.isApp(mAppItem.key)) {
+ removePreference(KEY_UNRESTRICTED_DATA);
+ removePreference(KEY_RESTRICT_BACKGROUND);
+ } else {
+ mRestrictBackground = (RestrictedSwitchPreference) findPreference(
+ KEY_RESTRICT_BACKGROUND);
+ mRestrictBackground.setOnPreferenceChangeListener(this);
+ mUnrestrictedData = (RestrictedSwitchPreference) findPreference(
+ KEY_UNRESTRICTED_DATA);
+ mUnrestrictedData.setOnPreferenceChangeListener(this);
+ }
+ mDataSaverBackend = new DataSaverBackend(getContext());
+ mAppSettings = findPreference(KEY_APP_SETTINGS);
+
+ mAppSettingsIntent = new Intent(Intent.ACTION_MANAGE_NETWORK_USAGE);
+ mAppSettingsIntent.addCategory(Intent.CATEGORY_DEFAULT);
+
+ PackageManager pm = getPackageManager();
+ boolean matchFound = false;
+ for (String packageName : mPackages) {
+ mAppSettingsIntent.setPackage(packageName);
+ if (pm.resolveActivity(mAppSettingsIntent, 0) != null) {
+ matchFound = true;
+ break;
+ }
+ }
+ if (!matchFound) {
+ removePreference(KEY_APP_SETTINGS);
+ mAppSettings = null;
+ }
+
+ if (mPackages.size() > 1) {
+ mAppList = (PreferenceCategory) findPreference(KEY_APP_LIST);
+ LoaderManager.getInstance(this).restartLoader(LOADER_APP_PREF, Bundle.EMPTY,
+ mAppPrefCallbacks);
+ } else {
+ removePreference(KEY_APP_LIST);
+ }
+ } else {
+ final Context context = getActivity();
+ UidDetail uidDetail = new UidDetailProvider(context).getUidDetail(mAppItem.key, true);
+ mIcon = uidDetail.icon;
+ mLabel = uidDetail.label;
+ mPackageName = context.getPackageName();
+
+ removePreference(KEY_UNRESTRICTED_DATA);
+ removePreference(KEY_APP_SETTINGS);
+ removePreference(KEY_RESTRICT_BACKGROUND);
+ removePreference(KEY_APP_LIST);
+ }
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ if (mDataSaverBackend != null) {
+ mDataSaverBackend.addListener(this);
+ }
+ LoaderManager.getInstance(this).restartLoader(LOADER_APP_USAGE_DATA, null /* args */,
+ mUidDataCallbacks);
+ updatePrefs();
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ if (mDataSaverBackend != null) {
+ mDataSaverBackend.remListener(this);
+ }
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ if (preference == mRestrictBackground) {
+ mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);
+ updatePrefs();
+ return true;
+ } else if (preference == mUnrestrictedData) {
+ mDataSaverBackend.setIsWhitelisted(mAppItem.key, mPackageName, (Boolean) newValue);
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public boolean onPreferenceTreeClick(Preference preference) {
+ if (preference == mAppSettings) {
+ // TODO: target towards entire UID instead of just first package
+ getActivity().startActivityAsUser(mAppSettingsIntent, new UserHandle(
+ UserHandle.getUserId(mAppItem.key)));
+ return true;
+ }
+ return super.onPreferenceTreeClick(preference);
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.app_data_usage;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @VisibleForTesting
+ void updatePrefs() {
+ updatePrefs(getAppRestrictBackground(), getUnrestrictData());
+ }
+
+ private void updatePrefs(boolean restrictBackground, boolean unrestrictData) {
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted(
+ getContext(), mPackageName, UserHandle.getUserId(mAppItem.key));
+ if (mRestrictBackground != null) {
+ mRestrictBackground.setChecked(!restrictBackground);
+ mRestrictBackground.setDisabledByAdmin(admin);
+ }
+ if (mUnrestrictedData != null) {
+ if (restrictBackground) {
+ mUnrestrictedData.setVisible(false);
+ } else {
+ mUnrestrictedData.setVisible(true);
+ mUnrestrictedData.setChecked(unrestrictData);
+ mUnrestrictedData.setDisabledByAdmin(admin);
+ }
+ }
+ }
+
+ private void addUid(int uid) {
+ String[] packages = getPackageManager().getPackagesForUid(uid);
+ if (packages != null) {
+ for (int i = 0; i < packages.length; i++) {
+ mPackages.add(packages[i]);
+ }
+ }
+ }
+
+ @VisibleForTesting
+ void bindData(int position) {
+ final long backgroundBytes, foregroundBytes;
+ if (mUsageData == null || position >= mUsageData.size()) {
+ backgroundBytes = foregroundBytes = 0;
+ mCycle.setVisible(false);
+ } else {
+ mCycle.setVisible(true);
+ final NetworkCycleDataForUid data = mUsageData.get(position);
+ backgroundBytes = data.getBackgroudUsage();
+ foregroundBytes = data.getForegroudUsage();
+ }
+ final long totalBytes = backgroundBytes + foregroundBytes;
+ final Context context = getContext();
+
+ mTotalUsage.setSummary(DataUsageUtils.formatDataUsage(context, totalBytes));
+ mForegroundUsage.setSummary(DataUsageUtils.formatDataUsage(context, foregroundBytes));
+ mBackgroundUsage.setSummary(DataUsageUtils.formatDataUsage(context, backgroundBytes));
+ }
+
+ private boolean getAppRestrictBackground() {
+ final int uid = mAppItem.key;
+ final int uidPolicy = services.mPolicyManager.getUidPolicy(uid);
+ return (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;
+ }
+
+ private boolean getUnrestrictData() {
+ if (mDataSaverBackend != null) {
+ return mDataSaverBackend.isWhitelisted(mAppItem.key);
+ }
+ return false;
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ String pkg = mPackages.size() != 0 ? mPackages.valueAt(0) : null;
+ int uid = 0;
+ if (pkg != null) {
+ try {
+ uid = mPackageManager.getPackageUidAsUser(pkg,
+ UserHandle.getUserId(mAppItem.key));
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, "Skipping UID because cannot find package " + pkg);
+ }
+ }
+
+ final boolean showInfoButton = mAppItem.key > 0;
+
+ final Activity activity = getActivity();
+ final Preference pref = EntityHeaderController
+ .newInstance(activity, this, null /* header */)
+ .setRecyclerView(getListView(), getSettingsLifecycle())
+ .setUid(uid)
+ .setHasAppInfoLink(showInfoButton)
+ .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
+ EntityHeaderController.ActionType.ACTION_NONE)
+ .setIcon(mIcon)
+ .setLabel(mLabel)
+ .setPackageName(pkg)
+ .done(activity, getPrefContext());
+ getPreferenceScreen().addPreference(pref);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsEvent.APP_DATA_USAGE;
+ }
+
+ private AdapterView.OnItemSelectedListener mCycleListener =
+ new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+ bindData(position);
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView<?> parent) {
+ // ignored
+ }
+ };
+
+ private final LoaderManager.LoaderCallbacks<List<NetworkCycleDataForUid>> mUidDataCallbacks =
+ new LoaderManager.LoaderCallbacks<List<NetworkCycleDataForUid>>() {
+ @Override
+ public Loader<List<NetworkCycleDataForUid>> onCreateLoader(int id, Bundle args) {
+ return NetworkCycleDataForUidLoader.builder(getContext())
+ .setUid(mAppItem.key)
+ .setRetrieveDetail(true)
+ .setNetworkTemplate(mTemplate)
+ .setSubscriberId(mTemplate.getSubscriberId())
+ .build();
+ }
+
+ @Override
+ public void onLoadFinished(Loader<List<NetworkCycleDataForUid>> loader,
+ List<NetworkCycleDataForUid> data) {
+ mUsageData = data;
+ mCycleAdapter.updateCycleList(data);
+ bindData(0 /* position */);
+ }
+
+ @Override
+ public void onLoaderReset(Loader<List<NetworkCycleDataForUid>> loader) {
+ }
+ };
+
+ private final LoaderManager.LoaderCallbacks<ArraySet<Preference>> mAppPrefCallbacks =
+ new LoaderManager.LoaderCallbacks<ArraySet<Preference>>() {
+ @Override
+ public Loader<ArraySet<Preference>> onCreateLoader(int i, Bundle bundle) {
+ return new AppPrefLoader(getPrefContext(), mPackages, getPackageManager());
+ }
+
+ @Override
+ public void onLoadFinished(Loader<ArraySet<Preference>> loader,
+ ArraySet<Preference> preferences) {
+ if (preferences != null && mAppList != null) {
+ for (Preference preference : preferences) {
+ mAppList.addPreference(preference);
+ }
+ }
+ }
+
+ @Override
+ public void onLoaderReset(Loader<ArraySet<Preference>> loader) {
+ }
+ };
+
+ @Override
+ public void onDataSaverChanged(boolean isDataSaving) {
+
+ }
+
+ @Override
+ public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+ if (mAppItem.uids.get(uid, false)) {
+ updatePrefs(getAppRestrictBackground(), isWhitelisted);
+ }
+ }
+
+ @Override
+ public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+ if (mAppItem.uids.get(uid, false)) {
+ updatePrefs(isBlacklisted, getUnrestrictData());
+ }
+ }
+}
diff --git a/src/com/android/settings/datausage/AppPrefLoader.java b/src/com/android/settings/datausage/AppPrefLoader.java
index 501d142..1e0a554 100644
--- a/src/com/android/settings/datausage/AppPrefLoader.java
+++ b/src/com/android/settings/datausage/AppPrefLoader.java
@@ -21,10 +21,10 @@
import android.content.pm.PackageManager;
import android.util.ArraySet;
-import com.android.settingslib.utils.AsyncLoaderCompat;
-
import androidx.preference.Preference;
+import com.android.settingslib.utils.AsyncLoaderCompat;
+
public class AppPrefLoader extends AsyncLoaderCompat<ArraySet<Preference>> {
private ArraySet<String> mPackages;
private PackageManager mPackageManager;
diff --git a/src/com/android/settings/datausage/BillingCyclePreference.java b/src/com/android/settings/datausage/BillingCyclePreference.java
index 70a123f..b30f32e 100644
--- a/src/com/android/settings/datausage/BillingCyclePreference.java
+++ b/src/com/android/settings/datausage/BillingCyclePreference.java
@@ -21,13 +21,13 @@
import android.os.RemoteException;
import android.util.AttributeSet;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.datausage.CellDataPreference.DataStateListener;
-import androidx.preference.Preference;
-
public class BillingCyclePreference extends Preference implements TemplatePreference {
private NetworkTemplate mTemplate;
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index 1d1ec6d..45997f8 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -33,6 +33,12 @@
import android.widget.NumberPicker;
import android.widget.Spinner;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -45,14 +51,8 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
@SearchIndexable
-public class BillingCycleSettings extends DataUsageBase implements
+public class BillingCycleSettings extends DataUsageBaseFragment implements
Preference.OnPreferenceChangeListener, DataUsageEditController {
private static final String TAG = "BillingCycleSettings";
@@ -73,7 +73,8 @@
static final String KEY_SET_DATA_LIMIT = "set_data_limit";
private static final String KEY_DATA_LIMIT = "data_limit";
- private NetworkTemplate mNetworkTemplate;
+ @VisibleForTesting
+ NetworkTemplate mNetworkTemplate;
private Preference mBillingCycle;
private Preference mDataWarning;
private SwitchPreference mEnableDataWarning;
@@ -100,12 +101,16 @@
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
- mDataUsageController = new DataUsageController(getContext());
+ final Context context = getContext();
+ mDataUsageController = new DataUsageController(context);
Bundle args = getArguments();
mNetworkTemplate = args.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE);
+ if (mNetworkTemplate == null) {
+ mNetworkTemplate = DataUsageUtils.getDefaultTemplate(context,
+ DataUsageUtils.getDefaultSubscriptionId(context));
+ }
- addPreferencesFromResource(R.xml.billing_cycle);
mBillingCycle = findPreference(KEY_BILLING_CYCLE);
mEnableDataWarning = (SwitchPreference) findPreference(KEY_SET_DATA_WARNING);
mEnableDataWarning.setOnPreferenceChangeListener(this);
@@ -191,6 +196,16 @@
return MetricsEvent.BILLING_CYCLE;
}
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.billing_cycle;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
@VisibleForTesting
void setPolicyLimitBytes(long limitBytes) {
if (LOGD) Log.d(TAG, "setPolicyLimitBytes()");
diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java
index e46a235..48e4089 100644
--- a/src/com/android/settings/datausage/CellDataPreference.java
+++ b/src/com/android/settings/datausage/CellDataPreference.java
@@ -32,6 +32,11 @@
import android.view.View;
import android.widget.Checkable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog.Builder;
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -40,11 +45,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog.Builder;
-import androidx.core.content.res.TypedArrayUtils;
-import androidx.preference.PreferenceViewHolder;
-
public class CellDataPreference extends CustomDialogPreferenceCompat implements TemplatePreference {
private static final String TAG = "CellDataPreference";
diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java
index 92d5cc8..a0cef3a 100644
--- a/src/com/android/settings/datausage/ChartDataUsagePreference.java
+++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java
@@ -23,16 +23,22 @@
import android.text.format.Formatter;
import android.text.style.ForegroundColorSpan;
import android.util.AttributeSet;
+import android.util.FeatureFlagUtils;
import android.util.SparseIntArray;
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.widget.UsageView;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.widget.UsageView;
+import com.android.settingslib.net.NetworkCycleChartData;
+import com.android.settingslib.net.NetworkCycleData;
+
+import java.util.List;
+
public class ChartDataUsagePreference extends Preference {
// The resolution we show on the graph so that we can squash things down to ints.
@@ -45,7 +51,9 @@
private NetworkPolicy mPolicy;
private long mStart;
private long mEnd;
+ @Deprecated
private NetworkStatsHistory mNetwork;
+ private NetworkCycleChartData mNetworkCycleChartData;
private int mSecondaryColor;
private int mSeriesColor;
@@ -60,13 +68,25 @@
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
- UsageView chart = (UsageView) holder.findViewById(R.id.data_usage);
- if (mNetwork == null) return;
+ final UsageView chart = (UsageView) holder.findViewById(R.id.data_usage);
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {
+ if (mNetworkCycleChartData == null) {
+ return;
+ }
+ } else {
+ if (mNetwork == null) {
+ return;
+ }
+ }
- int top = getTop();
+ final int top = getTop();
chart.clearPaths();
chart.configureGraph(toInt(mEnd - mStart), top);
- calcPoints(chart);
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {
+ calcPoints(chart, mNetworkCycleChartData.getUsageBuckets());
+ } else {
+ calcPoints(chart);
+ }
chart.setBottomLabels(new CharSequence[] {
Utils.formatDateRange(getContext(), mStart, mStart),
Utils.formatDateRange(getContext(), mEnd, mEnd),
@@ -76,21 +96,26 @@
}
public int getTop() {
- NetworkStatsHistory.Entry entry = null;
long totalData = 0;
- final int start = mNetwork.getIndexBefore(mStart);
- final int end = mNetwork.getIndexAfter(mEnd);
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {
+ totalData = mNetworkCycleChartData.getTotalUsage();
+ } else {
+ NetworkStatsHistory.Entry entry = null;
+ final int start = mNetwork.getIndexBefore(mStart);
+ final int end = mNetwork.getIndexAfter(mEnd);
- for (int i = start; i <= end; i++) {
- entry = mNetwork.getValues(i, entry);
+ for (int i = start; i <= end; i++) {
+ entry = mNetwork.getValues(i, entry);
- // increment by current bucket total
- totalData += entry.rxBytes + entry.txBytes;
+ // increment by current bucket total
+ totalData += entry.rxBytes + entry.txBytes;
+ }
}
long policyMax = mPolicy != null ? Math.max(mPolicy.limitBytes, mPolicy.warningBytes) : 0;
return (int) (Math.max(totalData, policyMax) / RESOLUTION);
}
+ @Deprecated
@VisibleForTesting
void calcPoints(UsageView chart) {
SparseIntArray points = new SparseIntArray();
@@ -123,6 +148,33 @@
}
}
+ @VisibleForTesting
+ void calcPoints(UsageView chart, List<NetworkCycleData> usageSummary) {
+ if (usageSummary == null) {
+ return;
+ }
+ final SparseIntArray points = new SparseIntArray();
+ points.put(0, 0);
+
+ long totalData = 0;
+ for (NetworkCycleData data : usageSummary) {
+ final long startTime = data.getStartTime();
+ final long endTime = data.getEndTime();
+
+ // increment by current bucket total
+ totalData += data.getTotalUsage();
+
+ if (points.size() == 1) {
+ points.put(toInt(startTime - mStart) - 1, -1);
+ }
+ points.put(toInt(startTime - mStart + 1), (int) (totalData / RESOLUTION));
+ points.put(toInt(endTime - mStart), (int) (totalData / RESOLUTION));
+ }
+ if (points.size() > 1) {
+ chart.addPath(points);
+ }
+ }
+
private int toInt(long l) {
// Don't need that much resolution on these times.
return (int) (l / (1000 * 60));
@@ -168,6 +220,7 @@
notifyChanged();
}
+ @Deprecated
public void setVisibleRange(long start, long end) {
mStart = start;
mEnd = end;
@@ -182,11 +235,19 @@
return mEnd;
}
+ @Deprecated
public void setNetworkStats(NetworkStatsHistory network) {
mNetwork = network;
notifyChanged();
}
+ public void setNetworkCycleData(NetworkCycleChartData data) {
+ mNetworkCycleChartData = data;
+ mStart = data.getStartTime();
+ mEnd = data.getEndTime();
+ notifyChanged();
+ }
+
public void setColors(int seriesColor, int secondaryColor) {
mSeriesColor = seriesColor;
mSecondaryColor = secondaryColor;
diff --git a/src/com/android/settings/datausage/CycleAdapter.java b/src/com/android/settings/datausage/CycleAdapter.java
index e5c4e43..74d27be 100644
--- a/src/com/android/settings/datausage/CycleAdapter.java
+++ b/src/com/android/settings/datausage/CycleAdapter.java
@@ -20,26 +20,25 @@
import android.text.format.DateUtils;
import android.util.Pair;
import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.net.ChartData;
+import com.android.settingslib.net.NetworkCycleData;
+import com.android.settingslib.widget.settingsspinner.SettingsSpinnerAdapter;
import java.time.ZonedDateTime;
import java.util.Iterator;
+import java.util.List;
import java.util.Objects;
-public class CycleAdapter extends ArrayAdapter<CycleAdapter.CycleItem> {
+public class CycleAdapter extends SettingsSpinnerAdapter<CycleAdapter.CycleItem> {
private final SpinnerInterface mSpinner;
private final AdapterView.OnItemSelectedListener mListener;
public CycleAdapter(Context context, SpinnerInterface spinner,
- AdapterView.OnItemSelectedListener listener, boolean isHeader) {
- super(context, isHeader ? R.layout.filter_spinner_item
- : R.layout.data_usage_cycle_item);
- setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+ AdapterView.OnItemSelectedListener listener) {
+ super(context);
mSpinner = spinner;
mListener = listener;
mSpinner.setAdapter(this);
@@ -68,7 +67,8 @@
* {@link NetworkStatsHistory} data. Always selects the newest item,
* updating the inspection range on chartData.
*/
- public boolean updateCycleList(NetworkPolicy policy, ChartData chartData) {
+ @Deprecated
+ public boolean updateCycleList(NetworkPolicy policy, ChartData chartData) {
// stash away currently selected cycle to try restoring below
final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem)
mSpinner.getSelectedItem();
@@ -150,6 +150,37 @@
}
/**
+ * Rebuild list based on network data. Always selects the newest item,
+ * updating the inspection range on chartData.
+ */
+ public boolean updateCycleList(List<? extends NetworkCycleData> cycleData) {
+ // stash away currently selected cycle to try restoring below
+ final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem)
+ mSpinner.getSelectedItem();
+ clear();
+
+ final Context context = getContext();
+ for (NetworkCycleData data : cycleData) {
+ add(new CycleAdapter.CycleItem(context, data.getStartTime(), data.getEndTime()));
+ }
+
+ // force pick the current cycle (first item)
+ if (getCount() > 0) {
+ final int position = findNearestPosition(previousItem);
+ mSpinner.setSelection(position);
+
+ // only force-update cycle when changed; skipping preserves any
+ // user-defined inspection region.
+ final CycleAdapter.CycleItem selectedItem = getItem(position);
+ if (!Objects.equals(selectedItem, previousItem)) {
+ mListener.onItemSelected(null, null, position, 0);
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
* List item that reflects a specific data usage cycle.
*/
public static class CycleItem implements Comparable<CycleItem> {
@@ -189,8 +220,11 @@
public interface SpinnerInterface {
void setAdapter(CycleAdapter cycleAdapter);
+
void setOnItemSelectedListener(AdapterView.OnItemSelectedListener listener);
+
Object getSelectedItem();
+
void setSelection(int position);
}
}
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index b59da9d..ed2e6c9 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -95,19 +95,10 @@
return mUidPolicies.get(uid, POLICY_NONE) == POLICY_ALLOW_METERED_BACKGROUND;
}
- public int getWhitelistedCount() {
- int count = 0;
- loadWhitelist();
- for (int i = 0; i < mUidPolicies.size(); i++) {
- if (mUidPolicies.valueAt(i) == POLICY_ALLOW_METERED_BACKGROUND) {
- count++;
- }
- }
- return count;
- }
-
private void loadWhitelist() {
- if (mWhitelistInitialized) return;
+ if (mWhitelistInitialized) {
+ return;
+ }
for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_ALLOW_METERED_BACKGROUND)) {
mUidPolicies.put(uid, POLICY_ALLOW_METERED_BACKGROUND);
@@ -135,7 +126,9 @@
}
private void loadBlacklist() {
- if (mBlacklistInitialized) return;
+ if (mBlacklistInitialized) {
+ return;
+ }
for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_REJECT_METERED_BACKGROUND)) {
mUidPolicies.put(uid, POLICY_REJECT_METERED_BACKGROUND);
}
@@ -212,7 +205,9 @@
public interface Listener {
void onDataSaverChanged(boolean isDataSaving);
+
void onWhitelistStatusChanged(int uid, boolean isWhitelisted);
+
void onBlacklistStatusChanged(int uid, boolean isBlacklisted);
}
}
diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java
index 80a6042..79e4c13 100644
--- a/src/com/android/settings/datausage/DataSaverPreference.java
+++ b/src/com/android/settings/datausage/DataSaverPreference.java
@@ -17,10 +17,10 @@
import android.content.Context;
import android.util.AttributeSet;
-import com.android.settings.R;
-
import androidx.preference.Preference;
+import com.android.settings.R;
+
public class DataSaverPreference extends Preference implements DataSaverBackend.Listener {
private final DataSaverBackend mDataSaverBackend;
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index 24e8740..f401342 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -21,6 +21,8 @@
import android.telephony.SubscriptionManager;
import android.widget.Switch;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -40,8 +42,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
@SearchIndexable
public class DataSaverSummary extends SettingsPreferenceFragment
implements OnSwitchChangeListener, Listener, Callback, Callbacks {
diff --git a/src/com/android/settings/datausage/DataUsageBase.java b/src/com/android/settings/datausage/DataUsageBase.java
deleted file mode 100644
index c5df0bb..0000000
--- a/src/com/android/settings/datausage/DataUsageBase.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.datausage;
-
-import android.content.Context;
-import android.net.INetworkStatsService;
-import android.net.NetworkPolicy;
-import android.net.NetworkPolicyManager;
-import android.os.Bundle;
-import android.os.INetworkManagementService;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settingslib.NetworkPolicyEditor;
-
-/**
- * @deprecated please use {@link DataUsageBaseFragment} instead.
- */
-@Deprecated
-public abstract class DataUsageBase extends SettingsPreferenceFragment {
- private static final String TAG = "DataUsageBase";
- private static final String ETHERNET = "ethernet";
-
- protected final TemplatePreference.NetworkServices services =
- new TemplatePreference.NetworkServices();
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
- final Context context = getActivity();
-
- services.mNetworkService = INetworkManagementService.Stub.asInterface(
- ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
- services.mStatsService = INetworkStatsService.Stub.asInterface(
- ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
- services.mPolicyManager = NetworkPolicyManager.from(context);
-
- services.mPolicyEditor = new NetworkPolicyEditor(services.mPolicyManager);
-
- services.mTelephonyManager = TelephonyManager.from(context);
- services.mSubscriptionManager = SubscriptionManager.from(context);
- services.mUserManager = UserManager.get(context);
- }
-
- @Override
- public void onResume() {
- super.onResume();
- services.mPolicyEditor.read();
- }
-
- protected boolean isAdmin() {
- return services.mUserManager.isAdminUser();
- }
-
- protected boolean isMobileDataAvailable(int subId) {
- return services.mSubscriptionManager.getActiveSubscriptionInfo(subId) != null;
- }
-
- protected boolean isNetworkPolicyModifiable(NetworkPolicy policy, int subId) {
- return policy != null && isBandwidthControlEnabled() && services.mUserManager.isAdminUser()
- && isDataEnabled(subId);
- }
-
- private boolean isDataEnabled(int subId) {
- if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
- return true;
- }
- return services.mTelephonyManager.getDataEnabled(subId);
- }
-
- protected boolean isBandwidthControlEnabled() {
- try {
- return services.mNetworkService.isBandwidthControlEnabled();
- } catch (RemoteException e) {
- Log.w(TAG, "problem talking with INetworkManagementService: ", e);
- return false;
- }
- }
-}
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index 0c9c7f9..8f0026f 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -14,18 +14,15 @@
package com.android.settings.datausage;
-import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
import static android.net.TrafficStats.UID_REMOVED;
import static android.net.TrafficStats.UID_TETHERING;
-import static android.telephony.TelephonyManager.SIM_STATE_READY;
import android.app.ActivityManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
import android.graphics.Color;
-import android.net.ConnectivityManager;
import android.net.INetworkStatsSession;
import android.net.NetworkPolicy;
import android.net.NetworkStats;
@@ -35,13 +32,11 @@
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.RemoteException;
-import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
import android.text.format.DateUtils;
import android.util.Log;
import android.util.SparseArray;
@@ -51,6 +46,12 @@
import android.widget.ImageView;
import android.widget.Spinner;
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
@@ -66,22 +67,21 @@
import java.util.Collections;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
-import androidx.loader.content.Loader;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
/**
* Panel showing data usage history across various networks, including options
* to inspect based on usage cycle and control through {@link NetworkPolicy}.
+
+ * Deprecated in favor of {@link DataUsageListV2}
+ *
+ * @deprecated
*/
-public class DataUsageList extends DataUsageBase {
+@Deprecated
+public class DataUsageList extends DataUsageBaseFragment {
public static final String EXTRA_SUB_ID = "sub_id";
public static final String EXTRA_NETWORK_TEMPLATE = "network_template";
- private static final String TAG = "DataUsage";
+ private static final String TAG = "DataUsageList";
private static final boolean LOGD = false;
private static final String KEY_USAGE_AMOUNT = "usage_amount";
@@ -140,7 +140,6 @@
mUidDetailProvider = new UidDetailProvider(context);
- addPreferencesFromResource(R.xml.data_usage_list);
mUsageAmount = findPreference(KEY_USAGE_AMOUNT);
mChart = (ChartDataUsagePreference) findPreference(KEY_CHART_DATA);
mApps = (PreferenceGroup) findPreference(KEY_APPS_GROUP);
@@ -183,7 +182,7 @@
public void setSelection(int position) {
mCycleSpinner.setSelection(position);
}
- }, mCycleListener, true);
+ }, mCycleListener);
mLoadingViewController = new LoadingViewController(
getView().findViewById(R.id.loading_container), getListView());
@@ -235,6 +234,16 @@
super.onDestroy();
}
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.data_usage_list;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
void processArgument() {
final Bundle args = getArguments();
if (args != null) {
@@ -338,7 +347,7 @@
/**
* Bind the given {@link NetworkStats}, or {@code null} to clear list.
*/
- public void bindStats(NetworkStats stats, int[] restrictedUids) {
+ private void bindStats(NetworkStats stats, int[] restrictedUids) {
ArrayList<AppItem> items = new ArrayList<>();
long largest = 0;
@@ -450,7 +459,7 @@
* @param entry the network stats entry to extract data usage from.
* @param itemCategory the item is categorized on the list view by this category. Must be
*/
- private static long accumulate(int collapseKey, final SparseArray<AppItem> knownItems,
+ private long accumulate(int collapseKey, final SparseArray<AppItem> knownItems,
NetworkStats.Entry entry, int itemCategory, ArrayList<AppItem> items, long largest) {
final int uid = entry.uid;
AppItem item = knownItems.get(collapseKey);
@@ -465,63 +474,6 @@
return Math.max(largest, item.total);
}
- /**
- * Test if device has a mobile data radio with SIM in ready state.
- */
- public static boolean hasReadyMobileRadio(Context context) {
- if (DataUsageUtils.TEST_RADIOS) {
- return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");
- }
-
- final ConnectivityManager conn = ConnectivityManager.from(context);
- final TelephonyManager tele = TelephonyManager.from(context);
-
- final List<SubscriptionInfo> subInfoList =
- SubscriptionManager.from(context).getActiveSubscriptionInfoList();
- // No activated Subscriptions
- if (subInfoList == null) {
- if (LOGD) Log.d(TAG, "hasReadyMobileRadio: subInfoList=null");
- return false;
- }
- // require both supported network and ready SIM
- boolean isReady = true;
- for (SubscriptionInfo subInfo : subInfoList) {
- isReady = isReady & tele.getSimState(subInfo.getSimSlotIndex()) == SIM_STATE_READY;
- if (LOGD) Log.d(TAG, "hasReadyMobileRadio: subInfo=" + subInfo);
- }
- boolean retVal = conn.isNetworkSupported(TYPE_MOBILE) && isReady;
- if (LOGD) {
- Log.d(TAG, "hasReadyMobileRadio:"
- + " conn.isNetworkSupported(TYPE_MOBILE)="
- + conn.isNetworkSupported(TYPE_MOBILE)
- + " isReady=" + isReady);
- }
- return retVal;
- }
-
- /*
- * TODO: consider adding to TelephonyManager or SubscriptionManager.
- */
- public static boolean hasReadyMobileRadio(Context context, int subId) {
- if (DataUsageUtils.TEST_RADIOS) {
- return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");
- }
-
- final ConnectivityManager conn = ConnectivityManager.from(context);
- final TelephonyManager tele = TelephonyManager.from(context);
- final int slotId = SubscriptionManager.getSlotIndex(subId);
- final boolean isReady = tele.getSimState(slotId) == SIM_STATE_READY;
-
- boolean retVal = conn.isNetworkSupported(TYPE_MOBILE) && isReady;
- if (LOGD) {
- Log.d(TAG, "hasReadyMobileRadio: subId=" + subId
- + " conn.isNetworkSupported(TYPE_MOBILE)="
- + conn.isNetworkSupported(TYPE_MOBILE)
- + " isReady=" + isReady);
- }
- return retVal;
- }
-
private OnItemSelectedListener mCycleListener = new OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
diff --git a/src/com/android/settings/datausage/DataUsageListV2.java b/src/com/android/settings/datausage/DataUsageListV2.java
new file mode 100644
index 0000000..4432fee
--- /dev/null
+++ b/src/com/android/settings/datausage/DataUsageListV2.java
@@ -0,0 +1,549 @@
+/*
+ * 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.datausage;
+
+import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+import static android.net.TrafficStats.UID_REMOVED;
+import static android.net.TrafficStats.UID_TETHERING;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.usage.NetworkStats;
+import android.app.usage.NetworkStats.Bucket;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.UserInfo;
+import android.graphics.Color;
+import android.net.ConnectivityManager;
+import android.net.NetworkPolicy;
+import android.net.NetworkTemplate;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.format.DateUtils;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ImageView;
+import android.widget.Spinner;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.datausage.CycleAdapter.SpinnerInterface;
+import com.android.settings.widget.LoadingViewController;
+import com.android.settingslib.AppItem;
+import com.android.settingslib.net.ChartDataLoaderCompat;
+import com.android.settingslib.net.NetworkCycleChartDataLoader;
+import com.android.settingslib.net.NetworkCycleChartData;
+import com.android.settingslib.net.NetworkStatsSummaryLoader;
+import com.android.settingslib.net.UidDetailProvider;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Panel showing data usage history across various networks, including options
+ * to inspect based on usage cycle and control through {@link NetworkPolicy}.
+ */
+public class DataUsageListV2 extends DataUsageBaseFragment {
+
+ static final String EXTRA_SUB_ID = "sub_id";
+ static final String EXTRA_NETWORK_TEMPLATE = "network_template";
+ static final String EXTRA_NETWORK_TYPE = "network_type";
+
+ private static final String TAG = "DataUsageListV2";
+ private static final boolean LOGD = false;
+
+ private static final String KEY_USAGE_AMOUNT = "usage_amount";
+ private static final String KEY_CHART_DATA = "chart_data";
+ private static final String KEY_APPS_GROUP = "apps_group";
+
+ private static final int LOADER_CHART_DATA = 2;
+ private static final int LOADER_SUMMARY = 3;
+
+ private final CellDataPreference.DataStateListener mDataStateListener =
+ new CellDataPreference.DataStateListener() {
+ @Override
+ public void onChange(boolean selfChange) {
+ updatePolicy();
+ }
+ };
+
+ private ChartDataUsagePreference mChart;
+ private TelephonyManager mTelephonyManager;
+
+ @VisibleForTesting
+ NetworkTemplate mTemplate;
+ @VisibleForTesting
+ int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ @VisibleForTesting
+ int mNetworkType;
+ private List<NetworkCycleChartData> mCycleData;
+
+ private LoadingViewController mLoadingViewController;
+ private UidDetailProvider mUidDetailProvider;
+ private CycleAdapter mCycleAdapter;
+ private Spinner mCycleSpinner;
+ private Preference mUsageAmount;
+ private PreferenceGroup mApps;
+ private View mHeader;
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsEvent.DATA_USAGE_LIST;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ final Activity activity = getActivity();
+
+ if (!isBandwidthControlEnabled()) {
+ Log.w(TAG, "No bandwidth control; leaving");
+ activity.finish();
+ }
+
+ mUidDetailProvider = new UidDetailProvider(activity);
+ mTelephonyManager = activity.getSystemService(TelephonyManager.class);
+ mUsageAmount = findPreference(KEY_USAGE_AMOUNT);
+ mChart = (ChartDataUsagePreference) findPreference(KEY_CHART_DATA);
+ mApps = (PreferenceGroup) findPreference(KEY_APPS_GROUP);
+ processArgument();
+ }
+
+ @Override
+ public void onViewCreated(View v, Bundle savedInstanceState) {
+ super.onViewCreated(v, savedInstanceState);
+
+ mHeader = setPinnedHeaderView(R.layout.apps_filter_spinner);
+ mHeader.findViewById(R.id.filter_settings).setOnClickListener(btn -> {
+ final Bundle args = new Bundle();
+ args.putParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE, mTemplate);
+ new SubSettingLauncher(getContext())
+ .setDestination(BillingCycleSettings.class.getName())
+ .setTitleRes(R.string.billing_cycle)
+ .setSourceMetricsCategory(getMetricsCategory())
+ .setArguments(args)
+ .launch();
+ });
+ mCycleSpinner = mHeader.findViewById(R.id.filter_spinner);
+ mCycleAdapter = new CycleAdapter(mCycleSpinner.getContext(), new SpinnerInterface() {
+ @Override
+ public void setAdapter(CycleAdapter cycleAdapter) {
+ mCycleSpinner.setAdapter(cycleAdapter);
+ }
+
+ @Override
+ public void setOnItemSelectedListener(OnItemSelectedListener listener) {
+ mCycleSpinner.setOnItemSelectedListener(listener);
+ }
+
+ @Override
+ public Object getSelectedItem() {
+ return mCycleSpinner.getSelectedItem();
+ }
+
+ @Override
+ public void setSelection(int position) {
+ mCycleSpinner.setSelection(position);
+ }
+ }, mCycleListener);
+
+ mLoadingViewController = new LoadingViewController(
+ getView().findViewById(R.id.loading_container), getListView());
+ mLoadingViewController.showLoadingViewDelayed();
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ mDataStateListener.setListener(true, mSubId, getContext());
+ updateBody();
+
+ // kick off background task to update stats
+ new AsyncTask<Void, Void, Void>() {
+ @Override
+ protected Void doInBackground(Void... params) {
+ try {
+ // wait a few seconds before kicking off
+ Thread.sleep(2 * DateUtils.SECOND_IN_MILLIS);
+ services.mStatsService.forceUpdate();
+ } catch (InterruptedException e) {
+ } catch (RemoteException e) {
+ }
+ return null;
+ }
+
+ @Override
+ protected void onPostExecute(Void result) {
+ if (isAdded()) {
+ updateBody();
+ }
+ }
+ }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ mDataStateListener.setListener(false, mSubId, getContext());
+ }
+
+ @Override
+ public void onDestroy() {
+ mUidDetailProvider.clearCache();
+ mUidDetailProvider = null;
+
+ super.onDestroy();
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.data_usage_list;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ void processArgument() {
+ final Bundle args = getArguments();
+ if (args != null) {
+ mSubId = args.getInt(EXTRA_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ mTemplate = args.getParcelable(EXTRA_NETWORK_TEMPLATE);
+ mNetworkType = args.getInt(EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_MOBILE);
+ }
+ if (mTemplate == null && mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ final Intent intent = getIntent();
+ mSubId = intent.getIntExtra(Settings.EXTRA_SUB_ID,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ mTemplate = intent.getParcelableExtra(Settings.EXTRA_NETWORK_TEMPLATE);
+ }
+ }
+
+ /**
+ * Update body content based on current tab. Loads network cycle data from system, and
+ * binds them to visible controls.
+ */
+ private void updateBody() {
+ if (!isAdded()) return;
+
+ final Context context = getActivity();
+
+ // kick off loader for network history
+ // TODO: consider chaining two loaders together instead of reloading
+ // network history when showing app detail.
+ getLoaderManager().restartLoader(LOADER_CHART_DATA,
+ ChartDataLoaderCompat.buildArgs(mTemplate, null), mNetworkCycleDataCallbacks);
+
+ // detail mode can change visible menus, invalidate
+ getActivity().invalidateOptionsMenu();
+
+ int seriesColor = context.getColor(R.color.sim_noitification);
+ if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ final SubscriptionInfo sir = services.mSubscriptionManager
+ .getActiveSubscriptionInfo(mSubId);
+
+ if (sir != null) {
+ seriesColor = sir.getIconTint();
+ }
+ }
+
+ final int secondaryColor = Color.argb(127, Color.red(seriesColor), Color.green(seriesColor),
+ Color.blue(seriesColor));
+ mChart.setColors(seriesColor, secondaryColor);
+ }
+
+ /**
+ * Update chart sweeps and cycle list to reflect {@link NetworkPolicy} for
+ * current {@link #mTemplate}.
+ */
+ private void updatePolicy() {
+ final NetworkPolicy policy = services.mPolicyEditor.getPolicy(mTemplate);
+ final View configureButton = mHeader.findViewById(R.id.filter_settings);
+ //SUB SELECT
+ if (isNetworkPolicyModifiable(policy, mSubId) && isMobileDataAvailable(mSubId)) {
+ mChart.setNetworkPolicy(policy);
+ configureButton.setVisibility(View.VISIBLE);
+ ((ImageView) configureButton).setColorFilter(android.R.color.white);
+ } else {
+ // controls are disabled; don't bind warning/limit sweeps
+ mChart.setNetworkPolicy(null);
+ configureButton.setVisibility(View.GONE);
+ }
+
+ // generate cycle list based on policy and available history
+ if (mCycleAdapter.updateCycleList(mCycleData)) {
+ updateDetailData();
+ }
+ }
+
+ /**
+ * Update details based on {@link #mChart} inspection range depending on
+ * current mode. Updates {@link #mAdapter} with sorted list
+ * of applications data usage.
+ */
+ private void updateDetailData() {
+ if (LOGD) Log.d(TAG, "updateDetailData()");
+
+ // kick off loader for detailed stats
+ getLoaderManager().restartLoader(LOADER_SUMMARY, null /* args */,
+ mNetworkStatsDetailCallbacks);
+
+ final long totalBytes = mCycleData != null
+ ? mCycleData.get(mCycleSpinner.getSelectedItemPosition()).getTotalUsage() : 0;
+ final CharSequence totalPhrase = DataUsageUtils.formatDataUsage(getActivity(), totalBytes);
+ mUsageAmount.setTitle(getString(R.string.data_used_template, totalPhrase));
+ }
+
+ /**
+ * Bind the given {@link NetworkStats}, or {@code null} to clear list.
+ */
+ private void bindStats(NetworkStats stats, int[] restrictedUids) {
+ mApps.removeAll();
+ if (stats == null) {
+ if (LOGD) {
+ Log.d(TAG, "No network stats data. App list cleared.");
+ }
+ return;
+ }
+
+ final ArrayList<AppItem> items = new ArrayList<>();
+ long largest = 0;
+
+ final int currentUserId = ActivityManager.getCurrentUser();
+ final UserManager userManager = UserManager.get(getContext());
+ final List<UserHandle> profiles = userManager.getUserProfiles();
+ final SparseArray<AppItem> knownItems = new SparseArray<AppItem>();
+
+ final Bucket bucket = new Bucket();
+ while (stats.hasNextBucket() && stats.getNextBucket(bucket)) {
+ // Decide how to collapse items together
+ final int uid = bucket.getUid();
+ final int collapseKey;
+ final int category;
+ final int userId = UserHandle.getUserId(uid);
+ if (UserHandle.isApp(uid)) {
+ if (profiles.contains(new UserHandle(userId))) {
+ if (userId != currentUserId) {
+ // Add to a managed user item.
+ final int managedKey = UidDetailProvider.buildKeyForUser(userId);
+ largest = accumulate(managedKey, knownItems, bucket,
+ AppItem.CATEGORY_USER, items, largest);
+ }
+ // Add to app item.
+ collapseKey = uid;
+ category = AppItem.CATEGORY_APP;
+ } else {
+ // If it is a removed user add it to the removed users' key
+ final UserInfo info = userManager.getUserInfo(userId);
+ if (info == null) {
+ collapseKey = UID_REMOVED;
+ category = AppItem.CATEGORY_APP;
+ } else {
+ // Add to other user item.
+ collapseKey = UidDetailProvider.buildKeyForUser(userId);
+ category = AppItem.CATEGORY_USER;
+ }
+ }
+ } else if (uid == UID_REMOVED || uid == UID_TETHERING) {
+ collapseKey = uid;
+ category = AppItem.CATEGORY_APP;
+ } else {
+ collapseKey = android.os.Process.SYSTEM_UID;
+ category = AppItem.CATEGORY_APP;
+ }
+ largest = accumulate(collapseKey, knownItems, bucket, category, items, largest);
+ }
+ stats.close();
+
+ final int restrictedUidsMax = restrictedUids.length;
+ for (int i = 0; i < restrictedUidsMax; ++i) {
+ final int uid = restrictedUids[i];
+ // Only splice in restricted state for current user or managed users
+ if (!profiles.contains(new UserHandle(UserHandle.getUserId(uid)))) {
+ continue;
+ }
+
+ AppItem item = knownItems.get(uid);
+ if (item == null) {
+ item = new AppItem(uid);
+ item.total = -1;
+ items.add(item);
+ knownItems.put(item.key, item);
+ }
+ item.restricted = true;
+ }
+
+ Collections.sort(items);
+ for (int i = 0; i < items.size(); i++) {
+ final int percentTotal = largest != 0 ? (int) (items.get(i).total * 100 / largest) : 0;
+ AppDataUsagePreference preference = new AppDataUsagePreference(getContext(),
+ items.get(i), percentTotal, mUidDetailProvider);
+ preference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ AppDataUsagePreference pref = (AppDataUsagePreference) preference;
+ AppItem item = pref.getItem();
+ startAppDataUsage(item);
+ return true;
+ }
+ });
+ mApps.addPreference(preference);
+ }
+ }
+
+ private void startAppDataUsage(AppItem item) {
+ final Bundle args = new Bundle();
+ args.putParcelable(AppDataUsageV2.ARG_APP_ITEM, item);
+ args.putParcelable(AppDataUsageV2.ARG_NETWORK_TEMPLATE, mTemplate);
+
+ new SubSettingLauncher(getContext())
+ .setDestination(AppDataUsageV2.class.getName())
+ .setTitleRes(R.string.app_data_usage)
+ .setArguments(args)
+ .setSourceMetricsCategory(getMetricsCategory())
+ .launch();
+ }
+
+ /**
+ * Accumulate data usage of a network stats entry for the item mapped by the collapse key.
+ * Creates the item if needed.
+ *
+ * @param collapseKey the collapse key used to map the item.
+ * @param knownItems collection of known (already existing) items.
+ * @param bucket the network stats bucket to extract data usage from.
+ * @param itemCategory the item is categorized on the list view by this category. Must be
+ */
+ private static long accumulate(int collapseKey, final SparseArray<AppItem> knownItems,
+ Bucket bucket, int itemCategory, ArrayList<AppItem> items, long largest) {
+ final int uid = bucket.getUid();
+ AppItem item = knownItems.get(collapseKey);
+ if (item == null) {
+ item = new AppItem(collapseKey);
+ item.category = itemCategory;
+ items.add(item);
+ knownItems.put(item.key, item);
+ }
+ item.addUid(uid);
+ item.total += bucket.getRxBytes() + bucket.getTxBytes();
+ return Math.max(largest, item.total);
+ }
+
+ private OnItemSelectedListener mCycleListener = new OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+ final CycleAdapter.CycleItem cycle = (CycleAdapter.CycleItem)
+ mCycleSpinner.getSelectedItem();
+
+ if (LOGD) {
+ Log.d(TAG, "showing cycle " + cycle + ", start=" + cycle.start + ", end="
+ + cycle.end + "]");
+ }
+
+ // update chart to show selected cycle, and update detail data
+ // to match updated sweep bounds.
+ mChart.setNetworkCycleData(mCycleData.get(position));
+
+ updateDetailData();
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView<?> parent) {
+ // ignored
+ }
+ };
+
+ private final LoaderCallbacks<List<NetworkCycleChartData>> mNetworkCycleDataCallbacks =
+ new LoaderCallbacks<List<NetworkCycleChartData>>() {
+ @Override
+ public Loader<List<NetworkCycleChartData>> onCreateLoader(int id, Bundle args) {
+ return NetworkCycleChartDataLoader.builder(getContext())
+ .setNetworkTemplate(mTemplate)
+ .setSubscriberId(mTelephonyManager.getSubscriberId(mSubId))
+ .build();
+ }
+
+ @Override
+ public void onLoadFinished(Loader<List<NetworkCycleChartData>> loader,
+ List<NetworkCycleChartData> data) {
+ mLoadingViewController.showContent(false /* animate */);
+ mCycleData = data;
+ // calculate policy cycles based on available data
+ updatePolicy();
+ }
+
+ @Override
+ public void onLoaderReset(Loader<List<NetworkCycleChartData>> loader) {
+ mCycleData = null;
+ }
+ };
+
+ private final LoaderCallbacks<NetworkStats> mNetworkStatsDetailCallbacks =
+ new LoaderCallbacks<NetworkStats>() {
+ @Override
+ public Loader<NetworkStats> onCreateLoader(int id, Bundle args) {
+ return new NetworkStatsSummaryLoader.Builder(getContext())
+ .setStartTime(mChart.getInspectStart())
+ .setEndTime(mChart.getInspectEnd())
+ .setNetworkType(mNetworkType)
+ .setSubscriberId(mTelephonyManager.getSubscriberId(mSubId))
+ .build();
+ }
+
+ @Override
+ public void onLoadFinished(Loader<NetworkStats> loader, NetworkStats data) {
+ final int[] restrictedUids = services.mPolicyManager.getUidsWithPolicy(
+ POLICY_REJECT_METERED_BACKGROUND);
+ bindStats(data, restrictedUids);
+ updateEmptyVisible();
+ }
+
+ @Override
+ public void onLoaderReset(Loader<NetworkStats> loader) {
+ bindStats(null, new int[0]);
+ updateEmptyVisible();
+ }
+
+ private void updateEmptyVisible() {
+ if ((mApps.getPreferenceCount() != 0) !=
+ (getPreferenceScreen().getPreferenceCount() != 0)) {
+ if (mApps.getPreferenceCount() != 0) {
+ getPreferenceScreen().addPreference(mUsageAmount);
+ getPreferenceScreen().addPreference(mApps);
+ } else {
+ getPreferenceScreen().removeAll();
+ }
+ }
+ }
+ };
+}
diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java
index 1658c46..aa4e646 100644
--- a/src/com/android/settings/datausage/DataUsagePreference.java
+++ b/src/com/android/settings/datausage/DataUsagePreference.java
@@ -17,19 +17,22 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.TypedArray;
+import android.net.ConnectivityManager;
import android.net.NetworkTemplate;
import android.os.Bundle;
import android.util.AttributeSet;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settingslib.net.DataUsageController;
+import android.util.FeatureFlagUtils;
import androidx.annotation.VisibleForTesting;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.net.DataUsageController;
+
public class DataUsagePreference extends Preference implements TemplatePreference {
private NetworkTemplate mTemplate;
@@ -48,8 +51,7 @@
}
@Override
- public void setTemplate(NetworkTemplate template, int subId,
- NetworkServices services) {
+ public void setTemplate(NetworkTemplate template, int subId, NetworkServices services) {
mTemplate = template;
mSubId = subId;
final DataUsageController controller = getDataUsageController();
@@ -63,7 +65,7 @@
DataUsageUtils.formatDataUsage(getContext(), usageInfo.usageLevel),
usageInfo.period));
}
- final long usageLevel = controller.getHistoriclUsageLevel(template);
+ final long usageLevel = controller.getHistoricalUsageLevel(template);
if (usageLevel > 0L) {
setIntent(getIntent());
} else {
@@ -75,12 +77,24 @@
@Override
public Intent getIntent() {
final Bundle args = new Bundle();
- args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
- args.putInt(DataUsageList.EXTRA_SUB_ID, mSubId);
- final SubSettingLauncher launcher = new SubSettingLauncher(getContext())
+ final SubSettingLauncher launcher;
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_V2)) {
+ args.putParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE, mTemplate);
+ args.putInt(DataUsageListV2.EXTRA_SUB_ID, mSubId);
+ args.putInt(DataUsageListV2.EXTRA_NETWORK_TYPE, mTemplate.isMatchRuleMobile()
+ ? ConnectivityManager.TYPE_MOBILE : ConnectivityManager.TYPE_WIFI);
+ launcher = new SubSettingLauncher(getContext())
+ .setArguments(args)
+ .setDestination(DataUsageListV2.class.getName())
+ .setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN);
+ } else {
+ args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
+ args.putInt(DataUsageList.EXTRA_SUB_ID, mSubId);
+ launcher = new SubSettingLauncher(getContext())
.setArguments(args)
.setDestination(DataUsageList.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN);
+ }
if (mTemplate.isMatchRuleMobile()) {
launcher.setTitleRes(R.string.app_cellular_data_usage);
} else {
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index d8f8f02..97715db 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -29,6 +29,10 @@
import android.text.format.Formatter;
import android.text.style.RelativeSizeSpan;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -43,10 +47,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Settings preference fragment that displays data usage summary.
*/
@@ -283,8 +283,7 @@
formatUsedData()));
} else {
final DataUsageController.DataUsageInfo info =
- mDataController
- .getDataUsageInfo(NetworkTemplate.buildTemplateWifiWildcard());
+ mDataController.getWifiDataUsageInfo();
if (info == null) {
mSummaryLoader.setSummary(this, null);
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index 8744560..92d3e29 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -33,6 +33,10 @@
import android.widget.ProgressBar;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
@@ -43,10 +47,6 @@
import java.util.Objects;
import java.util.concurrent.TimeUnit;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
/**
* Provides a summary of data usage.
*/
@@ -178,7 +178,7 @@
carrierInfo.setVisibility(View.GONE);
limitInfo.setVisibility(View.GONE);
- final long usageLevel = getHistoriclUsageLevel();
+ final long usageLevel = getHistoricalUsageLevel();
if (usageLevel > 0L) {
launchButton.setOnClickListener((view) -> {
launchWifiDataUsage(getContext());
@@ -339,9 +339,9 @@
}
@VisibleForTesting
- long getHistoriclUsageLevel() {
+ long getHistoricalUsageLevel() {
final DataUsageController controller = new DataUsageController(getContext());
- return controller.getHistoriclUsageLevel(NetworkTemplate.buildTemplateWifiWildcard());
+ return controller.getHistoricalUsageLevel(NetworkTemplate.buildTemplateWifiWildcard());
}
}
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index 8cbd82d..d5707c4 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -29,6 +29,10 @@
import android.util.Log;
import android.util.RecurrenceRule;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.util.CollectionUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -42,10 +46,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* This is the controller for the top of the data usage screen that retrieves carrier data from the
* new subscriptions framework API if available. The controller reads subscription information from
diff --git a/src/com/android/settings/datausage/DataUsageUtils.java b/src/com/android/settings/datausage/DataUsageUtils.java
index 803bc37..53565ac 100644
--- a/src/com/android/settings/datausage/DataUsageUtils.java
+++ b/src/com/android/settings/datausage/DataUsageUtils.java
@@ -14,8 +14,12 @@
package com.android.settings.datausage;
+import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_WIFI;
+import static android.telephony.TelephonyManager.SIM_STATE_READY;
+import android.app.usage.NetworkStats.Bucket;
+import android.app.usage.NetworkStatsManager;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.INetworkStatsService;
@@ -31,6 +35,10 @@
import android.text.BidiFormatter;
import android.text.format.Formatter;
import android.text.format.Formatter.BytesResult;
+import android.util.FeatureFlagUtils;
+import android.util.Log;
+
+import com.android.settings.core.FeatureFlags;
import java.util.List;
@@ -40,7 +48,9 @@
public final class DataUsageUtils {
static final boolean TEST_RADIOS = false;
static final String TEST_RADIOS_PROP = "test.radios";
+ private static final boolean LOGD = false;
private static final String ETHERNET = "ethernet";
+ private static final String TAG = "DataUsageUtils";
private DataUsageUtils() {
}
@@ -64,28 +74,48 @@
}
final ConnectivityManager conn = ConnectivityManager.from(context);
- final boolean hasEthernet = conn.isNetworkSupported(ConnectivityManager.TYPE_ETHERNET);
-
- final long ethernetBytes;
- try {
- INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
- ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
-
- INetworkStatsSession statsSession = statsService.openSession();
- if (statsSession != null) {
- ethernetBytes = statsSession.getSummaryForNetwork(
- NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
- .getTotalBytes();
- TrafficStats.closeQuietly(statsSession);
- } else {
- ethernetBytes = 0;
- }
- } catch (RemoteException e) {
- throw new RuntimeException(e);
+ if (!conn.isNetworkSupported(ConnectivityManager.TYPE_ETHERNET)) {
+ return false;
}
- // only show ethernet when both hardware present and traffic has occurred
- return hasEthernet && ethernetBytes > 0;
+ if (FeatureFlagUtils.isEnabled(context, FeatureFlags.DATA_USAGE_V2)) {
+ final TelephonyManager telephonyManager = TelephonyManager.from(context);;
+ final NetworkStatsManager networkStatsManager =
+ context.getSystemService(NetworkStatsManager.class);
+ boolean hasEthernetUsage = false;
+ try {
+ final Bucket bucket = networkStatsManager.querySummaryForUser(
+ ConnectivityManager.TYPE_ETHERNET, telephonyManager.getSubscriberId(),
+ 0L /* startTime */, System.currentTimeMillis() /* endTime */);
+ if (bucket != null) {
+ hasEthernetUsage = bucket.getRxBytes() > 0 || bucket.getTxBytes() > 0;
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Exception querying network detail.", e);
+ }
+ return hasEthernetUsage;
+ } else {
+ final long ethernetBytes;
+ try {
+ INetworkStatsService statsService = INetworkStatsService.Stub.asInterface(
+ ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
+
+ INetworkStatsSession statsSession = statsService.openSession();
+ if (statsSession != null) {
+ ethernetBytes = statsSession.getSummaryForNetwork(
+ NetworkTemplate.buildTemplateEthernet(), Long.MIN_VALUE, Long.MAX_VALUE)
+ .getTotalBytes();
+ TrafficStats.closeQuietly(statsSession);
+ } else {
+ ethernetBytes = 0;
+ }
+ } catch (RemoteException e) {
+ throw new RuntimeException(e);
+ }
+
+ // only show ethernet when both hardware present and traffic has occurred
+ return ethernetBytes > 0;
+ }
}
/**
@@ -99,6 +129,42 @@
}
/**
+ * Test if device has a mobile data radio with SIM in ready state.
+ */
+ public static boolean hasReadyMobileRadio(Context context) {
+ if (DataUsageUtils.TEST_RADIOS) {
+ return SystemProperties.get(DataUsageUtils.TEST_RADIOS_PROP).contains("mobile");
+ }
+ final List<SubscriptionInfo> subInfoList =
+ SubscriptionManager.from(context).getActiveSubscriptionInfoList();
+ // No activated Subscriptions
+ if (subInfoList == null) {
+ if (LOGD) {
+ Log.d(TAG, "hasReadyMobileRadio: subInfoList=null");
+ }
+ return false;
+ }
+ final TelephonyManager tele = TelephonyManager.from(context);
+ // require both supported network and ready SIM
+ boolean isReady = true;
+ for (SubscriptionInfo subInfo : subInfoList) {
+ isReady = isReady & tele.getSimState(subInfo.getSimSlotIndex()) == SIM_STATE_READY;
+ if (LOGD) {
+ Log.d(TAG, "hasReadyMobileRadio: subInfo=" + subInfo);
+ }
+ }
+ final ConnectivityManager conn = ConnectivityManager.from(context);
+ final boolean retVal = conn.isNetworkSupported(TYPE_MOBILE) && isReady;
+ if (LOGD) {
+ Log.d(TAG, "hasReadyMobileRadio:"
+ + " conn.isNetworkSupported(TYPE_MOBILE)="
+ + conn.isNetworkSupported(TYPE_MOBILE)
+ + " isReady=" + isReady);
+ }
+ return retVal;
+ }
+
+ /**
* Whether device has a Wi-Fi data radio.
*/
public static boolean hasWifiRadio(Context context) {
@@ -106,8 +172,7 @@
return SystemProperties.get(TEST_RADIOS_PROP).contains("wifi");
}
- ConnectivityManager connectivityManager =
- context.getSystemService(ConnectivityManager.class);
+ final ConnectivityManager connectivityManager = ConnectivityManager.from(context);
return connectivityManager != null && connectivityManager.isNetworkSupported(TYPE_WIFI);
}
diff --git a/src/com/android/settings/datausage/SpinnerPreference.java b/src/com/android/settings/datausage/SpinnerPreference.java
index 15a07dc..67298a1 100644
--- a/src/com/android/settings/datausage/SpinnerPreference.java
+++ b/src/com/android/settings/datausage/SpinnerPreference.java
@@ -18,13 +18,13 @@
import android.util.AttributeSet;
import android.view.View;
import android.widget.AdapterView;
-import android.widget.Spinner;
-
-import com.android.settings.R;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+import com.android.settingslib.widget.settingsspinner.SettingsSpinner;
+
public class SpinnerPreference extends Preference implements CycleAdapter.SpinnerInterface {
private CycleAdapter mAdapter;
@@ -63,7 +63,7 @@
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
- Spinner spinner = (Spinner) holder.findViewById(R.id.cycles_spinner);
+ SettingsSpinner spinner = (SettingsSpinner) holder.findViewById(R.id.cycles_spinner);
spinner.setAdapter(mAdapter);
spinner.setSelection(mPosition);
spinner.setOnItemSelectedListener(mOnSelectedListener);
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
index 0c462db..824c102 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
@@ -13,12 +13,14 @@
*/
package com.android.settings.datausage;
-import static com.android.settingslib.RestrictedLockUtils.checkIfMeteredDataRestricted;
+import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfMeteredDataRestricted;
import android.content.Context;
import android.os.UserHandle;
import android.view.View;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.dashboard.DashboardFragment;
@@ -28,8 +30,6 @@
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import androidx.preference.PreferenceViewHolder;
-
public class UnrestrictedDataAccessPreference extends AppSwitchPreference implements
DataSaverBackend.Listener {
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
index d686d98..efc20f0 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
@@ -13,12 +13,16 @@
*/
package com.android.settings.datausage;
-import static com.android.settingslib.RestrictedLockUtils.checkIfMeteredDataRestricted;
+import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfMeteredDataRestricted;
import android.app.Application;
import android.content.Context;
import android.os.UserHandle;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppStateBaseBridge;
@@ -38,10 +42,6 @@
import java.util.Set;
import java.util.TreeSet;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class UnrestrictedDataAccessPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnStart, OnStop, OnDestroy, ApplicationsState.Callbacks,
diff --git a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java
index f191a13..7b7e064 100644
--- a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java
@@ -22,15 +22,15 @@
import android.text.TextUtils;
import android.text.format.DateFormat;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+import androidx.preference.TwoStatePreference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Locale;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-import androidx.preference.TwoStatePreference;
-
public class AutoTimeFormatPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java
index a5da34a..bf6ecb4 100644
--- a/src/com/android/settings/datetime/AutoTimePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java
@@ -19,13 +19,14 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class AutoTimePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
@@ -74,6 +75,6 @@
}
private RestrictedLockUtils.EnforcedAdmin getEnforcedAdminProperty() {
- return RestrictedLockUtils.checkIfAutoTimeRequired(mContext);
+ return RestrictedLockUtilsInternal.checkIfAutoTimeRequired(mContext);
}
}
diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
index a0355b2..4426bde 100644
--- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
+++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java
@@ -19,13 +19,13 @@
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.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
public class AutoTimeZonePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/datetime/DatePreferenceController.java b/src/com/android/settings/datetime/DatePreferenceController.java
index ceb65ca..1704bd6 100644
--- a/src/com/android/settings/datetime/DatePreferenceController.java
+++ b/src/com/android/settings/datetime/DatePreferenceController.java
@@ -24,15 +24,15 @@
import android.text.format.DateFormat;
import android.widget.DatePicker;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Calendar;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class DatePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, DatePickerDialog.OnDateSetListener {
diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
index 25af357..3ad879a 100644
--- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java
+++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
@@ -22,16 +22,16 @@
import android.text.TextUtils;
import android.text.format.DateFormat;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+import androidx.preference.TwoStatePreference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Calendar;
import java.util.Date;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-import androidx.preference.TwoStatePreference;
-
public class TimeFormatPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/datetime/TimePreferenceController.java b/src/com/android/settings/datetime/TimePreferenceController.java
index 8bb292c..3ca26bc 100644
--- a/src/com/android/settings/datetime/TimePreferenceController.java
+++ b/src/com/android/settings/datetime/TimePreferenceController.java
@@ -24,14 +24,14 @@
import android.text.format.DateFormat;
import android.widget.TimePicker;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Calendar;
-import androidx.preference.Preference;
-
public class TimePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, TimePickerDialog.OnTimeSetListener {
diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java
index 76c2455..a19f055 100644
--- a/src/com/android/settings/datetime/TimeZonePreferenceController.java
+++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java
@@ -18,6 +18,9 @@
import android.content.Context;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -25,9 +28,6 @@
import java.util.Calendar;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class TimeZonePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java
index a067687..ff980b2 100644
--- a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java
+++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java
@@ -24,6 +24,12 @@
import android.widget.Filter;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.R;
import com.android.settings.datetime.timezone.BaseTimeZonePicker.OnListItemClickListener;
@@ -31,12 +37,6 @@
import java.util.List;
import java.util.Locale;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* Used with {@class BaseTimeZonePicker}. It renders text in each item into list view. A list of
* {@class AdapterItem} must be provided when an instance is created.
diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java
index fa0be2e..1ed8516 100644
--- a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java
+++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java
@@ -24,6 +24,8 @@
import android.icu.text.SimpleDateFormat;
import android.icu.util.Calendar;
+import androidx.annotation.Nullable;
+
import com.android.settings.R;
import com.android.settings.datetime.timezone.model.TimeZoneData;
@@ -32,8 +34,6 @@
import java.util.List;
import java.util.Locale;
-import androidx.annotation.Nullable;
-
/**
* Render a list of {@class TimeZoneInfo} into the list view in {@class BaseTimeZonePicker}
*/
diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
index 5e1471b..887b9f2 100644
--- a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
+++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java
@@ -27,6 +27,9 @@
import android.widget.SearchView;
import android.widget.TextView;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.datetime.timezone.model.TimeZoneData;
@@ -34,9 +37,6 @@
import java.util.Locale;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* It's abstract class. Subclass should use it with {@class BaseTimeZoneAdapter} and
* {@class AdapterItem} to provide a list view with text search capability.
diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java
index 89b68cb..8a0d737 100644
--- a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java
+++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java
@@ -18,12 +18,12 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.google.common.base.Objects;
-import androidx.preference.Preference;
-
public abstract class BaseTimeZonePreferenceController extends BasePreferenceController {
private OnPreferenceClickListener mOnClickListener;
diff --git a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java
index ea4c7ee..0abf4e4 100644
--- a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java
+++ b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java
@@ -23,6 +23,8 @@
import android.os.Bundle;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
@@ -36,8 +38,6 @@
import java.util.Set;
import java.util.TreeSet;
-import androidx.annotation.VisibleForTesting;
-
/**
* Render a list of regions into a list view.
*/
diff --git a/src/com/android/settings/datetime/timezone/RegionZonePicker.java b/src/com/android/settings/datetime/timezone/RegionZonePicker.java
index ea8d328..83d71f1 100644
--- a/src/com/android/settings/datetime/timezone/RegionZonePicker.java
+++ b/src/com/android/settings/datetime/timezone/RegionZonePicker.java
@@ -23,6 +23,9 @@
import android.os.Bundle;
import android.util.Log;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.datetime.timezone.model.FilteredCountryTimeZones;
@@ -36,9 +39,6 @@
import java.util.List;
import java.util.TreeSet;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-
/**
* Given a region, render a list of time zone {@class TimeZoneInfo} into a list view.
*/
diff --git a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java
index 8d08c6b..a297ce6 100644
--- a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java
+++ b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java
@@ -18,10 +18,10 @@
import android.content.Context;
-import com.android.settings.R;
-
import androidx.preference.Preference;
+import com.android.settings.R;
+
public class RegionZonePreferenceController extends BaseTimeZonePreferenceController {
private static final String PREFERENCE_KEY = "region_zone";
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
index 9544829..a819f10 100644
--- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
+++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java
@@ -17,22 +17,22 @@
package com.android.settings.datetime.timezone;
import android.content.Context;
-import android.icu.impl.OlsonTimeZone;
import android.icu.text.DateFormat;
import android.icu.text.DisplayContext;
import android.icu.text.SimpleDateFormat;
+import android.icu.util.BasicTimeZone;
import android.icu.util.Calendar;
import android.icu.util.TimeZone;
import android.icu.util.TimeZoneTransition;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settingslib.widget.FooterPreference;
import java.util.Date;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class TimeZoneInfoPreferenceController extends BaseTimeZonePreferenceController {
private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER;
@@ -115,17 +115,17 @@
}
private TimeZoneTransition findNextDstTransition(TimeZone timeZone) {
- if (!(timeZone instanceof OlsonTimeZone)) {
+ if (!(timeZone instanceof BasicTimeZone)) {
return null;
}
- final OlsonTimeZone olsonTimeZone = (OlsonTimeZone) timeZone;
- TimeZoneTransition transition = olsonTimeZone.getNextTransition(
+ final BasicTimeZone basicTimeZone = (BasicTimeZone) timeZone;
+ TimeZoneTransition transition = basicTimeZone.getNextTransition(
mDate.getTime(), /* inclusive */ false);
do {
if (transition.getTo().getDSTSavings() != transition.getFrom().getDSTSavings()) {
break;
}
- transition = olsonTimeZone.getNextTransition(
+ transition = basicTimeZone.getNextTransition(
transition.getTime(), /*inclusive */ false);
} while (transition != null);
return transition;
diff --git a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java
index 23b09f5..a20cdb5 100644
--- a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java
+++ b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java
@@ -28,6 +28,9 @@
import android.view.MenuInflater;
import android.view.MenuItem;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceCategory;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
@@ -44,9 +47,6 @@
import java.util.Objects;
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceCategory;
-
/**
* The class displays a time zone picker either by regions or fixed offset time zones.
*/
diff --git a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
index b7ba66d..c914845 100644
--- a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
+++ b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
@@ -15,6 +15,9 @@
*/
package com.android.settings.datetime.timezone.model;
+import androidx.annotation.VisibleForTesting;
+import androidx.collection.ArraySet;
+
import libcore.util.CountryTimeZones;
import libcore.util.CountryZonesFinder;
import libcore.util.TimeZoneFinder;
@@ -26,9 +29,6 @@
import java.util.Locale;
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-import androidx.collection.ArraySet;
-
/**
* Wrapper of CountryZonesFinder to normalize the country code and only show the regions that are
* has time zone shown in the time zone picker.
diff --git a/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java b/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java
index 7ca157e..e901833 100644
--- a/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java
+++ b/src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java
@@ -19,11 +19,11 @@
import android.content.Context;
import android.os.Bundle;
-import com.android.settingslib.utils.AsyncLoaderCompat;
-
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
+import com.android.settingslib.utils.AsyncLoaderCompat;
+
public class TimeZoneDataLoader extends AsyncLoaderCompat<TimeZoneData> {
public TimeZoneDataLoader(Context context) {
diff --git a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java
index 9bfe032..8e3f8ca 100644
--- a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java
+++ b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java
@@ -19,11 +19,11 @@
import android.app.Dialog;
import android.os.Bundle;
-import com.android.settings.R;
-
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
+import com.android.settings.R;
+
/**
* Fragment to warn the user about activating the storage manager.
*/
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
index d228fa7..d11e68b 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java
@@ -19,14 +19,14 @@
import android.text.format.DateUtils;
import android.text.format.Formatter;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Handles the wall of text which appears below the options in the Storage Management settings drill
* down.
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index a0c450a..221afb0 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -24,6 +24,10 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.preference.DropDownPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -38,10 +42,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.DropDownPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-
/**
* AutomaticStorageManagerSettings is the Settings screen for configuration and management of the
* automatic storage manager.
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java
index 3182d8a..eab19be 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java
@@ -21,15 +21,15 @@
import android.provider.Settings;
import android.widget.Switch;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.Preconditions;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.Utils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
-
/** Handles the logic for flipping the storage management toggle on a {@link SwitchBar}. */
public class AutomaticStorageManagerSwitchBarController
implements SwitchBar.OnSwitchChangeListener {
diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
index b27a362..0f21dee 100644
--- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
+++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java
@@ -22,6 +22,11 @@
import android.bluetooth.BluetoothDevice;
import android.content.Context;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -29,11 +34,6 @@
import com.android.settingslib.core.lifecycle.events.OnDestroy;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public abstract class AbstractBluetoothA2dpPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin, BluetoothServiceConnectionListener, LifecycleObserver,
diff --git a/src/com/android/settings/development/AdbPreferenceController.java b/src/com/android/settings/development/AdbPreferenceController.java
index 32812e5..468c5bd 100644
--- a/src/com/android/settings/development/AdbPreferenceController.java
+++ b/src/com/android/settings/development/AdbPreferenceController.java
@@ -19,12 +19,12 @@
import android.content.Context;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
-
import androidx.annotation.Nullable;
import androidx.preference.Preference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
+
public class AdbPreferenceController extends AbstractEnableAdbPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
index 974591c..14474f2 100644
--- a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
+++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class AllowAppsOnExternalPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/AngleEnabledAppPreferenceController.java b/src/com/android/settings/development/AngleEnabledAppPreferenceController.java
new file mode 100644
index 0000000..3a7f6bf
--- /dev/null
+++ b/src/com/android/settings/development/AngleEnabledAppPreferenceController.java
@@ -0,0 +1,119 @@
+/*
+ * 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 static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
+ .REQUEST_CODE_ANGLE_ENABLED_APP;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class AngleEnabledAppPreferenceController extends DeveloperOptionsPreferenceController
+ implements PreferenceControllerMixin, OnActivityResultListener {
+
+ private static final String ANGLE_ENABLED_APP_KEY = "angle_enabled_app";
+
+ private final DevelopmentSettingsDashboardFragment mFragment;
+ private final PackageManager mPackageManager;
+
+ public AngleEnabledAppPreferenceController(Context context,
+ DevelopmentSettingsDashboardFragment fragment) {
+ super(context);
+ mFragment = fragment;
+ mPackageManager = mContext.getPackageManager();
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return ANGLE_ENABLED_APP_KEY;
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (ANGLE_ENABLED_APP_KEY.equals(preference.getKey())) {
+ // pass it on to settings
+ final Intent intent = getActivityStartIntent();
+ mFragment.startActivityForResult(intent, REQUEST_CODE_ANGLE_ENABLED_APP);
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ updatePreferenceSummary();
+ }
+
+ @Override
+ public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode != REQUEST_CODE_ANGLE_ENABLED_APP || resultCode != Activity.RESULT_OK) {
+ return false;
+ }
+ Settings.Global.putString(mContext.getContentResolver(), Settings.Global.ANGLE_ENABLED_APP,
+ data.getAction());
+ updatePreferenceSummary();
+ return true;
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ super.onDeveloperOptionsSwitchDisabled();
+ mPreference.setSummary(mContext.getResources().getString(
+ R.string.angle_enabled_app_not_set));
+ }
+
+ @VisibleForTesting
+ Intent getActivityStartIntent() {
+ Intent intent = new Intent(mContext, AppPicker.class);
+ intent.putExtra(AppPicker.EXTRA_NON_SYSTEM, true /* value */);
+ return intent;
+ }
+
+ private void updatePreferenceSummary() {
+ final String angleEnabledApp = Settings.Global.getString(
+ mContext.getContentResolver(), Settings.Global.ANGLE_ENABLED_APP);
+ if (angleEnabledApp != null && angleEnabledApp.length() > 0) {
+ mPreference.setSummary(mContext.getResources().getString(
+ R.string.angle_enabled_app_set,
+ getAppLabel(angleEnabledApp)));
+ } else {
+ mPreference.setSummary(mContext.getResources().getString(
+ R.string.angle_enabled_app_not_set));
+ }
+ }
+
+ private String getAppLabel(String angleEnabledApp) {
+ try {
+ final ApplicationInfo ai = mPackageManager.getApplicationInfo(angleEnabledApp,
+ PackageManager.GET_DISABLED_COMPONENTS);
+ final CharSequence lab = mPackageManager.getApplicationLabel(ai);
+ return lab != null ? lab.toString() : angleEnabledApp;
+ } catch (PackageManager.NameNotFoundException e) {
+ return angleEnabledApp;
+ }
+ }
+}
diff --git a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
index e53037c..766352a 100644
--- a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
+++ b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java
@@ -21,14 +21,14 @@
import android.os.ServiceManager;
import android.view.IWindowManager;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class AnimatorDurationScalePreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/AppPicker.java b/src/com/android/settings/development/AppPicker.java
index 433f31a..04f318f 100644
--- a/src/com/android/settings/development/AppPicker.java
+++ b/src/com/android/settings/development/AppPicker.java
@@ -45,9 +45,11 @@
public static final String EXTRA_REQUESTIING_PERMISSION
= "com.android.settings.extra.REQUESTIING_PERMISSION";
public static final String EXTRA_DEBUGGABLE = "com.android.settings.extra.DEBUGGABLE";
+ public static final String EXTRA_NON_SYSTEM = "com.android.settings.extra.NON_SYSTEM";
private String mPermissionName;
private boolean mDebuggableOnly;
+ private boolean mNonSystemOnly;
@Override
protected void onCreate(Bundle icicle) {
@@ -55,6 +57,7 @@
mPermissionName = getIntent().getStringExtra(EXTRA_REQUESTIING_PERMISSION);
mDebuggableOnly = getIntent().getBooleanExtra(EXTRA_DEBUGGABLE, false);
+ mNonSystemOnly = getIntent().getBooleanExtra(EXTRA_NON_SYSTEM, false);
mAdapter = new AppListAdapter(this);
if (mAdapter.getCount() <= 0) {
@@ -113,6 +116,11 @@
}
}
+ // Filter out apps that are system apps if requested
+ if (mNonSystemOnly && ai.isSystemApp()) {
+ continue;
+ }
+
// Filter out apps that do not request the permission if required.
if (mPermissionName != null) {
boolean requestsPermission = false;
diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
index dbf0142..15e2663 100644
--- a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
+++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java
@@ -18,13 +18,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class AppsNotRespondingPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java
index 5651d9b..690d079 100644
--- a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java
+++ b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java
@@ -21,14 +21,14 @@
import android.content.Context;
import android.os.RemoteException;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BackgroundProcessLimitPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java
index 860b2ef..0fcec05 100644
--- a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java
@@ -19,12 +19,12 @@
import android.content.Context;
import android.os.SystemProperties;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BluetoothA2dpHwOffloadPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
@@ -66,20 +66,6 @@
}
}
- @Override
- protected void onDeveloperOptionsSwitchDisabled() {
- super.onDeveloperOptionsSwitchDisabled();
- final boolean offloadSupported =
- SystemProperties.getBoolean(A2DP_OFFLOAD_SUPPORTED_PROPERTY, false);
- if (offloadSupported) {
- ((SwitchPreference) mPreference).setChecked(false);
- SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, "false");
- } else {
- ((SwitchPreference) mPreference).setChecked(true);
- SystemProperties.set(A2DP_OFFLOAD_DISABLED_PROPERTY, "true");
- }
- }
-
public void onA2dpHwDialogConfirmed() {
final boolean offloadDisabled =
SystemProperties.getBoolean(A2DP_OFFLOAD_DISABLED_PROPERTY, false);
diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java
index ba05910..cbd77f5 100644
--- a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java
+++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java
@@ -21,13 +21,13 @@
import android.os.Bundle;
import android.os.PowerManager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentManager;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentManager;
-
public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragment
implements DialogInterface.OnClickListener {
diff --git a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
index 829f3fb..77f0f50 100644
--- a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
+++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.os.SystemProperties;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BluetoothAbsoluteVolumePreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
index 0aba44a..136ddad 100644
--- a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
@@ -20,14 +20,14 @@
import android.os.SystemProperties;
import android.text.TextUtils;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BluetoothAvrcpVersionPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
index e56de10..849e981 100644
--- a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
+++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.os.SystemProperties;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BluetoothDeviceNoNamePreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
index 0960625..ee6af1c 100644
--- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java
@@ -19,14 +19,14 @@
import android.content.Context;
import android.os.SystemProperties;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BluetoothMaxConnectedAudioDevicesPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
index 0372cd6..c92fe90 100644
--- a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.os.SystemProperties;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BluetoothSnoopLogPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java
index f09b486..99ced77 100644
--- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java
+++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java
@@ -20,13 +20,13 @@
import android.os.UserManager;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class BugReportInPowerPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
index 845e58a..ec0ca24 100644
--- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
+++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java
@@ -20,14 +20,14 @@
import android.os.SystemProperties;
import android.text.TextUtils;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class CameraLaserSensorPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java b/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
new file mode 100644
index 0000000..d5c78e8
--- /dev/null
+++ b/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
@@ -0,0 +1,66 @@
+/*
+ * 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.util.Log;
+import android.telephony.TelephonyManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.SwitchPreference;
+import androidx.preference.Preference;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+public class CbrsDataSwitchPreferenceController extends DeveloperOptionsPreferenceController
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+ private static final String CBRS_DATA_SWITCH_KEY = "cbrs_data_switch";
+ private static final String TAG = "CbrsDataSwitchPreferenceController";
+ private Context mContext;
+
+ private TelephonyManager mTelephonyManager;
+
+ public CbrsDataSwitchPreferenceController(Context context) {
+ super(context);
+ mContext = context;
+ mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return CBRS_DATA_SWITCH_KEY;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return mTelephonyManager != null;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ boolean state = (Boolean)newValue;
+ return mTelephonyManager.setAlternativeNetworkState(state);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ boolean state = mTelephonyManager.isAlternativeNetworkEnabled();
+ ((SwitchPreference) mPreference).setChecked(state);
+ }
+
+}
diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
index 8497809..e1fda67 100644
--- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
+++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java
@@ -17,7 +17,7 @@
package com.android.settings.development;
import android.content.Context;
-import android.hardware.usb.IUsbManager;
+import android.debug.IAdbManager;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
@@ -25,14 +25,14 @@
import android.text.TextUtils;
import android.util.Log;
-import com.android.settings.Utils;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.Utils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreferenceController
implements PreferenceControllerMixin {
@@ -42,7 +42,7 @@
@VisibleForTesting
static final String RO_ADB_SECURE_PROPERTY_KEY = "ro.adb.secure";
- private final IUsbManager mUsbManager;
+ private final IAdbManager mAdbManager;
private final DevelopmentSettingsDashboardFragment mFragment;
public ClearAdbKeysPreferenceController(Context context,
@@ -50,7 +50,7 @@
super(context);
mFragment = fragment;
- mUsbManager = IUsbManager.Stub.asInterface(ServiceManager.getService(Context.USB_SERVICE));
+ mAdbManager = IAdbManager.Stub.asInterface(ServiceManager.getService(Context.ADB_SERVICE));
}
@Override
@@ -94,7 +94,7 @@
public void onClearAdbKeysConfirmed() {
try {
- mUsbManager.clearUsbDebuggingKeys();
+ mAdbManager.clearDebuggingKeys();
} catch (RemoteException e) {
Log.e(TAG, "Unable to clear adb keys", e);
}
diff --git a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java
index 3d81f1a..ce7e149 100644
--- a/src/com/android/settings/development/ClearAdbKeysWarningDialog.java
+++ b/src/com/android/settings/development/ClearAdbKeysWarningDialog.java
@@ -20,14 +20,14 @@
import android.content.DialogInterface;
import android.os.Bundle;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implements
DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
diff --git a/src/com/android/settings/development/ColorModePreference.java b/src/com/android/settings/development/ColorModePreference.java
index 8f9ef3a..9e5666e 100644
--- a/src/com/android/settings/development/ColorModePreference.java
+++ b/src/com/android/settings/development/ColorModePreference.java
@@ -24,13 +24,13 @@
import android.util.AttributeSet;
import android.view.Display;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.SwitchPreference;
-
public class ColorModePreference extends SwitchPreference implements DisplayListener {
private DisplayManager mDisplayManager;
diff --git a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
index c141ef5..54df6ba 100644
--- a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
+++ b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java
@@ -20,15 +20,15 @@
import android.os.SystemProperties;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
public class CoolColorTemperaturePreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java
index 68aae93..da4b94b 100644
--- a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java
+++ b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java
@@ -21,14 +21,14 @@
import android.text.TextUtils;
import android.view.ThreadedRenderer;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
public class DebugGpuOverdrawPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java
index ae4070d..8f15c86 100644
--- a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java
+++ b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java
@@ -21,14 +21,14 @@
import android.text.TextUtils;
import android.view.ThreadedRenderer;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
public class DebugNonRectClipOperationsPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
index 963eb3b..04d819c 100644
--- a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
+++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class DebugViewAttributesPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java
index b7b2759..6e3ec93 100644
--- a/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java
+++ b/src/com/android/settings/development/DevelopmentOptionsActivityRequestCodes.java
@@ -25,4 +25,6 @@
int REQUEST_CODE_DEBUG_APP = 1;
int REQUEST_MOCK_LOCATION_APP = 2;
+
+ int REQUEST_CODE_ANGLE_ENABLED_APP = 3;
}
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 5be381a..82c9828 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -34,6 +34,9 @@
import android.view.ViewGroup;
import android.widget.Switch;
+import androidx.annotation.VisibleForTesting;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -55,9 +58,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
@@ -405,6 +405,7 @@
controllers.add(new SelectDebugAppPreferenceController(context, fragment));
controllers.add(new WaitForDebuggerPreferenceController(context));
controllers.add(new EnableGpuDebugLayersPreferenceController(context));
+ controllers.add(new AngleEnabledAppPreferenceController(context, fragment));
controllers.add(new VerifyAppsOverUsbPreferenceController(context));
controllers.add(new LogdSizePreferenceController(context));
controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));
@@ -457,8 +458,10 @@
controllers.add(new AllowAppsOnExternalPreferenceController(context));
controllers.add(new ResizableActivityPreferenceController(context));
controllers.add(new FreeformWindowsPreferenceController(context));
+ controllers.add(new SmsAccessRestrictionPreferenceController(context));
controllers.add(new ShortcutManagerThrottlingPreferenceController(context));
controllers.add(new EnableGnssRawMeasFullTrackingPreferenceController(context));
+ controllers.add(new CbrsDataSwitchPreferenceController(context));
controllers.add(new DefaultLaunchPreferenceController(context, "running_apps"));
controllers.add(new DefaultLaunchPreferenceController(context, "demo_mode"));
controllers.add(new DefaultLaunchPreferenceController(context, "quick_settings_tiles"));
@@ -468,7 +471,7 @@
controllers.add(new DefaultLaunchPreferenceController(context, "density"));
controllers.add(new DefaultLaunchPreferenceController(context, "background_check"));
controllers.add(new DefaultLaunchPreferenceController(context, "inactive_apps"));
- controllers.add(new AutofillLoggingLevelPreferenceController(context));
+ controllers.add(new AutofillLoggingLevelPreferenceController(context, lifecycle));
controllers.add(new AutofillResetOptionsPreferenceController(context));
return controllers;
}
diff --git a/src/com/android/settings/development/DevelopmentSwitchBarController.java b/src/com/android/settings/development/DevelopmentSwitchBarController.java
index 08ddc86..84b7f9f 100644
--- a/src/com/android/settings/development/DevelopmentSwitchBarController.java
+++ b/src/com/android/settings/development/DevelopmentSwitchBarController.java
@@ -16,6 +16,8 @@
package com.android.settings.development;
+import androidx.annotation.NonNull;
+
import com.android.settings.Utils;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -24,8 +26,6 @@
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
-import androidx.annotation.NonNull;
-
public class DevelopmentSwitchBarController implements LifecycleObserver, OnStart, OnStop {
private final SwitchBar mSwitchBar;
diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
index a1ecfd4..f10e171 100644
--- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class DisableAutomaticUpdatesPreferenceController extends
DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/DisableLogPersistWarningDialog.java b/src/com/android/settings/development/DisableLogPersistWarningDialog.java
index b25e5ff..a2192c1 100644
--- a/src/com/android/settings/development/DisableLogPersistWarningDialog.java
+++ b/src/com/android/settings/development/DisableLogPersistWarningDialog.java
@@ -20,14 +20,14 @@
import android.content.DialogInterface;
import android.os.Bundle;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment implements
DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
index 01687c6..e3c16f3 100644
--- a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
+++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java
@@ -27,22 +27,25 @@
import android.text.TextUtils;
import android.view.DisplayCutout;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-import java.util.List;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+import java.util.Comparator;
+import java.util.List;
+
public class EmulateDisplayCutoutPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
private static final String KEY = "display_cutout_emulation";
+ private static final Comparator<OverlayInfo> OVERLAY_INFO_COMPARATOR =
+ Comparator.comparingInt(a -> a.priority);
private final IOverlayManager mOverlayManager;
private final boolean mAvailable;
@@ -128,7 +131,7 @@
int current = 0;
pkgs[0] = "";
- labels[0] = mContext.getString(R.string.display_cutout_emulation_none);
+ labels[0] = mContext.getString(R.string.display_cutout_emulation_device_default);
for (int i = 0; i < overlays.length; i++) {
OverlayInfo o = overlays[i];
@@ -165,6 +168,7 @@
} catch (RemoteException re) {
throw re.rethrowFromSystemServer();
}
+ overlayInfos.sort(OVERLAY_INFO_COMPARATOR);
return overlayInfos.toArray(new OverlayInfo[overlayInfos.size()]);
}
diff --git a/src/com/android/settings/development/EnableAdbWarningDialog.java b/src/com/android/settings/development/EnableAdbWarningDialog.java
index e191f30..3eff3f8 100644
--- a/src/com/android/settings/development/EnableAdbWarningDialog.java
+++ b/src/com/android/settings/development/EnableAdbWarningDialog.java
@@ -20,14 +20,14 @@
import android.content.DialogInterface;
import android.os.Bundle;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
public class EnableAdbWarningDialog extends InstrumentedDialogFragment implements
DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
diff --git a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
index ebc195e..5d102eb 100644
--- a/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
+++ b/src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
@@ -20,13 +20,13 @@
import android.content.DialogInterface;
import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentManager;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentManager;
-
public class EnableDevelopmentSettingWarningDialog extends InstrumentedDialogFragment
implements DialogInterface.OnClickListener {
diff --git a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java
index 5def536..6348d62 100644
--- a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java
+++ b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java
@@ -19,12 +19,12 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class EnableGnssRawMeasFullTrackingPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java
index 2a7e944..163605f 100644
--- a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java
+++ b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class EnableGpuDebugLayersPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
index cf077ca..6324ada 100644
--- a/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
+++ b/src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
@@ -20,14 +20,14 @@
import android.content.DialogInterface;
import android.os.Bundle;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
public class EnableOemUnlockSettingWarningDialog extends InstrumentedDialogFragment implements
DialogInterface.OnClickListener, DialogInterface.OnDismissListener {
diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java
index 2e57c27..a0628b0 100644
--- a/src/com/android/settings/development/FileEncryptionPreferenceController.java
+++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java
@@ -23,13 +23,13 @@
import android.os.storage.IStorageManager;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class FileEncryptionPreferenceController extends DeveloperOptionsPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java
index dda03e0..be6efca 100644
--- a/src/com/android/settings/development/ForceMSAAPreferenceController.java
+++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java
@@ -19,14 +19,14 @@
import android.content.Context;
import android.os.SystemProperties;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import com.android.settingslib.development.SystemPropPoker;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+import com.android.settingslib.development.SystemPropPoker;
+
public class ForceMSAAPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java
index ec63b6c..5b19f36 100644
--- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java
+++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.java
@@ -21,13 +21,13 @@
import android.provider.Settings;
import android.text.TextUtils;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class FreeformWindowsPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java
index 7986d36..d79c231 100644
--- a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java
+++ b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java
@@ -19,12 +19,12 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
/**
* Base controller for Switch preference that maps to a specific value in Settings.Global.
*/
diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
index 5b54bd7..0087e28 100644
--- a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java
@@ -20,13 +20,13 @@
import android.os.SystemProperties;
import android.view.ThreadedRenderer;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
public class GpuViewUpdatesPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
index 0dd5627..8ffbdcd 100644
--- a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java
@@ -20,13 +20,13 @@
import android.os.SystemProperties;
import android.view.ThreadedRenderer;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
public class HardwareLayersUpdatesPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
index b299f93..c10e107 100644
--- a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
+++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java
@@ -22,13 +22,13 @@
import android.os.RemoteException;
import android.os.ServiceManager;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class HardwareOverlaysPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/HdcpCheckingPreferenceController.java b/src/com/android/settings/development/HdcpCheckingPreferenceController.java
index f268978..52fe8e0 100644
--- a/src/com/android/settings/development/HdcpCheckingPreferenceController.java
+++ b/src/com/android/settings/development/HdcpCheckingPreferenceController.java
@@ -21,15 +21,15 @@
import android.os.SystemProperties;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
public class HdcpCheckingPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java
index 9076223..0ba2c42 100644
--- a/src/com/android/settings/development/KeepActivitiesPreferenceController.java
+++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.java
@@ -22,14 +22,14 @@
import android.os.RemoteException;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class KeepActivitiesPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
index 2358a64..d970f42 100644
--- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
+++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java
@@ -22,13 +22,13 @@
import android.os.ServiceManager;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class LocalBackupPasswordPreferenceController extends DeveloperOptionsPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java
index 7ffd92d..d48615c 100644
--- a/src/com/android/settings/development/LocalTerminalPreferenceController.java
+++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java
@@ -4,14 +4,14 @@
import android.content.pm.PackageManager;
import android.os.UserManager;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/LogPersistPreferenceController.java b/src/com/android/settings/development/LogPersistPreferenceController.java
index 0cb09e8..1386cec 100644
--- a/src/com/android/settings/development/LogPersistPreferenceController.java
+++ b/src/com/android/settings/development/LogPersistPreferenceController.java
@@ -18,13 +18,13 @@
import android.content.Context;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.development.AbstractLogpersistPreferenceController;
-import androidx.annotation.Nullable;
-import androidx.preference.Preference;
-
public class LogPersistPreferenceController extends AbstractLogpersistPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/LogdSizePreferenceController.java b/src/com/android/settings/development/LogdSizePreferenceController.java
index f4120c6..3a62e63 100644
--- a/src/com/android/settings/development/LogdSizePreferenceController.java
+++ b/src/com/android/settings/development/LogdSizePreferenceController.java
@@ -18,11 +18,11 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.AbstractLogdSizePreferenceController;
-import androidx.preference.Preference;
-
public class LogdSizePreferenceController extends AbstractLogdSizePreferenceController implements
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/MemoryUsagePreferenceController.java b/src/com/android/settings/development/MemoryUsagePreferenceController.java
index 9a7d6b1..1b20e70 100644
--- a/src/com/android/settings/development/MemoryUsagePreferenceController.java
+++ b/src/com/android/settings/development/MemoryUsagePreferenceController.java
@@ -19,6 +19,10 @@
import android.content.Context;
import android.text.format.Formatter;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.ProcStatsData;
import com.android.settings.applications.ProcessStatsBase;
@@ -26,10 +30,6 @@
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.utils.ThreadUtils;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class MemoryUsagePreferenceController extends DeveloperOptionsPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
index 21d6e4e..78054ae 100644
--- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class MobileDataAlwaysOnPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java
index 02ea1af..0d8c07a 100644
--- a/src/com/android/settings/development/MockLocationAppPreferenceController.java
+++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java
@@ -28,14 +28,14 @@
import android.content.pm.PackageManager;
import android.text.TextUtils;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import java.util.List;
-import androidx.preference.Preference;
-
public class MockLocationAppPreferenceController extends DeveloperOptionsPreferenceController
implements PreferenceControllerMixin, OnActivityResultListener {
diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
index 81373f3..775b708 100644
--- a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
+++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java
@@ -20,13 +20,13 @@
import android.os.Build;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class NotificationChannelWarningsPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/OemLockInfoDialog.java b/src/com/android/settings/development/OemLockInfoDialog.java
index f197c6a..3136ec1 100644
--- a/src/com/android/settings/development/OemLockInfoDialog.java
+++ b/src/com/android/settings/development/OemLockInfoDialog.java
@@ -19,14 +19,14 @@
import android.app.Dialog;
import android.os.Bundle;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
public class OemLockInfoDialog extends InstrumentedDialogFragment {
private static final String TAG = "OemLockInfoDialog";
diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java
index c687502..cadb0bc 100644
--- a/src/com/android/settings/development/OemUnlockPreferenceController.java
+++ b/src/com/android/settings/development/OemUnlockPreferenceController.java
@@ -28,16 +28,16 @@
import android.service.oemlock.OemLockManager;
import android.telephony.TelephonyManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, PreferenceControllerMixin, OnActivityResultListener {
diff --git a/src/com/android/settings/development/PictureColorModePreferenceController.java b/src/com/android/settings/development/PictureColorModePreferenceController.java
index 20f2d9a..3cf1f4e 100644
--- a/src/com/android/settings/development/PictureColorModePreferenceController.java
+++ b/src/com/android/settings/development/PictureColorModePreferenceController.java
@@ -18,6 +18,9 @@
import android.content.Context;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -25,9 +28,6 @@
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceScreen;
-
public class PictureColorModePreferenceController extends DeveloperOptionsPreferenceController
implements LifecycleObserver, OnResume, OnPause, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java
index 15f56d1..0fd0137 100644
--- a/src/com/android/settings/development/PointerLocationPreferenceController.java
+++ b/src/com/android/settings/development/PointerLocationPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class PointerLocationPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java
index bb4182e..52e730b 100644
--- a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java
+++ b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java
@@ -21,14 +21,14 @@
import android.text.TextUtils;
import android.view.ThreadedRenderer;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
public class ProfileGpuRenderingPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java
index e168226..c74e995 100644
--- a/src/com/android/settings/development/ResizableActivityPreferenceController.java
+++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class ResizableActivityPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java
index 892ea4e..97b366a 100644
--- a/src/com/android/settings/development/RtlLayoutPreferenceController.java
+++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java
@@ -20,14 +20,14 @@
import android.os.SystemProperties;
import android.provider.Settings;
-import com.android.internal.app.LocalePicker;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.internal.app.LocalePicker;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class RtlLayoutPreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java
index 7496585..3e1653d 100644
--- a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java
+++ b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java
@@ -20,13 +20,13 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
public class SecondaryDisplayPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java
index 029509d..a72c0e0 100644
--- a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java
+++ b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java
@@ -19,12 +19,12 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
/**
* Base controller for Switch preference that maps to a specific value in Settings.Secure.
*/
diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
index 7f92a34..ce6c7c4 100644
--- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java
+++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java
@@ -26,13 +26,13 @@
import android.content.pm.PackageManager;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferenceController
implements PreferenceControllerMixin, OnActivityResultListener {
diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
index b7df198..05ddf3a 100644
--- a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
+++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java
@@ -24,12 +24,12 @@
import android.util.Log;
import android.widget.Toast;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.preference.Preference;
-
public class ShortcutManagerThrottlingPreferenceController extends
DeveloperOptionsPreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
index f876c54..5e0cda8 100644
--- a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
+++ b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class ShowFirstCrashDialogPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
index ac412c7..fb091b7 100644
--- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
+++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java
@@ -20,13 +20,13 @@
import android.os.SystemProperties;
import android.view.View;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import com.android.settingslib.development.SystemPropPoker;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
public class ShowLayoutBoundsPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
index 4a03fb5..5dadb6f 100644
--- a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
+++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java
@@ -22,13 +22,13 @@
import android.os.RemoteException;
import android.os.ServiceManager;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class ShowSurfaceUpdatesPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java
index 08596ee..25d421d 100644
--- a/src/com/android/settings/development/ShowTapsPreferenceController.java
+++ b/src/com/android/settings/development/ShowTapsPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class ShowTapsPreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java
index 2d813fd..56fa76d 100644
--- a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java
+++ b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java
@@ -22,14 +22,14 @@
import android.provider.Settings;
import android.view.accessibility.AccessibilityManager;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class SimulateColorSpacePreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/SmsAccessRestrictionPreferenceController.java b/src/com/android/settings/development/SmsAccessRestrictionPreferenceController.java
new file mode 100644
index 0000000..b3f7b23
--- /dev/null
+++ b/src/com/android/settings/development/SmsAccessRestrictionPreferenceController.java
@@ -0,0 +1,69 @@
+/*
+ * 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 com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
+// STOPSHIP b/118694572: remove the kill switch once the feature is tested and stable
+public class SmsAccessRestrictionPreferenceController extends DeveloperOptionsPreferenceController
+ implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
+
+ private static final String SMS_ACCESS_RESTRICTION_ENABLED_KEY
+ = "sms_access_restriction_enabled";
+
+ public SmsAccessRestrictionPreferenceController(Context context) {
+ super(context);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return SMS_ACCESS_RESTRICTION_ENABLED_KEY;
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ writeSetting((boolean) newValue);
+ return true;
+ }
+
+ private void writeSetting(boolean isEnabled) {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED,
+ isEnabled ? 1 : 0);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, 0);
+ ((SwitchPreference) mPreference).setChecked(mode != 0);
+ }
+
+ @Override
+ protected void onDeveloperOptionsSwitchDisabled() {
+ super.onDeveloperOptionsSwitchDisabled();
+ writeSetting(false);
+ ((SwitchPreference) mPreference).setChecked(false);
+ }
+}
diff --git a/src/com/android/settings/development/StayAwakePreferenceController.java b/src/com/android/settings/development/StayAwakePreferenceController.java
index 1bea6d3..4091537 100644
--- a/src/com/android/settings/development/StayAwakePreferenceController.java
+++ b/src/com/android/settings/development/StayAwakePreferenceController.java
@@ -24,8 +24,13 @@
import android.os.Handler;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -33,10 +38,6 @@
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class StayAwakePreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause,
@@ -130,7 +131,7 @@
// will lock... in this case we can't allow the user to turn
// on "stay awake when plugged in" because that would defeat the
// restriction.
- return RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
+ return RestrictedLockUtilsInternal.checkIfMaximumTimeToLockIsSet(mContext);
}
@VisibleForTesting
diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java
index f1ec81b..c28e476 100644
--- a/src/com/android/settings/development/StrictModePreferenceController.java
+++ b/src/com/android/settings/development/StrictModePreferenceController.java
@@ -23,13 +23,13 @@
import android.os.SystemProperties;
import android.view.IWindowManager;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class StrictModePreferenceController extends DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java
index 09263a1..476cf50 100644
--- a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java
+++ b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java
@@ -19,12 +19,12 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
/**
* Base controller for Switch preference that maps to a specific value in Settings.System.
*/
diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
index 1277602..f838a76 100644
--- a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
+++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class TetheringHardwareAccelPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java
index a6859a1..0a8e941 100644
--- a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java
+++ b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java
@@ -21,14 +21,14 @@
import android.os.ServiceManager;
import android.view.IWindowManager;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class TransitionAnimationScalePreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
index 0c1bf25..335a48d 100644
--- a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
+++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
index b396f2d..20b8f1f 100644
--- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
+++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
@@ -24,17 +24,17 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
/**
* Controller to manage the state of "Verify apps over USB" toggle.
*/
@@ -57,7 +57,8 @@
class RestrictedLockUtilsDelegate {
public EnforcedAdmin checkIfRestrictionEnforced(
Context context, String userRestriction, int userId) {
- return RestrictedLockUtils.checkIfRestrictionEnforced(context, userRestriction, userId);
+ return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context, userRestriction,
+ userId);
}
}
diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
index 268def2..d11fe37 100644
--- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
+++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java
@@ -28,13 +28,13 @@
import android.provider.Settings;
import android.text.TextUtils;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class WaitForDebuggerPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin,
OnActivityResultListener {
diff --git a/src/com/android/settings/development/WebViewAppPreferenceController.java b/src/com/android/settings/development/WebViewAppPreferenceController.java
index 70eb33b..37653cc 100644
--- a/src/com/android/settings/development/WebViewAppPreferenceController.java
+++ b/src/com/android/settings/development/WebViewAppPreferenceController.java
@@ -19,18 +19,19 @@
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.webview.WebViewUpdateServiceWrapper;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class WebViewAppPreferenceController extends DeveloperOptionsPreferenceController implements
PreferenceControllerMixin {
@@ -66,7 +67,7 @@
@VisibleForTesting
DefaultAppInfo getDefaultAppInfo() {
final PackageInfo currentPackage = mWebViewUpdateServiceWrapper.getCurrentWebViewPackage();
- return new DefaultAppInfo(mContext, mPackageManager,
+ return new DefaultAppInfo(mContext, mPackageManager, UserHandle.myUserId(),
currentPackage == null ? null : currentPackage.applicationInfo);
}
diff --git a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java
index 2497ef4..fed07f6 100644
--- a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java
+++ b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java
@@ -19,14 +19,14 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class WifiConnectedMacRandomizationPreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
index bfd77c4..0236f15 100644
--- a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
+++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class WifiDisplayCertificationPreferenceController extends
DeveloperOptionsPreferenceController implements
Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
index dd99561..de53a2d 100644
--- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
+++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.net.wifi.WifiManager;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java
index 7c373e7..70b2e2d 100644
--- a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java
+++ b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java
@@ -21,14 +21,14 @@
import android.os.ServiceManager;
import android.view.IWindowManager;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public class WindowAnimationScalePreferenceController extends
DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/autofill/AbstractGlobalSettingsPreference.java b/src/com/android/settings/development/autofill/AbstractGlobalSettingsPreference.java
index 080c387..491deac 100644
--- a/src/com/android/settings/development/autofill/AbstractGlobalSettingsPreference.java
+++ b/src/com/android/settings/development/autofill/AbstractGlobalSettingsPreference.java
@@ -15,25 +15,16 @@
package com.android.settings.development.autofill;
import android.content.Context;
-import android.content.res.Resources;
import android.provider.Settings;
-import android.text.BidiFormatter;
import android.text.InputType;
import android.util.AttributeSet;
-import android.util.DisplayMetrics;
import android.util.Log;
-import android.util.Slog;
-import android.view.Display;
import android.view.View;
-import android.view.autofill.AutofillManager;
import android.widget.EditText;
-import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.CustomEditTextPreferenceCompat;
-import java.text.NumberFormat;
-
/**
* Base class for Autofill integer properties that are backed by
* {@link android.provider.Settings.Global}.
diff --git a/src/com/android/settings/development/autofill/AutofillDeveloperSettingsObserver.java b/src/com/android/settings/development/autofill/AutofillDeveloperSettingsObserver.java
index ae8e246..90266e0 100644
--- a/src/com/android/settings/development/autofill/AutofillDeveloperSettingsObserver.java
+++ b/src/com/android/settings/development/autofill/AutofillDeveloperSettingsObserver.java
@@ -21,6 +21,7 @@
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
+import android.os.Looper;
import android.os.UserHandle;
import android.provider.Settings;
@@ -30,7 +31,7 @@
private final ContentResolver mResolver;
public AutofillDeveloperSettingsObserver(Context context, Runnable changeCallback) {
- super(new Handler());
+ super(new Handler(Looper.getMainLooper()));
mResolver = context.getContentResolver();
mChangeCallback = changeCallback;
diff --git a/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java b/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java
index a22295c..f955f5e 100644
--- a/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java
+++ b/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceController.java
@@ -19,26 +19,32 @@
import android.content.Context;
import android.content.res.Resources;
import android.provider.Settings;
+import android.util.Log;
import android.view.autofill.AutofillManager;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
import androidx.preference.ListPreference;
import androidx.preference.Preference;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnDestroy;
+import com.android.settingslib.development.DeveloperOptionsPreferenceController;
+
public final class AutofillLoggingLevelPreferenceController
extends DeveloperOptionsPreferenceController
- implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+ implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+ LifecycleObserver, OnDestroy {
+ private static final String TAG = "AutofillLoggingLevelPreferenceController";
private static final String AUTOFILL_LOGGING_LEVEL_KEY = "autofill_logging_level";
private final String[] mListValues;
private final String[] mListSummaries;
private final AutofillDeveloperSettingsObserver mObserver;
- public AutofillLoggingLevelPreferenceController(Context context) {
+ public AutofillLoggingLevelPreferenceController(Context context, Lifecycle lifecycle) {
super(context);
Resources resources = context.getResources();
@@ -46,7 +52,15 @@
mListSummaries = resources.getStringArray(R.array.autofill_logging_level_entries);
mObserver = new AutofillDeveloperSettingsObserver(mContext, () -> updateOptions());
mObserver.register();
- // TODO: there should be a hook on AbstractPreferenceController where we could unregister it
+
+ if (lifecycle != null) {
+ lifecycle.addObserver(this);
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ mObserver.unregister();
}
@Override
@@ -73,6 +87,12 @@
}
private void updateOptions() {
+ if (mPreference == null) {
+ // TODO: there should be a hook on AbstractPreferenceController where we could
+ // unregister mObserver and avoid this check
+ Log.v(TAG, "ignoring Settings update because UI is gone");
+ return;
+ }
final int level = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.AUTOFILL_LOGGING_LEVEL, AutofillManager.DEFAULT_LOGGING_LEVEL);
diff --git a/src/com/android/settings/development/autofill/AutofillMaxPartitionsPreference.java b/src/com/android/settings/development/autofill/AutofillMaxPartitionsPreference.java
index ab0cec9..f8099b7 100644
--- a/src/com/android/settings/development/autofill/AutofillMaxPartitionsPreference.java
+++ b/src/com/android/settings/development/autofill/AutofillMaxPartitionsPreference.java
@@ -19,8 +19,6 @@
import android.util.AttributeSet;
import android.view.autofill.AutofillManager;
-import java.text.NumberFormat;
-
public final class AutofillMaxPartitionsPreference extends AbstractGlobalSettingsPreference {
public AutofillMaxPartitionsPreference(Context context, AttributeSet attrs) {
diff --git a/src/com/android/settings/development/autofill/AutofillPreferenceCategory.java b/src/com/android/settings/development/autofill/AutofillPreferenceCategory.java
index 711100d..cbfbdd3 100644
--- a/src/com/android/settings/development/autofill/AutofillPreferenceCategory.java
+++ b/src/com/android/settings/development/autofill/AutofillPreferenceCategory.java
@@ -20,7 +20,6 @@
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
-import android.os.UserHandle;
import android.provider.Settings;
import android.util.AttributeSet;
import android.util.Log;
diff --git a/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java b/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java
index 42f7a48..d30d0bb 100644
--- a/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java
+++ b/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceController.java
@@ -18,19 +18,17 @@
import android.content.ContentResolver;
import android.content.Context;
-import android.content.res.Resources;
import android.provider.Settings;
import android.text.TextUtils;
import android.view.autofill.AutofillManager;
import android.widget.Toast;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
public final class AutofillResetOptionsPreferenceController
extends DeveloperOptionsPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
index 4892bc0..d27af64 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
@@ -21,12 +21,14 @@
import android.text.TextUtils;
import android.util.FeatureFlagUtils;
+import androidx.annotation.VisibleForTesting;
+
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.core.FeatureFlags;
import java.util.HashSet;
-import androidx.annotation.VisibleForTesting;
-
/**
* Helper class to get feature persistent flag information.
*/
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java
index 6de83a8..1c4df4c 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java
@@ -19,15 +19,15 @@
import android.content.Context;
import android.util.FeatureFlagUtils;
+import androidx.preference.PreferenceGroup;
+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 java.util.Map;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
public class FeatureFlagsPreferenceController extends BasePreferenceController
implements LifecycleObserver, OnStart {
@@ -59,8 +59,7 @@
}
mGroup.removeAll();
final Context prefContext = mGroup.getContext();
- for (String feature : featureMap.keySet()) {
- mGroup.addPreference(new FeatureFlagPreference(prefContext, feature));
- }
+ featureMap.keySet().stream().sorted().forEach(feature ->
+ mGroup.addPreference(new FeatureFlagPreference(prefContext, feature)));
}
}
diff --git a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java
index 4d12b39..c271bc9 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java
@@ -27,16 +27,16 @@
import android.service.quicksettings.TileService;
import android.util.Log;
-import com.android.internal.statusbar.IStatusBarService;
-import com.android.settings.core.BasePreferenceController;
-
-import java.util.List;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
+import com.android.internal.statusbar.IStatusBarService;
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.List;
+
public class DevelopmentTilePreferenceController extends BasePreferenceController {
private static final String TAG = "DevTilePrefController";
diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java
index ec017c5..827705d 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTiles.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java
@@ -34,13 +34,13 @@
import android.view.WindowManagerGlobal;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.app.LocalePicker;
import com.android.internal.statusbar.IStatusBarService;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.development.SystemPropPoker;
-import androidx.annotation.VisibleForTesting;
-
public abstract class DevelopmentTiles extends TileService {
private static final String TAG = "DevelopmentTiles";
diff --git a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java
index 6f63279..5d07f2c 100644
--- a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java
@@ -20,6 +20,9 @@
import android.content.Context;
import android.os.Bundle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.accounts.AccountDetailDashboardFragment;
@@ -28,9 +31,6 @@
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.overlay.FeatureFactory;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class BrandedAccountPreferenceController extends BasePreferenceController {
private static final String KEY_PREFERENCE_TITLE = "branded_account";
private final Account[] mAccounts;
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index 171a6d3..6256e23 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -29,6 +29,10 @@
import android.util.Pair;
import android.widget.Toast;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -36,6 +40,7 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,10 +48,6 @@
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.development.DevelopmentSettingsEnabler;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class BuildNumberPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, LifecycleObserver, OnResume {
@@ -104,9 +105,9 @@
@Override
public void onResume() {
- mDebuggingFeaturesDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ mDebuggingFeaturesDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_DEBUGGING_FEATURES, UserHandle.myUserId());
- mDebuggingFeaturesDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
+ mDebuggingFeaturesDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
mContext, UserManager.DISALLOW_DEBUGGING_FEATURES, UserHandle.myUserId());
mDevHitCountdown = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
? -1 : TAPS_TO_BE_A_DEVELOPER;
diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
index 9040227..25090dc 100644
--- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java
@@ -20,6 +20,10 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.DeviceInfoUtils;
@@ -28,10 +32,6 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class DeviceModelPreferenceController extends BasePreferenceController {
@@ -73,6 +73,11 @@
return true;
}
+ @Override
+ public boolean isSliceable() {
+ return true;
+ }
+
public static String getDeviceModel() {
FutureTask<String> msvSuffixTask = new FutureTask<String>(new Callable<String>() {
@Override
diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
index d8e2e79..0d7b1d3 100644
--- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
@@ -25,24 +25,24 @@
import android.provider.Settings;
import android.text.SpannedString;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothLengthDeviceNameFilter;
import com.android.settings.core.BasePreferenceController;
-import com.android.settings.R;
import com.android.settings.widget.ValidatedEditTextPreference;
import com.android.settings.wifi.tether.WifiDeviceNameTextValidator;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnCreate;
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class DeviceNamePreferenceController extends BasePreferenceController
implements ValidatedEditTextPreference.Validator,
- Preference.OnPreferenceChangeListener,
- LifecycleObserver,
- OnSaveInstanceState,
- OnCreate {
+ Preference.OnPreferenceChangeListener,
+ LifecycleObserver,
+ OnSaveInstanceState,
+ OnCreate {
private static final String PREF_KEY = "device_name";
public static final int DEVICE_NAME_SET_WARNING_ID = 1;
private static final String KEY_PENDING_DEVICE_NAME = "key_pending_device_name";
@@ -116,9 +116,11 @@
return mWifiDeviceNameTextValidator.isTextValid(deviceName);
}
- public void confirmDeviceName() {
- if (mPendingDeviceName != null) {
+ public void updateDeviceName(boolean update) {
+ if (update && mPendingDeviceName != null) {
setDeviceName(mPendingDeviceName);
+ } else {
+ mPreference.setText(getSummary().toString());
}
}
@@ -153,7 +155,8 @@
* For more information, see {@link com.android.settings.bluetooth.BluetoothNameDialogFragment}.
*/
private static final String getFilteredBluetoothString(final String deviceName) {
- CharSequence filteredSequence = new BluetoothLengthDeviceNameFilter().filter(deviceName, 0, deviceName.length(),
+ CharSequence filteredSequence = new BluetoothLengthDeviceNameFilter().filter(deviceName, 0,
+ deviceName.length(),
new SpannedString(""),
0, 0);
// null -> use the original
diff --git a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
index 4a2ad24..1150838 100644
--- a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java
@@ -19,13 +19,13 @@
import android.os.SystemProperties;
import android.text.TextUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class FccEquipmentIdPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java
index cd91b57..d94586b 100644
--- a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Intent;
import android.text.TextUtils;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.DeviceInfoUtils;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-
public class FeedbackPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
private static final String KEY_DEVICE_FEEDBACK = "device_feedback";
diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java
index 3057fa0..fef0342 100644
--- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java
+++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java
@@ -25,13 +25,13 @@
import android.view.View;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
public class HardwareInfoDialogFragment extends InstrumentedDialogFragment {
public static final String TAG = "HardwareInfo";
diff --git a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
index 4824a4b..5c2b641 100644
--- a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java
@@ -17,12 +17,12 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.DeviceInfoUtils;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class KernelVersionPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
index 83138f9..6f5f346 100644
--- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
@@ -24,20 +24,18 @@
import android.text.TextDirectionHeuristics;
import android.text.TextUtils;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.DeviceInfoUtils;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import java.util.ArrayList;
-import java.util.List;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
-public class PhoneNumberPreferenceController extends AbstractPreferenceController implements
- PreferenceControllerMixin {
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.DeviceInfoUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PhoneNumberPreferenceController extends BasePreferenceController {
private final static String KEY_PHONE_NUMBER = "phone_number";
@@ -45,21 +43,20 @@
private final SubscriptionManager mSubscriptionManager;
private final List<Preference> mPreferenceList = new ArrayList<>();
- public PhoneNumberPreferenceController(Context context) {
- super(context);
- mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- mSubscriptionManager = (SubscriptionManager) context.getSystemService(
- Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+ public PhoneNumberPreferenceController(Context context, String key) {
+ super(context, key);
+ mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+ mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
}
@Override
- public String getPreferenceKey() {
- return KEY_PHONE_NUMBER;
+ public int getAvailabilityStatus() {
+ return mTelephonyManager.isVoiceCapable() ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override
- public boolean isAvailable() {
- return mTelephonyManager.isVoiceCapable();
+ public CharSequence getSummary() {
+ return getFirstPhoneNumber();
}
@Override
@@ -89,10 +86,26 @@
}
}
+ @Override
+ public boolean isSliceable() {
+ return true;
+ }
+
+ private CharSequence getFirstPhoneNumber() {
+ final List<SubscriptionInfo> subscriptionInfoList =
+ mSubscriptionManager.getActiveSubscriptionInfoList();
+ if (subscriptionInfoList == null) {
+ return mContext.getText(R.string.device_info_default);
+ }
+
+ // For now, We only return first result for slice view.
+ return getFormattedPhoneNumber(subscriptionInfoList.get(0));
+ }
+
private CharSequence getPhoneNumber(int simSlot) {
final SubscriptionInfo subscriptionInfo = getSubscriptionInfo(simSlot);
if (subscriptionInfo == null) {
- return mContext.getString(R.string.device_info_default);
+ return mContext.getText(R.string.device_info_default);
}
return getFormattedPhoneNumber(subscriptionInfo);
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
index ebd976b..41f8650 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java
@@ -30,16 +30,16 @@
import android.widget.Button;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.search.actionbar.SearchMenuController;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
public class PrivateVolumeForget extends InstrumentedFragment {
@VisibleForTesting
static final String TAG_FORGET_CONFIRM = "forget_confirm";
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
index 0bac296..83b55f8 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeFormat.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
import static android.os.storage.DiskInfo.EXTRA_DISK_ID;
+
import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FORGET_UUID;
import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE;
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 997f0d2..1812974 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -45,6 +45,13 @@
import android.view.View;
import android.widget.EditText;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings.StorageUseActivity;
@@ -64,13 +71,6 @@
import java.util.List;
import java.util.Objects;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
/**
* Panel showing summary and actions for a {@link VolumeInfo#TYPE_PRIVATE}
* storage volume.
diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
index 70838ca..8476974 100644
--- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java
@@ -35,6 +35,9 @@
import android.view.ViewGroup;
import android.widget.Button;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
@@ -45,9 +48,6 @@
import java.io.File;
import java.util.Objects;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Panel showing summary and actions for a {@link VolumeInfo#TYPE_PUBLIC}
* storage volume.
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 03a2ada..8fb3ef1 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -29,6 +29,10 @@
import android.util.SparseArray;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -54,10 +58,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-
@SearchIndexable
public class StorageDashboardFragment extends DashboardFragment
implements
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index d20d21b..0766a74 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -21,12 +21,12 @@
import android.util.AttributeSet;
import android.widget.ProgressBar;
-import com.android.settings.R;
-import com.android.settings.utils.FileSizeFormatter;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+import com.android.settings.utils.FileSizeFormatter;
+
public class StorageItemPreference extends Preference {
public int userHandle;
diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
index 06c9802..2a865bf 100644
--- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java
@@ -24,6 +24,10 @@
import android.os.storage.VolumeInfo;
import android.util.SparseArray;
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -38,10 +42,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-
/**
* StorageProfileFragment is a fragment which shows the storage results for a profile of the
* primary user.
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index f4ea580..49d5455 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -39,25 +39,6 @@
import android.util.Log;
import android.widget.Toast;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.search.Indexable;
-import com.android.settings.search.SearchIndexableRaw;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.deviceinfo.PrivateStorageInfo;
-import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
-import com.android.settingslib.search.SearchIndexable;
-
-import java.text.NumberFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
@@ -65,6 +46,24 @@
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
+import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
/**
* Panel showing both internal storage (both built-in storage and private
* volumes) and removable storage (public volumes).
@@ -460,10 +459,11 @@
* @return {@code true} iff a intent was shown.
*/
private boolean wasAdminSupportIntentShown(@NonNull String restriction) {
- EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
- getActivity(), restriction, UserHandle.myUserId());
+ EnforcedAdmin admin = RestrictedLockUtilsInternal
+ .checkIfRestrictionEnforced(getActivity(), restriction,
+ UserHandle.myUserId());
boolean hasBaseUserRestriction =
- RestrictedLockUtils.hasBaseUserRestriction(
+ RestrictedLockUtilsInternal.hasBaseUserRestriction(
getActivity(), restriction, UserHandle.myUserId());
if (admin != null && !hasBaseUserRestriction) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
@@ -540,41 +540,6 @@
}
}
- private static class SummaryProvider implements SummaryLoader.SummaryProvider {
- private final Context mContext;
- private final SummaryLoader mLoader;
- private final StorageManagerVolumeProvider mStorageManagerVolumeProvider;
-
- private SummaryProvider(Context context, SummaryLoader loader) {
- mContext = context;
- mLoader = loader;
- final StorageManager storageManager = mContext.getSystemService(StorageManager.class);
- mStorageManagerVolumeProvider = new StorageManagerVolumeProvider(storageManager);
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- updateSummary();
- }
- }
-
- private void updateSummary() {
- // TODO: Register listener.
- final NumberFormat percentageFormat = NumberFormat.getPercentInstance();
- final PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(
- mStorageManagerVolumeProvider);
- double privateUsedBytes = info.totalBytes - info.freeBytes;
- mLoader.setSummary(this, mContext.getString(R.string.storage_summary,
- percentageFormat.format(privateUsedBytes / info.totalBytes),
- Formatter.formatFileSize(mContext, info.freeBytes)));
- }
- }
-
-
- public static final SummaryLoader.SummaryProviderFactory SUMMARY_PROVIDER_FACTORY
- = (activity, summaryLoader) -> new SummaryProvider(activity, summaryLoader);
-
/** Enable indexing of searchable data */
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
diff --git a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java
index 481e044..72b67de 100644
--- a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java
@@ -23,11 +23,11 @@
import android.widget.ProgressBar;
import android.widget.TextView;
-import com.android.settings.R;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
public class StorageSummaryPreference extends Preference {
private int mPercent = -1;
diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
index db5339d..14fd42e 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java
@@ -30,6 +30,9 @@
import android.widget.ImageView;
import android.widget.ProgressBar;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.deviceinfo.StorageSettings.UnmountTask;
import com.android.settingslib.Utils;
@@ -37,9 +40,6 @@
import java.io.File;
import java.io.IOException;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
/**
* Preference line representing a single {@link VolumeInfo}, possibly including
* quick actions like unmounting.
diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java
index c6d0b2f..ef0e46b 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardBase.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java
@@ -18,6 +18,7 @@
import static android.os.storage.DiskInfo.EXTRA_DISK_ID;
import static android.os.storage.VolumeInfo.EXTRA_VOLUME_ID;
+
import static com.android.settings.deviceinfo.StorageSettings.TAG;
import android.annotation.LayoutRes;
@@ -39,6 +40,8 @@
import android.widget.ProgressBar;
import android.widget.TextView;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settingslib.Utils;
import com.android.setupwizardlib.GlifLayout;
@@ -47,8 +50,6 @@
import java.util.List;
import java.util.Objects;
-import androidx.fragment.app.FragmentActivity;
-
public abstract class StorageWizardBase extends FragmentActivity {
protected static final String EXTRA_FORMAT_FORGET_UUID = "format_forget_uuid";
protected static final String EXTRA_FORMAT_PRIVATE = "format_private";
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
index e09e89d..5e3c86e 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
import static android.os.storage.DiskInfo.EXTRA_DISK_ID;
+
import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FORGET_UUID;
import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE;
@@ -28,13 +29,13 @@
import android.os.storage.StorageManager;
import android.text.TextUtils;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentActivity;
-
public class StorageWizardFormatConfirm extends InstrumentedDialogFragment {
private static final String TAG_FORMAT_WARNING = "format_warning";
@@ -59,7 +60,6 @@
final StorageWizardFormatConfirm fragment = new StorageWizardFormatConfirm();
fragment.setArguments(args);
- // TODO (b/111150236) : Need to check it again.
fragment.show(activity.getSupportFragmentManager(), TAG_FORMAT_WARNING);
}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
index 287cc3f..1e8c169 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
import static android.os.storage.VolumeInfo.TYPE_PRIVATE;
+
import static com.android.settings.deviceinfo.StorageSettings.TAG;
import android.content.Intent;
@@ -59,7 +60,6 @@
setHeaderText(R.string.storage_wizard_format_progress_title, getDiskShortDescription());
setBodyText(R.string.storage_wizard_format_progress_body, getDiskDescription());
- // TODO (b/111151113) : Need to check it again.
mTask = (PartitionTask) getLastCustomNonConfigurationInstance();
if (mTask == null) {
mTask = new PartitionTask();
@@ -69,7 +69,7 @@
mTask.setActivity(this);
}
}
- // TODO (b/111151113) : Need to check it again.
+
@Override
public Object onRetainCustomNonConfigurationInstance() {
return mTask;
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index b17defd..48ec0e3 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -85,9 +85,13 @@
FeatureFactory.getFactory(this).getMetricsFeatureProvider().action(this,
MetricsEvent.ACTION_STORAGE_MIGRATE_LATER);
- final Intent intent = new Intent(this, StorageWizardReady.class);
- intent.putExtra(EXTRA_MIGRATE_SKIP, true);
- startActivity(intent);
+ if (mDisk != null) {
+ final Intent intent = new Intent(this, StorageWizardReady.class);
+ intent.putExtra(EXTRA_MIGRATE_SKIP, true);
+ startActivity(intent);
+ } else {
+ finishAffinity();
+ }
}
@Override
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
index f15665f..60f3cb5 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
import static android.content.pm.PackageManager.EXTRA_MOVE_ID;
+
import static com.android.settings.deviceinfo.StorageSettings.TAG;
import android.content.Context;
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
index 214f0c2..10b78af 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
@@ -20,6 +20,7 @@
import static android.content.Intent.EXTRA_TITLE;
import static android.content.pm.PackageManager.EXTRA_MOVE_ID;
import static android.os.storage.VolumeInfo.EXTRA_VOLUME_ID;
+
import static com.android.settings.deviceinfo.StorageSettings.TAG;
import android.content.Intent;
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
index a0185e4..7a2f0c1 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java
@@ -18,6 +18,7 @@
import static android.content.Intent.EXTRA_TITLE;
import static android.content.pm.PackageManager.EXTRA_MOVE_ID;
+
import static com.android.settings.deviceinfo.StorageSettings.TAG;
import android.content.pm.PackageManager;
diff --git a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
new file mode 100644
index 0000000..c6fc23b
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
@@ -0,0 +1,57 @@
+/*
+ * 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.deviceinfo;
+
+import android.content.Context;
+import android.os.storage.StorageManager;
+import android.text.format.Formatter;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
+import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
+
+import java.text.NumberFormat;
+
+public class TopLevelStoragePreferenceController extends BasePreferenceController {
+
+ private final StorageManager mStorageManager;
+ private final StorageManagerVolumeProvider mStorageManagerVolumeProvider;
+
+ public TopLevelStoragePreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mStorageManager = mContext.getSystemService(StorageManager.class);
+ mStorageManagerVolumeProvider = new StorageManagerVolumeProvider(mStorageManager);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE_UNSEARCHABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ // TODO: Register listener.
+ final NumberFormat percentageFormat = NumberFormat.getPercentInstance();
+ final PrivateStorageInfo info = PrivateStorageInfo.getPrivateStorageInfo(
+ mStorageManagerVolumeProvider);
+ double privateUsedBytes = info.totalBytes - info.freeBytes;
+ return mContext.getString(R.string.storage_summary,
+ percentageFormat.format(privateUsedBytes / info.totalBytes),
+ Formatter.formatFileSize(mContext, info.freeBytes));
+ }
+}
diff --git a/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java b/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java
index 0224040..a6b1dec 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/DeviceNameWarningDialog.java
@@ -20,13 +20,13 @@
import android.content.DialogInterface;
import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentManager;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentManager;
-
/**
* Warning dialog to let the user know where the device name will be shown before setting it.
*/
@@ -66,7 +66,9 @@
public void onClick(DialogInterface dialog, int which) {
final MyDeviceInfoFragment host = (MyDeviceInfoFragment) getTargetFragment();
if (which == DialogInterface.BUTTON_POSITIVE) {
- host.onSetDeviceNameConfirm();
+ host.onSetDeviceNameConfirm(true);
+ } else {
+ host.onSetDeviceNameConfirm(false);
}
}
}
diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
index 425edd9..37f80b7 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java
@@ -41,7 +41,6 @@
import com.android.settings.deviceinfo.FeedbackPreferenceController;
import com.android.settings.deviceinfo.IpAddressPreferenceController;
import com.android.settings.deviceinfo.ManualPreferenceController;
-import com.android.settings.deviceinfo.PhoneNumberPreferenceController;
import com.android.settings.deviceinfo.RegulatoryInfoPreferenceController;
import com.android.settings.deviceinfo.SafetyInfoPreferenceController;
import com.android.settings.deviceinfo.UptimePreferenceController;
@@ -65,7 +64,6 @@
private static final String LOG_TAG = "MyDeviceInfoFragment";
private static final String KEY_MY_DEVICE_INFO_HEADER = "my_device_info_header";
- private static final String KEY_LEGAL_CONTAINER = "legal_container";
@Override
public int getMetricsCategory() {
@@ -111,7 +109,6 @@
Lifecycle lifecycle) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new EmergencyInfoPreferenceController(context));
- controllers.add(new PhoneNumberPreferenceController(context));
controllers.add(new BrandedAccountPreferenceController(context));
DeviceNamePreferenceController deviceNamePreferenceController =
new DeviceNamePreferenceController(context);
@@ -179,9 +176,9 @@
DeviceNameWarningDialog.show(this);
}
- public void onSetDeviceNameConfirm() {
+ public void onSetDeviceNameConfirm(boolean confirm) {
final DeviceNamePreferenceController controller = use(DeviceNamePreferenceController.class);
- controller.confirmDeviceName();
+ controller.updateDeviceName(confirm);
}
private static class SummaryProvider implements SummaryLoader.SummaryProvider {
@@ -223,13 +220,5 @@
return buildPreferenceControllers(context, null /*activity */,
null /* fragment */, null /* lifecycle */);
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- List<String> keys = super.getNonIndexableKeys(context);
- // The legal container is duplicated, so we ignore it here.
- keys.add(KEY_LEGAL_CONTAINER);
- return keys;
- }
};
}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java
index 0f7f2e9..0e36d85 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java
@@ -19,11 +19,11 @@
import android.content.Context;
import android.os.SystemProperties;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.Utils;
-import androidx.annotation.VisibleForTesting;
-
public class BasebandVersionDialogController {
@VisibleForTesting
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java
index b8e1885..ba4eb7a 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java
@@ -19,10 +19,10 @@
import android.os.Build;
import android.text.BidiFormatter;
-import com.android.settings.R;
-
import androidx.annotation.VisibleForTesting;
+import com.android.settings.R;
+
public class BuildNumberDialogController {
@VisibleForTesting
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java
index e43091d..8c29f7b 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java
@@ -25,10 +25,11 @@
import android.util.Log;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
-
-import androidx.annotation.VisibleForTesting;
+import com.android.settingslib.RestrictedLockUtilsInternal;
public class FirmwareVersionDialogController implements View.OnClickListener {
@@ -105,9 +106,9 @@
@VisibleForTesting
void initializeAdminPermissions() {
- mFunDisallowedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ mFunDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
- mFunDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(
+ mFunDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
mContext, UserManager.DISALLOW_FUN, UserHandle.myUserId());
}
}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java
index 9c6075e..5dbc5ac 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogFragment.java
@@ -22,14 +22,14 @@
import android.view.View;
import android.widget.TextView;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
public class FirmwareVersionDialogFragment extends InstrumentedDialogFragment {
private static final String TAG = "firmwareVersionDialog";
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
index f31a504..7d12d43 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java
@@ -20,11 +20,11 @@
import android.os.Build;
import android.text.TextUtils;
-import com.android.settings.core.BasePreferenceController;
-
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
+import com.android.settings.core.BasePreferenceController;
+
public class FirmwareVersionPreferenceController extends BasePreferenceController {
private Fragment mFragment;
@@ -56,4 +56,9 @@
FirmwareVersionDialogFragment.show(mFragment);
return true;
}
+
+ @Override
+ public boolean isSliceable() {
+ return true;
+ }
}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java
index 36ebc39..0d816d5 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java
@@ -16,11 +16,11 @@
package com.android.settings.deviceinfo.firmwareversion;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settingslib.DeviceInfoUtils;
-import androidx.annotation.VisibleForTesting;
-
public class KernelVersionDialogController {
@VisibleForTesting
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java
index 221b7e2..9037fe7 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java
@@ -24,11 +24,11 @@
import android.util.Log;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settingslib.DeviceInfoUtils;
-import androidx.annotation.VisibleForTesting;
-
public class SecurityPatchLevelDialogController implements View.OnClickListener {
private static final String TAG = "SecurityPatchCtrl";
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
index a7b8a7a..577b478 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
@@ -27,14 +27,14 @@
import android.text.TextUtils;
import android.text.style.TtsSpan;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.telephony.PhoneConstants;
import com.android.settings.R;
import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-
public class ImeiInfoDialogController {
@VisibleForTesting
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java
index 808edd4..5347fa7 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java
@@ -23,16 +23,16 @@
import android.view.View;
import android.widget.TextView;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
public class ImeiInfoDialogFragment extends InstrumentedDialogFragment {
@VisibleForTesting
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
index 75a1333..66d68a6 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java
@@ -21,6 +21,11 @@
import android.content.Context;
import android.telephony.TelephonyManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
@@ -28,11 +33,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller that manages preference for single and multi sim devices.
*/
diff --git a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java
index 6a67e4b..0e16474 100644
--- a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java
@@ -20,13 +20,13 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public abstract class LegalPreferenceController extends BasePreferenceController {
private final PackageManager mPackageManager;
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 121bc03..25d1866 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -44,18 +44,19 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settingslib.DeviceInfoUtils;
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;
+import com.android.settingslib.Utils;
import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-
public class SimStatusDialogController implements LifecycleObserver, OnResume, OnPause {
private final static String TAG = "SimStatusDialogCtrl";
@@ -253,8 +254,8 @@
}
private void updateServiceState(ServiceState serviceState) {
- final int state = serviceState.getState();
- if (state == ServiceState.STATE_OUT_OF_SERVICE || state == ServiceState.STATE_POWER_OFF) {
+ final int state = Utils.getCombinedServiceState(serviceState);
+ if (!Utils.isInService(serviceState)) {
resetSignalStrength();
}
@@ -297,10 +298,8 @@
return;
}
- final int state = getCurrentServiceState().getState();
-
- if ((ServiceState.STATE_OUT_OF_SERVICE == state) ||
- (ServiceState.STATE_POWER_OFF == state)) {
+ ServiceState serviceState = getCurrentServiceState();
+ if (serviceState == null || !Utils.isInService(serviceState)) {
return;
}
@@ -338,14 +337,10 @@
}
boolean show4GForLTE = false;
- try {
- final Context con = mContext.createPackageContext(
- "com.android.systemui", 0 /* flags */);
- final int id = con.getResources().getIdentifier("config_show4GForLTE",
- "bool" /* default type */, "com.android.systemui" /* default package */);
- show4GForLTE = con.getResources().getBoolean(id);
- } catch (PackageManager.NameNotFoundException e) {
- Log.e(TAG, "NameNotFoundException for show4GForLTE");
+ final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);
+ if (carrierConfig != null) {
+ show4GForLTE = carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
}
if (show4GForLTE) {
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
index 2dd3785..ca1c6ef 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
@@ -23,14 +23,14 @@
import android.view.View;
import android.widget.TextView;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
public class SimStatusDialogFragment extends InstrumentedDialogFragment {
private static final String SIM_SLOT_BUNDLE_KEY = "arg_key_sim_slot";
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
index 7c211c2..02c1916 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java
@@ -21,6 +21,11 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController;
@@ -28,11 +33,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class SimStatusPreferenceController extends
AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
index 02965af..a9c98d5 100644
--- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -21,6 +21,10 @@
import android.os.SystemProperties;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.deletionhelper.ActivationWarningFragment;
@@ -33,10 +37,6 @@
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.PreferenceScreen;
-
public class AutomaticStorageManagementSwitchPreferenceController extends
BasePreferenceController implements LifecycleObserver, OnResume,
SwitchWidgetController.OnSwitchChangeListener {
diff --git a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java
index f6eea3d..e6d9a72 100644
--- a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java
+++ b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java
@@ -21,13 +21,13 @@
import android.provider.Settings;
import android.util.SparseArray;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.deviceinfo.PrivateStorageInfo;
import java.util.concurrent.TimeUnit;
-import androidx.annotation.VisibleForTesting;
-
public class CachedStorageValuesHelper {
@VisibleForTesting public static final String SHARED_PREFERENCES_NAME = "CachedStorageValues";
diff --git a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
index 67d70e6..ee9fad6 100644
--- a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
+++ b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
@@ -22,6 +22,12 @@
import android.os.UserManager;
import android.util.SparseArray;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.deviceinfo.StorageItemPreference;
@@ -30,12 +36,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
/**
* SecondaryUserController controls the preferences on the Storage screen which had to do with
* secondary users.
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index fa1e8e2..c63fe10 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -28,6 +28,11 @@
import android.util.Log;
import android.util.SparseArray;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Settings;
@@ -46,11 +51,6 @@
import java.util.List;
import java.util.Map;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* StorageItemPreferenceController handles the storage line items which summarize the storage
* categorization breakdown.
diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java
index bf29612..a025d8c 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java
@@ -26,14 +26,14 @@
import android.view.View;
import android.widget.Button;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.widget.DonutView;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
/**
* StorageSummaryDonutPreference is a preference which summarizes the used and remaining storage left
* on a given storage volume. It is visualized with a donut graphing the % used.
diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
index 8e188d8..1dd3d98 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
@@ -21,14 +21,14 @@
import android.text.TextUtils;
import android.text.format.Formatter;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* StorgaeSummaryPreferenceController updates the donut storage summary preference to have the
* correct sizes showing.
@@ -43,6 +43,20 @@
super(context);
}
+ /**
+ * Converts a used storage amount to a formatted text.
+ *
+ * @param context Context
+ * @param usedBytes used bytes of storage
+ * @return a formatted text.
+ */
+ public static CharSequence convertUsedBytesToFormattedText(Context context, long usedBytes) {
+ final Formatter.BytesResult result = Formatter.formatBytes(context.getResources(),
+ usedBytes, 0);
+ return TextUtils.expandTemplate(context.getText(R.string.storage_size_large_alternate),
+ result.value, result.units);
+ }
+
@Override
public void displayPreference(PreferenceScreen screen) {
mSummary = (StorageSummaryDonutPreference) screen.findPreference("pref_summary");
@@ -53,11 +67,7 @@
public void updateState(Preference preference) {
super.updateState(preference);
StorageSummaryDonutPreference summary = (StorageSummaryDonutPreference) preference;
- final Formatter.BytesResult result = Formatter.formatBytes(mContext.getResources(),
- mUsedBytes, 0);
- summary.setTitle(TextUtils.expandTemplate(
- mContext.getText(R.string.storage_size_large_alternate), result.value,
- result.units));
+ summary.setTitle(convertUsedBytesToFormattedText(mContext, mUsedBytes));
summary.setSummary(mContext.getString(R.string.storage_volume_total,
Formatter.formatShortFileSize(mContext, mTotalBytes)));
summary.setPercent(mUsedBytes, mTotalBytes);
@@ -83,6 +93,7 @@
/**
* Updates the state of the donut preference for the next update.
+ *
* @param used Total number of used bytes on the summarized volume.
* @param total Total number of bytes on the summarized volume.
*/
@@ -94,6 +105,7 @@
/**
* Updates the state of the donut preference for the next update using volume to summarize.
+ *
* @param volume VolumeInfo to use to populate the informayion.
*/
public void updateSizes(StorageVolumeProvider svp, VolumeInfo volume) {
diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
index 00cdc02..887b1a7 100644
--- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java
+++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java
@@ -23,6 +23,9 @@
import android.os.storage.VolumeInfo;
import android.util.SparseArray;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.util.Preconditions;
import com.android.settings.Utils;
@@ -32,9 +35,6 @@
import com.android.settings.deviceinfo.StorageProfileFragment;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Defines a {@link AbstractPreferenceController} which handles a single profile of the primary
* user.
diff --git a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java
index 2d3de81..d95befa 100644
--- a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java
+++ b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java
@@ -20,14 +20,14 @@
import android.content.Context;
import android.os.storage.VolumeInfo;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settingslib.deviceinfo.PrivateStorageInfo;
import com.android.settingslib.deviceinfo.StorageVolumeProvider;
import com.android.settingslib.utils.AsyncLoaderCompat;
import java.io.IOException;
-import androidx.annotation.VisibleForTesting;
-
public class VolumeSizesLoader extends AsyncLoaderCompat<PrivateStorageInfo> {
private StorageVolumeProvider mVolumeProvider;
private StorageStatsManager mStats;
diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
index b3c1822..f845331 100644
--- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java
@@ -14,6 +14,7 @@
package com.android.settings.display;
import static android.provider.Settings.Secure.DOZE_ENABLED;
+
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
import android.content.Context;
@@ -21,14 +22,14 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class AmbientDisplayNotificationsPreferenceController extends
TogglePreferenceController implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/display/AppGridView.java b/src/com/android/settings/display/AppGridView.java
index d48eb09..cda1445 100644
--- a/src/com/android/settings/display/AppGridView.java
+++ b/src/com/android/settings/display/AppGridView.java
@@ -30,14 +30,14 @@
import android.widget.GridView;
import android.widget.ImageView;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
public class AppGridView extends GridView {
public AppGridView(Context context) {
super(context);
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index 3b7a076..3f5f2b0 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -52,7 +52,7 @@
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(
com.android.internal.R.bool.config_automatic_brightness_available)
- ? AVAILABLE
+ ? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
}
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index 4c02cd6..c852c01 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -16,6 +16,8 @@
import android.content.Context;
import android.text.TextUtils;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.view.RotationPolicy;
import com.android.settings.core.PreferenceControllerMixin;
@@ -26,8 +28,6 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.preference.Preference;
-
public class AutoRotatePreferenceController extends TogglePreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver,
OnResume, OnPause {
diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java
index 50fbc64..e1bbbfc 100644
--- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java
+++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java
@@ -20,13 +20,13 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
/**
* A controller to manage the switch for showing battery percentage in the status bar.
*/
diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
index 5fd29d1..dc24ed0 100644
--- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
@@ -30,6 +30,10 @@
import android.service.vr.IVrManager;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -39,10 +43,6 @@
import java.text.NumberFormat;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class BrightnessLevelPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
@@ -152,12 +152,20 @@
}
@VisibleForTesting
+ IVrManager safeGetVrManager() {
+ return IVrManager.Stub.asInterface(ServiceManager.getService(
+ Context.VR_SERVICE));
+ }
+
+ @VisibleForTesting
boolean isInVrMode() {
- try {
- return IVrManager.Stub.asInterface(ServiceManager.getService(Context.VR_SERVICE))
- .getVrModeState();
- } catch (RemoteException e) {
- Log.e(TAG, "Failed to check vr mode!", e);
+ IVrManager vrManager = safeGetVrManager();
+ if (vrManager != null) {
+ try {
+ return vrManager.getVrModeState();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Failed to check vr mode!", e);
+ }
}
return false;
}
diff --git a/src/com/android/settings/display/CameraGesturePreferenceController.java b/src/com/android/settings/display/CameraGesturePreferenceController.java
index dddc026..8e72a55 100644
--- a/src/com/android/settings/display/CameraGesturePreferenceController.java
+++ b/src/com/android/settings/display/CameraGesturePreferenceController.java
@@ -19,12 +19,12 @@
import android.os.SystemProperties;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public class CameraGesturePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/display/ColorModePreferenceController.java b/src/com/android/settings/display/ColorModePreferenceController.java
index e85bbf9..4679436 100644
--- a/src/com/android/settings/display/ColorModePreferenceController.java
+++ b/src/com/android/settings/display/ColorModePreferenceController.java
@@ -20,16 +20,16 @@
import android.os.ServiceManager;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
-import androidx.annotation.VisibleForTesting;
-
public class ColorModePreferenceController extends BasePreferenceController {
private static final String TAG = "ColorModePreference";
- private static final int SURFACE_FLINGER_TRANSACTION_QUERY_WIDE_COLOR = 1024;
+ private static final int SURFACE_FLINGER_TRANSACTION_QUERY_COLOR_MANAGEMENT = 1030;
private final ConfigurationWrapper mConfigWrapper;
private ColorDisplayController mColorDisplayController;
@@ -41,7 +41,7 @@
@Override
public int getAvailabilityStatus() {
- return mConfigWrapper.isScreenWideColorGamut()
+ return mConfigWrapper.isDeviceColorManaged()
&& !getColorDisplayController().getAccessibilityTransformActivated() ?
AVAILABLE_UNSEARCHABLE : DISABLED_FOR_USER;
}
@@ -77,17 +77,17 @@
mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
}
- boolean isScreenWideColorGamut() {
+ boolean isDeviceColorManaged() {
if (mSurfaceFlinger != null) {
final Parcel data = Parcel.obtain();
final Parcel reply = Parcel.obtain();
data.writeInterfaceToken("android.ui.ISurfaceComposer");
try {
- mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_QUERY_WIDE_COLOR,
+ mSurfaceFlinger.transact(SURFACE_FLINGER_TRANSACTION_QUERY_COLOR_MANAGEMENT,
data, reply, 0);
return reply.readBoolean();
} catch (RemoteException ex) {
- Log.e(TAG, "Failed to query wide color support", ex);
+ Log.e(TAG, "Failed to query color management support", ex);
} finally {
data.recycle();
reply.recycle();
diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java
index 9b9f8bd..bf307b6 100644
--- a/src/com/android/settings/display/ColorModePreferenceFragment.java
+++ b/src/com/android/settings/display/ColorModePreferenceFragment.java
@@ -17,6 +17,9 @@
import android.graphics.drawable.Drawable;
import android.provider.SearchIndexableResource;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.app.ColorDisplayController;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
@@ -31,9 +34,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceScreen;
-
@SuppressWarnings("WeakerAccess")
@SearchIndexable
public class ColorModePreferenceFragment extends RadioButtonPickerFragment
diff --git a/src/com/android/settings/display/DarkUIPreferenceController.java b/src/com/android/settings/display/DarkUIPreferenceController.java
index 2476f98..c3aafee 100644
--- a/src/com/android/settings/display/DarkUIPreferenceController.java
+++ b/src/com/android/settings/display/DarkUIPreferenceController.java
@@ -19,14 +19,14 @@
import android.app.UiModeManager;
import android.content.Context;
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
public class DarkUIPreferenceController extends BasePreferenceController
implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/display/FontSizePreferenceController.java b/src/com/android/settings/display/FontSizePreferenceController.java
index a55d577..680e378 100644
--- a/src/com/android/settings/display/FontSizePreferenceController.java
+++ b/src/com/android/settings/display/FontSizePreferenceController.java
@@ -18,7 +18,6 @@
import android.provider.Settings;
import com.android.settings.R;
-import com.android.settings.accessibility.ToggleFontSizePreferenceFragment;
import com.android.settings.core.BasePreferenceController;
public class FontSizePreferenceController extends BasePreferenceController {
diff --git a/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java b/src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java
similarity index 92%
rename from src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java
rename to src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java
index 8dfb2b4..703ec9c 100644
--- a/src/com/android/settings/accessibility/FontSizePreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/display/FontSizePreferenceFragmentForSetupWizard.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.accessibility;
+package com.android.settings.display;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
diff --git a/src/com/android/settings/display/LiftToWakePreferenceController.java b/src/com/android/settings/display/LiftToWakePreferenceController.java
index e546258..d12b7c4 100644
--- a/src/com/android/settings/display/LiftToWakePreferenceController.java
+++ b/src/com/android/settings/display/LiftToWakePreferenceController.java
@@ -20,12 +20,12 @@
import android.hardware.SensorManager;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public class LiftToWakePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
index e988e30..6421ebd 100644
--- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java
@@ -22,14 +22,14 @@
import android.view.View.OnClickListener;
import android.widget.Button;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.TogglePreferenceController;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class NightDisplayActivationPreferenceController extends TogglePreferenceController {
private ColorDisplayController mController;
diff --git a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
index 6ccec7f..cfe1791 100644
--- a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java
@@ -18,14 +18,14 @@
import android.content.Context;
-import com.android.internal.app.ColorDisplayController;
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-
import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.internal.app.ColorDisplayController;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
public class NightDisplayAutoModePreferenceController extends BasePreferenceController
implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
index cb2adc7..e2abe1b 100644
--- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java
@@ -18,11 +18,11 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.BasePreferenceController;
-import androidx.preference.Preference;
-
public class NightDisplayCustomEndTimePreferenceController extends BasePreferenceController {
private ColorDisplayController mController;
diff --git a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
index 75e8b8c..255003c 100644
--- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java
@@ -18,11 +18,11 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.BasePreferenceController;
-import androidx.preference.Preference;
-
public class NightDisplayCustomStartTimePreferenceController extends BasePreferenceController {
private ColorDisplayController mController;
diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
index 7465b48..bb59859 100644
--- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
@@ -18,13 +18,13 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.FooterPreference;
-import androidx.preference.Preference;
-
public class NightDisplayFooterPreferenceController extends BasePreferenceController {
public NightDisplayFooterPreferenceController(Context context) {
diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
index 003accc..db053a5 100644
--- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.text.TextUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.widget.SeekBarPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class NightDisplayIntensityPreferenceController extends SliderPreferenceController {
private ColorDisplayController mController;
diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java
index 41c6b53..a84ba58 100644
--- a/src/com/android/settings/display/NightDisplayPreference.java
+++ b/src/com/android/settings/display/NightDisplayPreference.java
@@ -17,12 +17,12 @@
import android.content.Context;
import android.util.AttributeSet;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.app.ColorDisplayController;
import java.time.LocalTime;
-import androidx.preference.SwitchPreference;
-
public class NightDisplayPreference extends SwitchPreference
implements ColorDisplayController.Callback {
diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java
index d322c1d..fbd5d3e 100644
--- a/src/com/android/settings/display/NightDisplaySettings.java
+++ b/src/com/android/settings/display/NightDisplaySettings.java
@@ -22,6 +22,8 @@
import android.os.Bundle;
import android.provider.SearchIndexableResource;
+import androidx.preference.Preference;
+
import com.android.internal.app.ColorDisplayController;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -35,8 +37,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
/**
* Settings screen for Night display.
*/
diff --git a/src/com/android/settings/display/NightModePreferenceController.java b/src/com/android/settings/display/NightModePreferenceController.java
index 65120e7..5846a65 100644
--- a/src/com/android/settings/display/NightModePreferenceController.java
+++ b/src/com/android/settings/display/NightModePreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.util.Log;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public class NightModePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/PreviewPagerAdapter.java b/src/com/android/settings/display/PreviewPagerAdapter.java
similarity index 82%
rename from src/com/android/settings/PreviewPagerAdapter.java
rename to src/com/android/settings/display/PreviewPagerAdapter.java
index 8d83cb4..4d5b47a 100644
--- a/src/com/android/settings/PreviewPagerAdapter.java
+++ b/src/com/android/settings/display/PreviewPagerAdapter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.display;
import android.animation.Animator;
import android.animation.Animator.AnimatorListener;
@@ -32,6 +32,8 @@
import androidx.viewpager.widget.PagerAdapter;
+import com.android.settings.support.actionbar.HelpResourceProvider;
+
/**
* A PagerAdapter used by PreviewSeekBarPreferenceFragment that for showing multiple preview screen
* regarding a single setting and allowing the user to swipe across them.
@@ -76,16 +78,12 @@
final Context configContext = context.createConfigurationContext(configurations[j]);
configContext.getTheme().setTo(context.getTheme());
- final LayoutInflater configInflater = LayoutInflater.from(configContext);
final ViewStub sampleViewStub = new ViewStub(configContext);
sampleViewStub.setLayoutResource(previewSampleResIds[i]);
final int fi = i, fj = j;
- sampleViewStub.setOnInflateListener(new OnInflateListener() {
- @Override
- public void onInflate(ViewStub stub, View inflated) {
- inflated.setVisibility(stub.getVisibility());
- mViewStubInflated[fi][fj] = true;
- }
+ sampleViewStub.setOnInflateListener((stub, inflated) -> {
+ inflated.setVisibility(stub.getVisibility());
+ mViewStubInflated[fi][fj] = true;
});
mPreviewFrames[p].addView(sampleViewStub);
@@ -94,7 +92,7 @@
}
@Override
- public void destroyItem (ViewGroup container, int position, Object object) {
+ public void destroyItem(ViewGroup container, int position, Object object) {
container.removeView((View) object);
}
@@ -164,29 +162,29 @@
if (visibility == View.VISIBLE) {
// Fade in animation.
view.animate()
- .alpha(alpha)
- .setInterpolator(FADE_IN_INTERPOLATOR)
- .setDuration(CROSS_FADE_DURATION_MS)
- .setListener(new PreviewFrameAnimatorListener())
- .withStartAction(new Runnable() {
- @Override
- public void run() {
- view.setVisibility(visibility);
- }
- });
+ .alpha(alpha)
+ .setInterpolator(FADE_IN_INTERPOLATOR)
+ .setDuration(CROSS_FADE_DURATION_MS)
+ .setListener(new PreviewFrameAnimatorListener())
+ .withStartAction(new Runnable() {
+ @Override
+ public void run() {
+ view.setVisibility(visibility);
+ }
+ });
} else {
// Fade out animation.
view.animate()
- .alpha(alpha)
- .setInterpolator(FADE_OUT_INTERPOLATOR)
- .setDuration(CROSS_FADE_DURATION_MS)
- .setListener(new PreviewFrameAnimatorListener())
- .withEndAction(new Runnable() {
- @Override
- public void run() {
- view.setVisibility(visibility);
- }
- });
+ .alpha(alpha)
+ .setInterpolator(FADE_OUT_INTERPOLATOR)
+ .setDuration(CROSS_FADE_DURATION_MS)
+ .setListener(new PreviewFrameAnimatorListener())
+ .withEndAction(new Runnable() {
+ @Override
+ public void run() {
+ view.setVisibility(visibility);
+ }
+ });
}
}
}
diff --git a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java b/src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java
similarity index 79%
rename from src/com/android/settings/PreviewSeekBarPreferenceFragment.java
rename to src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java
index d953229..bb9e3d7 100644
--- a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java
+++ b/src/com/android/settings/display/PreviewSeekBarPreferenceFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 The Android Open Source Project
+ * 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.
@@ -14,26 +14,27 @@
* limitations under the License.
*/
-package com.android.settings;
+package com.android.settings.display;
import android.content.Context;
import android.content.res.Configuration;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityEvent;
import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.TextView;
-import com.android.settings.widget.DotsPageIndicator;
-import com.android.settings.widget.LabeledSeekBar;
-
import androidx.viewpager.widget.ViewPager;
import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.widget.DotsPageIndicator;
+import com.android.settings.widget.LabeledSeekBar;
+
/**
* Preference fragment shows a preview and a seek bar to adjust a specific settings.
*/
@@ -48,12 +49,6 @@
/** Index of the entry corresponding to current value of the settings. */
protected int mCurrentIndex;
- /** Resource id of the layout for this preference fragment. */
- protected int mActivityLayoutResId;
-
- /** Resource id of the layout that defines the contents inside preview screen. */
- protected int[] mPreviewSampleResIds;
-
private ViewPager mPreviewPager;
private PreviewPagerAdapter mPreviewPagerAdapter;
private DotsPageIndicator mPageIndicator;
@@ -82,12 +77,7 @@
@Override
public void onStopTrackingTouch(SeekBar seekBar) {
if (mPreviewPagerAdapter.isAnimating()) {
- mPreviewPagerAdapter.setAnimationEndAction(new Runnable() {
- @Override
- public void run() {
- commit();
- }
- });
+ mPreviewPagerAdapter.setAnimationEndAction(() -> commit());
} else {
commit();
}
@@ -102,39 +92,33 @@
final ViewGroup listContainer = root.findViewById(android.R.id.list_container);
listContainer.removeAllViews();
- final View content = inflater.inflate(mActivityLayoutResId, listContainer, false);
+ final View content = inflater.inflate(getActivityLayoutResId(), listContainer, false);
listContainer.addView(content);
- mLabel = (TextView) content.findViewById(R.id.current_label);
+ mLabel = content.findViewById(R.id.current_label);
// The maximum SeekBar value always needs to be non-zero. If there's
// only one available value, we'll handle this by disabling the
// seek bar.
final int max = Math.max(1, mEntries.length - 1);
- mSeekBar = (LabeledSeekBar) content.findViewById(R.id.seek_bar);
+ mSeekBar = content.findViewById(R.id.seek_bar);
mSeekBar.setLabels(mEntries);
mSeekBar.setMax(max);
mSmaller = content.findViewById(R.id.smaller);
- mSmaller.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- final int progress = mSeekBar.getProgress();
- if (progress > 0) {
- mSeekBar.setProgress(progress - 1, true);
- }
+ mSmaller.setOnClickListener(v -> {
+ final int progress = mSeekBar.getProgress();
+ if (progress > 0) {
+ mSeekBar.setProgress(progress - 1, true);
}
});
mLarger = content.findViewById(R.id.larger);
- mLarger.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- final int progress = mSeekBar.getProgress();
- if (progress < mSeekBar.getMax()) {
- mSeekBar.setProgress(progress + 1, true);
- }
+ mLarger.setOnClickListener(v -> {
+ final int progress = mSeekBar.getProgress();
+ if (progress < mSeekBar.getMax()) {
+ mSeekBar.setProgress(progress + 1, true);
}
});
@@ -152,15 +136,16 @@
configurations[i] = createConfig(origConfig, i);
}
- mPreviewPager = (ViewPager) content.findViewById(R.id.preview_pager);
+ final int[] previews = getPreviewSampleResIds();
+ mPreviewPager = content.findViewById(R.id.preview_pager);
mPreviewPagerAdapter = new PreviewPagerAdapter(context, isLayoutRtl,
- mPreviewSampleResIds, configurations);
+ previews, configurations);
mPreviewPager.setAdapter(mPreviewPagerAdapter);
- mPreviewPager.setCurrentItem(isLayoutRtl ? mPreviewSampleResIds.length - 1 : 0);
+ mPreviewPager.setCurrentItem(isLayoutRtl ? previews.length - 1 : 0);
mPreviewPager.addOnPageChangeListener(mPreviewPageChangeListener);
- mPageIndicator = (DotsPageIndicator) content.findViewById(R.id.page_indicator);
- if (mPreviewSampleResIds.length > 1) {
+ mPageIndicator = content.findViewById(R.id.page_indicator);
+ if (previews.length > 1) {
mPageIndicator.setViewPager(mPreviewPager);
mPageIndicator.setVisibility(View.VISIBLE);
mPageIndicator.setOnPageChangeListener(mPageIndicatorPageChangeListener);
@@ -187,6 +172,12 @@
mSeekBar.setOnSeekBarChangeListener(null);
}
+ /** Resource id of the layout for this preference fragment. */
+ protected abstract int getActivityLayoutResId();
+
+ /** Resource id of the layout that defines the contents inside preview screen. */
+ protected abstract int[] getPreviewSampleResIds();
+
/**
* Creates new configuration based on the current position of the SeekBar.
*/
@@ -210,8 +201,8 @@
private void setPagerIndicatorContentDescription(int position) {
mPageIndicator.setContentDescription(
- getPrefContext().getString(R.string.preview_page_indicator_content_description,
- position + 1, mPreviewSampleResIds.length));
+ getString(R.string.preview_page_indicator_content_description,
+ position + 1, getPreviewSampleResIds().length));
}
private OnPageChangeListener mPreviewPageChangeListener = new OnPageChangeListener() {
diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java
index a172a39..c1b0b4e 100644
--- a/src/com/android/settings/display/ScreenSaverPreferenceController.java
+++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java
@@ -15,12 +15,12 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dream.DreamSettings;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class ScreenSaverPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/display/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java
index 6e40181..f47d7da 100644
--- a/src/com/android/settings/display/ScreenZoomPreference.java
+++ b/src/com/android/settings/display/ScreenZoomPreference.java
@@ -20,11 +20,11 @@
import android.text.TextUtils;
import android.util.AttributeSet;
-import com.android.settingslib.display.DisplayDensityUtils;
-
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
+import com.android.settingslib.display.DisplayDensityUtils;
+
/**
* Preference for changing the density of the display on which the preference
* is visible.
diff --git a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java
index 82cb58d..e02579f 100644
--- a/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/display/ScreenZoomPreferenceFragmentForSetupWizard.java
@@ -18,8 +18,7 @@
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-public class ScreenZoomPreferenceFragmentForSetupWizard
- extends ScreenZoomSettings {
+public class ScreenZoomPreferenceFragmentForSetupWizard extends ScreenZoomSettings {
@Override
public int getMetricsCategory() {
diff --git a/src/com/android/settings/display/ScreenZoomSettings.java b/src/com/android/settings/display/ScreenZoomSettings.java
index dbb6353..37ac046 100644
--- a/src/com/android/settings/display/ScreenZoomSettings.java
+++ b/src/com/android/settings/display/ScreenZoomSettings.java
@@ -24,9 +24,9 @@
import android.view.Display;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.PreviewSeekBarPreferenceFragment;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.display.DisplayDensityUtils;
import com.android.settingslib.search.SearchIndexable;
@@ -44,16 +44,25 @@
private int[] mValues;
@Override
+ protected int getActivityLayoutResId() {
+ return R.layout.screen_zoom_activity;
+ }
+
+ @Override
+ protected int[] getPreviewSampleResIds() {
+ return getContext().getResources().getBoolean(
+ R.bool.config_enable_extra_screen_zoom_preview)
+ ? new int[]{
+ R.layout.screen_zoom_preview_1,
+ R.layout.screen_zoom_preview_2,
+ R.layout.screen_zoom_preview_settings}
+ : new int[]{R.layout.screen_zoom_preview_1};
+ }
+
+ @Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- mActivityLayoutResId = R.layout.screen_zoom_activity;
-
- // This should be replaced once the final preview sample screen is in place.
- mPreviewSampleResIds = new int[] {R.layout.screen_zoom_preview_1,
- R.layout.screen_zoom_preview_2,
- R.layout.screen_zoom_preview_settings};
-
final DisplayDensityUtils density = new DisplayDensityUtils(getContext());
final int initialIndex = density.getCurrentIndex();
@@ -62,8 +71,8 @@
// connect to the window manager service. Just use the current
// density and don't let the user change anything.
final int densityDpi = getResources().getDisplayMetrics().densityDpi;
- mValues = new int[] {densityDpi};
- mEntries = new String[] {getString(DisplayDensityUtils.SUMMARY_DEFAULT)};
+ mValues = new int[]{densityDpi};
+ mEntries = new String[]{getString(DisplayDensityUtils.SUMMARY_DEFAULT)};
mInitialIndex = 0;
mDefaultDensity = densityDpi;
} else {
@@ -108,7 +117,7 @@
}
/** Index provider used to expose this fragment in search. */
- public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableRaw> getRawDataToIndex(Context context,
diff --git a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java
index 7af3351..40eaad3 100644
--- a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java
+++ b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java
@@ -16,13 +16,13 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
public class ShowOperatorNamePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/display/TapToWakePreferenceController.java b/src/com/android/settings/display/TapToWakePreferenceController.java
index da8e785..5c2d975 100644
--- a/src/com/android/settings/display/TapToWakePreferenceController.java
+++ b/src/com/android/settings/display/TapToWakePreferenceController.java
@@ -16,12 +16,12 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public class TapToWakePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java
index c71a7ab..6fc4b08 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -26,6 +26,10 @@
import android.os.UserHandle;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
@@ -36,10 +40,6 @@
import java.util.List;
import java.util.Objects;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
public class ThemePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/display/TimeoutListPreference.java b/src/com/android/settings/display/TimeoutListPreference.java
index 34b2e11..f9a731d 100644
--- a/src/com/android/settings/display/TimeoutListPreference.java
+++ b/src/com/android/settings/display/TimeoutListPreference.java
@@ -26,14 +26,14 @@
import android.util.Log;
import android.view.View;
+import androidx.appcompat.app.AlertDialog.Builder;
+
import com.android.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settingslib.RestrictedLockUtils;
import java.util.ArrayList;
-import androidx.appcompat.app.AlertDialog.Builder;
-
public class TimeoutListPreference extends RestrictedListPreference {
private static final String TAG = "TimeoutListPreference";
diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java
index 2fbe388..60b7e24 100644
--- a/src/com/android/settings/display/TimeoutPreferenceController.java
+++ b/src/com/android/settings/display/TimeoutPreferenceController.java
@@ -22,14 +22,15 @@
import android.provider.Settings;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class TimeoutPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
@@ -65,7 +66,7 @@
(DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
if (dpm != null) {
final RestrictedLockUtils.EnforcedAdmin admin =
- RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
+ RestrictedLockUtilsInternal.checkIfMaximumTimeToLockIsSet(mContext);
final long maxTimeout =
dpm.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
timeoutListPreference.removeUnusableTimeouts(maxTimeout, admin);
@@ -73,7 +74,7 @@
updateTimeoutPreferenceDescription(timeoutListPreference,
Long.parseLong(timeoutListPreference.getValue()));
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT,
UserHandle.myUserId());
if (admin != null) {
diff --git a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java
similarity index 91%
rename from src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
rename to src/com/android/settings/display/ToggleFontSizePreferenceFragment.java
index c3100ee..4f118d5 100644
--- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java
+++ b/src/com/android/settings/display/ToggleFontSizePreferenceFragment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2015 The Android Open Source Project
+ * 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.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.accessibility;
+package com.android.settings.display;
import android.annotation.Nullable;
import android.content.ContentResolver;
@@ -25,7 +25,6 @@
import android.provider.Settings;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.PreviewSeekBarPreferenceFragment;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -44,13 +43,20 @@
private float[] mValues;
@Override
+ protected int getActivityLayoutResId() {
+ return R.layout.font_size_activity;
+ }
+
+ @Override
+ protected int[] getPreviewSampleResIds() {
+ return new int[]{R.layout.font_size_preview};
+ }
+
+ @Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- mActivityLayoutResId = R.layout.font_size_activity;
- mPreviewSampleResIds = new int[] {R.layout.font_size_preview};
-
- Resources res = getContext().getResources();
+ final Resources res = getContext().getResources();
final ContentResolver resolver = getContext().getContentResolver();
// Mark the appropriate item in the preferences list.
mEntries = res.getStringArray(R.array.entries_font_size);
diff --git a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
new file mode 100644
index 0000000..88b87e0
--- /dev/null
+++ b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
@@ -0,0 +1,44 @@
+/*
+ * 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.display;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+public class TopLevelDisplayPreferenceController extends BasePreferenceController {
+
+ public TopLevelDisplayPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ if (new WallpaperPreferenceController(mContext, "dummy_key").isAvailable()) {
+ return mContext.getText(R.string.display_dashboard_summary);
+ } else {
+ return mContext.getText(R.string.display_dashboard_nowallpaper_summary);
+ }
+ }
+
+}
diff --git a/src/com/android/settings/display/VrDisplayPreferenceController.java b/src/com/android/settings/display/VrDisplayPreferenceController.java
index 1c9562c..6fcb5b0 100644
--- a/src/com/android/settings/display/VrDisplayPreferenceController.java
+++ b/src/com/android/settings/display/VrDisplayPreferenceController.java
@@ -18,12 +18,12 @@
import android.content.pm.PackageManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class VrDisplayPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java
index 60068e3..0b09124 100644
--- a/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/src/com/android/settings/display/WallpaperPreferenceController.java
@@ -24,37 +24,33 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
-import androidx.preference.Preference;
-
-public class WallpaperPreferenceController extends AbstractPreferenceController implements
- PreferenceControllerMixin {
+public class WallpaperPreferenceController extends BasePreferenceController {
private static final String TAG = "WallpaperPrefController";
- public static final String KEY_WALLPAPER = "wallpaper";
-
private final String mWallpaperPackage;
private final String mWallpaperClass;
- public WallpaperPreferenceController(Context context) {
- super(context);
+ public WallpaperPreferenceController(Context context, String key) {
+ super(context, key);
mWallpaperPackage = mContext.getString(R.string.config_wallpaper_picker_package);
mWallpaperClass = mContext.getString(R.string.config_wallpaper_picker_class);
}
@Override
- public boolean isAvailable() {
+ public int getAvailabilityStatus() {
if (TextUtils.isEmpty(mWallpaperPackage) || TextUtils.isEmpty(mWallpaperClass)) {
Log.e(TAG, "No Wallpaper picker specified!");
- return false;
+ return UNSUPPORTED_ON_DEVICE;
}
final ComponentName componentName =
new ComponentName(mWallpaperPackage, mWallpaperClass);
@@ -63,12 +59,8 @@
intent.setComponent(componentName);
final List<ResolveInfo> resolveInfos =
pm.queryIntentActivities(intent, 0 /* flags */);
- return resolveInfos != null && resolveInfos.size() != 0;
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_WALLPAPER;
+ return resolveInfos != null && !resolveInfos.isEmpty()
+ ? AVAILABLE_UNSEARCHABLE : CONDITIONALLY_UNAVAILABLE;
}
@Override
@@ -80,7 +72,7 @@
final String restriction = DISALLOW_SET_WALLPAPER;
if (pref != null) {
pref.setDisabledByAdmin(null);
- if (RestrictedLockUtils.hasBaseUserRestriction(mContext,
+ if (RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
restriction, UserHandle.myUserId())) {
pref.setEnabled(false);
} else {
diff --git a/src/com/android/settings/dream/CurrentDreamPreferenceController.java b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
index 880cb8c..fee4826 100644
--- a/src/com/android/settings/dream/CurrentDreamPreferenceController.java
+++ b/src/com/android/settings/dream/CurrentDreamPreferenceController.java
@@ -18,6 +18,8 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.widget.GearPreference;
import com.android.settingslib.dream.DreamBackend;
@@ -25,8 +27,6 @@
import java.util.Optional;
-import androidx.preference.Preference;
-
public class CurrentDreamPreferenceController extends BasePreferenceController {
private final DreamBackend mBackend;
diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java
index 9a46b1e..32869f8 100644
--- a/src/com/android/settings/dream/DreamSettings.java
+++ b/src/com/android/settings/dream/DreamSettings.java
@@ -24,6 +24,8 @@
import android.content.Context;
import android.provider.SearchIndexableResource;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -37,8 +39,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
@SearchIndexable
public class DreamSettings extends DashboardFragment {
diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java
index 124e485..5519a0e 100644
--- a/src/com/android/settings/dream/StartNowPreferenceController.java
+++ b/src/com/android/settings/dream/StartNowPreferenceController.java
@@ -19,15 +19,15 @@
import android.content.Context;
import android.widget.Button;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.dream.DreamBackend;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class StartNowPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
private static final String TAG = "StartNowPreferenceController";
diff --git a/src/com/android/settings/dream/WhenToDreamPreferenceController.java b/src/com/android/settings/dream/WhenToDreamPreferenceController.java
index b57d064..4108e85 100644
--- a/src/com/android/settings/dream/WhenToDreamPreferenceController.java
+++ b/src/com/android/settings/dream/WhenToDreamPreferenceController.java
@@ -18,12 +18,12 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.dream.DreamBackend;
-import androidx.preference.Preference;
-
public class WhenToDreamPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
index 104b216..717c5bc 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialog.java
@@ -53,12 +53,22 @@
@androidx.annotation.VisibleForTesting
EnforcedAdmin getAdminDetailsFromIntent(Intent intent) {
- final EnforcedAdmin admin = new EnforcedAdmin(null, UserHandle.myUserId());
+ final EnforcedAdmin admin = new EnforcedAdmin(null, UserHandle.of(UserHandle.myUserId()));
if (intent == null) {
return admin;
}
admin.component = intent.getParcelableExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN);
- admin.userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+
+ if (intent.hasExtra(Intent.EXTRA_USER)) {
+ admin.user = intent.getParcelableExtra(Intent.EXTRA_USER);
+ } else {
+ int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+ if (userId == UserHandle.USER_NULL) {
+ admin.user = null;
+ } else {
+ admin.user = UserHandle.of(userId);
+ }
+ }
return admin;
}
diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
index 6a4ca92..5ca8fea 100644
--- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
+++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
@@ -16,6 +16,8 @@
package com.android.settings.enterprise;
+import android.annotation.NonNull;
+import android.annotation.UserIdInt;
import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
@@ -32,18 +34,19 @@
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.Utils;
import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.Objects;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Helper class for {@link ActionDisabledByAdminDialog} which sets up the dialog.
*/
@@ -59,6 +62,18 @@
mActivity = activity;
}
+ private @UserIdInt int getEnforcementAdminUserId(@NonNull EnforcedAdmin admin) {
+ if (admin.user == null) {
+ return UserHandle.USER_NULL;
+ } else {
+ return admin.user.getIdentifier();
+ }
+ }
+
+ private @UserIdInt int getEnforcementAdminUserId() {
+ return getEnforcementAdminUserId(mEnforcedAdmin);
+ }
+
public AlertDialog.Builder prepareDialogBuilder(String restriction,
EnforcedAdmin enforcedAdmin) {
mEnforcedAdmin = enforcedAdmin;
@@ -67,7 +82,7 @@
final AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
mDialogView = (ViewGroup) LayoutInflater.from(builder.getContext()).inflate(
R.layout.admin_support_details_dialog, null);
- initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId,
+ initializeDialogViews(mDialogView, mEnforcedAdmin.component, getEnforcementAdminUserId(),
mRestriction);
return builder
.setPositiveButton(R.string.okay, null)
@@ -85,7 +100,7 @@
}
mEnforcedAdmin = admin;
mRestriction = restriction;
- initializeDialogViews(mDialogView, mEnforcedAdmin.component, mEnforcedAdmin.userId,
+ initializeDialogViews(mDialogView, mEnforcedAdmin.component, getEnforcementAdminUserId(),
mRestriction);
}
@@ -94,7 +109,7 @@
if (admin == null) {
return;
}
- if (!RestrictedLockUtils.isAdminInCurrentUserOrProfile(mActivity, admin)
+ if (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(mActivity, admin)
|| !RestrictedLockUtils.isCurrentUserOrProfile(mActivity, userId)) {
admin = null;
} else {
@@ -107,7 +122,15 @@
}
setAdminSupportTitle(root, restriction);
- setAdminSupportDetails(mActivity, root, new EnforcedAdmin(admin, userId));
+
+ final UserHandle user;
+ if (userId == UserHandle.USER_NULL) {
+ user = null;
+ } else {
+ user = UserHandle.of(userId);
+ }
+
+ setAdminSupportDetails(mActivity, root, new EnforcedAdmin(admin, user));
}
@VisibleForTesting
@@ -136,9 +159,6 @@
case DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE:
titleView.setText(R.string.disabled_by_policy_title_screen_capture);
break;
- case DevicePolicyManager.POLICY_MANDATORY_BACKUPS:
- titleView.setText(R.string.disabled_by_policy_title_turn_off_backups);
- break;
case DevicePolicyManager.POLICY_SUSPEND_PACKAGES:
titleView.setText(R.string.disabled_by_policy_title_suspend_packages);
break;
@@ -154,20 +174,21 @@
if (enforcedAdmin == null || enforcedAdmin.component == null) {
return;
}
+
final DevicePolicyManager dpm = (DevicePolicyManager) activity.getSystemService(
Context.DEVICE_POLICY_SERVICE);
- if (!RestrictedLockUtils.isAdminInCurrentUserOrProfile(activity,
+ if (!RestrictedLockUtilsInternal.isAdminInCurrentUserOrProfile(activity,
enforcedAdmin.component) || !RestrictedLockUtils.isCurrentUserOrProfile(
- activity, enforcedAdmin.userId)) {
+ activity, getEnforcementAdminUserId(enforcedAdmin))) {
enforcedAdmin.component = null;
} else {
- if (enforcedAdmin.userId == UserHandle.USER_NULL) {
- enforcedAdmin.userId = UserHandle.myUserId();
+ if (enforcedAdmin.user == null) {
+ enforcedAdmin.user = UserHandle.of(UserHandle.myUserId());
}
CharSequence supportMessage = null;
if (UserHandle.isSameApp(Process.myUid(), Process.SYSTEM_UID)) {
- supportMessage = dpm.getShortSupportMessageForUser(
- enforcedAdmin.component, enforcedAdmin.userId);
+ supportMessage = dpm.getShortSupportMessageForUser(enforcedAdmin.component,
+ getEnforcementAdminUserId(enforcedAdmin));
}
if (supportMessage != null) {
final TextView textView = root.findViewById(R.id.admin_support_msg);
@@ -185,8 +206,7 @@
enforcedAdmin.component);
intent.putExtra(DeviceAdminAdd.EXTRA_CALLED_FROM_SUPPORT_DIALOG, true);
// DeviceAdminAdd class may need to run as managed profile.
- activity.startActivityAsUser(intent,
- new UserHandle(enforcedAdmin.userId));
+ activity.startActivityAsUser(intent, enforcedAdmin.user);
} else {
intent.setClass(activity, Settings.DeviceAdminSettingsActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
index 954c643..1c7ff62 100644
--- a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
@@ -17,6 +17,8 @@
import android.content.Context;
import android.text.format.DateUtils;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
@@ -24,8 +26,6 @@
import java.util.Date;
-import androidx.preference.Preference;
-
public abstract class AdminActionPreferenceControllerBase extends
AbstractPreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
index c438e66..86d08cb 100644
--- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
@@ -17,14 +17,14 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public abstract class AdminGrantedPermissionsPreferenceControllerBase
extends AbstractPreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
index d523e3b..696561b 100644
--- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
@@ -15,13 +15,13 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class AlwaysOnVpnCurrentUserPreferenceController
extends AbstractPreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
index a12b62c..2719818 100644
--- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
+++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
@@ -20,18 +20,18 @@
import android.content.pm.PackageManager;
import android.util.IconDrawableFactory;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.UserAppInfo;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* PreferenceController that builds a dynamic list of applications provided by
* {@link ApplicationListBuilder} instance.
@@ -80,6 +80,7 @@
/**
* Simple interface for building application list within {
+ *
* @link ApplicationListPreferenceController}
*/
public interface ApplicationListBuilder {
diff --git a/src/com/android/settings/enterprise/BackupsEnabledPreferenceController.java b/src/com/android/settings/enterprise/BackupsEnabledPreferenceController.java
deleted file mode 100644
index b24f8dc..0000000
--- a/src/com/android/settings/enterprise/BackupsEnabledPreferenceController.java
+++ /dev/null
@@ -1,37 +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.enterprise;
-
-import android.content.Context;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.overlay.FeatureFactory;
-
-public class BackupsEnabledPreferenceController extends BasePreferenceController {
-
- private static final String KEY_BACKUPS_ENABLED = "backups_enabled";
- private final EnterprisePrivacyFeatureProvider mFeatureProvider;
-
- public BackupsEnabledPreferenceController(Context context) {
- super(context, KEY_BACKUPS_ENABLED);
- mFeatureProvider = FeatureFactory.getFactory(context)
- .getEnterprisePrivacyFeatureProvider(context);
- }
-
- @Override
- public int getAvailabilityStatus() {
- return mFeatureProvider.areBackupsMandatory() ? AVAILABLE : DISABLED_FOR_USER;
- }
-}
-
diff --git a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
index 5a24ab8..45170b3 100644
--- a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
+++ b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
@@ -16,11 +16,11 @@
import android.content.Context;
-import com.android.settings.R;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
+import com.android.settings.R;
+
public class CaCertsCurrentUserPreferenceController extends CaCertsPreferenceControllerBase {
@VisibleForTesting
diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
index 411140c..c7dde5c 100644
--- a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
@@ -16,13 +16,13 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public abstract class CaCertsPreferenceControllerBase
extends AbstractPreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
index b3d5297..9bd4279 100644
--- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
@@ -15,14 +15,14 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class EnterpriseInstalledPackagesPreferenceController
extends AbstractPreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
index 51d125d..048782e 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
@@ -124,9 +124,4 @@
* profile (if any).
*/
int getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile();
-
- /*
- * Returns whether backups are mandatory.
- */
- boolean areBackupsMandatory();
}
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 5505683..4085988 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -234,11 +234,6 @@
return activeAdmins;
}
- @Override
- public boolean areBackupsMandatory() {
- return null != mDpm.getMandatoryBackupTransport();
- }
-
protected static class EnterprisePrivacySpan extends ClickableSpan {
private final Context mContext;
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
index c5da685..b07eb91 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
@@ -15,13 +15,13 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class EnterprisePrivacyPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
index f04c421..dab1395 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java
@@ -84,7 +84,6 @@
exposureChangesCategoryControllers.add(new CaCertsCurrentUserPreferenceController(context));
exposureChangesCategoryControllers.add(new CaCertsManagedProfilePreferenceController(
context));
- exposureChangesCategoryControllers.add(new BackupsEnabledPreferenceController(context));
controllers.addAll(exposureChangesCategoryControllers);
controllers.add(new PreferenceCategoryController(context, "exposure_changes_category")
.setChildren(exposureChangesCategoryControllers));
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
index 650871f..e3136f4 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
@@ -22,6 +22,11 @@
import android.content.pm.UserInfo;
import android.os.UserHandle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.ApplicationFeatureProvider;
@@ -38,11 +43,6 @@
import java.util.EnumMap;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
/**
* PreferenceController that builds a dynamic list of default apps set by device or profile owner.
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
index eed6ba1..b2f9459 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
@@ -17,6 +17,8 @@
import android.content.Context;
import android.os.UserHandle;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.EnterpriseDefaultApps;
@@ -25,8 +27,6 @@
import com.android.settings.users.UserFeatureProvider;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class EnterpriseSetDefaultAppsPreferenceController
extends AbstractPreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
index 9c5906f..322589e 100644
--- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
@@ -16,13 +16,13 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public abstract class FailedPasswordWipePreferenceControllerBase
extends AbstractPreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java
index 3d2ed80..51a24a2 100644
--- a/src/com/android/settings/enterprise/ImePreferenceController.java
+++ b/src/com/android/settings/enterprise/ImePreferenceController.java
@@ -16,13 +16,13 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class ImePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {
diff --git a/src/com/android/settings/flashlight/FlashlightSliceBuilder.java b/src/com/android/settings/flashlight/FlashlightSliceBuilder.java
index a689fd2..d21739e 100644
--- a/src/com/android/settings/flashlight/FlashlightSliceBuilder.java
+++ b/src/com/android/settings/flashlight/FlashlightSliceBuilder.java
@@ -17,6 +17,7 @@
package com.android.settings.flashlight;
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+
import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
import android.annotation.ColorInt;
@@ -34,16 +35,17 @@
import android.provider.SettingsSlicesContract;
import android.util.Log;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.slices.SettingsSliceProvider;
import com.android.settings.slices.SliceBroadcastReceiver;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
/**
* Utility class to build a Flashlight Slice, and handle all associated actions.
@@ -93,7 +95,7 @@
IconCompat.createWithResource(context, R.drawable.ic_signal_flashlight);
return new ListBuilder(context, FLASHLIGHT_URI, ListBuilder.INFINITY)
.setAccentColor(color)
- .addRow(b -> b
+ .addRow(new RowBuilder()
.setTitle(context.getText(R.string.power_flashlight))
.setTitleItem(icon, ICON_IMAGE)
.setPrimaryAction(
diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
index 2c48c3d..e34e622 100644
--- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
@@ -29,6 +29,9 @@
import android.util.Log;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
@@ -53,11 +56,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.preference.Preference;
-
/**
* Power usage detail fragment for each app, this fragment contains
*
diff --git a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java
index 8ec877a2..26fd398 100644
--- a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java
@@ -18,12 +18,12 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.overlay.FeatureFactory;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+
/**
* Controller to change and update the auto restriction toggle
*/
diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
index 73d83e1..4a5ce7d 100644
--- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
@@ -19,6 +19,9 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -28,12 +31,10 @@
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
+import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
/**
* Controller to control whether an app can run in the background
*/
@@ -76,6 +77,11 @@
@Override
public void updateState(Preference preference) {
+ final RestrictedPreference restrictedPreference = (RestrictedPreference) preference;
+ if (restrictedPreference.isDisabledByAdmin()) {
+ // If disabled, let RestrictedPreference handle it and do nothing here
+ return;
+ }
final int mode = mAppOpsManager
.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage);
final boolean whitelisted = mPowerWhitelistBackend.isWhitelisted(mTargetPackage);
diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
index 7af6542..65181c4 100644
--- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
@@ -33,6 +33,11 @@
import android.util.Log;
import android.util.SparseArray;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatterySipper.DrainType;
import com.android.internal.os.BatteryStatsHelper;
@@ -51,11 +56,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller that update the battery header view
*/
diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
index 7a583d8..b5c39a1 100644
--- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
@@ -22,14 +22,14 @@
import android.content.IntentFilter;
import android.os.PowerManager;
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.Utils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import androidx.annotation.IntDef;
-import androidx.annotation.VisibleForTesting;
-
/**
* Use this broadcastReceiver to listen to the battery change, and it will invoke
* {@link OnBatteryChangedListener} if any of the following has been changed:
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index 5b5f50a..e5a2e5e 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -25,21 +25,20 @@
import android.os.PowerManager;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.Utils;
-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.OnStart;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller that update the battery header view
*/
@@ -135,9 +134,5 @@
mBatteryMeterView.setCharging(!discharging);
mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());
mBatteryPercentText.setText(Utils.formatPercentage(batteryLevel));
-
- // clear all the summaries
- mSummary1.setText("");
- mSummary2.setText("");
}
}
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
deleted file mode 100644
index e442a07..0000000
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ /dev/null
@@ -1,1366 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 android.content.Context;
-import android.content.Intent;
-import android.content.res.ColorStateList;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.DashPathEffect;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Typeface;
-import android.os.BatteryStats;
-import android.os.BatteryStats.HistoryItem;
-import android.os.SystemClock;
-import android.telephony.ServiceState;
-import android.text.TextPaint;
-import android.text.format.DateFormat;
-import android.text.format.Formatter;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.TimeUtils;
-import android.util.TypedValue;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-
-import libcore.icu.LocaleData;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Locale;
-
-public class BatteryHistoryChart extends View {
- static final boolean DEBUG = false;
- static final String TAG = "BatteryHistoryChart";
-
- static final int CHART_DATA_X_MASK = 0x0000ffff;
- static final int CHART_DATA_BIN_MASK = 0xffff0000;
- static final int CHART_DATA_BIN_SHIFT = 16;
-
- static class ChartData {
- int[] mColors;
- Paint[] mPaints;
-
- int mNumTicks;
- int[] mTicks;
- int mLastBin;
-
- void setColors(int[] colors) {
- mColors = colors;
- mPaints = new Paint[colors.length];
- for (int i=0; i<colors.length; i++) {
- mPaints[i] = new Paint();
- mPaints[i].setColor(colors[i]);
- mPaints[i].setStyle(Paint.Style.FILL);
- }
- }
-
- void init(int width) {
- if (width > 0) {
- mTicks = new int[width*2];
- } else {
- mTicks = null;
- }
- mNumTicks = 0;
- mLastBin = 0;
- }
-
- void addTick(int x, int bin) {
- if (bin != mLastBin && mNumTicks < mTicks.length) {
- mTicks[mNumTicks] = (x&CHART_DATA_X_MASK) | (bin<<CHART_DATA_BIN_SHIFT);
- mNumTicks++;
- mLastBin = bin;
- }
- }
-
- void finish(int width) {
- if (mLastBin != 0) {
- addTick(width, 0);
- }
- }
-
- void draw(Canvas canvas, int top, int height) {
- int lastBin=0, lastX=0;
- int bottom = top + height;
- for (int i=0; i<mNumTicks; i++) {
- int tick = mTicks[i];
- int x = tick&CHART_DATA_X_MASK;
- int bin = (tick&CHART_DATA_BIN_MASK) >> CHART_DATA_BIN_SHIFT;
- if (lastBin != 0) {
- canvas.drawRect(lastX, top, x, bottom, mPaints[lastBin]);
- }
- lastBin = bin;
- lastX = x;
- }
-
- }
- }
-
- static final int SANS = 1;
- static final int SERIF = 2;
- static final int MONOSPACE = 3;
-
- // First value if for phone off; first value is "scanning"; following values
- // are battery stats signal strength buckets.
- static final int NUM_PHONE_SIGNALS = 7;
-
- final Paint mBatteryBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
- final Paint mBatteryGoodPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
- final Paint mBatteryWarnPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
- final Paint mBatteryCriticalPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
- final Paint mTimeRemainPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
- final Paint mChargingPaint = new Paint();
- final Paint mScreenOnPaint = new Paint();
- final Paint mGpsOnPaint = new Paint();
- final Paint mFlashlightOnPaint = new Paint();
- final Paint mCameraOnPaint = new Paint();
- final Paint mWifiRunningPaint = new Paint();
- final Paint mCpuRunningPaint = new Paint();
- final Paint mDateLinePaint = new Paint();
- final ChartData mPhoneSignalChart = new ChartData();
- final TextPaint mTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
- final TextPaint mHeaderTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
- final Paint mDebugRectPaint = new Paint();
-
- final Path mBatLevelPath = new Path();
- final Path mBatGoodPath = new Path();
- final Path mBatWarnPath = new Path();
- final Path mBatCriticalPath = new Path();
- final Path mTimeRemainPath = new Path();
- final Path mChargingPath = new Path();
- final Path mScreenOnPath = new Path();
- final Path mGpsOnPath = new Path();
- final Path mFlashlightOnPath = new Path();
- final Path mCameraOnPath = new Path();
- final Path mWifiRunningPath = new Path();
- final Path mCpuRunningPath = new Path();
- final Path mDateLinePath = new Path();
-
- BatteryStats mStats;
- Intent mBatteryBroadcast;
- long mStatsPeriod;
- String mMaxPercentLabelString;
- String mMinPercentLabelString;
- String mDurationString;
- String mChargeDurationString;
- String mDrainString;
- String mChargingLabel;
- String mScreenOnLabel;
- String mGpsOnLabel;
- String mCameraOnLabel;
- String mFlashlightOnLabel;
- String mWifiRunningLabel;
- String mCpuRunningLabel;
- String mPhoneSignalLabel;
-
- BatteryInfo mInfo;
-
- int mChartMinHeight;
- int mHeaderHeight;
-
- int mBatteryWarnLevel;
- int mBatteryCriticalLevel;
-
- int mTextAscent;
- int mTextDescent;
- int mHeaderTextAscent;
- int mHeaderTextDescent;
- int mMaxPercentLabelStringWidth;
- int mMinPercentLabelStringWidth;
- int mDurationStringWidth;
- int mChargeLabelStringWidth;
- int mChargeDurationStringWidth;
- int mDrainStringWidth;
-
- boolean mLargeMode;
-
- int mLastWidth = -1;
- int mLastHeight = -1;
-
- int mLineWidth;
- int mThinLineWidth;
- int mChargingOffset;
- int mScreenOnOffset;
- int mGpsOnOffset;
- int mFlashlightOnOffset;
- int mCameraOnOffset;
- int mWifiRunningOffset;
- int mCpuRunningOffset;
- int mPhoneSignalOffset;
- int mLevelOffset;
- int mLevelTop;
- int mLevelBottom;
- int mLevelLeft;
- int mLevelRight;
-
- int mNumHist;
- long mHistStart;
- long mHistDataEnd;
- long mHistEnd;
- long mStartWallTime;
- long mEndDataWallTime;
- long mEndWallTime;
- int mBatLow;
- int mBatHigh;
- boolean mHaveWifi;
- boolean mHaveGps;
- boolean mHavePhoneSignal;
- boolean mHaveCamera;
- boolean mHaveFlashlight;
-
- final ArrayList<TimeLabel> mTimeLabels = new ArrayList<TimeLabel>();
- final ArrayList<DateLabel> mDateLabels = new ArrayList<DateLabel>();
-
- Bitmap mBitmap;
- Canvas mCanvas;
-
- static class TextAttrs {
- ColorStateList textColor = null;
- int textSize = 15;
- int typefaceIndex = -1;
- int styleIndex = -1;
-
- void retrieve(Context context, TypedArray from, int index) {
- TypedArray appearance = null;
- int ap = from.getResourceId(index, -1);
- if (ap != -1) {
- appearance = context.obtainStyledAttributes(ap,
- com.android.internal.R.styleable.TextAppearance);
- }
- if (appearance != null) {
- int n = appearance.getIndexCount();
- for (int i = 0; i < n; i++) {
- int attr = appearance.getIndex(i);
-
- switch (attr) {
- case com.android.internal.R.styleable.TextAppearance_textColor:
- textColor = appearance.getColorStateList(attr);
- break;
-
- case com.android.internal.R.styleable.TextAppearance_textSize:
- textSize = appearance.getDimensionPixelSize(attr, textSize);
- break;
-
- case com.android.internal.R.styleable.TextAppearance_typeface:
- typefaceIndex = appearance.getInt(attr, -1);
- break;
-
- case com.android.internal.R.styleable.TextAppearance_textStyle:
- styleIndex = appearance.getInt(attr, -1);
- break;
- }
- }
-
- appearance.recycle();
- }
- }
-
- void apply(Context context, TextPaint paint) {
- paint.density = context.getResources().getDisplayMetrics().density;
- paint.setCompatibilityScaling(
- context.getResources().getCompatibilityInfo().applicationScale);
-
- paint.setColor(textColor.getDefaultColor());
- paint.setTextSize(textSize);
-
- Typeface tf = null;
- switch (typefaceIndex) {
- case SANS:
- tf = Typeface.SANS_SERIF;
- break;
-
- case SERIF:
- tf = Typeface.SERIF;
- break;
-
- case MONOSPACE:
- tf = Typeface.MONOSPACE;
- break;
- }
-
- setTypeface(paint, tf, styleIndex);
- }
-
- public void setTypeface(TextPaint paint, Typeface tf, int style) {
- if (style > 0) {
- if (tf == null) {
- tf = Typeface.defaultFromStyle(style);
- } else {
- tf = Typeface.create(tf, style);
- }
-
- paint.setTypeface(tf);
- // now compute what (if any) algorithmic styling is needed
- int typefaceStyle = tf != null ? tf.getStyle() : 0;
- int need = style & ~typefaceStyle;
- paint.setFakeBoldText((need & Typeface.BOLD) != 0);
- paint.setTextSkewX((need & Typeface.ITALIC) != 0 ? -0.25f : 0);
- } else {
- paint.setFakeBoldText(false);
- paint.setTextSkewX(0);
- paint.setTypeface(tf);
- }
- }
- }
-
- static class TimeLabel {
- final int x;
- final String label;
- final int width;
-
- TimeLabel(TextPaint paint, int x, Calendar cal, boolean use24hr) {
- this.x = x;
- final String bestFormat = DateFormat.getBestDateTimePattern(
- Locale.getDefault(), use24hr ? "km" : "ha");
- label = DateFormat.format(bestFormat, cal).toString();
- width = (int)paint.measureText(label);
- }
- }
-
- static class DateLabel {
- final int x;
- final String label;
- final int width;
-
- DateLabel(TextPaint paint, int x, Calendar cal, boolean dayFirst) {
- this.x = x;
- final String bestFormat = DateFormat.getBestDateTimePattern(
- Locale.getDefault(), dayFirst ? "dM" : "Md");
- label = DateFormat.format(bestFormat, cal).toString();
- width = (int)paint.measureText(label);
- }
- }
-
- public BatteryHistoryChart(Context context, AttributeSet attrs) {
- super(context, attrs);
-
- if (DEBUG) Log.d(TAG, "New BatteryHistoryChart!");
-
- mBatteryWarnLevel = mContext.getResources().getInteger(
- com.android.internal.R.integer.config_lowBatteryWarningLevel);
- mBatteryCriticalLevel = mContext.getResources().getInteger(
- com.android.internal.R.integer.config_criticalBatteryWarningLevel);
-
- mThinLineWidth = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
- 2, getResources().getDisplayMetrics());
-
- int accentColor = Utils.getColorAccentDefaultColor(mContext);
- mBatteryBackgroundPaint.setColor(accentColor);
- mBatteryBackgroundPaint.setStyle(Paint.Style.FILL);
- mBatteryGoodPaint.setARGB(128, 0, 128, 0);
- mBatteryGoodPaint.setStyle(Paint.Style.STROKE);
- mBatteryWarnPaint.setARGB(128, 128, 128, 0);
- mBatteryWarnPaint.setStyle(Paint.Style.STROKE);
- mBatteryCriticalPaint.setARGB(192, 128, 0, 0);
- mBatteryCriticalPaint.setStyle(Paint.Style.STROKE);
- mTimeRemainPaint.setColor(0xFFCED7BB);
- mTimeRemainPaint.setStyle(Paint.Style.FILL);
- mChargingPaint.setStyle(Paint.Style.STROKE);
- mScreenOnPaint.setStyle(Paint.Style.STROKE);
- mGpsOnPaint.setStyle(Paint.Style.STROKE);
- mCameraOnPaint.setStyle(Paint.Style.STROKE);
- mFlashlightOnPaint.setStyle(Paint.Style.STROKE);
- mWifiRunningPaint.setStyle(Paint.Style.STROKE);
- mCpuRunningPaint.setStyle(Paint.Style.STROKE);
- mPhoneSignalChart.setColors(com.android.settings.Utils.BADNESS_COLORS);
- mDebugRectPaint.setARGB(255, 255, 0, 0);
- mDebugRectPaint.setStyle(Paint.Style.STROKE);
- mScreenOnPaint.setColor(accentColor);
- mGpsOnPaint.setColor(accentColor);
- mCameraOnPaint.setColor(accentColor);
- mFlashlightOnPaint.setColor(accentColor);
- mWifiRunningPaint.setColor(accentColor);
- mCpuRunningPaint.setColor(accentColor);
- mChargingPaint.setColor(accentColor);
-
- TypedArray a =
- context.obtainStyledAttributes(
- attrs, R.styleable.BatteryHistoryChart, 0, 0);
-
- final TextAttrs mainTextAttrs = new TextAttrs();
- final TextAttrs headTextAttrs = new TextAttrs();
- mainTextAttrs.retrieve(context, a, R.styleable.BatteryHistoryChart_android_textAppearance);
- headTextAttrs.retrieve(context, a, R.styleable.BatteryHistoryChart_headerAppearance);
-
- int shadowcolor = 0;
- float dx=0, dy=0, r=0;
-
- int n = a.getIndexCount();
- for (int i = 0; i < n; i++) {
- int attr = a.getIndex(i);
-
- switch (attr) {
- case R.styleable.BatteryHistoryChart_android_shadowColor:
- shadowcolor = a.getInt(attr, 0);
- break;
-
- case R.styleable.BatteryHistoryChart_android_shadowDx:
- dx = a.getFloat(attr, 0);
- break;
-
- case R.styleable.BatteryHistoryChart_android_shadowDy:
- dy = a.getFloat(attr, 0);
- break;
-
- case R.styleable.BatteryHistoryChart_android_shadowRadius:
- r = a.getFloat(attr, 0);
- break;
-
- case R.styleable.BatteryHistoryChart_android_textColor:
- mainTextAttrs.textColor = a.getColorStateList(attr);
- headTextAttrs.textColor = a.getColorStateList(attr);
- break;
-
- case R.styleable.BatteryHistoryChart_android_textSize:
- mainTextAttrs.textSize = a.getDimensionPixelSize(attr, mainTextAttrs.textSize);
- headTextAttrs.textSize = a.getDimensionPixelSize(attr, headTextAttrs.textSize);
- break;
-
- case R.styleable.BatteryHistoryChart_android_typeface:
- mainTextAttrs.typefaceIndex = a.getInt(attr, mainTextAttrs.typefaceIndex);
- headTextAttrs.typefaceIndex = a.getInt(attr, headTextAttrs.typefaceIndex);
- break;
-
- case R.styleable.BatteryHistoryChart_android_textStyle:
- mainTextAttrs.styleIndex = a.getInt(attr, mainTextAttrs.styleIndex);
- headTextAttrs.styleIndex = a.getInt(attr, headTextAttrs.styleIndex);
- break;
-
- case R.styleable.BatteryHistoryChart_barPrimaryColor:
- mBatteryBackgroundPaint.setColor(a.getInt(attr, 0));
- mScreenOnPaint.setColor(a.getInt(attr, 0));
- mGpsOnPaint.setColor(a.getInt(attr, 0));
- mCameraOnPaint.setColor(a.getInt(attr, 0));
- mFlashlightOnPaint.setColor(a.getInt(attr, 0));
- mWifiRunningPaint.setColor(a.getInt(attr, 0));
- mCpuRunningPaint.setColor(a.getInt(attr, 0));
- mChargingPaint.setColor(a.getInt(attr, 0));
- break;
-
- case R.styleable.BatteryHistoryChart_barPredictionColor:
- mTimeRemainPaint.setColor(a.getInt(attr, 0));
- break;
-
- case R.styleable.BatteryHistoryChart_chartMinHeight:
- mChartMinHeight = a.getDimensionPixelSize(attr, 0);
- break;
- }
- }
-
- a.recycle();
-
- mainTextAttrs.apply(context, mTextPaint);
- headTextAttrs.apply(context, mHeaderTextPaint);
-
- mDateLinePaint.set(mTextPaint);
- mDateLinePaint.setStyle(Paint.Style.STROKE);
- int hairlineWidth = mThinLineWidth/2;
- if (hairlineWidth < 1) {
- hairlineWidth = 1;
- }
- mDateLinePaint.setStrokeWidth(hairlineWidth);
- mDateLinePaint.setPathEffect(new DashPathEffect(new float[] {
- mThinLineWidth * 2, mThinLineWidth * 2 }, 0));
-
- if (shadowcolor != 0) {
- mTextPaint.setShadowLayer(r, dx, dy, shadowcolor);
- mHeaderTextPaint.setShadowLayer(r, dx, dy, shadowcolor);
- }
- }
-
- void setStats(BatteryStats stats, Intent broadcast) {
- mStats = stats;
- mBatteryBroadcast = broadcast;
-
- if (DEBUG) Log.d(TAG, "Setting stats...");
-
- final long elapsedRealtimeUs = SystemClock.elapsedRealtime() * 1000;
-
- long uSecTime = mStats.computeBatteryRealtime(elapsedRealtimeUs,
- BatteryStats.STATS_SINCE_CHARGED);
- mStatsPeriod = uSecTime;
- mChargingLabel = getContext().getString(R.string.battery_stats_charging_label);
- mScreenOnLabel = getContext().getString(R.string.battery_stats_screen_on_label);
- mGpsOnLabel = getContext().getString(R.string.battery_stats_gps_on_label);
- mCameraOnLabel = getContext().getString(R.string.battery_stats_camera_on_label);
- mFlashlightOnLabel = getContext().getString(R.string.battery_stats_flashlight_on_label);
- mWifiRunningLabel = getContext().getString(R.string.battery_stats_wifi_running_label);
- mCpuRunningLabel = getContext().getString(R.string.battery_stats_wake_lock_label);
- mPhoneSignalLabel = getContext().getString(R.string.battery_stats_phone_signal_label);
-
- mMaxPercentLabelString = Utils.formatPercentage(100);
- mMinPercentLabelString = Utils.formatPercentage(0);
- BatteryInfo.getBatteryInfo(getContext(), info -> {
- mInfo = info;
- mDrainString = "";
- mChargeDurationString = "";
- setContentDescription(mInfo.chargeLabel);
-
- int pos = 0;
- int lastInteresting = 0;
- byte lastLevel = -1;
- mBatLow = 0;
- mBatHigh = 100;
- mStartWallTime = 0;
- mEndDataWallTime = 0;
- mEndWallTime = 0;
- mHistStart = 0;
- mHistEnd = 0;
- long lastWallTime = 0;
- long lastRealtime = 0;
- int aggrStates = 0;
- int aggrStates2 = 0;
- boolean first = true;
- if (stats.startIteratingHistoryLocked()) {
- final HistoryItem rec = new HistoryItem();
- while (stats.getNextHistoryLocked(rec)) {
- pos++;
- if (first) {
- first = false;
- mHistStart = rec.time;
- }
- if (rec.cmd == HistoryItem.CMD_CURRENT_TIME
- || rec.cmd == HistoryItem.CMD_RESET) {
- // If there is a ridiculously large jump in time, then we won't be
- // able to create a good chart with that data, so just ignore the
- // times we got before and pretend like our data extends back from
- // the time we have now.
- // Also, if we are getting a time change and we are less than 5 minutes
- // since the start of the history real time, then also use this new
- // time to compute the base time, since whatever time we had before is
- // pretty much just noise.
- if (rec.currentTime > (lastWallTime+(180*24*60*60*1000L))
- || rec.time < (mHistStart+(5*60*1000L))) {
- mStartWallTime = 0;
- }
- lastWallTime = rec.currentTime;
- lastRealtime = rec.time;
- if (mStartWallTime == 0) {
- mStartWallTime = lastWallTime - (lastRealtime-mHistStart);
- }
- }
- if (rec.isDeltaData()) {
- if (rec.batteryLevel != lastLevel || pos == 1) {
- lastLevel = rec.batteryLevel;
- }
- lastInteresting = pos;
- mHistDataEnd = rec.time;
- aggrStates |= rec.states;
- aggrStates2 |= rec.states2;
- }
- }
- }
- mHistEnd = mHistDataEnd + (mInfo.remainingTimeUs/1000);
- mEndDataWallTime = lastWallTime + mHistDataEnd - lastRealtime;
- mEndWallTime = mEndDataWallTime + (mInfo.remainingTimeUs/1000);
- mNumHist = lastInteresting;
- mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
- mHaveFlashlight = (aggrStates2&HistoryItem.STATE2_FLASHLIGHT_FLAG) != 0;
- mHaveCamera = (aggrStates2&HistoryItem.STATE2_CAMERA_FLAG) != 0;
- mHaveWifi = (aggrStates2&HistoryItem.STATE2_WIFI_RUNNING_FLAG) != 0
- || (aggrStates&(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG
- |HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG
- |HistoryItem.STATE_WIFI_SCAN_FLAG)) != 0;
- if (!com.android.settingslib.Utils.isWifiOnly(getContext())) {
- mHavePhoneSignal = true;
- }
- if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
- }, mStats, false /* shortString */);
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- mMaxPercentLabelStringWidth = (int)mTextPaint.measureText(mMaxPercentLabelString);
- mMinPercentLabelStringWidth = (int)mTextPaint.measureText(mMinPercentLabelString);
- mDrainStringWidth = (int)mHeaderTextPaint.measureText(mDrainString);
- mChargeLabelStringWidth = (int) mHeaderTextPaint.measureText(
- mInfo.chargeLabel.toString());
- mChargeDurationStringWidth = (int)mHeaderTextPaint.measureText(mChargeDurationString);
- mTextAscent = (int)mTextPaint.ascent();
- mTextDescent = (int)mTextPaint.descent();
- mHeaderTextAscent = (int)mHeaderTextPaint.ascent();
- mHeaderTextDescent = (int)mHeaderTextPaint.descent();
- int headerTextHeight = mHeaderTextDescent - mHeaderTextAscent;
- mHeaderHeight = headerTextHeight*2 - mTextAscent;
- setMeasuredDimension(getDefaultSize(getSuggestedMinimumWidth(), widthMeasureSpec),
- getDefaultSize(mChartMinHeight+mHeaderHeight, heightMeasureSpec));
- }
-
- void finishPaths(int w, int h, int levelh, int startX, int y, Path curLevelPath,
- int lastX, boolean lastCharging, boolean lastScreenOn, boolean lastGpsOn,
- boolean lastFlashlightOn, boolean lastCameraOn, boolean lastWifiRunning,
- boolean lastCpuRunning, Path lastPath) {
- if (curLevelPath != null) {
- if (lastX >= 0 && lastX < w) {
- if (lastPath != null) {
- lastPath.lineTo(w, y);
- }
- curLevelPath.lineTo(w, y);
- }
- curLevelPath.lineTo(w, mLevelTop+levelh);
- curLevelPath.lineTo(startX, mLevelTop+levelh);
- curLevelPath.close();
- }
-
- if (lastCharging) {
- mChargingPath.lineTo(w, h-mChargingOffset);
- }
- if (lastScreenOn) {
- mScreenOnPath.lineTo(w, h-mScreenOnOffset);
- }
- if (lastGpsOn) {
- mGpsOnPath.lineTo(w, h-mGpsOnOffset);
- }
- if (lastFlashlightOn) {
- mFlashlightOnPath.lineTo(w, h-mFlashlightOnOffset);
- }
- if (lastCameraOn) {
- mCameraOnPath.lineTo(w, h-mCameraOnOffset);
- }
- if (lastWifiRunning) {
- mWifiRunningPath.lineTo(w, h-mWifiRunningOffset);
- }
- if (lastCpuRunning) {
- mCpuRunningPath.lineTo(w, h - mCpuRunningOffset);
- }
- if (mHavePhoneSignal) {
- mPhoneSignalChart.finish(w);
- }
- }
-
- private boolean is24Hour() {
- return DateFormat.is24HourFormat(getContext());
- }
-
- private boolean isDayFirst() {
- final String value = LocaleData.get(getResources().getConfiguration().locale)
- .getDateFormat(java.text.DateFormat.SHORT);
- return value.indexOf('M') > value.indexOf('d');
- }
-
- @Override
- protected void onSizeChanged(int w, int h, int oldw, int oldh) {
- super.onSizeChanged(w, h, oldw, oldh);
-
- if (DEBUG) Log.d(TAG, "onSizeChanged: " + oldw + "x" + oldh + " to " + w + "x" + h);
-
- if (mLastWidth == w && mLastHeight == h) {
- return;
- }
-
- if (mLastWidth == 0 || mLastHeight == 0) {
- return;
- }
-
- if (DEBUG) Log.d(TAG, "Rebuilding chart for: " + w + "x" + h);
-
- mLastWidth = w;
- mLastHeight = h;
- mBitmap = null;
- mCanvas = null;
-
- int textHeight = mTextDescent - mTextAscent;
- if (h > ((textHeight*10)+mChartMinHeight)) {
- mLargeMode = true;
- if (h > (textHeight*15)) {
- // Plenty of room for the chart.
- mLineWidth = textHeight/2;
- } else {
- // Compress lines to make more room for chart.
- mLineWidth = textHeight/3;
- }
- } else {
- mLargeMode = false;
- mLineWidth = mThinLineWidth;
- }
- if (mLineWidth <= 0) mLineWidth = 1;
-
- mLevelTop = mHeaderHeight;
- mLevelLeft = mMaxPercentLabelStringWidth + mThinLineWidth*3;
- mLevelRight = w;
- int levelWidth = mLevelRight-mLevelLeft;
-
- mTextPaint.setStrokeWidth(mThinLineWidth);
- mBatteryGoodPaint.setStrokeWidth(mThinLineWidth);
- mBatteryWarnPaint.setStrokeWidth(mThinLineWidth);
- mBatteryCriticalPaint.setStrokeWidth(mThinLineWidth);
- mChargingPaint.setStrokeWidth(mLineWidth);
- mScreenOnPaint.setStrokeWidth(mLineWidth);
- mGpsOnPaint.setStrokeWidth(mLineWidth);
- mCameraOnPaint.setStrokeWidth(mLineWidth);
- mFlashlightOnPaint.setStrokeWidth(mLineWidth);
- mWifiRunningPaint.setStrokeWidth(mLineWidth);
- mCpuRunningPaint.setStrokeWidth(mLineWidth);
- mDebugRectPaint.setStrokeWidth(1);
-
- int fullBarOffset = textHeight + mLineWidth;
-
- if (mLargeMode) {
- mChargingOffset = mLineWidth;
- mScreenOnOffset = mChargingOffset + fullBarOffset;
- mCpuRunningOffset = mScreenOnOffset + fullBarOffset;
- mWifiRunningOffset = mCpuRunningOffset + fullBarOffset;
- mGpsOnOffset = mWifiRunningOffset + (mHaveWifi ? fullBarOffset : 0);
- mFlashlightOnOffset = mGpsOnOffset + (mHaveGps ? fullBarOffset : 0);
- mCameraOnOffset = mFlashlightOnOffset + (mHaveFlashlight ? fullBarOffset : 0);
- mPhoneSignalOffset = mCameraOnOffset + (mHaveCamera ? fullBarOffset : 0);
- mLevelOffset = mPhoneSignalOffset + (mHavePhoneSignal ? fullBarOffset : 0)
- + mLineWidth*2 + mLineWidth/2;
- if (mHavePhoneSignal) {
- mPhoneSignalChart.init(w);
- }
- } else {
- mScreenOnOffset = mGpsOnOffset = mCameraOnOffset = mFlashlightOnOffset =
- mWifiRunningOffset = mCpuRunningOffset = mChargingOffset =
- mPhoneSignalOffset = 0;
- mLevelOffset = fullBarOffset + mThinLineWidth*4;
- if (mHavePhoneSignal) {
- mPhoneSignalChart.init(0);
- }
- }
-
- mBatLevelPath.reset();
- mBatGoodPath.reset();
- mBatWarnPath.reset();
- mTimeRemainPath.reset();
- mBatCriticalPath.reset();
- mScreenOnPath.reset();
- mGpsOnPath.reset();
- mFlashlightOnPath.reset();
- mCameraOnPath.reset();
- mWifiRunningPath.reset();
- mCpuRunningPath.reset();
- mChargingPath.reset();
-
- mTimeLabels.clear();
- mDateLabels.clear();
-
- final long walltimeStart = mStartWallTime;
- final long walltimeChange = mEndWallTime > walltimeStart
- ? (mEndWallTime-walltimeStart) : 1;
- long curWalltime = mStartWallTime;
- long lastRealtime = 0;
-
- final int batLow = mBatLow;
- final int batChange = mBatHigh-mBatLow;
-
- final int levelh = h - mLevelOffset - mLevelTop;
- mLevelBottom = mLevelTop + levelh;
-
- int x = mLevelLeft, y = 0, startX = mLevelLeft, lastX = -1, lastY = -1;
- int i = 0;
- Path curLevelPath = null;
- Path lastLinePath = null;
- boolean lastCharging = false, lastScreenOn = false, lastGpsOn = false;
- boolean lastFlashlightOn = false, lastCameraOn = false;
- boolean lastWifiRunning = false, lastWifiSupplRunning = false, lastCpuRunning = false;
- int lastWifiSupplState = BatteryStats.WIFI_SUPPL_STATE_INVALID;
- final int N = mNumHist;
- if (mEndDataWallTime > mStartWallTime && mStats.startIteratingHistoryLocked()) {
- final HistoryItem rec = new HistoryItem();
- while (mStats.getNextHistoryLocked(rec) && i < N) {
- if (rec.isDeltaData()) {
- curWalltime += rec.time-lastRealtime;
- lastRealtime = rec.time;
- x = mLevelLeft + (int)(((curWalltime-walltimeStart)*levelWidth)/walltimeChange);
- if (x < 0) {
- x = 0;
- }
- if (false) {
- StringBuilder sb = new StringBuilder(128);
- sb.append("walloff=");
- TimeUtils.formatDuration(curWalltime - walltimeStart, sb);
- sb.append(" wallchange=");
- TimeUtils.formatDuration(walltimeChange, sb);
- sb.append(" x=");
- sb.append(x);
- Log.d("foo", sb.toString());
- }
- y = mLevelTop + levelh - ((rec.batteryLevel-batLow)*(levelh-1))/batChange;
-
- if (lastX != x) {
- // We have moved by at least a pixel.
- if (lastY != y) {
- // Don't plot changes within a pixel.
- Path path;
- byte value = rec.batteryLevel;
- if (value <= mBatteryCriticalLevel) path = mBatCriticalPath;
- else if (value <= mBatteryWarnLevel) path = mBatWarnPath;
- else path = null; //mBatGoodPath;
-
- if (path != lastLinePath) {
- if (lastLinePath != null) {
- lastLinePath.lineTo(x, y);
- }
- if (path != null) {
- path.moveTo(x, y);
- }
- lastLinePath = path;
- } else if (path != null) {
- path.lineTo(x, y);
- }
-
- if (curLevelPath == null) {
- curLevelPath = mBatLevelPath;
- curLevelPath.moveTo(x, y);
- startX = x;
- } else {
- curLevelPath.lineTo(x, y);
- }
- lastX = x;
- lastY = y;
- }
- }
-
- if (mLargeMode) {
- final boolean charging =
- (rec.states&HistoryItem.STATE_BATTERY_PLUGGED_FLAG) != 0;
- if (charging != lastCharging) {
- if (charging) {
- mChargingPath.moveTo(x, h-mChargingOffset);
- } else {
- mChargingPath.lineTo(x, h-mChargingOffset);
- }
- lastCharging = charging;
- }
-
- final boolean screenOn =
- (rec.states&HistoryItem.STATE_SCREEN_ON_FLAG) != 0;
- if (screenOn != lastScreenOn) {
- if (screenOn) {
- mScreenOnPath.moveTo(x, h-mScreenOnOffset);
- } else {
- mScreenOnPath.lineTo(x, h-mScreenOnOffset);
- }
- lastScreenOn = screenOn;
- }
-
- final boolean gpsOn =
- (rec.states&HistoryItem.STATE_GPS_ON_FLAG) != 0;
- if (gpsOn != lastGpsOn) {
- if (gpsOn) {
- mGpsOnPath.moveTo(x, h-mGpsOnOffset);
- } else {
- mGpsOnPath.lineTo(x, h-mGpsOnOffset);
- }
- lastGpsOn = gpsOn;
- }
-
- final boolean flashlightOn =
- (rec.states2&HistoryItem.STATE2_FLASHLIGHT_FLAG) != 0;
- if (flashlightOn != lastFlashlightOn) {
- if (flashlightOn) {
- mFlashlightOnPath.moveTo(x, h-mFlashlightOnOffset);
- } else {
- mFlashlightOnPath.lineTo(x, h-mFlashlightOnOffset);
- }
- lastFlashlightOn = flashlightOn;
- }
-
- final boolean cameraOn =
- (rec.states2&HistoryItem.STATE2_CAMERA_FLAG) != 0;
- if (cameraOn != lastCameraOn) {
- if (cameraOn) {
- mCameraOnPath.moveTo(x, h-mCameraOnOffset);
- } else {
- mCameraOnPath.lineTo(x, h-mCameraOnOffset);
- }
- lastCameraOn = cameraOn;
- }
-
- final int wifiSupplState =
- ((rec.states2&HistoryItem.STATE2_WIFI_SUPPL_STATE_MASK)
- >> HistoryItem.STATE2_WIFI_SUPPL_STATE_SHIFT);
- boolean wifiRunning;
- if (lastWifiSupplState != wifiSupplState) {
- lastWifiSupplState = wifiSupplState;
- switch (wifiSupplState) {
- case BatteryStats.WIFI_SUPPL_STATE_DISCONNECTED:
- case BatteryStats.WIFI_SUPPL_STATE_DORMANT:
- case BatteryStats.WIFI_SUPPL_STATE_INACTIVE:
- case BatteryStats.WIFI_SUPPL_STATE_INTERFACE_DISABLED:
- case BatteryStats.WIFI_SUPPL_STATE_INVALID:
- case BatteryStats.WIFI_SUPPL_STATE_UNINITIALIZED:
- wifiRunning = lastWifiSupplRunning = false;
- break;
- default:
- wifiRunning = lastWifiSupplRunning = true;
- break;
- }
- } else {
- wifiRunning = lastWifiSupplRunning;
- }
- if ((rec.states&(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG
- |HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG
- |HistoryItem.STATE_WIFI_SCAN_FLAG)) != 0) {
- wifiRunning = true;
- }
- if (wifiRunning != lastWifiRunning) {
- if (wifiRunning) {
- mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
- } else {
- mWifiRunningPath.lineTo(x, h-mWifiRunningOffset);
- }
- lastWifiRunning = wifiRunning;
- }
-
- final boolean cpuRunning =
- (rec.states&HistoryItem.STATE_CPU_RUNNING_FLAG) != 0;
- if (cpuRunning != lastCpuRunning) {
- if (cpuRunning) {
- mCpuRunningPath.moveTo(x, h - mCpuRunningOffset);
- } else {
- mCpuRunningPath.lineTo(x, h - mCpuRunningOffset);
- }
- lastCpuRunning = cpuRunning;
- }
-
- if (mLargeMode && mHavePhoneSignal) {
- int bin;
- if (((rec.states&HistoryItem.STATE_PHONE_STATE_MASK)
- >> HistoryItem.STATE_PHONE_STATE_SHIFT)
- == ServiceState.STATE_POWER_OFF) {
- bin = 0;
- } else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
- bin = 1;
- } else {
- bin = (rec.states&HistoryItem.STATE_PHONE_SIGNAL_STRENGTH_MASK)
- >> HistoryItem.STATE_PHONE_SIGNAL_STRENGTH_SHIFT;
- bin += 2;
- }
- mPhoneSignalChart.addTick(x, bin);
- }
- }
-
- } else {
- long lastWalltime = curWalltime;
- if (rec.cmd == HistoryItem.CMD_CURRENT_TIME
- || rec.cmd == HistoryItem.CMD_RESET) {
- if (rec.currentTime >= mStartWallTime) {
- curWalltime = rec.currentTime;
- } else {
- curWalltime = mStartWallTime + (rec.time-mHistStart);
- }
- lastRealtime = rec.time;
- }
-
- if (rec.cmd != HistoryItem.CMD_OVERFLOW
- && (rec.cmd != HistoryItem.CMD_CURRENT_TIME
- || Math.abs(lastWalltime-curWalltime) > (60*60*1000))) {
- if (curLevelPath != null) {
- finishPaths(x+1, h, levelh, startX, lastY, curLevelPath, lastX,
- lastCharging, lastScreenOn, lastGpsOn, lastFlashlightOn,
- lastCameraOn, lastWifiRunning, lastCpuRunning, lastLinePath);
- lastX = lastY = -1;
- curLevelPath = null;
- lastLinePath = null;
- lastCharging = lastScreenOn = lastGpsOn = lastFlashlightOn =
- lastCameraOn = lastCpuRunning = false;
- }
- }
- }
-
- i++;
- }
- mStats.finishIteratingHistoryLocked();
- }
-
- if (lastY < 0 || lastX < 0) {
- // Didn't get any data...
- x = lastX = mLevelLeft;
- y = lastY = mLevelTop + levelh - ((mInfo.batteryLevel -batLow)*(levelh-1))/batChange;
- Path path;
- byte value = (byte)mInfo.batteryLevel;
- if (value <= mBatteryCriticalLevel) path = mBatCriticalPath;
- else if (value <= mBatteryWarnLevel) path = mBatWarnPath;
- else path = null; //mBatGoodPath;
- if (path != null) {
- path.moveTo(x, y);
- lastLinePath = path;
- }
- mBatLevelPath.moveTo(x, y);
- curLevelPath = mBatLevelPath;
- x = w;
- } else {
- // Figure out where the actual data ends on the screen.
- x = mLevelLeft + (int)(((mEndDataWallTime-walltimeStart)*levelWidth)/walltimeChange);
- if (x < 0) {
- x = 0;
- }
- }
-
- finishPaths(x, h, levelh, startX, lastY, curLevelPath, lastX,
- lastCharging, lastScreenOn, lastGpsOn, lastFlashlightOn, lastCameraOn,
- lastWifiRunning, lastCpuRunning, lastLinePath);
-
- if (x < w) {
- // If we reserved room for the remaining time, create a final path to draw
- // that part of the UI.
- mTimeRemainPath.moveTo(x, lastY);
- int fullY = mLevelTop + levelh - ((100-batLow)*(levelh-1))/batChange;
- int emptyY = mLevelTop + levelh - ((0-batLow)*(levelh-1))/batChange;
- if (mInfo.discharging) {
- mTimeRemainPath.lineTo(mLevelRight, emptyY);
- } else {
- mTimeRemainPath.lineTo(mLevelRight, fullY);
- mTimeRemainPath.lineTo(mLevelRight, emptyY);
- }
- mTimeRemainPath.lineTo(x, emptyY);
- mTimeRemainPath.close();
- }
-
- if (mStartWallTime > 0 && mEndWallTime > mStartWallTime) {
- // Create the time labels at the bottom.
- boolean is24hr = is24Hour();
- Calendar calStart = Calendar.getInstance();
- calStart.setTimeInMillis(mStartWallTime);
- calStart.set(Calendar.MILLISECOND, 0);
- calStart.set(Calendar.SECOND, 0);
- calStart.set(Calendar.MINUTE, 0);
- long startRoundTime = calStart.getTimeInMillis();
- if (startRoundTime < mStartWallTime) {
- calStart.set(Calendar.HOUR_OF_DAY, calStart.get(Calendar.HOUR_OF_DAY)+1);
- startRoundTime = calStart.getTimeInMillis();
- }
- Calendar calEnd = Calendar.getInstance();
- calEnd.setTimeInMillis(mEndWallTime);
- calEnd.set(Calendar.MILLISECOND, 0);
- calEnd.set(Calendar.SECOND, 0);
- calEnd.set(Calendar.MINUTE, 0);
- long endRoundTime = calEnd.getTimeInMillis();
- if (startRoundTime < endRoundTime) {
- addTimeLabel(calStart, mLevelLeft, mLevelRight, is24hr);
- Calendar calMid = Calendar.getInstance();
- calMid.setTimeInMillis(mStartWallTime+((mEndWallTime-mStartWallTime)/2));
- calMid.set(Calendar.MILLISECOND, 0);
- calMid.set(Calendar.SECOND, 0);
- calMid.set(Calendar.MINUTE, 0);
- long calMidMillis = calMid.getTimeInMillis();
- if (calMidMillis > startRoundTime && calMidMillis < endRoundTime) {
- addTimeLabel(calMid, mLevelLeft, mLevelRight, is24hr);
- }
- addTimeLabel(calEnd, mLevelLeft, mLevelRight, is24hr);
- }
-
- // Create the date labels if the chart includes multiple days
- if (calStart.get(Calendar.DAY_OF_YEAR) != calEnd.get(Calendar.DAY_OF_YEAR) ||
- calStart.get(Calendar.YEAR) != calEnd.get(Calendar.YEAR)) {
- boolean isDayFirst = isDayFirst();
- calStart.set(Calendar.HOUR_OF_DAY, 0);
- startRoundTime = calStart.getTimeInMillis();
- if (startRoundTime < mStartWallTime) {
- calStart.set(Calendar.DAY_OF_YEAR, calStart.get(Calendar.DAY_OF_YEAR) + 1);
- startRoundTime = calStart.getTimeInMillis();
- }
- calEnd.set(Calendar.HOUR_OF_DAY, 0);
- endRoundTime = calEnd.getTimeInMillis();
- if (startRoundTime < endRoundTime) {
- addDateLabel(calStart, mLevelLeft, mLevelRight, isDayFirst);
- Calendar calMid = Calendar.getInstance();
-
- // The middle between two beginnings of days can be anywhere between -1 to 13
- // after the beginning of the "median" day.
- calMid.setTimeInMillis(startRoundTime + ((endRoundTime - startRoundTime) / 2)
- + 2 * 60 * 60 * 1000);
- calMid.set(Calendar.HOUR_OF_DAY, 0);
- calMid.set(Calendar.MINUTE, 0);
- long calMidMillis = calMid.getTimeInMillis();
- if (calMidMillis > startRoundTime && calMidMillis < endRoundTime) {
- addDateLabel(calMid, mLevelLeft, mLevelRight, isDayFirst);
- }
- }
- addDateLabel(calEnd, mLevelLeft, mLevelRight, isDayFirst);
- }
- }
-
- if (mTimeLabels.size() < 2) {
- // If there are fewer than 2 time labels, then they are useless. Just
- // show an axis label giving the entire duration.
- mDurationString = Formatter.formatShortElapsedTime(getContext(),
- mEndWallTime - mStartWallTime);
- mDurationStringWidth = (int)mTextPaint.measureText(mDurationString);
- } else {
- mDurationString = null;
- mDurationStringWidth = 0;
- }
- }
-
- void addTimeLabel(Calendar cal, int levelLeft, int levelRight, boolean is24hr) {
- final long walltimeStart = mStartWallTime;
- final long walltimeChange = mEndWallTime-walltimeStart;
- mTimeLabels.add(new TimeLabel(mTextPaint,
- levelLeft + (int)(((cal.getTimeInMillis()-walltimeStart)*(levelRight-levelLeft))
- / walltimeChange),
- cal, is24hr));
- }
-
- void addDateLabel(Calendar cal, int levelLeft, int levelRight, boolean isDayFirst) {
- final long walltimeStart = mStartWallTime;
- final long walltimeChange = mEndWallTime-walltimeStart;
- mDateLabels.add(new DateLabel(mTextPaint,
- levelLeft + (int)(((cal.getTimeInMillis()-walltimeStart)*(levelRight-levelLeft))
- / walltimeChange),
- cal, isDayFirst));
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- super.onDraw(canvas);
-
- final int width = getWidth();
- final int height = getHeight();
-
- //buildBitmap(width, height);
-
- if (DEBUG) Log.d(TAG, "onDraw: " + width + "x" + height);
- //canvas.drawBitmap(mBitmap, 0, 0, null);
- drawChart(canvas, width, height);
- }
-
- void buildBitmap(int width, int height) {
- if (mBitmap != null && width == mBitmap.getWidth() && height == mBitmap.getHeight()) {
- return;
- }
-
- if (DEBUG) Log.d(TAG, "buildBitmap: " + width + "x" + height);
-
- mBitmap = Bitmap.createBitmap(getResources().getDisplayMetrics(), width, height,
- Bitmap.Config.ARGB_8888);
- mCanvas = new Canvas(mBitmap);
- drawChart(mCanvas, width, height);
- }
-
- void drawChart(Canvas canvas, int width, int height) {
- final boolean layoutRtl = isLayoutRtl();
- final int textStartX = layoutRtl ? width : 0;
- final int textEndX = layoutRtl ? 0 : width;
- final Paint.Align textAlignLeft = layoutRtl ? Paint.Align.RIGHT : Paint.Align.LEFT;
- final Paint.Align textAlignRight = layoutRtl ? Paint.Align.LEFT : Paint.Align.RIGHT;
-
- if (DEBUG) {
- canvas.drawRect(1, 1, width, height, mDebugRectPaint);
- }
-
- if (DEBUG) Log.d(TAG, "Drawing level path.");
- canvas.drawPath(mBatLevelPath, mBatteryBackgroundPaint);
- if (!mTimeRemainPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing time remain path.");
- canvas.drawPath(mTimeRemainPath, mTimeRemainPaint);
- }
- if (mTimeLabels.size() > 1) {
- int y = mLevelBottom - mTextAscent + (mThinLineWidth*4);
- int ytick = mLevelBottom+mThinLineWidth+(mThinLineWidth/2);
- mTextPaint.setTextAlign(Paint.Align.LEFT);
- int lastX = 0;
- for (int i=0; i<mTimeLabels.size(); i++) {
- TimeLabel label = mTimeLabels.get(i);
- if (i == 0) {
- int x = label.x - label.width/2;
- if (x < 0) {
- x = 0;
- }
- if (DEBUG) Log.d(TAG, "Drawing left label: " + label.label + " @ " + x);
- canvas.drawText(label.label, x, y, mTextPaint);
- canvas.drawLine(label.x, ytick, label.x, ytick+mThinLineWidth, mTextPaint);
- lastX = x + label.width;
- } else if (i < (mTimeLabels.size()-1)) {
- int x = label.x - label.width/2;
- if (x < (lastX+mTextAscent)) {
- continue;
- }
- TimeLabel nextLabel = mTimeLabels.get(i+1);
- if (x > (width-nextLabel.width-mTextAscent)) {
- continue;
- }
- if (DEBUG) Log.d(TAG, "Drawing middle label: " + label.label + " @ " + x);
- canvas.drawText(label.label, x, y, mTextPaint);
- canvas.drawLine(label.x, ytick, label.x, ytick + mThinLineWidth, mTextPaint);
- lastX = x + label.width;
- } else {
- int x = label.x - label.width/2;
- if ((x+label.width) >= width) {
- x = width-1-label.width;
- }
- if (DEBUG) Log.d(TAG, "Drawing right label: " + label.label + " @ " + x);
- canvas.drawText(label.label, x, y, mTextPaint);
- canvas.drawLine(label.x, ytick, label.x, ytick+mThinLineWidth, mTextPaint);
- }
- }
- } else if (mDurationString != null) {
- int y = mLevelBottom - mTextAscent + (mThinLineWidth*4);
- mTextPaint.setTextAlign(Paint.Align.LEFT);
- canvas.drawText(mDurationString,
- mLevelLeft + (mLevelRight-mLevelLeft)/2 - mDurationStringWidth/2,
- y, mTextPaint);
- }
-
- int headerTop = -mHeaderTextAscent + (mHeaderTextDescent-mHeaderTextAscent)/3;
- mHeaderTextPaint.setTextAlign(textAlignLeft);
- if (DEBUG) Log.d(TAG, "Drawing charge label string: " + mInfo.chargeLabel);
- canvas.drawText(mInfo.chargeLabel.toString(), textStartX, headerTop,
- mHeaderTextPaint);
- int stringHalfWidth = mChargeDurationStringWidth / 2;
- if (layoutRtl) stringHalfWidth = -stringHalfWidth;
- int headerCenter = ((width-mChargeDurationStringWidth-mDrainStringWidth)/2)
- + (layoutRtl ? mDrainStringWidth : mChargeLabelStringWidth);
- if (DEBUG) Log.d(TAG, "Drawing charge duration string: " + mChargeDurationString);
- canvas.drawText(mChargeDurationString, headerCenter - stringHalfWidth, headerTop,
- mHeaderTextPaint);
- mHeaderTextPaint.setTextAlign(textAlignRight);
- if (DEBUG) Log.d(TAG, "Drawing drain string: " + mDrainString);
- canvas.drawText(mDrainString, textEndX, headerTop, mHeaderTextPaint);
-
- if (!mBatGoodPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing good battery path");
- canvas.drawPath(mBatGoodPath, mBatteryGoodPaint);
- }
- if (!mBatWarnPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing warn battery path");
- canvas.drawPath(mBatWarnPath, mBatteryWarnPaint);
- }
- if (!mBatCriticalPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing critical battery path");
- canvas.drawPath(mBatCriticalPath, mBatteryCriticalPaint);
- }
- if (mHavePhoneSignal) {
- if (DEBUG) Log.d(TAG, "Drawing phone signal path");
- int top = height-mPhoneSignalOffset - (mLineWidth/2);
- mPhoneSignalChart.draw(canvas, top, mLineWidth);
- }
- if (!mScreenOnPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing screen on path");
- canvas.drawPath(mScreenOnPath, mScreenOnPaint);
- }
- if (!mChargingPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing charging path");
- canvas.drawPath(mChargingPath, mChargingPaint);
- }
- if (mHaveGps) {
- if (!mGpsOnPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing gps path");
- canvas.drawPath(mGpsOnPath, mGpsOnPaint);
- }
- }
- if (mHaveFlashlight) {
- if (!mFlashlightOnPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing flashlight path");
- canvas.drawPath(mFlashlightOnPath, mFlashlightOnPaint);
- }
- }
- if (mHaveCamera) {
- if (!mCameraOnPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing camera path");
- canvas.drawPath(mCameraOnPath, mCameraOnPaint);
- }
- }
- if (mHaveWifi) {
- if (!mWifiRunningPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing wifi path");
- canvas.drawPath(mWifiRunningPath, mWifiRunningPaint);
- }
- }
- if (!mCpuRunningPath.isEmpty()) {
- if (DEBUG) Log.d(TAG, "Drawing running path");
- canvas.drawPath(mCpuRunningPath, mCpuRunningPaint);
- }
-
- if (mLargeMode) {
- if (DEBUG) Log.d(TAG, "Drawing large mode labels");
- Paint.Align align = mTextPaint.getTextAlign();
- mTextPaint.setTextAlign(textAlignLeft); // large-mode labels always aligned to start
- if (mHavePhoneSignal) {
- canvas.drawText(mPhoneSignalLabel, textStartX,
- height - mPhoneSignalOffset - mTextDescent, mTextPaint);
- }
- if (mHaveGps) {
- canvas.drawText(mGpsOnLabel, textStartX,
- height - mGpsOnOffset - mTextDescent, mTextPaint);
- }
- if (mHaveFlashlight) {
- canvas.drawText(mFlashlightOnLabel, textStartX,
- height - mFlashlightOnOffset - mTextDescent, mTextPaint);
- }
- if (mHaveCamera) {
- canvas.drawText(mCameraOnLabel, textStartX,
- height - mCameraOnOffset - mTextDescent, mTextPaint);
- }
- if (mHaveWifi) {
- canvas.drawText(mWifiRunningLabel, textStartX,
- height - mWifiRunningOffset - mTextDescent, mTextPaint);
- }
- canvas.drawText(mCpuRunningLabel, textStartX,
- height - mCpuRunningOffset - mTextDescent, mTextPaint);
- canvas.drawText(mChargingLabel, textStartX,
- height - mChargingOffset - mTextDescent, mTextPaint);
- canvas.drawText(mScreenOnLabel, textStartX,
- height - mScreenOnOffset - mTextDescent, mTextPaint);
- mTextPaint.setTextAlign(align);
- }
-
- canvas.drawLine(mLevelLeft-mThinLineWidth, mLevelTop, mLevelLeft-mThinLineWidth,
- mLevelBottom+(mThinLineWidth/2), mTextPaint);
- if (mLargeMode) {
- for (int i=0; i<10; i++) {
- int y = mLevelTop + mThinLineWidth/2 + ((mLevelBottom-mLevelTop)*i)/10;
- canvas.drawLine(mLevelLeft-mThinLineWidth*2-mThinLineWidth/2, y,
- mLevelLeft-mThinLineWidth-mThinLineWidth/2, y, mTextPaint);
- }
- }
- if (DEBUG) Log.d(TAG, "Drawing max percent, origw=" + mMaxPercentLabelStringWidth
- + ", noww=" + (int)mTextPaint.measureText(mMaxPercentLabelString));
- canvas.drawText(mMaxPercentLabelString, 0, mLevelTop, mTextPaint);
- canvas.drawText(mMinPercentLabelString,
- mMaxPercentLabelStringWidth-mMinPercentLabelStringWidth,
- mLevelBottom - mThinLineWidth, mTextPaint);
- canvas.drawLine(mLevelLeft/2, mLevelBottom+mThinLineWidth, width,
- mLevelBottom+mThinLineWidth, mTextPaint);
-
- if (mDateLabels.size() > 0) {
- int ytop = mLevelTop + mTextAscent;
- int ybottom = mLevelBottom;
- int lastLeft = mLevelRight;
- mTextPaint.setTextAlign(Paint.Align.LEFT);
- for (int i=mDateLabels.size()-1; i>=0; i--) {
- DateLabel label = mDateLabels.get(i);
- int left = label.x - mThinLineWidth;
- int x = label.x + mThinLineWidth*2;
- if ((x+label.width) >= lastLeft) {
- x = label.x - mThinLineWidth*2 - label.width;
- left = x - mThinLineWidth;
- if (left >= lastLeft) {
- // okay we give up.
- continue;
- }
- }
- if (left < mLevelLeft) {
- // Won't fit on left, give up.
- continue;
- }
- mDateLinePath.reset();
- mDateLinePath.moveTo(label.x, ytop);
- mDateLinePath.lineTo(label.x, ybottom);
- canvas.drawPath(mDateLinePath, mDateLinePaint);
- canvas.drawText(label.label, x, ytop - mTextAscent, mTextPaint);
- }
- }
- }
-}
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
deleted file mode 100644
index 1343fef..0000000
--- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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 android.content.Intent;
-import android.os.BatteryStats;
-import android.os.BatteryStats.HistoryItem;
-import android.os.Bundle;
-import android.util.TypedValue;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider;
-import com.android.settings.widget.UsageView;
-
-public class BatteryHistoryDetail extends SettingsPreferenceFragment {
- public static final String EXTRA_STATS = "stats";
- public static final String EXTRA_BROADCAST = "broadcast";
- public static final String BATTERY_HISTORY_FILE = "tmp_bat_history.bin";
-
- private BatteryStats mStats;
- private Intent mBatteryBroadcast;
-
- private BatteryFlagParser mChargingParser;
- private BatteryFlagParser mScreenOn;
- private BatteryFlagParser mGpsParser;
- private BatteryFlagParser mFlashlightParser;
- private BatteryFlagParser mCameraParser;
- private BatteryWifiParser mWifiParser;
- private BatteryFlagParser mCpuParser;
- private BatteryCellParser mPhoneParser;
-
- @Override
- public void onCreate(Bundle icicle) {
- super.onCreate(icicle);
- String histFile = getArguments().getString(EXTRA_STATS);
- mStats = BatteryStatsHelper.statsFromFile(getActivity(), histFile);
- mBatteryBroadcast = getArguments().getParcelable(EXTRA_BROADCAST);
-
- TypedValue value = new TypedValue();
- getContext().getTheme().resolveAttribute(android.R.attr.colorAccent, value, true);
- int accentColor = getContext().getColor(value.resourceId);
-
- mChargingParser = new BatteryFlagParser(accentColor, false,
- HistoryItem.STATE_BATTERY_PLUGGED_FLAG);
- mScreenOn = new BatteryFlagParser(accentColor, false,
- HistoryItem.STATE_SCREEN_ON_FLAG);
- mGpsParser = new BatteryFlagParser(accentColor, false,
- HistoryItem.STATE_GPS_ON_FLAG);
- mFlashlightParser = new BatteryFlagParser(accentColor, true,
- HistoryItem.STATE2_FLASHLIGHT_FLAG);
- mCameraParser = new BatteryFlagParser(accentColor, true,
- HistoryItem.STATE2_CAMERA_FLAG);
- mWifiParser = new BatteryWifiParser(accentColor);
- mCpuParser = new BatteryFlagParser(accentColor, false,
- HistoryItem.STATE_CPU_RUNNING_FLAG);
- mPhoneParser = new BatteryCellParser();
- setHasOptionsMenu(true);
- }
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- return inflater.inflate(R.layout.battery_history_detail, container, false);
- }
-
- @Override
- public void onViewCreated(View view, Bundle savedInstanceState) {
- super.onViewCreated(view, savedInstanceState);
- updateEverything();
- }
-
- private void updateEverything() {
- BatteryInfo.getBatteryInfo(getContext(), info -> {
- final View view = getView();
- info.bindHistory((UsageView) view.findViewById(R.id.battery_usage), mChargingParser,
- mScreenOn, mGpsParser, mFlashlightParser, mCameraParser, mWifiParser,
- mCpuParser, mPhoneParser);
- ((TextView) view.findViewById(R.id.charge)).setText(info.batteryPercentString);
- ((TextView) view.findViewById(R.id.estimation)).setText(info.remainingLabel);
-
- bindData(mChargingParser, R.string.battery_stats_charging_label, R.id.charging_group);
- bindData(mScreenOn, R.string.battery_stats_screen_on_label, R.id.screen_on_group);
- bindData(mGpsParser, R.string.battery_stats_gps_on_label, R.id.gps_group);
- bindData(mFlashlightParser, R.string.battery_stats_flashlight_on_label,
- R.id.flashlight_group);
- bindData(mCameraParser, R.string.battery_stats_camera_on_label, R.id.camera_group);
- bindData(mWifiParser, R.string.battery_stats_wifi_running_label, R.id.wifi_group);
- bindData(mCpuParser, R.string.battery_stats_wake_lock_label, R.id.cpu_group);
- bindData(mPhoneParser, R.string.battery_stats_phone_signal_label,
- R.id.cell_network_group);
- }, mStats, false /* shortString */);
- }
-
- private void bindData(BatteryActiveProvider provider, int label, int groupId) {
- View group = getView().findViewById(groupId);
- group.setVisibility(provider.hasData() ? View.VISIBLE : View.GONE);
- ((TextView) group.findViewById(android.R.id.title)).setText(label);
- ((BatteryActiveView) group.findViewById(R.id.battery_active)).setProvider(provider);
- }
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.FUELGAUGE_BATTERY_HISTORY_DETAIL;
- }
-}
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
index 89b3edd..faca9fb 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java
@@ -21,14 +21,14 @@
import android.view.View;
import android.widget.TextView;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.R;
-import com.android.settings.widget.UsageView;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.R;
+import com.android.settings.widget.UsageView;
+
/**
* Custom preference for displaying power consumption as a bar and an icon on the left for the
* subsystem/app type.
@@ -54,7 +54,7 @@
BatteryInfo.getBatteryInfo(getContext(), info -> {
mBatteryInfo = info;
notifyChanged();
- }, batteryStats.getStats(), false);
+ }, batteryStats, false);
}
public void setBottomSummary(CharSequence text) {
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index f642d30..1f11f5a 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -27,6 +27,8 @@
import android.text.format.Formatter;
import android.util.SparseIntArray;
+import androidx.annotation.WorkerThread;
+
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.Utils;
import com.android.settings.overlay.FeatureFactory;
@@ -35,8 +37,6 @@
import com.android.settingslib.utils.PowerUtil;
import com.android.settingslib.utils.StringUtil;
-import androidx.annotation.WorkerThread;
-
public class BatteryInfo {
public CharSequence chargeLabel;
@@ -134,62 +134,21 @@
}
public static void getBatteryInfo(final Context context, final Callback callback) {
- BatteryInfo.getBatteryInfo(context, callback, false /* shortString */);
+ BatteryInfo.getBatteryInfo(context, callback, null /* statsHelper */,
+ false /* shortString */);
}
public static void getBatteryInfo(final Context context, final Callback callback,
boolean shortString) {
- final long startTime = System.currentTimeMillis();
- BatteryStatsHelper statsHelper = new BatteryStatsHelper(context, true);
- statsHelper.create((Bundle) null);
- BatteryUtils.logRuntime(LOG_TAG, "time to make batteryStatsHelper", startTime);
- BatteryInfo.getBatteryInfo(context, callback, statsHelper, shortString);
+ BatteryInfo.getBatteryInfo(context, callback, null /* statsHelper */, shortString);
}
public static void getBatteryInfo(final Context context, final Callback callback,
- BatteryStatsHelper statsHelper, boolean shortString) {
- final long startTime = System.currentTimeMillis();
- BatteryStats stats = statsHelper.getStats();
- BatteryUtils.logRuntime(LOG_TAG, "time for getStats", startTime);
- getBatteryInfo(context, callback, stats, shortString);
- }
-
- public static void getBatteryInfo(final Context context, final Callback callback,
- BatteryStats stats, boolean shortString) {
+ final BatteryStatsHelper statsHelper, boolean shortString) {
new AsyncTask<Void, Void, BatteryInfo>() {
@Override
protected BatteryInfo doInBackground(Void... params) {
- final long startTime = System.currentTimeMillis();
- PowerUsageFeatureProvider provider =
- FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);
- final long elapsedRealtimeUs =
- PowerUtil.convertMsToUs(SystemClock.elapsedRealtime());
-
- Intent batteryBroadcast = context.registerReceiver(null,
- new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
- // 0 means we are discharging, anything else means charging
- boolean discharging =
- batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
-
- if (discharging && provider != null
- && provider.isEnhancedBatteryPredictionEnabled(context)) {
- Estimate estimate = provider.getEnhancedBatteryPrediction(context);
- if (estimate != null) {
- BatteryUtils
- .logRuntime(LOG_TAG, "time for enhanced BatteryInfo", startTime);
- return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
- estimate, elapsedRealtimeUs, shortString);
- }
- }
- long prediction = discharging
- ? stats.computeBatteryTimeRemaining(elapsedRealtimeUs) : 0;
- Estimate estimate = new Estimate(
- PowerUtil.convertUsToMs(prediction),
- false, /* isBasedOnUsage */
- Estimate.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN);
- BatteryUtils.logRuntime(LOG_TAG, "time for regular BatteryInfo", startTime);
- return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
- estimate, elapsedRealtimeUs, shortString);
+ return getBatteryInfo(context, statsHelper, shortString);
}
@Override
@@ -201,6 +160,53 @@
}.execute();
}
+ public static BatteryInfo getBatteryInfo(final Context context,
+ final BatteryStatsHelper statsHelper, boolean shortString) {
+ final BatteryStats stats;
+ final long batteryStatsTime = System.currentTimeMillis();
+ if (statsHelper == null) {
+ final BatteryStatsHelper localStatsHelper = new BatteryStatsHelper(context,
+ true);
+ localStatsHelper.create((Bundle) null);
+ stats = localStatsHelper.getStats();
+ } else {
+ stats = statsHelper.getStats();
+ }
+ BatteryUtils.logRuntime(LOG_TAG, "time for getStats", batteryStatsTime);
+
+ final long startTime = System.currentTimeMillis();
+ PowerUsageFeatureProvider provider =
+ FeatureFactory.getFactory(context).getPowerUsageFeatureProvider(context);
+ final long elapsedRealtimeUs =
+ PowerUtil.convertMsToUs(SystemClock.elapsedRealtime());
+
+ final Intent batteryBroadcast = context.registerReceiver(null,
+ new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+ // 0 means we are discharging, anything else means charging
+ final boolean discharging =
+ batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1) == 0;
+
+ if (discharging && provider != null
+ && provider.isEnhancedBatteryPredictionEnabled(context)) {
+ Estimate estimate = provider.getEnhancedBatteryPrediction(context);
+ if (estimate != null) {
+ BatteryUtils
+ .logRuntime(LOG_TAG, "time for enhanced BatteryInfo", startTime);
+ return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+ estimate, elapsedRealtimeUs, shortString);
+ }
+ }
+ final long prediction = discharging
+ ? stats.computeBatteryTimeRemaining(elapsedRealtimeUs) : 0;
+ final Estimate estimate = new Estimate(
+ PowerUtil.convertUsToMs(prediction),
+ false, /* isBasedOnUsage */
+ Estimate.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN);
+ BatteryUtils.logRuntime(LOG_TAG, "time for regular BatteryInfo", startTime);
+ return BatteryInfo.getBatteryInfo(context, batteryBroadcast, stats,
+ estimate, elapsedRealtimeUs, shortString);
+ }
+
@WorkerThread
public static BatteryInfo getBatteryInfoOld(Context context, Intent batteryBroadcast,
BatteryStats stats, long elapsedRealtimeUs, boolean shortString) {
diff --git a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
index b7ebaf9..cd87612 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java
@@ -17,11 +17,11 @@
import android.content.Context;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.os.BatteryStatsHelper;
import com.android.settingslib.utils.AsyncLoaderCompat;
-import androidx.annotation.VisibleForTesting;
-
/**
* Loader that can be used by classes to load BatteryInfo in a background thread. This loader will
* automatically grab enhanced battery estimates if available or fall back to the system estimate
diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java
index 3c235f5..822f0e9 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -25,12 +25,12 @@
import android.util.AttributeSet;
import android.widget.ImageView;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.graph.BatteryMeterDrawableBase;
-import androidx.annotation.VisibleForTesting;
-
public class BatteryMeterView extends ImageView {
@VisibleForTesting
BatteryMeterDrawable mDrawable;
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
index 8baf272..7e00307 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
@@ -16,6 +16,9 @@
import android.os.Bundle;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.SettingsActivity;
@@ -26,9 +29,6 @@
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
/**
* Controller that jumps to high power optimization fragment
*/
diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java
index e2440a5..28cc893 100644
--- a/src/com/android/settings/fuelgauge/BatterySaverController.java
+++ b/src/com/android/settings/fuelgauge/BatterySaverController.java
@@ -22,19 +22,16 @@
import android.os.PowerManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
-import com.android.settings.dashboard.conditional.BatterySaverCondition;
-import com.android.settings.dashboard.conditional.ConditionManager;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class BatterySaverController extends BasePreferenceController
implements LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener {
private static final String KEY_BATTERY_SAVER = "battery_saver_summary";
@@ -52,7 +49,7 @@
@Override
public int getAvailabilityStatus() {
- return AVAILABLE;
+ return AVAILABLE_UNSEARCHABLE;
}
@Override
@@ -82,11 +79,6 @@
mBatteryStateChangeReceiver.setListening(false);
}
- @VisibleForTesting
- void refreshConditionManager() {
- ConditionManager.get(mContext).getCondition(BatterySaverCondition.class).refreshState();
- }
-
@Override
public CharSequence getSummary() {
final boolean isPowerSaveOn = mPowerManager.isPowerSaveMode();
diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
index 7369ed8..5de83d3 100644
--- a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
+++ b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java
@@ -19,11 +19,11 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.os.BatteryStatsHelper;
import com.android.settingslib.utils.AsyncLoaderCompat;
-import androidx.annotation.VisibleForTesting;
-
/**
* Loader to get new {@link BatteryStatsHelper} in the background
*/
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 3676761..c071284 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -34,10 +34,14 @@
import android.util.Log;
import android.util.SparseLongArray;
+import androidx.annotation.IntDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
+
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.internal.util.ArrayUtils;
-import com.android.settings.R;
import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
import com.android.settings.fuelgauge.batterytip.AnomalyInfo;
import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager;
@@ -53,12 +57,6 @@
import java.util.Comparator;
import java.util.List;
-import androidx.annotation.IntDef;
-import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-
/**
* Utils for battery operation
*/
diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java
index f5df452..3102973 100644
--- a/src/com/android/settings/fuelgauge/HighPowerDetail.java
+++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java
@@ -28,6 +28,10 @@
import android.widget.Checkable;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
@@ -36,10 +40,6 @@
import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
public class HighPowerDetail extends InstrumentedDialogFragment implements OnClickListener,
View.OnClickListener {
diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java
index 655a1b7..cb419ca 100644
--- a/src/com/android/settings/fuelgauge/InactiveApps.java
+++ b/src/com/android/settings/fuelgauge/InactiveApps.java
@@ -31,16 +31,16 @@
import android.content.res.Resources;
import android.os.Bundle;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import java.util.List;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
public class InactiveApps extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index bfa0a78..8cac2b2 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -17,16 +17,15 @@
package com.android.settings.fuelgauge;
import android.content.Context;
-import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.util.AttributeSet;
import android.widget.TextView;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.Utils;
-import com.android.settings.widget.AppPreference;
-
-import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.apppreference.AppPreference;
/**
* Custom preference for displaying battery usage info as a bar and an icon on
@@ -58,7 +57,9 @@
private PowerGaugePreference(Context context, AttributeSet attrs, Drawable icon,
CharSequence contentDescription, BatteryEntry info) {
super(context, attrs);
- setIcon(icon != null ? icon : new ColorDrawable(0));
+ if (icon != null) {
+ setIcon(icon);
+ }
setWidgetLayoutResource(R.layout.preference_widget_summary);
mInfo = info;
mContentDescription = contentDescription;
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
index 9e9e7af..a4ae1ac 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -25,6 +25,8 @@
import android.view.MenuInflater;
import android.view.MenuItem;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -37,8 +39,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
public class PowerUsageAdvanced extends PowerUsageBase {
private static final String TAG = "AdvancedBatteryUsage";
diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java
index 06200a3..ec73b1b 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageBase.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java
@@ -23,13 +23,13 @@
import android.os.UserManager;
import android.view.Menu;
-import com.android.internal.os.BatteryStatsHelper;
-import com.android.settings.dashboard.DashboardFragment;
-
import androidx.annotation.VisibleForTesting;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.Loader;
+import com.android.internal.os.BatteryStatsHelper;
+import com.android.settings.dashboard.DashboardFragment;
+
/**
* Common base class for things that need to show the battery usage graph.
*/
@@ -72,8 +72,6 @@
@Override
public void onResume() {
super.onResume();
-
- BatteryStatsHelper.dropFile(getActivity(), BatteryHistoryDetail.BATTERY_HISTORY_FILE);
mBatteryBroadcastReceiver.register();
}
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 2ae5876..f7c31e5 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -18,12 +18,10 @@
import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
-import android.app.Activity;
import android.content.Context;
import android.os.BatteryStats;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
-import android.text.BidiFormatter;
import android.text.format.Formatter;
import android.view.Menu;
import android.view.MenuInflater;
@@ -32,13 +30,17 @@
import android.view.View.OnLongClickListener;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.fuelgauge.batterytip.BatteryTipLoader;
import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
@@ -51,11 +53,6 @@
import java.util.Collections;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
-import androidx.loader.content.Loader;
-
/**
* Displays a list of apps and subsystems that consume power, ordered by how much power was
* consumed since the last time it was unplugged.
@@ -68,7 +65,6 @@
private static final boolean DEBUG = false;
private static final String KEY_BATTERY_HEADER = "battery_header";
- private static final String KEY_BATTERY_TIP = "battery_tip";
private static final String KEY_SCREEN_USAGE = "screen_usage";
private static final String KEY_TIME_SINCE_LAST_FULL_CHARGE = "last_full_charge";
@@ -147,9 +143,9 @@
protected void updateViews(List<BatteryInfo> batteryInfos) {
final BatteryMeterView batteryView = mBatteryLayoutPref
- .findViewById(R.id.battery_header_icon);
+ .findViewById(R.id.battery_header_icon);
final TextView percentRemaining =
- mBatteryLayoutPref.findViewById(R.id.battery_percent);
+ 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);
@@ -160,13 +156,13 @@
// 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(
- Formatter.formatShortElapsedTime(getContext(),
- PowerUtil.convertUsToMs(oldInfo.remainingTimeUs))));
+ Formatter.formatShortElapsedTime(getContext(),
+ PowerUtil.convertUsToMs(oldInfo.remainingTimeUs))));
// for this one we can just set the string directly
summary2.setText(mPowerFeatureProvider.getEnhancedEstimateDebugString(
- Formatter.formatShortElapsedTime(getContext(),
- PowerUtil.convertUsToMs(newInfo.remainingTimeUs))));
+ Formatter.formatShortElapsedTime(getContext(),
+ PowerUtil.convertUsToMs(newInfo.remainingTimeUs))));
batteryView.setBatteryLevel(oldInfo.batteryLevel);
batteryView.setCharging(!oldInfo.discharging);
@@ -390,48 +386,6 @@
restartBatteryTipLoader();
}
- private static class SummaryProvider implements SummaryLoader.SummaryProvider {
- private final Context mContext;
- private final SummaryLoader mLoader;
- private final BatteryBroadcastReceiver mBatteryBroadcastReceiver;
-
- private SummaryProvider(Context context, SummaryLoader loader) {
- mContext = context;
- mLoader = loader;
- mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext);
- mBatteryBroadcastReceiver.setBatteryChangedListener(type -> {
- BatteryInfo.getBatteryInfo(mContext, new BatteryInfo.Callback() {
- @Override
- public void onBatteryInfoLoaded(BatteryInfo info) {
- mLoader.setSummary(SummaryProvider.this, getDashboardLabel(mContext, info));
- }
- }, true /* shortString */);
- });
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- mBatteryBroadcastReceiver.register();
- } else {
- mBatteryBroadcastReceiver.unRegister();
- }
- }
- }
-
- @VisibleForTesting
- static CharSequence getDashboardLabel(Context context, BatteryInfo info) {
- CharSequence label;
- final BidiFormatter formatter = BidiFormatter.getInstance();
- 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));
- }
- return label;
- }
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@@ -442,21 +396,5 @@
sir.xmlResId = R.xml.power_usage_summary;
return Collections.singletonList(sir);
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- List<String> niks = super.getNonIndexableKeys(context);
- niks.add(KEY_BATTERY_SAVER_SUMMARY);
- return niks;
- }
};
-
- 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/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
index 64489ea..d3c1d54 100644
--- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java
@@ -21,6 +21,9 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -29,9 +32,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
/**
* Controller to change and update the smart battery toggle
*/
diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
index b64a707..0906a5d 100644
--- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
+++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java
@@ -25,6 +25,11 @@
import android.util.Log;
import android.util.SparseLongArray;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -46,11 +51,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.CheckBoxPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
/**
* Fragment to show a list of anomaly apps, where user could handle these anomalies
*/
diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
index 0e8281d..af49f3d 100644
--- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java
@@ -21,12 +21,12 @@
import android.provider.Settings;
import android.text.TextUtils;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.overlay.FeatureFactory;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+
/**
* Controller to change and update the smart battery toggle
*/
diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
new file mode 100644
index 0000000..8205818
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
@@ -0,0 +1,90 @@
+/*
+ * 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.fuelgauge;
+
+import android.content.Context;
+import android.text.BidiFormatter;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+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;
+
+public class TopLevelBatteryPreferenceController extends BasePreferenceController implements
+ LifecycleObserver, OnStart, OnStop {
+
+ private final BatteryBroadcastReceiver mBatteryBroadcastReceiver;
+ private Preference mPreference;
+ private BatteryInfo mBatteryInfo;
+
+ public TopLevelBatteryPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext);
+ mBatteryBroadcastReceiver.setBatteryChangedListener(type -> {
+ BatteryInfo.getBatteryInfo(mContext, info -> {
+ mBatteryInfo = info;
+ updateState(mPreference);
+ }, true /* shortString */);
+ });
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE_UNSEARCHABLE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void onStart() {
+ mBatteryBroadcastReceiver.register();
+ }
+
+ @Override
+ public void onStop() {
+ mBatteryBroadcastReceiver.unRegister();
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return getDashboardLabel(mContext, mBatteryInfo);
+ }
+
+ static CharSequence getDashboardLabel(Context context, BatteryInfo info) {
+ if (info == null || context == null) {
+ return null;
+ }
+ CharSequence label;
+ final BidiFormatter formatter = BidiFormatter.getInstance();
+ 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));
+ }
+ return label;
+ }
+}
diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java
index ad916ee..c0ecbf9 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java
@@ -18,12 +18,12 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.TogglePreferenceController;
-import com.android.settingslib.fuelgauge.BatterySaverUtils;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.fuelgauge.BatterySaverUtils;
+
/**
* Controller that update whether to turn on battery saver automatically
*/
diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java
index 63bd697..0fbba0b 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java
@@ -25,6 +25,10 @@
import android.util.Log;
import android.view.accessibility.AccessibilityNodeInfo;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
@@ -34,10 +38,6 @@
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller that update the battery saver seekbar
*/
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
index 00b890d..80a72e6 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java
@@ -19,6 +19,9 @@
import android.content.Context;
import android.os.PowerManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.fuelgauge.BatterySaverReceiver;
import com.android.settings.widget.TwoStateButtonPreference;
@@ -27,9 +30,6 @@
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.fuelgauge.BatterySaverUtils;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller to update the battery saver button
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java
index 60d1c95..bb73142 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java
@@ -24,13 +24,13 @@
import android.content.Context;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settingslib.utils.ThreadUtils;
import java.util.concurrent.TimeUnit;
-import androidx.annotation.VisibleForTesting;
-
/** A JobService to clean up obsolete data in anomaly database */
public class AnomalyCleanupJobService extends JobService {
private static final String TAG = "AnomalyCleanUpJobService";
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java
index 0a19add..ad02c3a 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java
@@ -29,13 +29,13 @@
import android.util.Base64;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settingslib.utils.ThreadUtils;
import java.util.concurrent.TimeUnit;
-import androidx.annotation.VisibleForTesting;
-
/** A JobService check whether to update the anomaly config periodically */
public class AnomalyConfigJobService extends JobService {
private static final String TAG = "AnomalyConfigJobService";
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java
index bd1633f..349a419 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java
@@ -21,11 +21,11 @@
import android.database.sqlite.SQLiteOpenHelper;
import android.util.Log;
+import androidx.annotation.IntDef;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import androidx.annotation.IntDef;
-
/**
* Database controls the anomaly logging(e.g. packageName, anomalyType and time)
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
index 70cdf92..b3be061 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
@@ -37,6 +37,9 @@
import android.util.Log;
import android.util.Pair;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.util.ArrayUtils;
import com.android.settings.R;
@@ -51,9 +54,6 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
-import androidx.annotation.GuardedBy;
-import androidx.annotation.VisibleForTesting;
-
/** A JobService to store anomaly data to anomaly database */
public class AnomalyDetectionJobService extends JobService {
private static final String TAG = "AnomalyDetectionService";
diff --git a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java
index 73d3b86..e79b874 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java
@@ -21,10 +21,10 @@
import android.text.TextUtils;
import android.util.ArraySet;
-import java.util.Objects;
-
import androidx.annotation.VisibleForTesting;
+import java.util.Objects;
+
/**
* Model class stores app info(e.g. package name, type..) that used in battery tip
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java b/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java
index 513244e..5fa952c 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java
@@ -39,15 +39,15 @@
import android.util.ArrayMap;
import android.util.SparseLongArray;
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.ActionColumns;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.ActionColumns;
-
-import androidx.annotation.VisibleForTesting;
-
/**
* Database manager for battery data. Now it only contains anomaly data stored in {@link AppInfo}.
*
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java
index 1043a8e..9565036 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java
@@ -21,14 +21,14 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
/**
* Preference controller to control the battery manager
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
index 66d9f2c..dc79835 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
@@ -22,6 +22,11 @@
import android.os.Bundle;
import android.view.LayoutInflater;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -37,11 +42,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* Dialog Fragment to show action dialog for each anomaly
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
index 916ee85..aa66aed 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
@@ -18,6 +18,8 @@
import android.content.Context;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.fuelgauge.BatteryInfo;
import com.android.settings.fuelgauge.BatteryUtils;
@@ -37,8 +39,6 @@
import java.util.Collections;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Loader to compute and return a battery tip list. It will always return a full length list even
* though some tips may have state {@code BaseBatteryTip.StateType.INVISIBLE}.
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
index 4bd8cd7..487adf8 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
@@ -21,10 +21,10 @@
import android.util.KeyValueListParser;
import android.util.Log;
-import java.time.Duration;
-
import androidx.annotation.VisibleForTesting;
+import java.time.Duration;
+
/**
* Class to store the policy for battery tips, which comes from
* {@link Settings.Global}
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
index 158ffd4..eac2bf5 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
@@ -19,6 +19,11 @@
import android.content.Context;
import android.os.Bundle;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.SettingsActivity;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -33,11 +38,6 @@
import java.util.List;
import java.util.Map;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller in charge of the battery tip group
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
index 8debf6b..ed06cce 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
@@ -24,6 +24,8 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.annotation.NonNull;
+
import com.android.internal.util.CollectionUtils;
import com.android.settings.SettingsActivity;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -43,8 +45,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.NonNull;
-
/**
* Utility class for {@link BatteryTip}
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java
index 831226c..d832640 100644
--- a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java
+++ b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java
@@ -26,14 +26,14 @@
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.utils.StringUtil;
import java.util.List;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* Adapter for the high usage app list
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java
index c246f0a..a0449f2 100644
--- a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java
+++ b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java
@@ -16,11 +16,11 @@
package com.android.settings.fuelgauge.batterytip;
+import androidx.annotation.IntDef;
+
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import androidx.annotation.IntDef;
-
/**
* This class provides all the configs needed if we want to use {@link android.app.StatsManager}
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java
index 98d6dcc..9d35615 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java
@@ -16,6 +16,8 @@
package com.android.settings.fuelgauge.batterytip.actions;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.fuelgauge.RestrictedAppDetails;
@@ -27,8 +29,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Action to open the {@link com.android.settings.fuelgauge.RestrictedAppDetails}
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java
index 3905156..ac946df 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java
@@ -20,6 +20,8 @@
import android.content.Context;
import android.util.Pair;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.util.CollectionUtils;
import com.android.settings.fuelgauge.BatteryUtils;
@@ -30,8 +32,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Action to restrict the apps, then app is not allowed to run in the background.
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
index ba65028..10a09c5 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
@@ -16,6 +16,8 @@
package com.android.settings.fuelgauge.batterytip.actions;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -23,8 +25,6 @@
import com.android.settings.fuelgauge.SmartBatterySettings;
import com.android.settingslib.core.instrumentation.Instrumentable;
-import androidx.fragment.app.Fragment;
-
public class SmartBatteryAction extends BatteryTipAction {
private SettingsActivity mSettingsActivity;
private Fragment mFragment;
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java
index 8a371ef..419e043 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java
@@ -20,13 +20,13 @@
import android.content.Context;
import android.util.Pair;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
-import androidx.annotation.VisibleForTesting;
-
/**
* Action to clear the restriction to the app
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
index c67b2a8..13ba5f6 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java
@@ -20,6 +20,8 @@
import android.os.BatteryStats;
import android.text.format.DateUtils;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.fuelgauge.BatteryInfo;
@@ -35,8 +37,6 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
-import androidx.annotation.VisibleForTesting;
-
/**
* Detector whether to show summary tip. This detector should be executed as the last
* {@link BatteryTipDetector} since it need the most up-to-date {@code visibleTips}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java
index e6c0837..63bb977 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java
@@ -17,7 +17,8 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import android.content.Context;
-import android.text.format.DateUtils;
+
+import androidx.annotation.VisibleForTesting;
import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
import com.android.settings.fuelgauge.batterytip.AppInfo;
@@ -33,8 +34,6 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
-import androidx.annotation.VisibleForTesting;
-
/**
* Detector whether to show summary tip. This detector should be executed as the last
* {@link BatteryTipDetector} since it need the most up-to-date {@code visibleTips}
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
index 1d5143f..841a27e 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
@@ -21,16 +21,16 @@
import android.os.Parcelable;
import android.util.SparseIntArray;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
import androidx.annotation.IdRes;
import androidx.annotation.IntDef;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
/**
* Base model for a battery tip(e.g. suggest user to turn on battery saver)
*
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java
index b308e1b..356097d 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java
@@ -20,6 +20,8 @@
import android.os.Parcel;
import android.os.Parcelable;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.fuelgauge.batterytip.AppInfo;
@@ -27,8 +29,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Tip to show general summary about battery life
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
index 0d91c74..4ff0d28 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
@@ -22,6 +22,8 @@
import android.os.Parcel;
import android.util.Pair;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -31,8 +33,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Tip to suggest user to restrict some bad apps
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java
index e7f5230..0e2e8b5 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java
@@ -20,12 +20,12 @@
import android.os.Parcel;
import android.os.Parcelable;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import androidx.annotation.VisibleForTesting;
-
/**
* Tip to show general summary about battery life
*/
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java
index 9964f05..a0e470f 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/UnrestrictAppTip.java
@@ -19,11 +19,11 @@
import android.content.Context;
import android.os.Parcel;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import androidx.annotation.VisibleForTesting;
-
/**
* Tip to suggest user to remove app restriction. This is the empty tip and it is only used in
* {@link com.android.settings.fuelgauge.AdvancedPowerUsageDetail} to create dialog.
diff --git a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
index f8b86b0..729962d 100644
--- a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
+++ b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java
@@ -22,13 +22,13 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.R;
-import com.android.settings.overlay.FeatureFactory;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
+
public class AssistGestureSettingsPreferenceController extends GesturePreferenceController {
private static final String PREF_KEY_VIDEO = "gesture_assist_video";
@@ -38,7 +38,6 @@
private static final int ON = 1;
private static final int OFF = 0;
- private final String mAssistGesturePrefKey;
private final AssistGestureFeatureProvider mFeatureProvider;
private boolean mWasAvailable;
@@ -48,12 +47,10 @@
@VisibleForTesting
boolean mAssistOnly;
- public AssistGestureSettingsPreferenceController(Context context,
- String key) {
+ public AssistGestureSettingsPreferenceController(Context context, String key) {
super(context, key);
mFeatureProvider = FeatureFactory.getFactory(context).getAssistGestureFeatureProvider();
mWasAvailable = isAvailable();
- mAssistGesturePrefKey = key;
}
@Override
diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
index 04bdedc..9f0a613 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.gestures;
-import static android.provider.Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP;
+import static android.provider.Settings.Secure.DOZE_DOUBLE_TAP_GESTURE;
import android.annotation.UserIdInt;
import android.content.Context;
@@ -25,10 +25,10 @@
import android.provider.Settings;
import android.text.TextUtils;
-import com.android.internal.hardware.AmbientDisplayConfiguration;
-
import androidx.annotation.VisibleForTesting;
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+
public class DoubleTapScreenPreferenceController extends GesturePreferenceController {
private final int ON = 1;
@@ -36,7 +36,7 @@
private static final String PREF_KEY_VIDEO = "gesture_double_tap_screen_video";
- private final String SECURE_KEY = DOZE_PULSE_ON_DOUBLE_TAP;
+ private final String SECURE_KEY = DOZE_DOUBLE_TAP_GESTURE;
private AmbientDisplayConfiguration mAmbientConfig;
@UserIdInt
@@ -59,7 +59,7 @@
@VisibleForTesting
static boolean isSuggestionComplete(AmbientDisplayConfiguration config,
SharedPreferences prefs) {
- return !config.pulseOnDoubleTapAvailable()
+ return !config.doubleTapSensorAvailable()
|| prefs.getBoolean(DoubleTapScreenSettings.PREF_KEY_SUGGESTION_COMPLETE, false);
}
@@ -70,11 +70,6 @@
return UNSUPPORTED_ON_DEVICE;
}
- // Can't change Double Tap when AOD is enabled.
- if (!getAmbientConfig().ambientDisplayAvailable()) {
- return DISABLED_DEPENDENT_SETTING;
- }
-
return AVAILABLE;
}
@@ -96,12 +91,7 @@
@Override
public boolean isChecked() {
- return getAmbientConfig().pulseOnDoubleTapEnabled(mUserId);
- }
-
- @Override
- protected boolean canHandleClicks() {
- return !getAmbientConfig().alwaysOnEnabled(mUserId);
+ return getAmbientConfig().doubleTapGestureEnabled(mUserId);
}
private AmbientDisplayConfiguration getAmbientConfig() {
diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
index fe8aa57..d4c63c0 100644
--- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java
@@ -26,11 +26,11 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.Utils;
-import androidx.annotation.VisibleForTesting;
-
public class DoubleTwistPreferenceController extends GesturePreferenceController {
private final int ON = 1;
diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java
index 7b649e1..a4274bf 100644
--- a/src/com/android/settings/gestures/GesturePreferenceController.java
+++ b/src/com/android/settings/gestures/GesturePreferenceController.java
@@ -19,6 +19,10 @@
import android.content.Context;
import android.os.Bundle;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.widget.VideoPreference;
@@ -28,10 +32,6 @@
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public abstract class GesturePreferenceController extends TogglePreferenceController
implements Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState {
diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
index 1074be0..069085b 100644
--- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
+++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java
@@ -20,6 +20,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.annotation.NonNull;
+
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -29,8 +31,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.NonNull;
-
public class GesturesSettingPreferenceController extends BasePreferenceController {
private final AssistGestureFeatureProvider mFeatureProvider;
private List<AbstractPreferenceController> mGestureControllers;
diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
index 53a4447..7619b69 100644
--- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java
@@ -16,7 +16,7 @@
package com.android.settings.gestures;
-import static android.provider.Settings.Secure.DOZE_PULSE_ON_PICK_UP;
+import static android.provider.Settings.Secure.DOZE_PICK_UP_GESTURE;
import android.annotation.UserIdInt;
import android.content.Context;
@@ -27,17 +27,15 @@
import com.android.internal.hardware.AmbientDisplayConfiguration;
-import androidx.annotation.VisibleForTesting;
-
public class PickupGesturePreferenceController extends GesturePreferenceController {
- private final int ON = 1;
- private final int OFF = 0;
+ private static final int ON = 1;
+ private static final int OFF = 0;
private static final String PREF_KEY_VIDEO = "gesture_pick_up_video";
private final String mPickUpPrefKey;
- private final String SECURE_KEY = DOZE_PULSE_ON_PICK_UP;
+ private final String SECURE_KEY = DOZE_PICK_UP_GESTURE;
private AmbientDisplayConfiguration mAmbientConfig;
@UserIdInt
@@ -57,21 +55,16 @@
public static boolean isSuggestionComplete(Context context, SharedPreferences prefs) {
AmbientDisplayConfiguration ambientConfig = new AmbientDisplayConfiguration(context);
return prefs.getBoolean(PickupGestureSettings.PREF_KEY_SUGGESTION_COMPLETE, false)
- || !ambientConfig.pulseOnPickupAvailable();
+ || !ambientConfig.dozePickupSensorAvailable();
}
@Override
public int getAvailabilityStatus() {
// No hardware support for Pickup Gesture
- if (!getAmbientConfig().dozePulsePickupSensorAvailable()) {
+ if (!getAmbientConfig().dozePickupSensorAvailable()) {
return UNSUPPORTED_ON_DEVICE;
}
- // Can't change Pickup Gesture when AOD is enabled.
- if (!getAmbientConfig().ambientDisplayAvailable()) {
- return DISABLED_DEPENDENT_SETTING;
- }
-
return AVAILABLE;
}
@@ -87,7 +80,7 @@
@Override
public boolean isChecked() {
- return getAmbientConfig().pulseOnPickupEnabled(mUserId);
+ return getAmbientConfig().pickupGestureEnabled(mUserId);
}
@Override
@@ -101,16 +94,6 @@
isChecked ? ON : OFF);
}
- @Override
- public boolean canHandleClicks() {
- return pulseOnPickupCanBeModified();
- }
-
- @VisibleForTesting
- boolean pulseOnPickupCanBeModified() {
- return getAmbientConfig().pulseOnPickupCanBeModified(mUserId);
- }
-
private AmbientDisplayConfiguration getAmbientConfig() {
if (mAmbientConfig == null) {
mAmbientConfig = new AmbientDisplayConfiguration(mContext);
diff --git a/src/com/android/settings/gestures/PreventRingingPreferenceController.java b/src/com/android/settings/gestures/PreventRingingPreferenceController.java
index 1e7c148..570c1c6 100644
--- a/src/com/android/settings/gestures/PreventRingingPreferenceController.java
+++ b/src/com/android/settings/gestures/PreventRingingPreferenceController.java
@@ -24,6 +24,11 @@
import android.os.Bundle;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.widget.VideoPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnCreate;
@@ -31,11 +36,6 @@
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class PreventRingingPreferenceController extends PreventRingingParentPreferenceController
implements Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState {
diff --git a/src/com/android/settings/gestures/SwipeUpPreferenceController.java b/src/com/android/settings/gestures/SwipeUpPreferenceController.java
index f48d21b..5e882c4 100644
--- a/src/com/android/settings/gestures/SwipeUpPreferenceController.java
+++ b/src/com/android/settings/gestures/SwipeUpPreferenceController.java
@@ -47,6 +47,9 @@
final ComponentName recentsComponentName = ComponentName.unflattenFromString(
context.getString(R.string.config_recentsComponentName));
+ if (recentsComponentName == null) {
+ return false;
+ }
final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
.setPackage(recentsComponentName.getPackageName());
if (context.getPackageManager().resolveService(quickStepIntent,
diff --git a/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceController.java b/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceController.java
new file mode 100644
index 0000000..1f1630e
--- /dev/null
+++ b/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceController.java
@@ -0,0 +1,96 @@
+/*
+ * 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.gestures;
+
+import static android.provider.Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE;
+
+import android.annotation.UserIdInt;
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+
+public class WakeLockScreenGesturePreferenceController extends GesturePreferenceController {
+
+ private static final int ON = 1;
+ private static final int OFF = 0;
+
+ private static final String PREF_KEY_VIDEO = "gesture_wake_lock_screen_video";
+ private final String mWakeLockScreenPrefKey;
+
+ private AmbientDisplayConfiguration mAmbientConfig;
+ @UserIdInt
+ private final int mUserId;
+
+ public WakeLockScreenGesturePreferenceController(Context context, String key) {
+ super(context, key);
+ mUserId = UserHandle.myUserId();
+ mWakeLockScreenPrefKey = key;
+ }
+
+ public WakeLockScreenGesturePreferenceController
+ setConfig(AmbientDisplayConfiguration config) {
+ mAmbientConfig = config;
+ return this;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ // No hardware support for this Gesture
+ if (!getAmbientConfig().wakeLockScreenGestureAvailable()) {
+ return UNSUPPORTED_ON_DEVICE;
+ }
+
+ return AVAILABLE;
+ }
+
+ @Override
+ public boolean isSliceable() {
+ return TextUtils.equals(getPreferenceKey(), "gesture_wake_lock_screen");
+ }
+
+ @Override
+ protected String getVideoPrefKey() {
+ return PREF_KEY_VIDEO;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return getAmbientConfig().wakeLockScreenGestureEnabled(mUserId);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return mWakeLockScreenPrefKey;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.Secure.putInt(mContext.getContentResolver(), DOZE_WAKE_LOCK_SCREEN_GESTURE,
+ isChecked ? ON : OFF);
+ }
+
+ private AmbientDisplayConfiguration getAmbientConfig() {
+ if (mAmbientConfig == null) {
+ mAmbientConfig = new AmbientDisplayConfiguration(mContext);
+ }
+
+ return mAmbientConfig;
+ }
+}
diff --git a/src/com/android/settings/gestures/WakeLockScreenGestureSettings.java b/src/com/android/settings/gestures/WakeLockScreenGestureSettings.java
new file mode 100644
index 0000000..e6b7265
--- /dev/null
+++ b/src/com/android/settings/gestures/WakeLockScreenGestureSettings.java
@@ -0,0 +1,81 @@
+/*
+ * 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.gestures;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.Arrays;
+import java.util.List;
+
+@SearchIndexable
+public class WakeLockScreenGestureSettings extends DashboardFragment {
+
+ private static final String TAG = "WakeLockScreenGestureSettings";
+
+ public static final String PREF_KEY_SUGGESTION_COMPLETE =
+ "pref_wake_lock_screen_gesture_suggestion_complete";
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ SuggestionFeatureProvider suggestionFeatureProvider = FeatureFactory.getFactory(context)
+ .getSuggestionFeatureProvider(context);
+ SharedPreferences prefs = suggestionFeatureProvider.getSharedPrefs(context);
+ prefs.edit().putBoolean(PREF_KEY_SUGGESTION_COMPLETE, true).apply();
+
+ use(WakeLockScreenGesturePreferenceController.class)
+ .setConfig(new AmbientDisplayConfiguration(context));
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.SETTINGS_GESTURE_WAKE_LOCK_SCREEN;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.wake_lock_screen_gesture_settings;
+ }
+
+ public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(
+ Context context, boolean enabled) {
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.wake_lock_screen_gesture_settings;
+ return Arrays.asList(sir);
+ }
+ };
+
+}
diff --git a/src/com/android/settings/gestures/WakeScreenGesturePreferenceController.java b/src/com/android/settings/gestures/WakeScreenGesturePreferenceController.java
new file mode 100644
index 0000000..2c7bed2
--- /dev/null
+++ b/src/com/android/settings/gestures/WakeScreenGesturePreferenceController.java
@@ -0,0 +1,89 @@
+/*
+ * 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.gestures;
+
+import static android.provider.Settings.Secure.DOZE_WAKE_SCREEN_GESTURE;
+
+import android.annotation.UserIdInt;
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+
+public class WakeScreenGesturePreferenceController extends GesturePreferenceController {
+
+ private static final int ON = 1;
+ private static final int OFF = 0;
+
+ private static final String PREF_KEY_VIDEO = "gesture_wake_screen_video";
+
+ private AmbientDisplayConfiguration mAmbientConfig;
+ @UserIdInt
+ private final int mUserId;
+
+ public WakeScreenGesturePreferenceController(Context context, String key) {
+ super(context, key);
+ mUserId = UserHandle.myUserId();
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ // No hardware support for Wake Screen Gesture
+ if (!getAmbientConfig().wakeScreenGestureAvailable()) {
+ return UNSUPPORTED_ON_DEVICE;
+ }
+
+ return AVAILABLE;
+ }
+
+ @Override
+ public boolean isSliceable() {
+ return TextUtils.equals(getPreferenceKey(), "gesture_wake_screen");
+ }
+
+ @Override
+ protected String getVideoPrefKey() {
+ return PREF_KEY_VIDEO;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return getAmbientConfig().wakeScreenGestureEnabled(mUserId);
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ return Settings.Secure.putInt(mContext.getContentResolver(), DOZE_WAKE_SCREEN_GESTURE,
+ isChecked ? ON : OFF);
+ }
+
+ private AmbientDisplayConfiguration getAmbientConfig() {
+ if (mAmbientConfig == null) {
+ mAmbientConfig = new AmbientDisplayConfiguration(mContext);
+ }
+
+ return mAmbientConfig;
+ }
+
+ @VisibleForTesting
+ public void setConfig(AmbientDisplayConfiguration config) {
+ mAmbientConfig = config;
+ }
+}
diff --git a/src/com/android/settings/gestures/WakeScreenGestureSettings.java b/src/com/android/settings/gestures/WakeScreenGestureSettings.java
new file mode 100644
index 0000000..708ac01
--- /dev/null
+++ b/src/com/android/settings/gestures/WakeScreenGestureSettings.java
@@ -0,0 +1,69 @@
+/*
+ * 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.gestures;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.provider.SearchIndexableResource;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.Arrays;
+import java.util.List;
+
+@SearchIndexable
+public class WakeScreenGestureSettings extends DashboardFragment {
+
+ private static final String TAG = "WakeScreenGestureSettings";
+
+ public static final String PREF_KEY_SUGGESTION_COMPLETE =
+ "pref_wake_screen_gesture_suggestion_complete";
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.SETTINGS_GESTURE_WAKE_SCREEN;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.wake_screen_gesture_settings;
+ }
+
+ public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(
+ Context context, boolean enabled) {
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.wake_screen_gesture_settings;
+ return Arrays.asList(sir);
+ }
+ };
+
+}
diff --git a/src/com/android/settings/homepage/HomepageFragment.java b/src/com/android/settings/homepage/HomepageFragment.java
deleted file mode 100644
index ff89dd5..0000000
--- a/src/com/android/settings/homepage/HomepageFragment.java
+++ /dev/null
@@ -1,152 +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.homepage;
-
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Toolbar;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsHomepageActivity;
-import com.android.settings.Utils;
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.dashboard.DashboardSummary;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.SearchFeatureProvider;
-
-import com.google.android.material.bottomappbar.BottomAppBar;
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
-import androidx.annotation.NonNull;
-
-public class HomepageFragment extends InstrumentedFragment {
-
- private static final String TAG = "HomepageFragment";
-
- private FloatingActionButton mSearchButton;
- private BottomSheetBehavior mBottomSheetBehavior;
- private boolean mBottomFragmentLoaded = false;
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- final View rootView = inflater.inflate(R.layout.dashboard, container, false);
- return rootView;
- }
-
- @Override
- public void onActivityCreated(Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
- setupBottomBar();
- setupSearchBar();
- }
-
- @Override
- public int getMetricsCategory() {
- return MetricsEvent.SETTINGS_HOMEPAGE;
- }
-
- private void setupBottomBar() {
- final Activity activity = getActivity();
- mSearchButton = (FloatingActionButton) activity.findViewById(R.id.search_fab);
-
- mSearchButton.setOnClickListener(v -> {
- final Intent intent = SearchFeatureProvider.SEARCH_UI_INTENT;
- intent.setPackage(FeatureFactory.getFactory(activity)
- .getSearchFeatureProvider().getSettingsIntelligencePkgName());
- startActivityForResult(intent, 0 /* requestCode */);
- });
- mBottomSheetBehavior = BottomSheetBehavior.from(activity.findViewById(R.id.bottom_sheet));
- final BottomAppBar bottomBar = (BottomAppBar) activity.findViewById(R.id.bar);
- bottomBar.setOnClickListener(v -> {
- mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
- });
-
- final int screenWidthpx = getResources().getDisplayMetrics().widthPixels;
- final View searchbar = activity.findViewById(R.id.search_bar_container);
- final View bottombar = activity.findViewById(R.id.bar);
- final Toolbar searchActionBar = (Toolbar) activity.findViewById(R.id.search_action_bar);
- searchActionBar.setNavigationIcon(R.drawable.ic_search_floating_24dp);
-
-
- mBottomSheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
- @Override
- public void onStateChanged(@NonNull View bottomSheet, int newState) {
- if (!mBottomFragmentLoaded) {
- SettingsHomepageActivity.switchToFragment(getActivity(),
- R.id.bottom_sheet_fragment, DashboardSummary.class.getName());
- mBottomFragmentLoaded = true;
- }
- if (newState == BottomSheetBehavior.STATE_EXPANDED) {
- bottombar.setVisibility(View.INVISIBLE);
- searchbar.setVisibility(View.VISIBLE);
- mSearchButton.setVisibility(View.GONE);
- } else if (newState == BottomSheetBehavior.STATE_COLLAPSED) {
- bottombar.setVisibility(View.VISIBLE);
- searchbar.setVisibility(View.INVISIBLE);
- mSearchButton.setVisibility(View.VISIBLE);
- } else if (newState == BottomSheetBehavior.STATE_SETTLING) {
- bottombar.setVisibility(View.VISIBLE);
- searchbar.setVisibility(View.VISIBLE);
- mSearchButton.setVisibility(View.VISIBLE);
- }
- }
-
- @Override
- public void onSlide(@NonNull View bottomSheet, float slideOffset) {
- bottombar.setAlpha(1 - slideOffset);
- mSearchButton.setAlpha(1 - slideOffset);
- searchbar.setAlpha(slideOffset);
- searchbar.setPadding((int) (screenWidthpx * (1 - slideOffset)), 0, 0, 0);
- }
- });
- }
-
- //TODO(110767984), copied from settingsActivity. We have to merge them
- private void setupSearchBar() {
- final Activity activity = getActivity();
- final Toolbar toolbar = activity.findViewById(R.id.search_action_bar);
- FeatureFactory.getFactory(activity).getSearchFeatureProvider()
- .initSearchToolbar(activity, toolbar);
- activity.setActionBar(toolbar);
-
- // Please forgive me for what I am about to do.
- //
- // Need to make the navigation icon non-clickable so that the entire card is clickable
- // and goes to the search UI. Also set the background to null so there's no ripple.
- final View navView = toolbar.getNavigationView();
- navView.setClickable(false);
- navView.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_NO);
- navView.setBackground(null);
-
- final ActionBar actionBar = activity.getActionBar();
- if (actionBar != null) {
- boolean deviceProvisioned = Utils.isDeviceProvisioned(activity);
- actionBar.setDisplayHomeAsUpEnabled(deviceProvisioned);
- actionBar.setHomeButtonEnabled(deviceProvisioned);
- actionBar.setDisplayShowTitleEnabled(false);
- }
- }
-}
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
new file mode 100644
index 0000000..d3f11a0
--- /dev/null
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -0,0 +1,76 @@
+/*
+ * 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.homepage;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.FeatureFlagUtils;
+import android.widget.ImageView;
+import android.widget.Toolbar;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settings.accounts.AvatarViewMixin;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.core.SettingsBaseActivity;
+import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
+import com.android.settings.overlay.FeatureFactory;
+
+public class SettingsHomepageActivity extends SettingsBaseActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ if (!FeatureFlagUtils.isEnabled(this, FeatureFlags.DYNAMIC_HOMEPAGE)) {
+ final Intent settings = new Intent(this, SettingsActivity.class);
+ startActivity(settings);
+ finish();
+ return;
+ }
+
+ setContentView(R.layout.settings_homepage_container);
+
+ final Toolbar toolbar = findViewById(R.id.search_action_bar);
+ FeatureFactory.getFactory(this).getSearchFeatureProvider()
+ .initSearchToolbar(this, toolbar);
+
+ final ImageView avatarView = findViewById(R.id.account_avatar);
+ final AvatarViewMixin avatarViewMixin = new AvatarViewMixin(this, avatarView);
+ getLifecycle().addObserver(avatarViewMixin);
+
+ showFragment(new ContextualCardsFragment(), R.id.contextual_cards_content);
+ showFragment(new TopLevelSettings(), R.id.main_content);
+ }
+
+ private void showFragment(Fragment fragment, int id) {
+ final FragmentManager fragmentManager = getSupportFragmentManager();
+ final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+ final Fragment showFragment = fragmentManager.findFragmentById(id);
+
+ if (showFragment == null) {
+ fragmentTransaction.add(id, fragment);
+ } else {
+ fragmentTransaction.show(showFragment);
+ }
+ fragmentTransaction.commit();
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java
new file mode 100644
index 0000000..8f70b2b
--- /dev/null
+++ b/src/com/android/settings/homepage/TopLevelSettings.java
@@ -0,0 +1,123 @@
+/*
+ * 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.homepage;
+
+import static com.android.settings.search.actionbar.SearchMenuController
+ .NEED_SEARCH_ICON_IN_ACTION_BAR;
+import static com.android.settingslib.search.SearchIndexable.MOBILE;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.SearchIndexableResource;
+
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.support.SupportPreferenceController;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.Arrays;
+import java.util.List;
+
+@SearchIndexable(forTarget = MOBILE)
+public class TopLevelSettings extends DashboardFragment implements
+ PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+
+ private static final String TAG = "TopLevelSettings";
+
+ public TopLevelSettings() {
+ final Bundle args = new Bundle();
+ // Disable the search icon because this page uses a full search view in actionbar.
+ args.putBoolean(NEED_SEARCH_ICON_IN_ACTION_BAR, false);
+ setArguments(args);
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.top_level_settings;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.DASHBOARD_SUMMARY;
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ use(SupportPreferenceController.class).setActivity(getActivity());
+ }
+
+ @Override
+ public int getHelpResource() {
+ // Disable the help icon because this page uses a full search view in actionbar.
+ return 0;
+ }
+
+ @Override
+ public Fragment getCallbackFragment() {
+ return this;
+ }
+
+ @Override
+ public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {
+ new SubSettingLauncher(getActivity())
+ .setDestination(pref.getFragment())
+ .setArguments(pref.getExtras())
+ .setSourceMetricsCategory(caller instanceof Instrumentable
+ ? ((Instrumentable) caller).getMetricsCategory()
+ : Instrumentable.METRICS_CATEGORY_UNKNOWN)
+ .setTitleRes(-1)
+ .launch();
+ return true;
+ }
+
+ @Override
+ protected boolean shouldForceRoundedIcon() {
+ return getContext().getResources()
+ .getBoolean(R.bool.config_force_rounded_icon_TopLevelSettings);
+ }
+
+ public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(
+ Context context, boolean enabled) {
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.top_level_settings;
+ return Arrays.asList(sir);
+ }
+
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ // Never searchable, all entries in this page are already indexed elsewhere.
+ return false;
+ }
+ };
+}
diff --git a/src/com/android/settings/homepage/contextualcards/CardContentProvider.java b/src/com/android/settings/homepage/contextualcards/CardContentProvider.java
new file mode 100644
index 0000000..74e09e8
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/CardContentProvider.java
@@ -0,0 +1,182 @@
+/*
+ * 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.homepage.contextualcards;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteQueryBuilder;
+import android.net.Uri;
+import android.os.Build;
+import android.os.StrictMode;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+/**
+ * Provider stores and manages user interaction feedback for homepage contextual cards.
+ */
+public class CardContentProvider extends ContentProvider {
+
+ private static final String TAG = "CardContentProvider";
+
+ public static final String CARD_AUTHORITY = "com.android.settings.homepage.CardContentProvider";
+
+ /** URI matcher for ContentProvider queries. */
+ private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
+ /** URI matcher type for cards table */
+ private static final int MATCH_CARDS = 100;
+
+ static {
+ URI_MATCHER.addURI(CARD_AUTHORITY, CardDatabaseHelper.CARD_TABLE, MATCH_CARDS);
+ }
+
+ private CardDatabaseHelper mDBHelper;
+
+ @Override
+ public boolean onCreate() {
+ mDBHelper = CardDatabaseHelper.getInstance(getContext());
+ return true;
+ }
+
+ @Override
+ public Uri insert(Uri uri, ContentValues values) {
+ final ContentValues[] cvs = {values};
+ bulkInsert(uri, cvs);
+ return uri;
+ }
+
+ @Override
+ public int bulkInsert(Uri uri, ContentValues[] values) {
+ final StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
+ int numInserted = 0;
+ final SQLiteDatabase database = mDBHelper.getWritableDatabase();
+
+ try {
+ maybeEnableStrictMode();
+
+ final String table = getTableFromMatch(uri);
+ database.beginTransaction();
+
+ // Here deletion first is avoiding redundant insertion. According to cl/215350754
+ database.delete(table, null /* whereClause */, null /* whereArgs */);
+ for (ContentValues value : values) {
+ long ret = database.insert(table, null /* nullColumnHack */, value);
+ if (ret != -1L) {
+ numInserted++;
+ } else {
+ Log.e(TAG, "The row " + value.getAsString(CardDatabaseHelper.CardColumns.NAME)
+ + " insertion failed! Please check your data.");
+ }
+ }
+ database.setTransactionSuccessful();
+ getContext().getContentResolver().notifyChange(uri, null /* observer */);
+ } finally {
+ database.endTransaction();
+ StrictMode.setThreadPolicy(oldPolicy);
+ }
+ return numInserted;
+ }
+
+ @Override
+ public int delete(Uri uri, String selection, String[] selectionArgs) {
+ final StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
+ try {
+ maybeEnableStrictMode();
+ final SQLiteDatabase database = mDBHelper.getWritableDatabase();
+ final String table = getTableFromMatch(uri);
+ final int rowsDeleted = database.delete(table, selection, selectionArgs);
+ getContext().getContentResolver().notifyChange(uri, null /* observer */);
+ return rowsDeleted;
+ } finally {
+ StrictMode.setThreadPolicy(oldPolicy);
+ }
+ }
+
+ @Override
+ public String getType(Uri uri) {
+ throw new UnsupportedOperationException("getType operation not supported currently.");
+ }
+
+ @Override
+ public Cursor query(Uri uri, String[] projection, String selection,
+ String[] selectionArgs, String sortOrder) {
+ final StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
+ try {
+ maybeEnableStrictMode();
+
+ final SQLiteQueryBuilder queryBuilder = new SQLiteQueryBuilder();
+ final String table = getTableFromMatch(uri);
+ queryBuilder.setTables(table);
+ final SQLiteDatabase database = mDBHelper.getReadableDatabase();
+ final Cursor cursor = queryBuilder.query(database,
+ projection, selection, selectionArgs, null /* groupBy */, null /* having */,
+ sortOrder);
+
+ cursor.setNotificationUri(getContext().getContentResolver(), uri);
+ return cursor;
+ } finally {
+ StrictMode.setThreadPolicy(oldPolicy);
+ }
+ }
+
+ @Override
+ public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+ final StrictMode.ThreadPolicy oldPolicy = StrictMode.getThreadPolicy();
+ try {
+ maybeEnableStrictMode();
+
+ final SQLiteDatabase database = mDBHelper.getWritableDatabase();
+ final String table = getTableFromMatch(uri);
+ final int rowsUpdated = database.update(table, values, selection, selectionArgs);
+ getContext().getContentResolver().notifyChange(uri, null /* observer */);
+ return rowsUpdated;
+ } finally {
+ StrictMode.setThreadPolicy(oldPolicy);
+ }
+ }
+
+ @VisibleForTesting
+ void maybeEnableStrictMode() {
+ if (Build.IS_DEBUGGABLE && ThreadUtils.isMainThread()) {
+ enableStrictMode();
+ }
+ }
+
+ @VisibleForTesting
+ void enableStrictMode() {
+ StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder().detectAll().build());
+ }
+
+ @VisibleForTesting
+ String getTableFromMatch(Uri uri) {
+ final int match = URI_MATCHER.match(uri);
+ String table;
+ switch (match) {
+ case MATCH_CARDS:
+ table = CardDatabaseHelper.CARD_TABLE;
+ break;
+ default:
+ throw new IllegalArgumentException("Unknown Uri format: " + uri);
+ }
+ return table;
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java b/src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java
new file mode 100644
index 0000000..0065f5c
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java
@@ -0,0 +1,224 @@
+/*
+ * 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.homepage.contextualcards;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+
+/**
+ * Defines the schema for the Homepage Cards database.
+ */
+public class CardDatabaseHelper extends SQLiteOpenHelper {
+ private static final String TAG = "CardDatabaseHelper";
+ private static final String DATABASE_NAME = "homepage_cards.db";
+ private static final int DATABASE_VERSION = 5;
+
+ public static final String CARD_TABLE = "cards";
+
+ public interface CardColumns {
+ /**
+ * Primary key. Name of the card.
+ */
+ String NAME = "name";
+
+ /**
+ * Type of the card.
+ */
+ String TYPE = "type";
+
+ /**
+ * Score of the card. Higher numbers have higher priorities.
+ */
+ String SCORE = "score";
+
+ /**
+ * URI of the slice card.
+ */
+ String SLICE_URI = "slice_uri";
+
+ /**
+ * Category of the card.
+ */
+ String CATEGORY = "category";
+
+ /**
+ * Keep the card last display's locale.
+ */
+ String LOCALIZED_TO_LOCALE = "localized_to_locale";
+
+ /**
+ * Package name for all card candidates.
+ */
+ String PACKAGE_NAME = "package_name";
+
+ /**
+ * Application version of the package.
+ */
+ String APP_VERSION = "app_version";
+
+ /**
+ * Title resource name of the package.
+ */
+ String TITLE_RES_NAME = "title_res_name";
+
+ /**
+ * Title of the package to be shown.
+ */
+ String TITLE_TEXT = "title_text";
+
+ /**
+ * Summary resource name of the package.
+ */
+ String SUMMARY_RES_NAME = "summary_res_name";
+
+ /**
+ * Summary of the package to be shown.
+ */
+ String SUMMARY_TEXT = "summary_text";
+
+ /**
+ * Icon resource name of the package.
+ */
+ String ICON_RES_NAME = "icon_res_name";
+
+ /**
+ * Icon resource id of the package.
+ */
+ String ICON_RES_ID = "icon_res_id";
+
+ /**
+ * Key value mapping to Intent in Settings. Do action when user presses card.
+ */
+ String CARD_ACTION = "card_action";
+
+ /**
+ * Expire time of the card. The unit of the value is mini-second.
+ */
+ String EXPIRE_TIME_MS = "expire_time_ms";
+
+ /**
+ * Decide the card display full-length width or half-width in screen.
+ */
+ String SUPPORT_HALF_WIDTH = "support_half_width";
+
+ /**
+ * Decide the card is dismissed or not.
+ */
+ String CARD_DISMISSED = "card_dismissed";
+ }
+
+ private static final String CREATE_CARD_TABLE =
+ "CREATE TABLE " + CARD_TABLE +
+ "(" +
+ CardColumns.NAME +
+ " TEXT NOT NULL PRIMARY KEY, " +
+ CardColumns.TYPE +
+ " INTEGER NOT NULL, " +
+ CardColumns.SCORE +
+ " DOUBLE NOT NULL, " +
+ CardColumns.SLICE_URI +
+ " TEXT, " +
+ CardColumns.CATEGORY +
+ " INTEGER DEFAULT 0, " +
+ CardColumns.LOCALIZED_TO_LOCALE +
+ " TEXT, " +
+ CardColumns.PACKAGE_NAME +
+ " TEXT NOT NULL, " +
+ CardColumns.APP_VERSION +
+ " INTEGER NOT NULL, " +
+ CardColumns.TITLE_RES_NAME +
+ " TEXT, " +
+ CardColumns.TITLE_TEXT +
+ " TEXT, " +
+ CardColumns.SUMMARY_RES_NAME +
+ " TEXT, " +
+ CardColumns.SUMMARY_TEXT +
+ " TEXT, " +
+ CardColumns.ICON_RES_NAME +
+ " TEXT, " +
+ CardColumns.ICON_RES_ID +
+ " INTEGER DEFAULT 0, " +
+ CardColumns.CARD_ACTION +
+ " INTEGER, " +
+ CardColumns.EXPIRE_TIME_MS +
+ " INTEGER, " +
+ CardColumns.SUPPORT_HALF_WIDTH +
+ " INTEGER DEFAULT 0, " +
+ CardColumns.CARD_DISMISSED +
+ " INTEGER DEFAULT 0 " +
+ ");";
+
+ public CardDatabaseHelper(Context context) {
+ super(context, DATABASE_NAME, null, DATABASE_VERSION);
+ }
+
+ @Override
+ public void onCreate(SQLiteDatabase db) {
+ db.execSQL(CREATE_CARD_TABLE);
+ }
+
+ @Override
+ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+ if (oldVersion < newVersion) {
+ Log.d(TAG, "Reconstructing DB from " + oldVersion + " to " + newVersion);
+ db.execSQL("DROP TABLE IF EXISTS " + CARD_TABLE);
+ onCreate(db);
+ }
+ }
+
+ @VisibleForTesting
+ static CardDatabaseHelper sCardDatabaseHelper;
+
+ public static synchronized CardDatabaseHelper getInstance(Context context) {
+ if (sCardDatabaseHelper == null) {
+ sCardDatabaseHelper = new CardDatabaseHelper(context.getApplicationContext());
+ }
+ return sCardDatabaseHelper;
+ }
+
+ Cursor getContextualCards() {
+ final SQLiteDatabase db = this.getReadableDatabase();
+ final String selection = CardColumns.CARD_DISMISSED + "=0";
+ Cursor cursor = db.query(CARD_TABLE, null /* columns */, selection,
+ null /* selectionArgs */, null /* groupBy */, null /* having */,
+ null /* orderBy */);
+ return cursor;
+ }
+
+ /**
+ * Mark a specific ContextualCard with dismissal flag in the database to indicate that the
+ * card has been dismissed.
+ *
+ * @param cardName the card name of the ContextualCard which is dismissed by user.
+ * @return updated row number
+ */
+ public int markContextualCardAsDismissed(String cardName) {
+ final SQLiteDatabase database = this.getWritableDatabase();
+ final ContentValues values = new ContentValues();
+ values.put(CardColumns.CARD_DISMISSED, 1);
+ final String selection = CardColumns.NAME + "=?";
+ final String[] selectionArgs = {cardName};
+ final int rowsUpdated = database.update(CARD_TABLE, values, selection, selectionArgs);
+ return rowsUpdated;
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCard.java b/src/com/android/settings/homepage/contextualcards/ContextualCard.java
new file mode 100644
index 0000000..996c2dd
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCard.java
@@ -0,0 +1,326 @@
+/*
+ * 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.homepage.contextualcards;
+
+import android.annotation.IntDef;
+import android.database.Cursor;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.text.TextUtils;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * Data class representing a {@link ContextualCard}.
+ */
+public class ContextualCard {
+
+ /**
+ * Flags indicating the type of the ContextualCard.
+ */
+ @IntDef({CardType.DEFAULT, CardType.SLICE, CardType.SUGGESTION, CardType.CONDITIONAL})
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface CardType {
+ int DEFAULT = 0;
+ int SLICE = 1;
+ int SUGGESTION = 2;
+ int CONDITIONAL = 3;
+ }
+
+ private final String mName;
+ @CardType
+ private final int mCardType;
+ private final double mRankingScore;
+ private final String mSliceUri;
+ private final int mCategory;
+ private final String mLocalizedToLocale;
+ private final String mPackageName;
+ private final long mAppVersion;
+ private final String mTitleResName;
+ private final String mTitleText;
+ private final String mSummaryResName;
+ private final String mSummaryText;
+ private final String mIconResName;
+ private final int mIconResId;
+ private final int mCardAction;
+ private final long mExpireTimeMS;
+ private final boolean mIsHalfWidth;
+ private final Drawable mIconDrawable;
+
+ String getName() {
+ return mName;
+ }
+
+ public int getCardType() {
+ return mCardType;
+ }
+
+ public double getRankingScore() {
+ return mRankingScore;
+ }
+
+ public String getTextSliceUri() {
+ return mSliceUri;
+ }
+
+ public Uri getSliceUri() {
+ return Uri.parse(mSliceUri);
+ }
+
+ public int getCategory() {
+ return mCategory;
+ }
+
+ public String getLocalizedToLocale() {
+ return mLocalizedToLocale;
+ }
+
+ public String getPackageName() {
+ return mPackageName;
+ }
+
+ public long getAppVersion() {
+ return mAppVersion;
+ }
+
+ public String getTitleResName() {
+ return mTitleResName;
+ }
+
+ public String getTitleText() {
+ return mTitleText;
+ }
+
+ public String getSummaryResName() {
+ return mSummaryResName;
+ }
+
+ public String getSummaryText() {
+ return mSummaryText;
+ }
+
+ public String getIconResName() {
+ return mIconResName;
+ }
+
+ public int getIconResId() {
+ return mIconResId;
+ }
+
+ public int getCardAction() {
+ return mCardAction;
+ }
+
+ public long getExpireTimeMS() {
+ return mExpireTimeMS;
+ }
+
+ public Drawable getIconDrawable() {
+ return mIconDrawable;
+ }
+
+ public boolean isHalfWidth() {
+ return mIsHalfWidth;
+ }
+
+ boolean isCustomCard() {
+ return TextUtils.isEmpty(mSliceUri);
+ }
+
+ public ContextualCard(Builder builder) {
+ mName = builder.mName;
+ mCardType = builder.mCardType;
+ mRankingScore = builder.mRankingScore;
+ mSliceUri = builder.mSliceUri;
+ mCategory = builder.mCategory;
+ mLocalizedToLocale = builder.mLocalizedToLocale;
+ mPackageName = builder.mPackageName;
+ mAppVersion = builder.mAppVersion;
+ mTitleResName = builder.mTitleResName;
+ mTitleText = builder.mTitleText;
+ mSummaryResName = builder.mSummaryResName;
+ mSummaryText = builder.mSummaryText;
+ mIconResName = builder.mIconResName;
+ mIconResId = builder.mIconResId;
+ mCardAction = builder.mCardAction;
+ mExpireTimeMS = builder.mExpireTimeMS;
+ mIconDrawable = builder.mIconDrawable;
+ mIsHalfWidth = builder.mIsHalfWidth;
+ }
+
+ ContextualCard(Cursor c) {
+ mName = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.NAME));
+ mCardType = c.getInt(c.getColumnIndex(CardDatabaseHelper.CardColumns.TYPE));
+ mRankingScore = c.getDouble(c.getColumnIndex(CardDatabaseHelper.CardColumns.SCORE));
+ mSliceUri = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.SLICE_URI));
+ mCategory = c.getInt(c.getColumnIndex(CardDatabaseHelper.CardColumns.CATEGORY));
+ mLocalizedToLocale = c.getString(
+ c.getColumnIndex(CardDatabaseHelper.CardColumns.LOCALIZED_TO_LOCALE));
+ mPackageName = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.PACKAGE_NAME));
+ mAppVersion = c.getLong(c.getColumnIndex(CardDatabaseHelper.CardColumns.APP_VERSION));
+ mTitleResName = c.getString(
+ c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_RES_NAME));
+ mTitleText = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.TITLE_TEXT));
+ mSummaryResName = c.getString(
+ c.getColumnIndex(CardDatabaseHelper.CardColumns.SUMMARY_RES_NAME));
+ mSummaryText = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.SUMMARY_TEXT));
+ mIconResName = c.getString(c.getColumnIndex(CardDatabaseHelper.CardColumns.ICON_RES_NAME));
+ mIconResId = c.getInt(c.getColumnIndex(CardDatabaseHelper.CardColumns.ICON_RES_ID));
+ mCardAction = c.getInt(c.getColumnIndex(CardDatabaseHelper.CardColumns.CARD_ACTION));
+ mExpireTimeMS = c.getLong(c.getColumnIndex(CardDatabaseHelper.CardColumns.EXPIRE_TIME_MS));
+ mIsHalfWidth = (c.getInt(
+ c.getColumnIndex(CardDatabaseHelper.CardColumns.SUPPORT_HALF_WIDTH)) == 1);
+ mIconDrawable = null;
+ }
+
+ @Override
+ public int hashCode() {
+ return mName.hashCode();
+ }
+
+ /**
+ * Note that {@link #mName} is treated as a primary key for this class and determines equality.
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof ContextualCard)) {
+ return false;
+ }
+ final ContextualCard that = (ContextualCard) obj;
+
+ return TextUtils.equals(mName, that.mName);
+ }
+
+ public static class Builder {
+ private String mName;
+ private int mCardType;
+ private double mRankingScore;
+ private String mSliceUri;
+ private int mCategory;
+ private String mLocalizedToLocale;
+ private String mPackageName;
+ private long mAppVersion;
+ private String mTitleResName;
+ private String mTitleText;
+ private String mSummaryResName;
+ private String mSummaryText;
+ private String mIconResName;
+ private int mIconResId;
+ private int mCardAction;
+ private long mExpireTimeMS;
+ private Drawable mIconDrawable;
+ private boolean mIsHalfWidth;
+
+ public Builder setName(String name) {
+ mName = name;
+ return this;
+ }
+
+ public Builder setCardType(int cardType) {
+ mCardType = cardType;
+ return this;
+ }
+
+ public Builder setRankingScore(double rankingScore) {
+ mRankingScore = rankingScore;
+ return this;
+ }
+
+ public Builder setSliceUri(Uri sliceUri) {
+ mSliceUri = sliceUri.toString();
+ return this;
+ }
+
+ public Builder setCategory(int category) {
+ mCategory = category;
+ return this;
+ }
+
+ public Builder setLocalizedToLocale(String localizedToLocale) {
+ mLocalizedToLocale = localizedToLocale;
+ return this;
+ }
+
+ public Builder setPackageName(String packageName) {
+ mPackageName = packageName;
+ return this;
+ }
+
+ public Builder setAppVersion(long appVersion) {
+ mAppVersion = appVersion;
+ return this;
+ }
+
+ public Builder setTitleResName(String titleResName) {
+ mTitleResName = titleResName;
+ return this;
+ }
+
+ public Builder setTitleText(String titleText) {
+ mTitleText = titleText;
+ return this;
+ }
+
+ public Builder setSummaryResName(String summaryResName) {
+ mSummaryResName = summaryResName;
+ return this;
+ }
+
+ public Builder setSummaryText(String summaryText) {
+ mSummaryText = summaryText;
+ return this;
+ }
+
+ public Builder setIconResName(String iconResName) {
+ mIconResName = iconResName;
+ return this;
+ }
+
+ public Builder setIconResId(int iconResId) {
+ mIconResId = iconResId;
+ return this;
+ }
+
+ public Builder setCardAction(int cardAction) {
+ mCardAction = cardAction;
+ return this;
+ }
+
+ public Builder setExpireTimeMS(long expireTimeMS) {
+ mExpireTimeMS = expireTimeMS;
+ return this;
+ }
+
+ public Builder setIconDrawable(Drawable iconDrawable) {
+ mIconDrawable = iconDrawable;
+ return this;
+ }
+
+ public Builder setIsHalfWidth(boolean isHalfWidth) {
+ mIsHalfWidth = isHalfWidth;
+ return this;
+ }
+
+ public ContextualCard build() {
+ return new ContextualCard(this);
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardController.java b/src/com/android/settings/homepage/contextualcards/ContextualCardController.java
new file mode 100644
index 0000000..95669ce
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardController.java
@@ -0,0 +1,32 @@
+/*
+ * 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.homepage.contextualcards;
+
+/**
+ * Data controller for {@link ContextualCard}.
+ */
+public interface ContextualCardController {
+
+ @ContextualCard.CardType
+ int getCardType();
+
+ void onPrimaryClick(ContextualCard card);
+
+ void onActionClick(ContextualCard card);
+
+ void setCardUpdateListener(ContextualCardUpdateListener listener);
+}
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
new file mode 100644
index 0000000..f3fbf06
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
@@ -0,0 +1,151 @@
+/*
+ * 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.homepage.contextualcards;
+
+import static android.app.slice.Slice.HINT_ERROR;
+
+import static androidx.slice.widget.SliceLiveData.SUPPORTED_SPECS;
+
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.slice.Slice;
+
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settingslib.utils.AsyncLoaderCompat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>> {
+ private static final String TAG = "ContextualCardLoader";
+ static final int CARD_CONTENT_LOADER_ID = 1;
+
+ private Context mContext;
+
+ public interface CardContentLoaderListener {
+ void onFinishCardLoading(List<ContextualCard> contextualCards);
+ }
+
+ ContextualCardLoader(Context context) {
+ super(context);
+ mContext = context.getApplicationContext();
+ }
+
+ @Override
+ protected void onDiscardResult(List<ContextualCard> result) {
+
+ }
+
+ @NonNull
+ @Override
+ public List<ContextualCard> loadInBackground() {
+ final List<ContextualCard> result = new ArrayList<>();
+ try (Cursor cursor = getContextualCardsFromProvider()) {
+ if (cursor.getCount() == 0) {
+ result.addAll(createStaticCards());
+ } else {
+ for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+ final ContextualCard card = new ContextualCard(cursor);
+ if (card.isCustomCard()) {
+ //TODO(b/114688391): Load and generate custom card,then add into list
+ } else {
+ result.add(card);
+ }
+ }
+ }
+ }
+ return filterEligibleCards(result);
+ }
+
+ @VisibleForTesting
+ Cursor getContextualCardsFromProvider() {
+ return CardDatabaseHelper.getInstance(mContext).getContextualCards();
+ }
+
+ @VisibleForTesting
+ List<ContextualCard> createStaticCards() {
+ final long appVersionCode = getAppVersionCode();
+ final String packageName = mContext.getPackageName();
+ final double rankingScore = 0.0;
+ final List<ContextualCard> result = new ArrayList();
+ result.add(new ContextualCard.Builder()
+ .setSliceUri(BatterySlice.BATTERY_CARD_URI)
+ .setName(BatterySlice.PATH_BATTERY_INFO)
+ .setPackageName(packageName)
+ .setRankingScore(rankingScore)
+ .setAppVersion(appVersionCode)
+ .setCardType(ContextualCard.CardType.SLICE)
+ .setIsHalfWidth(false)
+ .build());
+ return result;
+ }
+
+ @VisibleForTesting
+ List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) {
+ return candidates.stream().filter(card -> isCardEligibleToDisplay(card))
+ .collect(Collectors.toList());
+ }
+
+ @VisibleForTesting
+ boolean isCardEligibleToDisplay(ContextualCard card) {
+ if (card.isCustomCard()) {
+ return true;
+ }
+
+ final Uri uri = card.getSliceUri();
+
+ if (!ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
+ return false;
+ }
+
+ //check if the uri has a provider associated with.
+ final ContentProviderClient provider =
+ mContext.getContentResolver().acquireContentProviderClient(uri);
+ if (provider == null) {
+ return false;
+ }
+ //release contentProviderClient to prevent from memory leak.
+ provider.release();
+
+ final Slice slice = Slice.bindSlice(mContext, uri, SUPPORTED_SPECS);
+ if (slice == null || slice.hasHint(HINT_ERROR)) {
+ Log.w(TAG, "Failed to bind slice, not eligible for display " + uri);
+ return false;
+ }
+
+ return true;
+ }
+
+ private long getAppVersionCode() {
+ try {
+ return mContext.getPackageManager().getPackageInfo(mContext.getPackageName(),
+ 0 /* flags */).getLongVersionCode();
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.e(TAG, "Invalid package name for context", e);
+ }
+ return -1L;
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java
new file mode 100644
index 0000000..0268fb0
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java
@@ -0,0 +1,80 @@
+/*
+ * 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.homepage.contextualcards;
+
+import com.android.settings.homepage.contextualcards.ContextualCard.CardType;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardController;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardController;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer;
+
+import java.util.Set;
+import java.util.TreeSet;
+
+public class ContextualCardLookupTable {
+
+ static class ControllerRendererMapping implements Comparable<ControllerRendererMapping> {
+ @CardType
+ private final int mCardType;
+ private final Class<? extends ContextualCardController> mControllerClass;
+ private final Class<? extends ContextualCardRenderer> mRendererClass;
+
+ private ControllerRendererMapping(@CardType int cardType,
+ Class<? extends ContextualCardController> controllerClass,
+ Class<? extends ContextualCardRenderer> rendererClass) {
+ mCardType = cardType;
+ mControllerClass = controllerClass;
+ mRendererClass = rendererClass;
+ }
+
+ @Override
+ public int compareTo(ControllerRendererMapping other) {
+ return Integer.compare(this.mCardType, other.mCardType);
+ }
+ }
+
+ private static final Set<ControllerRendererMapping> LOOKUP_TABLE =
+ new TreeSet<ControllerRendererMapping>() {{
+ add(new ControllerRendererMapping(CardType.CONDITIONAL,
+ ConditionContextualCardController.class,
+ ConditionContextualCardRenderer.class));
+ add(new ControllerRendererMapping(CardType.SLICE,
+ SliceContextualCardController.class,
+ SliceContextualCardRenderer.class));
+ }};
+
+ public static Class<? extends ContextualCardController> getCardControllerClass(
+ @CardType int cardType) {
+ for (ControllerRendererMapping mapping : LOOKUP_TABLE) {
+ if (mapping.mCardType == cardType) {
+ return mapping.mControllerClass;
+ }
+ }
+ return null;
+ }
+
+ //TODO(b/112578070): Implement multi renderer cases.
+ public static Class<? extends ContextualCardRenderer> getCardRendererClasses(
+ @CardType int cardType) {
+ for (ControllerRendererMapping mapping : LOOKUP_TABLE) {
+ if (mapping.mCardType == cardType) {
+ return mapping.mRendererClass;
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
new file mode 100644
index 0000000..9bd08c8
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java
@@ -0,0 +1,193 @@
+/*
+ * 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.homepage.contextualcards;
+
+import static com.android.settings.homepage.contextualcards.ContextualCardLoader.CARD_CONTENT_LOADER_ID;
+
+import static java.util.stream.Collectors.groupingBy;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.widget.BaseAdapter;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * This is a centralized manager of multiple {@link ContextualCardController}.
+ *
+ * {@link ContextualCardManager} first loads data from {@link ContextualCardLoader} and gets back a
+ * list of {@link ContextualCard}. All subclasses of {@link ContextualCardController} are loaded
+ * here, which will then trigger the {@link ContextualCardController} to load its data and listen to
+ * corresponding changes. When every single {@link ContextualCardController} updates its data, the
+ * data will be passed here, then going through some sorting mechanisms. The
+ * {@link ContextualCardController} will end up building a list of {@link ContextualCard} for
+ * {@link ContextualCardsAdapter} and {@link BaseAdapter#notifyDataSetChanged()} will be called to
+ * get the page refreshed.
+ */
+public class ContextualCardManager implements ContextualCardLoader.CardContentLoaderListener,
+ ContextualCardUpdateListener {
+
+ private static final String TAG = "ContextualCardManager";
+ //The list for Settings Custom Card
+ @ContextualCard.CardType
+ private static final int[] SETTINGS_CARDS = {ContextualCard.CardType.CONDITIONAL};
+
+ private final Context mContext;
+ private final ControllerRendererPool mControllerRendererPool;
+ private final Lifecycle mLifecycle;
+ private final List<ContextualCard> mContextualCards;
+ private final List<LifecycleObserver> mLifecycleObservers;
+
+ private ContextualCardUpdateListener mListener;
+
+ public ContextualCardManager(Context context, @NonNull Lifecycle lifecycle) {
+ mContext = context;
+ mLifecycle = lifecycle;
+ mContextualCards = new ArrayList<>();
+ mLifecycleObservers = new ArrayList<>();
+ mControllerRendererPool = new ControllerRendererPool();
+ //for data provided by Settings
+ for (int cardType : SETTINGS_CARDS) {
+ setupController(cardType);
+ }
+ }
+
+ void loadContextualCards(ContextualCardsFragment fragment) {
+ final CardContentLoaderCallbacks cardContentLoaderCallbacks =
+ new CardContentLoaderCallbacks(mContext);
+ cardContentLoaderCallbacks.setListener(this);
+ LoaderManager.getInstance(fragment).restartLoader(CARD_CONTENT_LOADER_ID, null /* bundle */,
+ cardContentLoaderCallbacks);
+ }
+
+ private void loadCardControllers() {
+ for (ContextualCard card : mContextualCards) {
+ setupController(card.getCardType());
+ }
+ }
+
+ private void setupController(int cardType) {
+ final ContextualCardController controller = mControllerRendererPool.getController(mContext,
+ cardType);
+ if (controller == null) {
+ Log.w(TAG, "Cannot find ContextualCardController for type " + cardType);
+ return;
+ }
+ controller.setCardUpdateListener(this);
+ if (controller instanceof LifecycleObserver && !mLifecycleObservers.contains(controller)) {
+ mLifecycleObservers.add((LifecycleObserver) controller);
+ mLifecycle.addObserver((LifecycleObserver) controller);
+ }
+ }
+
+ //TODO(b/111822376): implement sorting mechanism.
+ private void sortCards(List<ContextualCard> cards) {
+ //take mContextualCards as the source and do the ranking based on the rule.
+ }
+
+ @Override
+ public void onContextualCardUpdated(Map<Integer, List<ContextualCard>> updateList) {
+ final Set<Integer> cardTypes = updateList.keySet();
+ //Remove the existing data that matches the certain cardType before inserting new data.
+ final List<ContextualCard> cardsToKeep = mContextualCards
+ .stream()
+ .filter(card -> !cardTypes.contains(card.getCardType()))
+ .collect(Collectors.toList());
+ final List<ContextualCard> allCards = new ArrayList<>();
+ allCards.addAll(cardsToKeep);
+ allCards.addAll(
+ updateList.values().stream().flatMap(List::stream).collect(Collectors.toList()));
+
+ sortCards(allCards);
+ //replace with the new data
+ mContextualCards.clear();
+ mContextualCards.addAll(allCards);
+
+ loadCardControllers();
+
+ if (mListener != null) {
+ final Map<Integer, List<ContextualCard>> cardsToUpdate = new ArrayMap<>();
+ cardsToUpdate.put(ContextualCard.CardType.DEFAULT, mContextualCards);
+ mListener.onContextualCardUpdated(cardsToUpdate);
+ }
+ }
+
+ @Override
+ public void onFinishCardLoading(List<ContextualCard> cards) {
+ onContextualCardUpdated(cards.stream().collect(groupingBy(ContextualCard::getCardType)));
+ }
+
+ void setListener(ContextualCardUpdateListener listener) {
+ mListener = listener;
+ }
+
+ public ControllerRendererPool getControllerRendererPool() {
+ return mControllerRendererPool;
+ }
+
+ static class CardContentLoaderCallbacks implements
+ LoaderManager.LoaderCallbacks<List<ContextualCard>> {
+
+ private Context mContext;
+ private ContextualCardLoader.CardContentLoaderListener mListener;
+
+ CardContentLoaderCallbacks(Context context) {
+ mContext = context.getApplicationContext();
+ }
+
+ protected void setListener(ContextualCardLoader.CardContentLoaderListener listener) {
+ mListener = listener;
+ }
+
+ @NonNull
+ @Override
+ public Loader<List<ContextualCard>> onCreateLoader(int id, @Nullable Bundle bundle) {
+ if (id == CARD_CONTENT_LOADER_ID) {
+ return new ContextualCardLoader(mContext);
+ } else {
+ throw new IllegalArgumentException("Unknown loader id: " + id);
+ }
+ }
+
+ @Override
+ public void onLoadFinished(@NonNull Loader<List<ContextualCard>> loader,
+ List<ContextualCard> contextualCards) {
+ if (mListener != null) {
+ mListener.onFinishCardLoading(contextualCards);
+ }
+ }
+
+ @Override
+ public void onLoaderReset(@NonNull Loader<List<ContextualCard>> loader) {
+
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/ContextualCardRenderer.java
new file mode 100644
index 0000000..689b572
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardRenderer.java
@@ -0,0 +1,46 @@
+/*
+ * 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.homepage.contextualcards;
+
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * UI renderer for {@link ContextualCard}.
+ */
+public interface ContextualCardRenderer {
+
+ /**
+ * The layout type of the controller.
+ */
+ int getViewType();
+
+ /**
+ * When {@link ContextualCardsAdapter} calls {@link ContextualCardsAdapter#onCreateViewHolder},
+ * this method will be called to retrieve the corresponding
+ * {@link androidx.recyclerview.widget.RecyclerView.ViewHolder}.
+ */
+ RecyclerView.ViewHolder createViewHolder(View view);
+
+ /**
+ * When {@link ContextualCardsAdapter} calls {@link ContextualCardsAdapter#onBindViewHolder},
+ * this method will be called to bind data to the
+ * {@link androidx.recyclerview.widget.RecyclerView.ViewHolder}.
+ */
+ void bindView(RecyclerView.ViewHolder holder, ContextualCard card);
+}
\ No newline at end of file
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardUpdateListener.java b/src/com/android/settings/homepage/contextualcards/ContextualCardUpdateListener.java
new file mode 100644
index 0000000..725f6da
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardUpdateListener.java
@@ -0,0 +1,35 @@
+/*
+ * 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.homepage.contextualcards;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * When {@link ContextualCardController} detects changes, it will notify the listeners registered.
+ */
+public interface ContextualCardUpdateListener {
+
+ /**
+ * Called when a set of cards are updated.
+ *
+ * @param cards A map of updates grouped by {@link ContextualCard.CardType}. Values can be
+ * null, which means all cards from corresponding {@link
+ * ContextualCard.CardType} are removed.
+ */
+ void onContextualCardUpdated(Map<Integer, List<ContextualCard>> cards);
+}
\ No newline at end of file
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java
new file mode 100644
index 0000000..865d242
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java
@@ -0,0 +1,133 @@
+/*
+ * 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.homepage.contextualcards;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ContextualCardsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
+ implements ContextualCardUpdateListener {
+ static final int SPAN_COUNT = 2;
+
+ private static final String TAG = "ContextualCardsAdapter";
+ private static final int HALF_WIDTH = 1;
+ private static final int FULL_WIDTH = 2;
+
+ private final Context mContext;
+ private final ControllerRendererPool mControllerRendererPool;
+ private final List<ContextualCard> mContextualCards;
+ private final LifecycleOwner mLifecycleOwner;
+
+ private RecyclerView mRecyclerView;
+
+ public ContextualCardsAdapter(Context context, LifecycleOwner lifecycleOwner,
+ ContextualCardManager manager) {
+ mContext = context;
+ mContextualCards = new ArrayList<>();
+ mControllerRendererPool = manager.getControllerRendererPool();
+ mLifecycleOwner = lifecycleOwner;
+ setHasStableIds(true);
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return mContextualCards.get(position).hashCode();
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ return mContextualCards.get(position).getCardType();
+ }
+
+ @Override
+ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int cardType) {
+ final ContextualCardRenderer renderer = mControllerRendererPool.getRenderer(mContext,
+ mLifecycleOwner, cardType);
+ final int viewType = renderer.getViewType();
+ final View view = LayoutInflater.from(parent.getContext()).inflate(viewType, parent, false);
+
+ return renderer.createViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+ final int cardType = mContextualCards.get(position).getCardType();
+ final ContextualCardRenderer renderer = mControllerRendererPool.getRenderer(mContext,
+ mLifecycleOwner, cardType);
+
+ renderer.bindView(holder, mContextualCards.get(position));
+ }
+
+ @Override
+ public int getItemCount() {
+ return mContextualCards.size();
+ }
+
+ @Override
+ public void onAttachedToRecyclerView(RecyclerView recyclerView) {
+ super.onAttachedToRecyclerView(recyclerView);
+ mRecyclerView = recyclerView;
+ final RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+ if (layoutManager instanceof GridLayoutManager) {
+ final GridLayoutManager gridLayoutManager = (GridLayoutManager) layoutManager;
+ gridLayoutManager.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
+ @Override
+ public int getSpanSize(int position) {
+ final ContextualCard card = mContextualCards.get(position);
+ //TODO(b/114009676): may use another field to make decision. still under review.
+ if (card.isHalfWidth()) {
+ return HALF_WIDTH;
+ }
+ return FULL_WIDTH;
+ }
+ });
+ }
+ }
+
+ @Override
+ public void onContextualCardUpdated(Map<Integer, List<ContextualCard>> cards) {
+ final List<ContextualCard> contextualCards = cards.get(ContextualCard.CardType.DEFAULT);
+ final boolean previouslyEmpty = mContextualCards.isEmpty();
+ final boolean nowEmpty = contextualCards == null || contextualCards.isEmpty();
+ if (contextualCards == null) {
+ mContextualCards.clear();
+ notifyDataSetChanged();
+ } else {
+ final DiffUtil.DiffResult diffResult = DiffUtil.calculateDiff(
+ new ContextualCardsDiffCallback(mContextualCards, contextualCards));
+ mContextualCards.clear();
+ mContextualCards.addAll(contextualCards);
+ diffResult.dispatchUpdatesTo(this);
+ }
+
+ if (mRecyclerView != null && previouslyEmpty && !nowEmpty) {
+ // Adding items to empty list, should animate.
+ mRecyclerView.scheduleLayoutAnimation();
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallback.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallback.java
new file mode 100644
index 0000000..d1623cd
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallback.java
@@ -0,0 +1,58 @@
+/*
+ * 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.homepage.contextualcards;
+
+import androidx.recyclerview.widget.DiffUtil;
+
+import java.util.List;
+
+//TODO(b/117816826): add test cases for DiffUtil.
+/**
+ * A DiffCallback to calculate the difference between old and new {@link ContextualCard} List.
+ */
+public class ContextualCardsDiffCallback extends DiffUtil.Callback {
+
+ private final List<ContextualCard> mOldCards;
+ private final List<ContextualCard> mNewCards;
+
+ public ContextualCardsDiffCallback(List<ContextualCard> oldCards,
+ List<ContextualCard> newCards) {
+ mOldCards = oldCards;
+ mNewCards = newCards;
+ }
+
+ @Override
+ public int getOldListSize() {
+ return mOldCards.size();
+ }
+
+ @Override
+ public int getNewListSize() {
+ return mNewCards.size();
+ }
+
+ @Override
+ public boolean areItemsTheSame(int oldCardPosition, int newCardPosition) {
+ return mOldCards.get(oldCardPosition).getName().equals(
+ mNewCards.get(newCardPosition).getName());
+ }
+
+ @Override
+ public boolean areContentsTheSame(int oldCardPosition, int newCardPosition) {
+ return mOldCards.get(oldCardPosition).equals(mNewCards.get(newCardPosition));
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
new file mode 100644
index 0000000..29eea4b
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
@@ -0,0 +1,74 @@
+/*
+ * 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.homepage.contextualcards;
+
+import static com.android.settings.homepage.contextualcards.ContextualCardsAdapter.SPAN_COUNT;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.InstrumentedFragment;
+
+public class ContextualCardsFragment extends InstrumentedFragment {
+
+ private static final String TAG = "ContextualCardsFragment";
+
+ private RecyclerView mCardsContainer;
+ private GridLayoutManager mLayoutManager;
+ private ContextualCardsAdapter mContextualCardsAdapter;
+ private ContextualCardManager mContextualCardManager;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mContextualCardManager = new ContextualCardManager(getContext(), getSettingsLifecycle());
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ mContextualCardManager.loadContextualCards(this);
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ final View rootView = inflater.inflate(R.layout.settings_homepage, container, false);
+ mCardsContainer = rootView.findViewById(R.id.card_container);
+ mLayoutManager = new GridLayoutManager(getActivity(), SPAN_COUNT,
+ GridLayoutManager.VERTICAL, false /* reverseLayout */);
+ mCardsContainer.setLayoutManager(mLayoutManager);
+ mContextualCardsAdapter = new ContextualCardsAdapter(getContext(),
+ this /* lifecycleOwner */, mContextualCardManager);
+ mCardsContainer.setAdapter(mContextualCardsAdapter);
+ mContextualCardManager.setListener(mContextualCardsAdapter);
+
+ return rootView;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsEvent.SETTINGS_HOMEPAGE;
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java b/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java
new file mode 100644
index 0000000..212b6be
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java
@@ -0,0 +1,107 @@
+/*
+ * 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.homepage.contextualcards;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.collection.ArraySet;
+import androidx.lifecycle.LifecycleOwner;
+
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardController;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardController;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer;
+
+import java.util.Set;
+
+/**
+ * This is a fragment scoped singleton holding a set of {@link ContextualCardController} and
+ * {@link ContextualCardRenderer}.
+ */
+public class ControllerRendererPool {
+
+ private static final String TAG = "ControllerRendererPool";
+
+ private final Set<ContextualCardController> mControllers;
+ private final Set<ContextualCardRenderer> mRenderers;
+
+ public ControllerRendererPool() {
+ mControllers = new ArraySet<>();
+ mRenderers = new ArraySet<>();
+ }
+
+ public <T extends ContextualCardController> T getController(Context context,
+ @ContextualCard.CardType int cardType) {
+ final Class<? extends ContextualCardController> clz =
+ ContextualCardLookupTable.getCardControllerClass(cardType);
+ for (ContextualCardController controller : mControllers) {
+ if (controller.getClass() == clz) {
+ Log.d(TAG, "Controller is already there.");
+ return (T) controller;
+ }
+ }
+
+ final ContextualCardController controller = createCardController(context, clz);
+ if (controller != null) {
+ mControllers.add(controller);
+ }
+ return (T) controller;
+ }
+
+ public Set<ContextualCardController> getControllers() {
+ return mControllers;
+ }
+
+ public ContextualCardRenderer getRenderer(Context context, LifecycleOwner lifecycleOwner,
+ @ContextualCard.CardType int cardType) {
+ final Class<? extends ContextualCardRenderer> clz =
+ ContextualCardLookupTable.getCardRendererClasses(cardType);
+ for (ContextualCardRenderer renderer : mRenderers) {
+ if (renderer.getClass() == clz) {
+ Log.d(TAG, "Renderer is already there.");
+ return renderer;
+ }
+ }
+
+ final ContextualCardRenderer renderer = createCardRenderer(context, lifecycleOwner, clz);
+ if (renderer != null) {
+ mRenderers.add(renderer);
+ }
+ return renderer;
+ }
+
+ private ContextualCardController createCardController(Context context,
+ Class<? extends ContextualCardController> clz) {
+ if (ConditionContextualCardController.class == clz) {
+ return new ConditionContextualCardController(context);
+ } else if (SliceContextualCardController.class == clz) {
+ return new SliceContextualCardController();
+ }
+ return null;
+ }
+
+ private ContextualCardRenderer createCardRenderer(Context context,
+ LifecycleOwner lifecycleOwner, Class<?> clz) {
+ if (ConditionContextualCardRenderer.class == clz) {
+ return new ConditionContextualCardRenderer(context, this /*controllerRendererPool*/);
+ } else if (SliceContextualCardRenderer.class == clz) {
+ return new SliceContextualCardRenderer(context, lifecycleOwner);
+ }
+ return null;
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java
new file mode 100644
index 0000000..59c9ba9
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java
@@ -0,0 +1,66 @@
+/*
+ * 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.homepage.contextualcards;
+
+import static android.provider.SettingsSlicesContract.KEY_WIFI;
+
+import android.annotation.Nullable;
+
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settings.homepage.contextualcards.slices.ConnectedDeviceSlice;
+import com.android.settings.intelligence.ContextualCardProto.ContextualCard;
+import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;
+import com.android.settings.wifi.WifiSlice;
+
+import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardCategory;
+import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardProvider;
+
+/** Provides dynamic card for SettingsIntelligence. */
+public class SettingsContextualCardProvider extends ContextualCardProvider {
+
+ public static final String CARD_AUTHORITY = "com.android.settings.homepage.contextualcards";
+
+ @Override
+ @Nullable
+ public ContextualCardList getContextualCards() {
+ final ContextualCard wifiCard =
+ ContextualCard.newBuilder()
+ .setSliceUri(WifiSlice.WIFI_URI.toString())
+ .setCardName(KEY_WIFI)
+ .setCategory(ContextualCardCategory.IMPORTANT)
+ .build();
+ final ContextualCard batteryInfoCard =
+ ContextualCard.newBuilder()
+ .setSliceUri(BatterySlice.BATTERY_CARD_URI.toString())
+ .setCardName(BatterySlice.PATH_BATTERY_INFO)
+ .setCategory(ContextualCardCategory.DEFAULT)
+ .build();
+ final ContextualCard connectedDeviceCard =
+ ContextualCard.newBuilder()
+ .setSliceUri(ConnectedDeviceSlice.CONNECTED_DEVICE_URI.toString())
+ .setCardName(ConnectedDeviceSlice.PATH_CONNECTED_DEVICE)
+ .setCategory(ContextualCardCategory.IMPORTANT)
+ .build();
+ final ContextualCardList cards = ContextualCardList.newBuilder()
+ .addCard(wifiCard)
+ .addCard(batteryInfoCard)
+ .addCard(connectedDeviceCard)
+ .build();
+
+ return cards;
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionController.java
new file mode 100644
index 0000000..6a66d2f
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionController.java
@@ -0,0 +1,74 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.media.AudioManager;
+import android.provider.Settings;
+
+public abstract class AbnormalRingerConditionController implements ConditionalCardController {
+
+ private static final IntentFilter FILTER =
+ new IntentFilter(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);
+
+ protected final AudioManager mAudioManager;
+ private final Context mAppContext;
+ private final ConditionManager mConditionManager;
+ private final RingerModeChangeReceiver mReceiver;
+
+ public AbnormalRingerConditionController(Context appContext, ConditionManager manager) {
+ mAppContext = appContext;
+ mConditionManager = manager;
+ mAudioManager = (AudioManager) appContext.getSystemService(Context.AUDIO_SERVICE);
+ mReceiver = new RingerModeChangeReceiver();
+ }
+
+ @Override
+ public void onPrimaryClick(Context context) {
+ context.startActivity(new Intent(Settings.ACTION_SOUND_SETTINGS));
+ }
+
+ @Override
+ public void onActionClick() {
+ mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_NORMAL);
+ mAudioManager.setStreamVolume(AudioManager.STREAM_RING, 1, 0 /* flags */);
+ }
+
+ @Override
+ public void startMonitoringStateChange() {
+ mAppContext.registerReceiver(mReceiver, FILTER);
+ }
+
+ @Override
+ public void stopMonitoringStateChange() {
+ mAppContext.unregisterReceiver(mReceiver);
+ }
+
+ class RingerModeChangeReceiver extends BroadcastReceiver {
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ final String action = intent.getAction();
+ if (AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION.equals(action)) {
+ mConditionManager.onConditionChanged();
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
new file mode 100644
index 0000000..b6bb05a
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java
@@ -0,0 +1,103 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.provider.Settings;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settingslib.WirelessUtils;
+
+import java.util.Objects;
+
+public class AirplaneModeConditionController implements ConditionalCardController {
+
+ static final int ID = Objects.hash("AirplaneModeConditionController");
+
+ private static final IntentFilter AIRPLANE_MODE_FILTER =
+ new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED);
+
+ private final ConditionManager mConditionManager;
+ private final Context mAppContext;
+ private final Receiver mReceiver;
+
+ public AirplaneModeConditionController(Context appContext, ConditionManager conditionManager) {
+ mAppContext = appContext;
+ mConditionManager = conditionManager;
+ mReceiver = new Receiver();
+ }
+
+ @Override
+ public long getId() {
+ return ID;
+ }
+
+ @Override
+ public boolean isDisplayable() {
+ return WirelessUtils.isAirplaneModeOn(mAppContext);
+ }
+
+ @Override
+ public void onPrimaryClick(Context context) {
+ context.startActivity(
+ new Intent(Settings.ACTION_WIRELESS_SETTINGS));
+ }
+
+ @Override
+ public void onActionClick() {
+ ConnectivityManager.from(mAppContext).setAirplaneMode(false);
+ }
+
+ @Override
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(ID)
+ .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_AIRPLANE_MODE)
+ .setActionText(mAppContext.getText(R.string.condition_turn_off))
+ .setName(mAppContext.getPackageName() + "/"
+ + mAppContext.getText(R.string.condition_airplane_title))
+ .setTitleText(mAppContext.getText(R.string.condition_airplane_title).toString())
+ .setSummaryText(mAppContext.getText(R.string.condition_airplane_summary).toString())
+ .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_airplanemode_active))
+ .build();
+ }
+
+ @Override
+ public void startMonitoringStateChange() {
+ mAppContext.registerReceiver(mReceiver, AIRPLANE_MODE_FILTER);
+ }
+
+ @Override
+ public void stopMonitoringStateChange() {
+ mAppContext.unregisterReceiver(mReceiver);
+ }
+
+ public class Receiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (Intent.ACTION_AIRPLANE_MODE_CHANGED.equals(intent.getAction())) {
+ mConditionManager.onConditionChanged();
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java
new file mode 100644
index 0000000..8b0ee42
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java
@@ -0,0 +1,88 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.NetworkPolicyManager;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.Settings;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import java.util.Objects;
+
+public class BackgroundDataConditionController implements ConditionalCardController {
+ static final int ID = Objects.hash("BackgroundDataConditionController");
+
+ private final Context mAppContext;
+ private final ConditionManager mConditionManager;
+ private final NetworkPolicyManager mNetworkPolicyManager;
+
+ public BackgroundDataConditionController(Context appContext, ConditionManager manager) {
+ mAppContext = appContext;
+ mConditionManager = manager;
+ mNetworkPolicyManager =
+ (NetworkPolicyManager) appContext.getSystemService(Context.NETWORK_POLICY_SERVICE);
+ }
+
+ @Override
+ public long getId() {
+ return ID;
+ }
+
+ @Override
+ public boolean isDisplayable() {
+ return mNetworkPolicyManager.getRestrictBackground();
+ }
+
+ @Override
+ public void onPrimaryClick(Context context) {
+ context.startActivity(new Intent(context, Settings.DataUsageSummaryActivity.class));
+ }
+
+ @Override
+ public void onActionClick() {
+ mNetworkPolicyManager.setRestrictBackground(false);
+ mConditionManager.onConditionChanged();
+ }
+
+ @Override
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(ID)
+ .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_BACKGROUND_DATA)
+ .setActionText(mAppContext.getText(R.string.condition_turn_off))
+ .setName(mAppContext.getPackageName() + "/"
+ + mAppContext.getText(R.string.condition_bg_data_title))
+ .setTitleText(mAppContext.getText(R.string.condition_bg_data_title).toString())
+ .setSummaryText(mAppContext.getText(R.string.condition_bg_data_summary).toString())
+ .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_data_saver))
+ .build();
+ }
+
+ @Override
+ public void startMonitoringStateChange() {
+
+ }
+
+ @Override
+ public void stopMonitoringStateChange() {
+
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java
new file mode 100644
index 0000000..66901f3
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java
@@ -0,0 +1,107 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.Context;
+import android.os.PowerManager;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.fuelgauge.BatterySaverReceiver;
+import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settingslib.fuelgauge.BatterySaverUtils;
+
+import java.util.Objects;
+
+public class BatterySaverConditionController implements ConditionalCardController,
+ BatterySaverReceiver.BatterySaverListener {
+ static final int ID = Objects.hash("BatterySaverConditionController");
+
+ private final Context mAppContext;
+ private final ConditionManager mConditionManager;
+ private final BatterySaverReceiver mReceiver;
+ private final PowerManager mPowerManager;
+
+ public BatterySaverConditionController(Context appContext, ConditionManager conditionManager) {
+ mAppContext = appContext;
+ mConditionManager = conditionManager;
+ mPowerManager = appContext.getSystemService(PowerManager.class);
+ mReceiver = new BatterySaverReceiver(appContext);
+ mReceiver.setBatterySaverListener(this);
+ }
+
+ @Override
+ public long getId() {
+ return ID;
+ }
+
+ @Override
+ public boolean isDisplayable() {
+ return mPowerManager.isPowerSaveMode();
+ }
+
+ @Override
+ public void onPrimaryClick(Context context) {
+ new SubSettingLauncher(context)
+ .setDestination(BatterySaverSettings.class.getName())
+ .setSourceMetricsCategory(MetricsProto.MetricsEvent.DASHBOARD_SUMMARY)
+ .setTitleRes(R.string.battery_saver)
+ .launch();
+ }
+
+ @Override
+ public void onActionClick() {
+ BatterySaverUtils.setPowerSaveMode(mAppContext, false,
+ /*needFirstTimeWarning*/ false);
+ }
+
+ @Override
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(ID)
+ .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_BATTERY_SAVER)
+ .setActionText(mAppContext.getText(R.string.condition_turn_off))
+ .setName(mAppContext.getPackageName() + "/"
+ + mAppContext.getText(R.string.condition_battery_title))
+ .setTitleText(mAppContext.getText(R.string.condition_battery_title).toString())
+ .setSummaryText(mAppContext.getText(R.string.condition_battery_summary).toString())
+ .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_battery_saver_accent_24dp))
+ .build();
+ }
+
+ @Override
+ public void startMonitoringStateChange() {
+ mReceiver.setListening(true);
+ }
+
+ @Override
+ public void stopMonitoringStateChange() {
+ mReceiver.setListening(false);
+ }
+
+ @Override
+ public void onPowerSaveModeChanged() {
+ mConditionManager.onConditionChanged();
+ }
+
+ @Override
+ public void onBatteryChanged(boolean pluggedIn) {
+
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
new file mode 100644
index 0000000..b2fbbcb
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java
@@ -0,0 +1,114 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.telephony.TelephonyManager;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.telephony.TelephonyIntents;
+import com.android.settings.R;
+import com.android.settings.Settings;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import java.util.Objects;
+
+public class CellularDataConditionController implements ConditionalCardController {
+
+ static final int ID = Objects.hash("CellularDataConditionController");
+
+ private static final IntentFilter DATA_CONNECTION_FILTER =
+ new IntentFilter(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
+
+ private final Context mAppContext;
+ private final ConditionManager mConditionManager;
+ private final Receiver mReceiver;
+ private final TelephonyManager mTelephonyManager;
+ private final ConnectivityManager mConnectivityManager;
+
+ public CellularDataConditionController(Context appContext, ConditionManager conditionManager) {
+ mAppContext = appContext;
+ mConditionManager = conditionManager;
+ mReceiver = new Receiver();
+ mConnectivityManager = appContext.getSystemService(
+ ConnectivityManager.class);
+ mTelephonyManager = appContext.getSystemService(TelephonyManager.class);
+ }
+
+ @Override
+ public long getId() {
+ return ID;
+ }
+
+ @Override
+ public boolean isDisplayable() {
+ if (!mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)
+ || mTelephonyManager.getSimState() != TelephonyManager.SIM_STATE_READY) {
+ return false;
+ }
+ return !mTelephonyManager.isDataEnabled();
+ }
+
+ @Override
+ public void onPrimaryClick(Context context) {
+ context.startActivity(new Intent(context,
+ Settings.DataUsageSummaryActivity.class));
+ }
+
+ @Override
+ public void onActionClick() {
+ mTelephonyManager.setDataEnabled(true);
+ }
+
+ @Override
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(ID)
+ .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_CELLULAR_DATA)
+ .setActionText(mAppContext.getText(R.string.condition_turn_on))
+ .setName(mAppContext.getPackageName() + "/"
+ + mAppContext.getText(R.string.condition_cellular_title))
+ .setTitleText(mAppContext.getText(R.string.condition_cellular_title).toString())
+ .setSummaryText(mAppContext.getText(R.string.condition_cellular_summary).toString())
+ .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_cellular_off))
+ .build();
+ }
+
+ @Override
+ public void startMonitoringStateChange() {
+ mAppContext.registerReceiver(mReceiver, DATA_CONNECTION_FILTER);
+ }
+
+ @Override
+ public void stopMonitoringStateChange() {
+ mAppContext.unregisterReceiver(mReceiver);
+ }
+
+ public class Receiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED.equals(
+ intent.getAction())) {
+ mConditionManager.onConditionChanged();
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
new file mode 100644
index 0000000..eb65819
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java
@@ -0,0 +1,94 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.Context;
+import android.util.ArrayMap;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardController;
+import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
+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.List;
+import java.util.Map;
+
+/**
+ * This controller triggers the loading of conditional cards and monitors state changes to
+ * update the homepage.
+ */
+public class ConditionContextualCardController implements ContextualCardController,
+ ConditionListener, LifecycleObserver, OnStart, OnStop {
+
+ private static final String TAG = "ConditionCtxCardCtrl";
+
+ private final Context mContext;
+ private final ConditionManager mConditionManager;
+
+ private ContextualCardUpdateListener mListener;
+
+ public ConditionContextualCardController(Context context) {
+ mContext = context;
+ mConditionManager = new ConditionManager(context.getApplicationContext(), this);
+ mConditionManager.startMonitoringStateChange();
+ }
+
+ @Override
+ public void setCardUpdateListener(ContextualCardUpdateListener listener) {
+ mListener = listener;
+ }
+
+ @Override
+ public int getCardType() {
+ return ContextualCard.CardType.CONDITIONAL;
+ }
+
+ @Override
+ public void onStart() {
+ mConditionManager.startMonitoringStateChange();
+ }
+
+ @Override
+ public void onStop() {
+ mConditionManager.stopMonitoringStateChange();
+ }
+
+ @Override
+ public void onPrimaryClick(ContextualCard contextualCard) {
+ final ConditionalContextualCard card = (ConditionalContextualCard) contextualCard;
+ mConditionManager.onPrimaryClick(mContext, card.getConditionId());
+ }
+
+ @Override
+ public void onActionClick(ContextualCard contextualCard) {
+ final ConditionalContextualCard card = (ConditionalContextualCard) contextualCard;
+ mConditionManager.onActionClick(card.getConditionId());
+ }
+
+ @Override
+ public void onConditionsChanged() {
+ final List<ContextualCard> conditionCards = mConditionManager.getDisplayableCards();
+
+ if (mListener != null) {
+ final Map<Integer, List<ContextualCard>> conditionalCards = new ArrayMap<>();
+ conditionalCards.put(ContextualCard.CardType.CONDITIONAL, conditionCards);
+ mListener.onContextualCardUpdated(conditionalCards);
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
new file mode 100644
index 0000000..8a3635b
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java
@@ -0,0 +1,137 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.ControllerRendererPool;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+/**
+ * Card renderer for {@link ConditionalContextualCard}.
+ */
+public class ConditionContextualCardRenderer implements ContextualCardRenderer {
+
+ private final Context mContext;
+ private final ControllerRendererPool mControllerRendererPool;
+
+ public ConditionContextualCardRenderer(Context context,
+ ControllerRendererPool controllerRendererPool) {
+ mContext = context;
+ mControllerRendererPool = controllerRendererPool;
+ }
+
+ @Override
+ public int getViewType() {
+ return R.layout.homepage_condition_tile;
+ }
+
+ @Override
+ public RecyclerView.ViewHolder createViewHolder(View view) {
+ return new ConditionalCardHolder(view);
+ }
+
+ @Override
+ public void bindView(RecyclerView.ViewHolder holder, ContextualCard contextualCard) {
+ final ConditionalCardHolder view = (ConditionalCardHolder) holder;
+ final ConditionalContextualCard card = (ConditionalContextualCard) contextualCard;
+ final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory.getFactory(
+ mContext).getMetricsFeatureProvider();
+
+ metricsFeatureProvider.visible(mContext, MetricsProto.MetricsEvent.SETTINGS_HOMEPAGE,
+ card.getMetricsConstant());
+ initializePrimaryClick(view, card, metricsFeatureProvider);
+ initializeView(view, card);
+ initializeActionButton(view, card, metricsFeatureProvider);
+ }
+
+ private void initializePrimaryClick(ConditionalCardHolder view, ConditionalContextualCard card,
+ MetricsFeatureProvider metricsFeatureProvider) {
+ view.itemView.findViewById(R.id.content).setOnClickListener(
+ v -> {
+ metricsFeatureProvider.action(mContext,
+ MetricsProto.MetricsEvent.ACTION_SETTINGS_CONDITION_CLICK,
+ card.getMetricsConstant());
+ mControllerRendererPool.getController(mContext,
+ card.getCardType()).onPrimaryClick(card);
+ });
+ }
+
+ private void initializeView(ConditionalCardHolder view, ConditionalContextualCard card) {
+ view.icon.setImageDrawable(card.getIconDrawable());
+ view.title.setText(card.getTitleText());
+ view.summary.setText(card.getSummaryText());
+
+ setViewVisibility(view.itemView, R.id.divider, false);
+ }
+
+ private void initializeActionButton(ConditionalCardHolder view, ConditionalContextualCard card,
+ MetricsFeatureProvider metricsFeatureProvider) {
+ final CharSequence action = card.getActionText();
+ final boolean hasButtons = !TextUtils.isEmpty(action);
+ setViewVisibility(view.itemView, R.id.buttonBar, hasButtons);
+
+ final Button button = view.itemView.findViewById(R.id.first_action);
+ if (hasButtons) {
+ button.setVisibility(View.VISIBLE);
+ button.setText(action);
+ button.setOnClickListener(v -> {
+ final Context viewContext = v.getContext();
+ metricsFeatureProvider.action(
+ viewContext, MetricsProto.MetricsEvent.ACTION_SETTINGS_CONDITION_BUTTON,
+ card.getMetricsConstant());
+ mControllerRendererPool.getController(mContext, card.getCardType()).onActionClick(
+ card);
+ });
+ } else {
+ button.setVisibility(View.GONE);
+ }
+ }
+
+ private void setViewVisibility(View containerView, int viewId, boolean visible) {
+ View view = containerView.findViewById(viewId);
+ if (view != null) {
+ view.setVisibility(visible ? View.VISIBLE : View.GONE);
+ }
+ }
+
+ public static class ConditionalCardHolder extends RecyclerView.ViewHolder {
+
+ public final ImageView icon;
+ public final TextView title;
+ public final TextView summary;
+
+ public ConditionalCardHolder(View itemView) {
+ super(itemView);
+ icon = itemView.findViewById(android.R.id.icon);
+ title = itemView.findViewById(android.R.id.title);
+ summary = itemView.findViewById(android.R.id.summary);
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionListener.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionListener.java
new file mode 100644
index 0000000..5f743b3
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionListener.java
@@ -0,0 +1,21 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+public interface ConditionListener {
+ void onConditionsChanged();
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java
new file mode 100644
index 0000000..c741b98
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java
@@ -0,0 +1,183 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class ConditionManager {
+ private static final String TAG = "ConditionManager";
+
+ @VisibleForTesting
+ final List<ConditionalCardController> mCardControllers;
+
+ private static final long DISPLAYABLE_CHECKER_TIMEOUT_MS = 20;
+
+ private final ExecutorService mExecutorService;
+ private final Context mAppContext;
+ private final ConditionListener mListener;
+
+ private boolean mIsListeningToStateChange;
+
+ public ConditionManager(Context context, ConditionListener listener) {
+ mAppContext = context.getApplicationContext();
+ mExecutorService = Executors.newCachedThreadPool();
+ mCardControllers = new ArrayList<>();
+ mListener = listener;
+ initCandidates();
+ }
+
+ /**
+ * Returns a list of {@link ContextualCard}s eligible for display.
+ */
+ public List<ContextualCard> getDisplayableCards() {
+ final List<ContextualCard> cards = new ArrayList<>();
+ final List<Future<ContextualCard>> displayableCards = new ArrayList<>();
+ // Check displayable future
+ for (ConditionalCardController card : mCardControllers) {
+ final DisplayableChecker future = new DisplayableChecker(getController(card.getId()));
+ displayableCards.add(mExecutorService.submit(future));
+ }
+ // Collect future and add displayable cards
+ for (Future<ContextualCard> cardFuture : displayableCards) {
+ try {
+ final ContextualCard card = cardFuture.get(
+ DISPLAYABLE_CHECKER_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+ if (card != null) {
+ cards.add(card);
+ }
+ } catch (InterruptedException | ExecutionException | TimeoutException e) {
+ Log.w(TAG, "Failed to get displayable state for card, likely timeout. Skipping", e);
+ }
+ }
+ return cards;
+ }
+
+ /**
+ * Handler when the card is clicked.
+ *
+ * @see {@link ConditionalCardController#onPrimaryClick(Context)}
+ */
+ public void onPrimaryClick(Context context, long id) {
+ getController(id).onPrimaryClick(context);
+ }
+
+ /**
+ * Handler when the card action is clicked.
+ *
+ * @see {@link ConditionalCardController#onActionClick()}
+ */
+ public void onActionClick(long id) {
+ getController(id).onActionClick();
+ }
+
+ /**
+ * Start monitoring state change for all conditions
+ */
+ public void startMonitoringStateChange() {
+ if (mIsListeningToStateChange) {
+ Log.d(TAG, "Already listening to condition state changes, skipping monitor setup");
+ } else {
+ mIsListeningToStateChange = true;
+ for (ConditionalCardController controller : mCardControllers) {
+ controller.startMonitoringStateChange();
+ }
+ }
+ // Force a refresh on listener
+ onConditionChanged();
+ }
+
+ /**
+ * Stop monitoring state change for all conditions
+ */
+ public void stopMonitoringStateChange() {
+ if (!mIsListeningToStateChange) {
+ Log.d(TAG, "Not listening to condition state changes, skipping");
+ return;
+ }
+ for (ConditionalCardController controller : mCardControllers) {
+ controller.stopMonitoringStateChange();
+ }
+ mIsListeningToStateChange = false;
+ }
+
+ /**
+ * Called when some conditional card's state has changed
+ */
+ void onConditionChanged() {
+ if (mListener != null) {
+ mListener.onConditionsChanged();
+ }
+ }
+
+ @NonNull
+ private <T extends ConditionalCardController> T getController(long id) {
+ for (ConditionalCardController controller : mCardControllers) {
+ if (controller.getId() == id) {
+ return (T) controller;
+ }
+ }
+ throw new IllegalStateException("Cannot find controller for " + id);
+ }
+
+ private void initCandidates() {
+ // Initialize controllers first.
+ mCardControllers.add(new AirplaneModeConditionController(mAppContext, this /* manager */));
+ mCardControllers.add(
+ new BackgroundDataConditionController(mAppContext, this /* manager */));
+ mCardControllers.add(new BatterySaverConditionController(mAppContext, this /* manager */));
+ mCardControllers.add(new CellularDataConditionController(mAppContext, this /* manager */));
+ mCardControllers.add(new DndConditionCardController(mAppContext, this /* manager */));
+ mCardControllers.add(new HotspotConditionController(mAppContext, this /* manager */));
+ mCardControllers.add(new NightDisplayConditionController(mAppContext, this /* manager */));
+ mCardControllers.add(new RingerVibrateConditionController(mAppContext, this /* manager */));
+ mCardControllers.add(new RingerMutedConditionController(mAppContext, this /* manager */));
+ mCardControllers.add(new WorkModeConditionController(mAppContext, this /* manager */));
+ }
+
+ /**
+ * Returns card if controller says it's displayable. Otherwise returns null.
+ */
+ public static class DisplayableChecker implements Callable<ContextualCard> {
+
+ private final ConditionalCardController mController;
+
+ private DisplayableChecker(ConditionalCardController controller) {
+ mController = controller;
+ }
+
+ @Override
+ public ContextualCard call() throws Exception {
+ return mController.isDisplayable() ? mController.buildContextualCard() : null;
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionalCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionalCardController.java
new file mode 100644
index 0000000..bc68cce
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionalCardController.java
@@ -0,0 +1,56 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.Context;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+/**
+ * Data controller for a {@link ConditionalContextualCard}.
+ */
+public interface ConditionalCardController {
+
+ /**
+ * A stable ID for this card.
+ */
+ long getId();
+
+ /**
+ * Whether or not the card is displayable on the ui.
+ */
+ boolean isDisplayable();
+
+ /**
+ * Handler when the card is clicked.
+ */
+ void onPrimaryClick(Context context);
+
+ /**
+ * Handler when the card action is clicked.
+ */
+ void onActionClick();
+
+ /**
+ * Creates a UI model suitable for display, controlled by this controller.
+ */
+ ContextualCard buildContextualCard();
+
+ void startMonitoringStateChange();
+
+ void stopMonitoringStateChange();
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCard.java b/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCard.java
new file mode 100644
index 0000000..81219c3
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCard.java
@@ -0,0 +1,89 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+/**
+ * Data class representing a conditional {@link ContextualCard}.
+ *
+ * Use this class to store additional attributes on top of {@link ContextualCard} for
+ * {@link ConditionalCardController}.
+ */
+public class ConditionalContextualCard extends ContextualCard {
+
+ private final long mConditionId;
+ private final int mMetricsConstant;
+ private final CharSequence mActionText;
+
+ private ConditionalContextualCard(Builder builder) {
+ super(builder);
+
+ mConditionId = builder.mConditionId;
+ mMetricsConstant = builder.mMetricsConstant;
+ mActionText = builder.mActionText;
+ }
+
+ @Override
+ public int getCardType() {
+ return CardType.CONDITIONAL;
+ }
+
+ public long getConditionId() {
+ return mConditionId;
+ }
+
+ public int getMetricsConstant() {
+ return mMetricsConstant;
+ }
+
+ public CharSequence getActionText() {
+ return mActionText;
+ }
+
+ public static class Builder extends ContextualCard.Builder {
+
+ private long mConditionId;
+ private int mMetricsConstant;
+ private CharSequence mActionText;
+
+ public Builder setConditionId(long id) {
+ mConditionId = id;
+ return this;
+ }
+
+ public Builder setMetricsConstant(int metricsConstant) {
+ mMetricsConstant = metricsConstant;
+ return this;
+ }
+
+ public Builder setActionText(CharSequence actionText) {
+ mActionText = actionText;
+ return this;
+ }
+
+ @Override
+ public Builder setCardType(int cardType) {
+ throw new IllegalArgumentException(
+ "Cannot change card type for " + getClass().getName());
+ }
+
+ public ConditionalContextualCard build() {
+ return new ConditionalContextualCard(this);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
new file mode 100644
index 0000000..21cb6c0
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java
@@ -0,0 +1,128 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.app.NotificationManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.provider.Settings;
+import android.service.notification.ZenModeConfig;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.notification.ZenModeSettings;
+
+import java.util.Objects;
+
+
+public class DndConditionCardController implements ConditionalCardController {
+ static final int ID = Objects.hash("DndConditionCardController");
+
+ @VisibleForTesting
+ static final IntentFilter DND_FILTER =
+ new IntentFilter(NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED_INTERNAL);
+
+ private static final String TAG = "DndCondition";
+ private final Context mAppContext;
+ private final ConditionManager mConditionManager;
+ private final NotificationManager mNotificationManager;
+ private final Receiver mReceiver;
+
+ public DndConditionCardController(Context appContext, ConditionManager conditionManager) {
+ mAppContext = appContext;
+ mConditionManager = conditionManager;
+ mNotificationManager = mAppContext.getSystemService(NotificationManager.class);
+ mReceiver = new Receiver();
+ }
+
+ @Override
+ public long getId() {
+ return ID;
+ }
+
+ @Override
+ public boolean isDisplayable() {
+ return mNotificationManager.getZenMode() != Settings.Global.ZEN_MODE_OFF;
+ }
+
+ @Override
+ public void startMonitoringStateChange() {
+ mAppContext.registerReceiver(mReceiver, DND_FILTER);
+ }
+
+ @Override
+ public void stopMonitoringStateChange() {
+ mAppContext.unregisterReceiver(mReceiver);
+ }
+
+ @Override
+ public void onPrimaryClick(Context context) {
+ new SubSettingLauncher(context)
+ .setDestination(ZenModeSettings.class.getName())
+ .setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_HOMEPAGE)
+ .setTitleRes(R.string.zen_mode_settings_title)
+ .launch();
+ }
+
+ @Override
+ public void onActionClick() {
+ mNotificationManager.setZenMode(Settings.Global.ZEN_MODE_OFF, null, TAG);
+ }
+
+ @Override
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(ID)
+ .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_DND)
+ .setActionText(mAppContext.getText(R.string.condition_turn_off))
+ .setName(mAppContext.getPackageName() + "/"
+ + mAppContext.getText(R.string.condition_zen_title))
+ .setTitleText(mAppContext.getText(R.string.condition_zen_title).toString())
+ .setSummaryText(getSummary().toString())
+ .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_do_not_disturb_on_24dp))
+ .build();
+ }
+
+ public CharSequence getSummary() {
+ final int zen = mNotificationManager.getZenMode();
+ final ZenModeConfig config;
+ boolean zenModeEnabled = zen != Settings.Global.ZEN_MODE_OFF;
+ if (zenModeEnabled) {
+ config = mNotificationManager.getZenModeConfig();
+ } else {
+ config = null;
+ }
+ return ZenModeConfig.getDescription(mAppContext, zen != Settings.Global.ZEN_MODE_OFF,
+ config, true);
+ }
+
+ public class Receiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED_INTERNAL
+ .equals(intent.getAction())) {
+ mConditionManager.onConditionChanged();
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java
new file mode 100644
index 0000000..eec7e4a
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java
@@ -0,0 +1,137 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.TetherSettings;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+
+import java.util.Objects;
+
+public class HotspotConditionController implements ConditionalCardController {
+ static final int ID = Objects.hash("HotspotConditionController");
+
+ private static final IntentFilter WIFI_AP_STATE_FILTER =
+ new IntentFilter(WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
+
+ private final Context mAppContext;
+ private final ConditionManager mConditionManager;
+ private final WifiManager mWifiManager;
+ private final Receiver mReceiver;
+
+
+ public HotspotConditionController(Context appContext, ConditionManager conditionManager) {
+ mAppContext = appContext;
+ mConditionManager = conditionManager;
+ mWifiManager = appContext.getSystemService(WifiManager.class);
+ mReceiver = new Receiver();
+ }
+
+ @Override
+ public long getId() {
+ return ID;
+ }
+
+ @Override
+ public boolean isDisplayable() {
+ return mWifiManager.isWifiApEnabled();
+ }
+
+ @Override
+ public void onPrimaryClick(Context context) {
+ new SubSettingLauncher(context)
+ .setDestination(TetherSettings.class.getName())
+ .setSourceMetricsCategory(MetricsProto.MetricsEvent.DASHBOARD_SUMMARY)
+ .setTitleRes(R.string.tether_settings_title_all)
+ .launch();
+ }
+
+ @Override
+ public void onActionClick() {
+ final RestrictedLockUtils.EnforcedAdmin admin =
+ RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+ mAppContext, UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId());
+ if (admin != null) {
+ RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mAppContext, admin);
+ } else {
+ ConnectivityManager cm = (ConnectivityManager) mAppContext.getSystemService(
+ Context.CONNECTIVITY_SERVICE);
+ cm.stopTethering(ConnectivityManager.TETHERING_WIFI);
+ }
+ }
+
+ @Override
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(ID)
+ .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_HOTSPOT)
+ .setActionText(mAppContext.getText(R.string.condition_turn_off))
+ .setName(mAppContext.getPackageName() + "/"
+ + mAppContext.getText(R.string.condition_hotspot_title))
+ .setTitleText(mAppContext.getText(R.string.condition_hotspot_title).toString())
+ .setSummaryText(getSummary().toString())
+ .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_hotspot))
+ .build();
+ }
+
+ @Override
+ public void startMonitoringStateChange() {
+ mAppContext.registerReceiver(mReceiver, WIFI_AP_STATE_FILTER);
+ }
+
+ @Override
+ public void stopMonitoringStateChange() {
+ mAppContext.unregisterReceiver(mReceiver);
+ }
+
+ public CharSequence getSummary() {
+ return mAppContext.getString(R.string.condition_hotspot_summary, getSsid());
+ }
+
+ private CharSequence getSsid() {
+ WifiConfiguration wifiConfig = mWifiManager.getWifiApConfiguration();
+ if (wifiConfig == null) {
+ return mAppContext.getText(
+ com.android.internal.R.string.wifi_tether_configure_ssid_default);
+ } else {
+ return wifiConfig.SSID;
+ }
+ }
+
+ public class Receiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (WifiManager.WIFI_AP_STATE_CHANGED_ACTION.equals(intent.getAction())) {
+ mConditionManager.onConditionChanged();
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java
new file mode 100644
index 0000000..d8d5f79
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java
@@ -0,0 +1,98 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.Context;
+
+import com.android.internal.app.ColorDisplayController;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.display.NightDisplaySettings;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import java.util.Objects;
+
+public class NightDisplayConditionController implements ConditionalCardController,
+ ColorDisplayController.Callback {
+ static final int ID = Objects.hash("NightDisplayConditionController");
+
+ private final Context mAppContext;
+ private final ConditionManager mConditionManager;
+ private final ColorDisplayController mController;
+
+ public NightDisplayConditionController(Context appContext, ConditionManager manager) {
+ mController = new ColorDisplayController(appContext);
+ mAppContext = appContext;
+ mConditionManager = manager;
+ }
+
+ @Override
+ public long getId() {
+ return ID;
+ }
+
+ @Override
+ public boolean isDisplayable() {
+ return mController.isActivated();
+ }
+
+ @Override
+ public void onPrimaryClick(Context context) {
+ new SubSettingLauncher(context)
+ .setDestination(NightDisplaySettings.class.getName())
+ .setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_HOMEPAGE)
+ .setTitleRes(R.string.night_display_title)
+ .launch();
+ }
+
+ @Override
+ public void onActionClick() {
+ mController.setActivated(false);
+ }
+
+ @Override
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(ID)
+ .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_NIGHT_DISPLAY)
+ .setActionText(mAppContext.getText(R.string.condition_turn_off))
+ .setName(mAppContext.getPackageName() + "/"
+ + mAppContext.getText(R.string.condition_night_display_title))
+ .setTitleText(mAppContext.getText(
+ R.string.condition_night_display_title).toString())
+ .setSummaryText(
+ mAppContext.getText(R.string.condition_night_display_summary).toString())
+ .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_settings_night_display))
+ .build();
+ }
+
+ @Override
+ public void startMonitoringStateChange() {
+ mController.setListener(this);
+ }
+
+ @Override
+ public void stopMonitoringStateChange() {
+ mController.setListener(null);
+ }
+
+ @Override
+ public void onActivated(boolean activated) {
+ mConditionManager.onConditionChanged();
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java
new file mode 100644
index 0000000..75a72fd
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java
@@ -0,0 +1,77 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import static android.content.Context.NOTIFICATION_SERVICE;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.media.AudioManager;
+import android.provider.Settings;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import java.util.Objects;
+
+public class RingerMutedConditionController extends AbnormalRingerConditionController {
+ static final int ID = Objects.hash("RingerMutedConditionController");
+
+ private final NotificationManager mNotificationManager;
+ private final Context mAppContext;
+
+ public RingerMutedConditionController(Context appContext, ConditionManager conditionManager) {
+ super(appContext, conditionManager);
+ mAppContext = appContext;
+ mNotificationManager =
+ (NotificationManager) appContext.getSystemService(NOTIFICATION_SERVICE);
+ }
+
+ @Override
+ public long getId() {
+ return ID;
+ }
+
+ @Override
+ public boolean isDisplayable() {
+ int zen = Settings.Global.ZEN_MODE_OFF;
+ if (mNotificationManager != null) {
+ zen = mNotificationManager.getZenMode();
+ }
+ final boolean zenModeEnabled = zen != Settings.Global.ZEN_MODE_OFF;
+ final boolean isSilent =
+ mAudioManager.getRingerModeInternal() == AudioManager.RINGER_MODE_SILENT;
+ return isSilent && !zenModeEnabled;
+ }
+
+ @Override
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(ID)
+ .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_DEVICE_MUTED)
+ .setActionText(
+ mAppContext.getText(R.string.condition_device_muted_action_turn_on_sound))
+ .setName(mAppContext.getPackageName() + "/"
+ + mAppContext.getText(R.string.condition_device_muted_title))
+ .setTitleText(mAppContext.getText(R.string.condition_device_muted_title).toString())
+ .setSummaryText(
+ mAppContext.getText(R.string.condition_device_muted_summary).toString())
+ .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_notifications_off_24dp))
+ .build();
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java
new file mode 100644
index 0000000..4c355a3
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java
@@ -0,0 +1,65 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.Context;
+import android.media.AudioManager;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import java.util.Objects;
+
+public class RingerVibrateConditionController extends AbnormalRingerConditionController {
+ static final int ID = Objects.hash("RingerVibrateConditionController");
+
+ private final Context mAppContext;
+
+ public RingerVibrateConditionController(Context appContext, ConditionManager conditionManager) {
+ super(appContext, conditionManager);
+ mAppContext = appContext;
+
+ }
+
+ @Override
+ public long getId() {
+ return ID;
+ }
+
+ @Override
+ public boolean isDisplayable() {
+ return mAudioManager.getRingerModeInternal() == AudioManager.RINGER_MODE_VIBRATE;
+ }
+
+ @Override
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(ID)
+ .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_DEVICE_VIBRATE)
+ .setActionText(
+ mAppContext.getText(R.string.condition_device_muted_action_turn_on_sound))
+ .setName(mAppContext.getPackageName() + "/"
+ + mAppContext.getText(R.string.condition_device_vibrate_title))
+ .setTitleText(
+ mAppContext.getText(R.string.condition_device_vibrate_title).toString())
+ .setSummaryText(
+ mAppContext.getText(R.string.condition_device_vibrate_summary).toString())
+ .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_volume_ringer_vibrate))
+ .build();
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java b/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java
new file mode 100644
index 0000000..c508403f
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java
@@ -0,0 +1,133 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.text.TextUtils;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.Settings;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import java.util.List;
+import java.util.Objects;
+
+public class WorkModeConditionController implements ConditionalCardController {
+
+ static final int ID = Objects.hash("WorkModeConditionController");
+
+ private static final IntentFilter FILTER = new IntentFilter();
+
+ static {
+ FILTER.addAction(Intent.ACTION_MANAGED_PROFILE_AVAILABLE);
+ FILTER.addAction(Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE);
+ }
+
+ private final Context mAppContext;
+ private final UserManager mUm;
+ private final ConditionManager mConditionManager;
+ private final Receiver mReceiver;
+
+ private UserHandle mUserHandle;
+
+ public WorkModeConditionController(Context appContext, ConditionManager manager) {
+ mAppContext = appContext;
+ mUm = mAppContext.getSystemService(UserManager.class);
+ mConditionManager = manager;
+ mReceiver = new Receiver();
+ }
+
+ @Override
+ public long getId() {
+ return ID;
+ }
+
+ @Override
+ public boolean isDisplayable() {
+ updateUserHandle();
+ return mUserHandle != null && mUm.isQuietModeEnabled(mUserHandle);
+ }
+
+ @Override
+ public void onPrimaryClick(Context context) {
+ context.startActivity(new Intent(context,
+ Settings.AccountDashboardActivity.class));
+ }
+
+ @Override
+ public void onActionClick() {
+ if (mUserHandle != null) {
+ mUm.requestQuietModeEnabled(false, mUserHandle);
+ }
+ }
+
+ @Override
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(ID)
+ .setMetricsConstant(MetricsProto.MetricsEvent.SETTINGS_CONDITION_WORK_MODE)
+ .setActionText(mAppContext.getText(R.string.condition_turn_on))
+ .setName(mAppContext.getPackageName() + "/"
+ + mAppContext.getText(R.string.condition_work_title))
+ .setTitleText(mAppContext.getText(R.string.condition_work_title).toString())
+ .setSummaryText(mAppContext.getText(R.string.condition_work_summary).toString())
+ .setIconDrawable(mAppContext.getDrawable(R.drawable.ic_signal_workmode_enable))
+ .build();
+ }
+
+ @Override
+ public void startMonitoringStateChange() {
+ mAppContext.registerReceiver(mReceiver, FILTER);
+ }
+
+ @Override
+ public void stopMonitoringStateChange() {
+ mAppContext.unregisterReceiver(mReceiver);
+ }
+
+ private void updateUserHandle() {
+ List<UserInfo> profiles = mUm.getProfiles(UserHandle.myUserId());
+ final int profilesCount = profiles.size();
+ mUserHandle = null;
+ for (int i = 0; i < profilesCount; i++) {
+ UserInfo userInfo = profiles.get(i);
+ if (userInfo.isManagedProfile()) {
+ // We assume there's only one managed profile, otherwise UI needs to change.
+ mUserHandle = userInfo.getUserHandle();
+ break;
+ }
+ }
+ }
+
+ public class Receiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ final String action = intent.getAction();
+ if (TextUtils.equals(action, Intent.ACTION_MANAGED_PROFILE_AVAILABLE)
+ || TextUtils.equals(action, Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE)) {
+ mConditionManager.onConditionChanged();
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java
new file mode 100644
index 0000000..873b942
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java
@@ -0,0 +1,156 @@
+/*
+ * 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.homepage.contextualcards.deviceinfo;
+
+import android.app.PendingIntent;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.Uri;
+import android.os.PowerManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.Utils;
+import com.android.settings.fuelgauge.BatteryInfo;
+import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBuilderUtils;
+
+/**
+ * Utility class to build a Battery Slice, and handle all associated actions.
+ */
+public class BatterySlice implements CustomSliceable {
+ private static final String TAG = "BatterySlice";
+
+ /**
+ * The path denotes the unique name of battery slice.
+ */
+ public static final String PATH_BATTERY_INFO = "battery_card";
+
+ /**
+ * Backing Uri for the Battery Slice.
+ */
+ public static final Uri BATTERY_CARD_URI = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(PATH_BATTERY_INFO)
+ .build();
+
+ private final Context mContext;
+
+ private BatteryInfo mBatteryInfo;
+ private boolean mIsBatteryInfoLoading;
+
+ public BatterySlice(Context context) {
+ mContext = context;
+ }
+
+ /**
+ * Return a {@link BatterySlice} bound to {@link #BATTERY_CARD_URI}
+ */
+ @Override
+ public Slice getSlice() {
+ if (mBatteryInfo == null) {
+ mIsBatteryInfoLoading = true;
+ loadBatteryInfo();
+ }
+ final IconCompat icon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_settings_battery);
+ final CharSequence title = mContext.getText(R.string.power_usage_summary_title);
+ final SliceAction primarySliceAction = new SliceAction(getPrimaryAction(), icon, title);
+ final Slice slice = new ListBuilder(mContext, BATTERY_CARD_URI, ListBuilder.INFINITY)
+ .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
+ .setHeader(new ListBuilder.HeaderBuilder().setTitle(title))
+ .addRow(new ListBuilder.RowBuilder()
+ .setTitle(getBatteryPercentString(), mIsBatteryInfoLoading)
+ .setSubtitle(getSummary(), mIsBatteryInfoLoading)
+ .setPrimaryAction(primarySliceAction))
+ .build();
+ mBatteryInfo = null;
+ mIsBatteryInfoLoading = false;
+ return slice;
+ }
+
+ @Override
+ public Uri getUri() {
+ return BATTERY_CARD_URI;
+ }
+
+ @Override
+ public void onNotifyChange(Intent intent) {
+
+ }
+
+ @Override
+ public Intent getIntent() {
+ final String screenTitle = mContext.getText(R.string.power_usage_summary_title).toString();
+ final Uri contentUri = new Uri.Builder().appendPath(PATH_BATTERY_INFO).build();
+ return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
+ PowerUsageSummary.class.getName(), PATH_BATTERY_INFO, screenTitle,
+ MetricsProto.MetricsEvent.SLICE)
+ .setClassName(mContext.getPackageName(), SubSettings.class.getName())
+ .setData(contentUri);
+ }
+
+ @Override
+ public IntentFilter getIntentFilter() {
+ final IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
+ intentFilter.addAction(Intent.ACTION_POWER_CONNECTED);
+ intentFilter.addAction(Intent.ACTION_POWER_DISCONNECTED);
+ intentFilter.addAction(Intent.ACTION_BATTERY_LEVEL_CHANGED);
+ return intentFilter;
+ }
+
+ @VisibleForTesting
+ void loadBatteryInfo() {
+ BatteryInfo.getBatteryInfo(mContext, info -> {
+ mBatteryInfo = info;
+ mContext.getContentResolver().notifyChange(getUri(), null);
+ }, true);
+ }
+
+ @VisibleForTesting
+ CharSequence getBatteryPercentString() {
+ return mBatteryInfo == null ? null : mBatteryInfo.batteryPercentString;
+ }
+
+ @VisibleForTesting
+ CharSequence getSummary() {
+ if (mBatteryInfo == null) {
+ return null;
+ }
+ return mBatteryInfo.remainingLabel == null ? mBatteryInfo.statusLabel
+ : mBatteryInfo.remainingLabel;
+ }
+
+ private PendingIntent getPrimaryAction() {
+ final Intent intent = getIntent();
+ return PendingIntent.getActivity(mContext, 0 /* requestCode */,
+ intent, 0 /* flags */);
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java
new file mode 100644
index 0000000..6296b1e
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java
@@ -0,0 +1,151 @@
+/*
+ * 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.homepage.contextualcards.deviceinfo;
+
+import android.app.PendingIntent;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.format.Formatter;
+import android.text.style.TextAppearanceSpan;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.Utils;
+import com.android.settings.datausage.DataUsageSummary;
+import com.android.settings.datausage.DataUsageUtils;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settingslib.net.DataUsageController;
+
+import java.util.concurrent.TimeUnit;
+
+public class DataUsageSlice implements CustomSliceable {
+ private static final String TAG = "DataUsageSlice";
+ private static final long MILLIS_IN_A_DAY = TimeUnit.DAYS.toMillis(1);
+
+ /**
+ * The path denotes the unique name of data usage slice.
+ */
+ public static final String PATH_DATA_USAGE = "data_usage_card";
+
+ /**
+ * Backing Uri for the Data usage Slice.
+ */
+ public static final Uri DATA_USAGE_CARD_URI = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(PATH_DATA_USAGE)
+ .build();
+
+ private final Context mContext;
+
+ public DataUsageSlice(Context context) {
+ mContext = context;
+ }
+
+ @Override
+ public Uri getUri() {
+ return DATA_USAGE_CARD_URI;
+ }
+
+ /**
+ * Return a Data usage Slice bound to {@link #DATA_USAGE_CARD_URI}
+ */
+ @Override
+ public Slice getSlice() {
+ final IconCompat icon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_settings_data_usage);
+ final String title = mContext.getString(R.string.data_usage_summary_title);
+ final SliceAction primaryAction = new SliceAction(getPrimaryAction(), icon, title);
+ final DataUsageController dataUsageController = new DataUsageController(mContext);
+ final DataUsageController.DataUsageInfo info = dataUsageController.getDataUsageInfo();
+ final ListBuilder listBuilder =
+ new ListBuilder(mContext, DATA_USAGE_CARD_URI, ListBuilder.INFINITY)
+ .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
+ .setHeader(new ListBuilder.HeaderBuilder().setTitle(title));
+ if (DataUsageUtils.hasSim(mContext)) {
+ listBuilder.addRow(new ListBuilder.RowBuilder()
+ .setTitle(getDataUsageText(info))
+ .setSubtitle(getCycleTime(info))
+ .setPrimaryAction(primaryAction));
+ } else {
+ listBuilder.addRow(new ListBuilder.RowBuilder()
+ .setTitle(mContext.getText(R.string.no_sim_card))
+ .setPrimaryAction(primaryAction));
+ }
+ return listBuilder.build();
+ }
+
+ @Override
+ public Intent getIntent() {
+ final String screenTitle = mContext.getText(R.string.data_usage_wifi_title).toString();
+ final Uri contentUri = new Uri.Builder().appendPath(PATH_DATA_USAGE).build();
+ return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
+ DataUsageSummary.class.getName(), PATH_DATA_USAGE, screenTitle,
+ MetricsProto.MetricsEvent.SLICE)
+ .setClassName(mContext.getPackageName(), SubSettings.class.getName())
+ .setData(contentUri);
+ }
+
+ private PendingIntent getPrimaryAction() {
+ final Intent intent = getIntent();
+ return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
+ }
+
+ @VisibleForTesting
+ CharSequence getDataUsageText(DataUsageController.DataUsageInfo info) {
+ final Formatter.BytesResult usedResult = Formatter.formatBytes(mContext.getResources(),
+ info.usageLevel, Formatter.FLAG_CALCULATE_ROUNDED | Formatter.FLAG_IEC_UNITS);
+ final SpannableString usageNumberText = new SpannableString(usedResult.value);
+ usageNumberText.setSpan(
+ new TextAppearanceSpan(mContext, android.R.style.TextAppearance_Large), 0,
+ usageNumberText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ return TextUtils.expandTemplate(mContext.getText(R.string.data_used_formatted),
+ usageNumberText, usedResult.units);
+ }
+
+ @VisibleForTesting
+ CharSequence getCycleTime(DataUsageController.DataUsageInfo info) {
+ final long millisLeft = info.cycleEnd - System.currentTimeMillis();
+ if (millisLeft <= 0) {
+ return mContext.getString(R.string.billing_cycle_none_left);
+ } else {
+ final int daysLeft = (int) (millisLeft / MILLIS_IN_A_DAY);
+ return daysLeft < 1 ? mContext.getString(R.string.billing_cycle_less_than_one_day_left)
+ : mContext.getResources().getQuantityString(R.plurals.billing_cycle_days_left,
+ daysLeft, daysLeft);
+ }
+ }
+
+ @Override
+ public void onNotifyChange(Intent intent) {
+
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java
new file mode 100644
index 0000000..d6fdfd5
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java
@@ -0,0 +1,144 @@
+/*
+ * 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.homepage.contextualcards.deviceinfo;
+
+import android.app.PendingIntent;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
+import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.Utils;
+import com.android.settings.deviceinfo.DeviceModelPreferenceController;
+import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settingslib.DeviceInfoUtils;
+
+import java.util.List;
+
+public class DeviceInfoSlice implements CustomSliceable {
+ private static final String TAG = "DeviceInfoSlice";
+
+ /**
+ * The path denotes the unique name of device info slice
+ */
+ public static final String PATH_DEVICE_INFO = "device_info_card";
+
+ /**
+ * Backing Uri for the Device info Slice.
+ */
+ public static final Uri DEVICE_INFO_CARD_URI = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(PATH_DEVICE_INFO)
+ .build();
+
+ private final Context mContext;
+ private final SubscriptionManager mSubscriptionManager;
+
+ public DeviceInfoSlice(Context context) {
+ mContext = context;
+ mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
+ }
+
+ /**
+ * Return a device info slice bound to {@Link #DEVICE_INFO_CARD_URI}
+ */
+ @Override
+ public Slice getSlice() {
+ final IconCompat icon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_info_outline_24dp);
+ final String title = mContext.getString(R.string.device_info_label);
+ final SliceAction primaryAction = new SliceAction(getPrimaryAction(), icon, title);
+ return new ListBuilder(mContext, DEVICE_INFO_CARD_URI, ListBuilder.INFINITY)
+ .setAccentColor((Utils.getColorAccentDefaultColor(mContext)))
+ .setHeader(new ListBuilder.HeaderBuilder().setTitle(title))
+ .addRow(new ListBuilder.RowBuilder()
+ .setTitle(getPhoneNumber())
+ .setSubtitle(getDeviceModel())
+ .setPrimaryAction(primaryAction))
+ .build();
+ }
+
+ @Override
+ public Uri getUri() {
+ return DEVICE_INFO_CARD_URI;
+ }
+
+ @Override
+ public Intent getIntent() {
+ final String screenTitle = mContext.getText(R.string.device_info_label).toString();
+ final Uri contentUri = new Uri.Builder().appendPath(PATH_DEVICE_INFO).build();
+ return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
+ MyDeviceInfoFragment.class.getName(), PATH_DEVICE_INFO, screenTitle,
+ MetricsProto.MetricsEvent.SLICE)
+ .setClassName(mContext.getPackageName(), SubSettings.class.getName())
+ .setData(contentUri);
+ }
+
+ private PendingIntent getPrimaryAction() {
+ final Intent intent = getIntent();
+ return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
+ }
+
+ @VisibleForTesting
+ CharSequence getPhoneNumber() {
+ final SubscriptionInfo subscriptionInfo = getFirstSubscriptionInfo();
+ if (subscriptionInfo == null) {
+ return mContext.getString(R.string.device_info_default);
+ }
+ final String phoneNumber = DeviceInfoUtils.getFormattedPhoneNumber(mContext,
+ subscriptionInfo);
+ return TextUtils.isEmpty(phoneNumber) ? mContext.getString(R.string.device_info_default)
+ : BidiFormatter.getInstance().unicodeWrap(phoneNumber, TextDirectionHeuristics.LTR);
+ }
+
+ private CharSequence getDeviceModel() {
+ return DeviceModelPreferenceController.getDeviceModel();
+ }
+
+ @VisibleForTesting
+ SubscriptionInfo getFirstSubscriptionInfo() {
+ final List<SubscriptionInfo> subscriptionInfoList =
+ mSubscriptionManager.getActiveSubscriptionInfoList();
+ if (subscriptionInfoList == null) {
+ return null;
+ }
+ return subscriptionInfoList.get(0);
+ }
+
+ @Override
+ public void onNotifyChange(Intent intent) {
+
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
new file mode 100644
index 0000000..aff34f4
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java
@@ -0,0 +1,77 @@
+/*
+ * 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.homepage.contextualcards.deviceinfo;
+
+import android.app.PendingIntent;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.settings.R;
+import com.android.settings.slices.SettingsSliceProvider;
+
+// This is a slice helper class for EmergencyInfo
+public class EmergencyInfoSlice {
+ /**
+ * The path denotes the unique name of emergency info slice.
+ */
+ public static final String PATH_EMERGENCY_INFO_CARD = "emergency_info_card";
+
+ /**
+ * Backing Uri for the Emergency Info Slice.
+ */
+ public static final Uri EMERGENCY_INFO_CARD_URI = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(PATH_EMERGENCY_INFO_CARD)
+ .build();
+
+ private static final String ACTION_EDIT_EMERGENCY_INFO = "android.settings.EDIT_EMERGENCY_INFO";
+
+ public static Slice getSlice(Context context) {
+ final ListBuilder listBuilder = new ListBuilder(context, EMERGENCY_INFO_CARD_URI,
+ ListBuilder.INFINITY);
+ listBuilder.addRow(
+ new ListBuilder.RowBuilder()
+ .setTitle(context.getText(R.string.emergency_info_title))
+ .setSubtitle(
+ context.getText(R.string.emergency_info_contextual_card_summary))
+ .setPrimaryAction(generatePrimaryAction(context)));
+ return listBuilder.build();
+ }
+
+ private static SliceAction generatePrimaryAction(Context context) {
+ PendingIntent pendingIntent =
+ PendingIntent.getActivity(
+ context,
+ 0 /* requestCode */,
+ new Intent(ACTION_EDIT_EMERGENCY_INFO),
+ PendingIntent.FLAG_UPDATE_CURRENT);
+
+ return SliceAction.create(
+ pendingIntent,
+ IconCompat.createWithResource(context, R.drawable.empty_icon),
+ ListBuilder.SMALL_IMAGE,
+ context.getText(R.string.emergency_info_title));
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
new file mode 100644
index 0000000..c61a8a0
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
@@ -0,0 +1,133 @@
+/*
+ * 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.homepage.contextualcards.deviceinfo;
+
+import android.app.PendingIntent;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.storage.StorageManager;
+import android.text.format.Formatter;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.Utils;
+import com.android.settings.deviceinfo.StorageDashboardFragment;
+import com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
+import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
+
+public class StorageSlice implements CustomSliceable {
+ private static final String TAG = "StorageSlice";
+
+ /**
+ * The path denotes the unique name of storage slicel
+ */
+ public static final String PATH_STORAGE_INFO = "storage_card";
+
+ /**
+ * Backing Uri for the storage slice.
+ */
+ public static final Uri STORAGE_CARD_URI = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(PATH_STORAGE_INFO)
+ .build();
+
+ private final Context mContext;
+
+ public StorageSlice(Context context) {
+ mContext = context;
+ }
+
+ @Override
+ public Uri getUri() {
+ return STORAGE_CARD_URI;
+ }
+
+ /**
+ * Return a storage slice bound to {@link #STORAGE_CARD_URI}
+ */
+ @Override
+ public Slice getSlice() {
+ final IconCompat icon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_homepage_storage);
+ final String title = mContext.getString(R.string.storage_label);
+ final SliceAction primaryAction = new SliceAction(getPrimaryAction(), icon, title);
+ final PrivateStorageInfo info = getPrivateStorageInfo();
+ return new ListBuilder(mContext, STORAGE_CARD_URI, ListBuilder.INFINITY)
+ .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
+ .setHeader(new ListBuilder.HeaderBuilder().setTitle(title))
+ .addRow(new ListBuilder.RowBuilder()
+ .setTitle(getStorageUsedText(info))
+ .setSubtitle(getStorageSummaryText(info))
+ .setPrimaryAction(primaryAction))
+ .build();
+ }
+
+ @Override
+ public Intent getIntent() {
+ final String screenTitle = mContext.getText(R.string.storage_label).toString();
+ final Uri contentUri = new Uri.Builder().appendPath(PATH_STORAGE_INFO).build();
+ return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
+ StorageDashboardFragment.class.getName(), PATH_STORAGE_INFO, screenTitle,
+ MetricsProto.MetricsEvent.SLICE)
+ .setClassName(mContext.getPackageName(), SubSettings.class.getName())
+ .setData(contentUri);
+ }
+
+ private PendingIntent getPrimaryAction() {
+ final Intent intent = getIntent();
+ return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
+ }
+
+ @VisibleForTesting
+ PrivateStorageInfo getPrivateStorageInfo() {
+ final StorageManager storageManager = mContext.getSystemService(StorageManager.class);
+ final StorageManagerVolumeProvider smvp = new StorageManagerVolumeProvider(storageManager);
+ return PrivateStorageInfo.getPrivateStorageInfo(smvp);
+ }
+
+ @VisibleForTesting
+ CharSequence getStorageUsedText(PrivateStorageInfo info) {
+ final long usedBytes = info.totalBytes - info.freeBytes;
+ return StorageSummaryDonutPreferenceController.convertUsedBytesToFormattedText(mContext,
+ usedBytes);
+ }
+
+ @VisibleForTesting
+ CharSequence getStorageSummaryText(PrivateStorageInfo info) {
+ return mContext.getString(R.string.storage_volume_total,
+ Formatter.formatShortFileSize(mContext, info.totalBytes));
+ }
+
+ @Override
+ public void onNotifyChange(Intent intent) {
+
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java b/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java
new file mode 100644
index 0000000..54cd82f
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSlice.java
@@ -0,0 +1,277 @@
+/*
+ * 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.homepage.contextualcards.slices;
+
+import android.app.PendingIntent;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.util.Pair;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.Utils;
+import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settingslib.bluetooth.BluetoothUtils;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TODO(b/114807655): Contextual Home Page - Connected Device
+ *
+ * Show connected device info if one is currently connected. UI for connected device should
+ * match Connected Devices > Currently Connected Devices
+ *
+ * This Slice will show multiple currently connected devices, which includes:
+ * 1) Bluetooth.
+ * 2) Docks.
+ * ...
+ * TODO Other device types are under checking to support, will update later.
+ */
+public class ConnectedDeviceSlice implements CustomSliceable {
+
+ /**
+ * The path denotes the unique name of Connected device Slice.
+ */
+ public static final String PATH_CONNECTED_DEVICE = "connected_device";
+
+ /**
+ * Backing Uri for Connected device Slice.
+ */
+ public static final Uri CONNECTED_DEVICE_URI = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendPath(PATH_CONNECTED_DEVICE)
+ .build();
+
+ /**
+ * To sort the Bluetooth devices by {@link CachedBluetoothDevice}.
+ * Refer compareTo method from {@link com.android.settings.bluetooth.BluetoothDevicePreference}.
+ */
+ private static final Comparator<CachedBluetoothDevice> COMPARATOR
+ = Comparator.naturalOrder();
+
+ private static final String TAG = "ConnectedDeviceSlice";
+
+ private final Context mContext;
+
+ public ConnectedDeviceSlice(Context context) {
+ mContext = context;
+ }
+
+ private static Bitmap getBitmapFromVectorDrawable(Drawable VectorDrawable) {
+ final Bitmap bitmap = Bitmap.createBitmap(VectorDrawable.getIntrinsicWidth(),
+ VectorDrawable.getIntrinsicHeight(), Config.ARGB_8888);
+ final Canvas canvas = new Canvas(bitmap);
+
+ VectorDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+ VectorDrawable.draw(canvas);
+
+ return bitmap;
+ }
+
+ @Override
+ public Uri getUri() {
+ return CONNECTED_DEVICE_URI;
+ }
+
+ /**
+ * Return a Connected Device Slice bound to {@link #CONNECTED_DEVICE_URI}.
+ */
+ @Override
+ public Slice getSlice() {
+ final IconCompat icon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_homepage_connected_device);
+ final CharSequence title = mContext.getText(R.string.connected_devices_dashboard_title);
+ final CharSequence titleNoConnectedDevices = mContext.getText(
+ R.string.no_connected_devices);
+ final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext, 0,
+ getIntent(), 0);
+ final SliceAction primarySliceAction = new SliceAction(primaryActionIntent, icon,
+ title);
+ final ListBuilder listBuilder =
+ new ListBuilder(mContext, CONNECTED_DEVICE_URI, ListBuilder.INFINITY)
+ .setAccentColor(Utils.getColorAccentDefaultColor(mContext));
+
+ // Get row builders by connected devices, e.g. Bluetooth.
+ // TODO Add other type connected devices, e.g. Docks.
+ final List<ListBuilder.RowBuilder> rows = getBluetoothRowBuilder(primarySliceAction);
+
+ // Return a header with IsError flag, if no connected devices.
+ if (rows.isEmpty()) {
+ return listBuilder.setHeader(new ListBuilder.HeaderBuilder()
+ .setTitle(titleNoConnectedDevices)
+ .setPrimaryAction(primarySliceAction))
+ .setIsError(true)
+ .build();
+ }
+
+ // According the number of connected devices to set sub title of header.
+ listBuilder.setHeader(new ListBuilder.HeaderBuilder()
+ .setTitle(title)
+ .setSubtitle(getSubTitle(rows.size()))
+ .setPrimaryAction(primarySliceAction));
+
+ // Add rows.
+ for (ListBuilder.RowBuilder rowBuilder : rows) {
+ listBuilder.addRow(rowBuilder);
+ }
+ return listBuilder.build();
+ }
+
+ @Override
+ public Intent getIntent() {
+ final String screenTitle = mContext.getText(R.string.connected_devices_dashboard_title)
+ .toString();
+ final Uri contentUri = new Uri.Builder().appendPath(PATH_CONNECTED_DEVICE).build();
+
+ return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
+ ConnectedDeviceDashboardFragment.class.getName(), PATH_CONNECTED_DEVICE,
+ screenTitle,
+ MetricsProto.MetricsEvent.SLICE)
+ .setClassName(mContext.getPackageName(), SubSettings.class.getName())
+ .setData(contentUri);
+ }
+
+ @Override
+ public void onNotifyChange(Intent intent) {
+ }
+
+ @VisibleForTesting
+ List<CachedBluetoothDevice> getBluetoothConnectedDevices() {
+ final List<CachedBluetoothDevice> connectedBluetoothList = new ArrayList<>();
+
+ // If Bluetooth is disable, skip to get the bluetooth devices.
+ if (!BluetoothAdapter.getDefaultAdapter().isEnabled()) {
+ Log.d(TAG, "Cannot get Bluetooth connected devices, Bluetooth is disabled.");
+ return connectedBluetoothList;
+ }
+
+ // Get the Bluetooth devices from LocalBluetoothManager.
+ final LocalBluetoothManager bluetoothManager =
+ com.android.settings.bluetooth.Utils.getLocalBtManager(mContext);
+ if (bluetoothManager == null) {
+ Log.d(TAG, "Cannot get Bluetooth connected devices, Bluetooth is not supported.");
+ return connectedBluetoothList;
+ }
+ final Collection<CachedBluetoothDevice> cachedDevices =
+ bluetoothManager.getCachedDeviceManager().getCachedDevicesCopy();
+
+ // Get all connected Bluetooth devices and use Map to filter duplicated Bluetooth.
+ final Map<BluetoothDevice, CachedBluetoothDevice> connectedBluetoothMap = new ArrayMap<>();
+ for (CachedBluetoothDevice device : cachedDevices) {
+ if (device.isConnected() && !connectedBluetoothMap.containsKey(device.getDevice())) {
+ connectedBluetoothMap.put(device.getDevice(), device);
+ }
+ }
+
+ // Sort connected Bluetooth devices.
+ connectedBluetoothList.addAll(connectedBluetoothMap.values());
+ Collections.sort(connectedBluetoothList, COMPARATOR);
+
+ return connectedBluetoothList;
+ }
+
+ @VisibleForTesting
+ PendingIntent getBluetoothDetailIntent(CachedBluetoothDevice device) {
+ final Bundle args = new Bundle();
+ args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS,
+ device.getDevice().getAddress());
+ final SubSettingLauncher subSettingLauncher = new SubSettingLauncher(mContext);
+ subSettingLauncher.setDestination(BluetoothDeviceDetailsFragment.class.getName())
+ .setArguments(args)
+ .setTitleRes(R.string.device_details_title)
+ .setSourceMetricsCategory(Instrumentable.METRICS_CATEGORY_UNKNOWN);
+
+ // The requestCode should be unique, use the hashcode of device as request code.
+ return PendingIntent
+ .getActivity(mContext, device.hashCode() /* requestCode */,
+ subSettingLauncher.toIntent(),
+ 0 /* flags */);
+ }
+
+ @VisibleForTesting
+ IconCompat getConnectedDeviceIcon(CachedBluetoothDevice device) {
+ final Pair<Drawable, String> pair = BluetoothUtils
+ .getBtClassDrawableWithDescription(mContext, device);
+
+ if (pair.first != null) {
+ return IconCompat.createWithBitmap(getBitmapFromVectorDrawable(pair.first));
+ } else {
+ return IconCompat.createWithResource(mContext, R.drawable.ic_homepage_connected_device);
+ }
+ }
+
+ private List<ListBuilder.RowBuilder> getBluetoothRowBuilder(SliceAction primarySliceAction) {
+ final List<ListBuilder.RowBuilder> bluetoothRows = new ArrayList<>();
+
+ // According Bluetooth connected device to create row builders.
+ final List<CachedBluetoothDevice> bluetoothDevices = getBluetoothConnectedDevices();
+ for (CachedBluetoothDevice bluetoothDevice : bluetoothDevices) {
+ bluetoothRows.add(new ListBuilder.RowBuilder()
+ .setTitleItem(getConnectedDeviceIcon(bluetoothDevice), ListBuilder.ICON_IMAGE)
+ .setTitle(bluetoothDevice.getName())
+ .setSubtitle(bluetoothDevice.getConnectionSummary())
+ .setPrimaryAction(primarySliceAction)
+ .addEndItem(buildBluetoothDetailDeepLinkAction(bluetoothDevice)));
+ }
+
+ return bluetoothRows;
+ }
+
+ private SliceAction buildBluetoothDetailDeepLinkAction(CachedBluetoothDevice bluetoothDevice) {
+ return new SliceAction(
+ getBluetoothDetailIntent(bluetoothDevice),
+ IconCompat.createWithResource(mContext, R.drawable.ic_settings),
+ bluetoothDevice.getName());
+ }
+
+ private CharSequence getSubTitle(int deviceCount) {
+ return mContext.getResources().getQuantityString(R.plurals.show_connected_devices,
+ deviceCount, deviceCount);
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
new file mode 100644
index 0000000..5711dc5
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java
@@ -0,0 +1,47 @@
+/*
+ * 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.homepage.contextualcards.slices;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardController;
+import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
+
+/**
+ * Card controller for {@link ContextualCard} built as slices.
+ */
+public class SliceContextualCardController implements ContextualCardController {
+
+ @Override
+ public int getCardType() {
+ return ContextualCard.CardType.SLICE;
+ }
+
+ @Override
+ public void onPrimaryClick(ContextualCard card) {
+
+ }
+
+ @Override
+ public void onActionClick(ContextualCard card) {
+
+ }
+
+ @Override
+ public void setCardUpdateListener(ContextualCardUpdateListener listener) {
+
+ }
+}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
new file mode 100644
index 0000000..c2bf536
--- /dev/null
+++ b/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java
@@ -0,0 +1,121 @@
+/*
+ * 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.homepage.contextualcards.slices;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.net.Uri;
+import android.util.ArrayMap;
+import android.util.Log;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.widget.EventInfo;
+import androidx.slice.widget.SliceLiveData;
+import androidx.slice.widget.SliceView;
+
+import com.android.settings.R;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
+
+import java.util.Map;
+
+/**
+ * Card renderer for {@link ContextualCard} built as slices.
+ */
+public class SliceContextualCardRenderer implements ContextualCardRenderer,
+ SliceView.OnSliceActionListener {
+
+ private static final String TAG = "SliceCardRenderer";
+
+ @VisibleForTesting
+ final Map<String, LiveData<Slice>> mSliceLiveDataMap;
+
+ private final Context mContext;
+ private final LifecycleOwner mLifecycleOwner;
+
+ public SliceContextualCardRenderer(Context context, LifecycleOwner lifecycleOwner) {
+ mContext = context;
+ mLifecycleOwner = lifecycleOwner;
+ mSliceLiveDataMap = new ArrayMap<>();
+ }
+
+ @Override
+ public int getViewType() {
+ return R.layout.homepage_slice_tile;
+ }
+
+ @Override
+ public RecyclerView.ViewHolder createViewHolder(View view) {
+ return new SliceViewHolder(view);
+ }
+
+ @Override
+ public void bindView(RecyclerView.ViewHolder holder, ContextualCard card) {
+ final SliceViewHolder cardHolder = (SliceViewHolder) holder;
+ final Uri uri = card.getSliceUri();
+
+ //TODO(b/116063073): The URI check should be done earlier when we are performing final
+ // filtering after having the full list.
+ if (!ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
+ Log.w(TAG, "Invalid uri, skipping slice: " + uri);
+ return;
+ }
+
+ cardHolder.sliceView.setScrollable(false);
+ cardHolder.sliceView.setTag(uri);
+ //TODO(b/114009676): We will soon have a field to decide what slice mode we should set.
+ cardHolder.sliceView.setMode(SliceView.MODE_LARGE);
+ LiveData<Slice> sliceLiveData = mSliceLiveDataMap.get(uri.toString());
+
+ if (sliceLiveData == null) {
+ sliceLiveData = SliceLiveData.fromUri(mContext, uri);
+ mSliceLiveDataMap.put(uri.toString(), sliceLiveData);
+ }
+
+ sliceLiveData.removeObservers(mLifecycleOwner);
+ sliceLiveData.observe(mLifecycleOwner, slice -> {
+ if (slice == null) {
+ Log.w(TAG, "Slice is null");
+ }
+ cardHolder.sliceView.setSlice(slice);
+ });
+
+ // Set this listener so we can log the interaction users make on the slice
+ cardHolder.sliceView.setOnSliceActionListener(this);
+ }
+
+ @Override
+ public void onSliceAction(@NonNull EventInfo eventInfo, @NonNull SliceItem sliceItem) {
+ //TODO(b/79698338): Log user interaction
+ }
+
+ public static class SliceViewHolder extends RecyclerView.ViewHolder {
+ public final SliceView sliceView;
+
+ public SliceViewHolder(View view) {
+ super(view);
+ sliceView = view.findViewById(R.id.slice_view);
+ }
+ }
+}
diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
index 87333a0..80f6680 100644
--- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java
@@ -21,6 +21,9 @@
import android.provider.Settings;
import android.view.InputDevice;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.TogglePreferenceController;
@@ -28,9 +31,6 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class GameControllerPreferenceController extends TogglePreferenceController
implements PreferenceControllerMixin, InputManager.InputDeviceListener, LifecycleObserver,
OnResume, OnPause {
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java
index 4c08e01..49e07b0 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java
@@ -18,15 +18,15 @@
import android.content.Context;
+import androidx.preference.PreferenceFragmentCompat;
+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.core.lifecycle.events.OnStop;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeEnablerManagerCompat;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
public class InputMethodAndSubtypePreferenceController extends BasePreferenceController implements
LifecycleObserver, OnStart, OnStop {
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
index 388e16c..5618697 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
@@ -35,6 +35,11 @@
import android.widget.RadioButton;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.AsyncTaskLoader;
+import androidx.loader.content.Loader;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -42,11 +47,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import androidx.appcompat.app.AlertDialog;
-import androidx.loader.app.LoaderManager.LoaderCallbacks;
-import androidx.loader.content.AsyncTaskLoader;
-import androidx.loader.content.Loader;
-
public class KeyboardLayoutDialogFragment extends InstrumentedDialogFragment
implements InputDeviceListener, LoaderCallbacks<KeyboardLayoutDialogFragment.Keyboards> {
private static final String KEY_INPUT_DEVICE_IDENTIFIER = "inputDeviceIdentifier";
@@ -215,7 +215,7 @@
private void updateSwitchHintVisibility() {
AlertDialog dialog = (AlertDialog)getDialog();
if (dialog != null) {
- View customPanel = dialog.findViewById(com.android.internal.R.id.customPanel);
+ View customPanel = dialog.findViewById(R.id.customPanel);
customPanel.setVisibility(mAdapter.getCount() > 1 ? View.VISIBLE : View.GONE);
}
}
diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java
index 63fe147..4ac52bc 100644
--- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java
+++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java
@@ -23,6 +23,11 @@
import android.hardware.input.KeyboardLayout;
import android.view.InputDevice;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -32,11 +37,6 @@
import java.util.HashMap;
import java.util.Map;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
public class KeyboardLayoutPickerController extends BasePreferenceController implements
InputManager.InputDeviceListener, LifecycleObserver, OnStart, OnStop {
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
index cc1978f..8d45178 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
@@ -33,6 +33,12 @@
import android.text.TextUtils;
import android.view.InputDevice;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
@@ -49,12 +55,6 @@
import java.util.List;
import java.util.Objects;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@SearchIndexable
public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
implements InputManager.InputDeviceListener,
diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
index c0f5782..367ea80 100644
--- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
+++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java
@@ -20,6 +20,8 @@
import android.hardware.input.InputManager;
import android.icu.text.ListFormatter;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo;
@@ -32,8 +34,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
public class PhysicalKeyboardPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause,
diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/src/com/android/settings/inputmethod/SpellCheckerPreference.java
index 8cd73f7..116f1c7 100644
--- a/src/com/android/settings/inputmethod/SpellCheckerPreference.java
+++ b/src/com/android/settings/inputmethod/SpellCheckerPreference.java
@@ -25,12 +25,12 @@
import android.view.View.OnClickListener;
import android.view.textservice.SpellCheckerInfo;
-import com.android.settings.CustomListPreference;
-import com.android.settings.R;
-
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.CustomListPreference;
+import com.android.settings.R;
+
/**
* Spell checker service preference.
*
diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
index cdc1c3a..f0bb8d9 100644
--- a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
+++ b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
@@ -20,14 +20,14 @@
import android.view.textservice.SpellCheckerInfo;
import android.view.textservice.TextServicesManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtilCompat;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class SpellCheckerPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index c8eb109..2870484 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -27,6 +27,12 @@
import android.view.textservice.TextServicesManager;
import android.widget.Switch;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -34,12 +40,6 @@
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.SwitchBar.OnSwitchChangeListener;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceScreen;
-
public class SpellCheckersSettings extends SettingsPreferenceFragment
implements OnSwitchChangeListener, OnPreferenceClickListener, OnPreferenceChangeListener {
private static final String TAG = SpellCheckersSettings.class.getSimpleName();
diff --git a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java
index 5f13402..e0c016f 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java
@@ -22,13 +22,13 @@
import android.provider.UserDictionary;
import android.util.ArraySet;
+import androidx.annotation.VisibleForTesting;
+import androidx.loader.content.CursorLoader;
+
import java.util.Locale;
import java.util.Objects;
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-import androidx.loader.content.CursorLoader;
-
public class UserDictionaryCursorLoader extends CursorLoader {
@VisibleForTesting
diff --git a/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java b/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java
index d233660..4be70d5 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java
@@ -25,6 +25,11 @@
import android.view.inputmethod.InputMethodManager;
import android.view.inputmethod.InputMethodSubtype;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
@@ -35,11 +40,6 @@
import java.util.Locale;
import java.util.TreeSet;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class UserDictionaryListPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnStart {
diff --git a/src/com/android/settings/inputmethod/UserDictionarySettings.java b/src/com/android/settings/inputmethod/UserDictionarySettings.java
index 1e912f1..cdc8b07 100644
--- a/src/com/android/settings/inputmethod/UserDictionarySettings.java
+++ b/src/com/android/settings/inputmethod/UserDictionarySettings.java
@@ -38,6 +38,10 @@
import android.widget.SimpleCursorAdapter;
import android.widget.TextView;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
@@ -45,10 +49,6 @@
import com.android.settingslib.core.instrumentation.Instrumentable;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
-import androidx.fragment.app.ListFragment;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-
public class UserDictionarySettings extends ListFragment implements Instrumentable,
LoaderManager.LoaderCallbacks<Cursor> {
diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
index 024fe60..e1c9615 100644
--- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
+++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
@@ -27,6 +27,8 @@
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.Preconditions;
import com.android.settings.R;
@@ -42,8 +44,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.preference.Preference;
-
@SearchIndexable
public final class VirtualKeyboardFragment extends SettingsPreferenceFragment implements Indexable {
@@ -130,12 +130,5 @@
sir.xmlResId = R.xml.virtual_keyboard_settings;
return Arrays.asList(sir);
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> keys = super.getNonIndexableKeys(context);
- keys.add("add_virtual_keyboard_screen");
- return keys;
- }
};
}
diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
index 5c68449..61e6a42 100644
--- a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
+++ b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java
@@ -24,6 +24,8 @@
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -31,8 +33,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
public class VirtualKeyboardPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index c983c07..ae0a568 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -23,14 +23,15 @@
import android.content.pm.PackageManager;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
-import android.speech.tts.TtsEngines;
import android.text.TextUtils;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.inputmethod.PhysicalKeyboardPreferenceController;
@@ -46,9 +47,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
@SearchIndexable
public class LanguageAndInputSettings extends DashboardFragment {
@@ -57,7 +55,6 @@
private static final String KEY_KEYBOARDS_CATEGORY = "keyboards_category";
private static final String KEY_TEXT_TO_SPEECH = "tts_settings_summary";
private static final String KEY_POINTER_AND_TTS_CATEGORY = "pointer_and_tts_category";
- private static final String KEY_PHYSICAL_KEYBOARD = "physical_keyboard_pref";
@Override
public int getMetricsCategory() {
@@ -112,7 +109,7 @@
// Pointer and Tts
final TtsPreferenceController ttsPreferenceController =
- new TtsPreferenceController(context, new TtsEngines(context));
+ new TtsPreferenceController(context, KEY_TEXT_TO_SPEECH);
controllers.add(ttsPreferenceController);
final PointerSpeedController pointerController = new PointerSpeedController(context);
controllers.add(pointerController);
@@ -122,7 +119,6 @@
// Input Assistance
controllers.add(new SpellCheckerPreferenceController(context));
- controllers.add(new DefaultAutofillPreferenceController(context));
return controllers;
}
@@ -180,14 +176,5 @@
Context context) {
return buildPreferenceControllers(context, null);
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- List<String> keys = super.getNonIndexableKeys(context);
- // Duplicates in summary and details pages.
- keys.add(KEY_TEXT_TO_SPEECH);
- keys.add(KEY_PHYSICAL_KEYBOARD);
- return keys;
- }
};
}
diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
index 8045fc0..c88bdb6 100644
--- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java
+++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java
@@ -18,6 +18,8 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
@@ -28,8 +30,6 @@
import java.util.List;
-import androidx.preference.Preference;
-
public class PhoneLanguagePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/language/PointerSpeedController.java b/src/com/android/settings/language/PointerSpeedController.java
index 3da3c49..67326dd 100644
--- a/src/com/android/settings/language/PointerSpeedController.java
+++ b/src/com/android/settings/language/PointerSpeedController.java
@@ -18,11 +18,11 @@
import android.content.Context;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
-import androidx.annotation.VisibleForTesting;
-
public class PointerSpeedController extends BasePreferenceController {
diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java
index c83492c..7e34175 100644
--- a/src/com/android/settings/language/TtsPreferenceController.java
+++ b/src/com/android/settings/language/TtsPreferenceController.java
@@ -19,31 +19,26 @@
import android.content.Context;
import android.speech.tts.TtsEngines;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settings.core.BasePreferenceController;
-public class TtsPreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin {
+public class TtsPreferenceController extends BasePreferenceController {
- private static final String KEY_VOICE_CATEGORY = "voice_category";
- private static final String KEY_TTS_SETTINGS = "tts_settings_summary";
+ @VisibleForTesting
+ TtsEngines mTtsEngines;
- private final TtsEngines mTtsEngines;
-
- public TtsPreferenceController(Context context, TtsEngines ttsEngines) {
- super(context);
- mTtsEngines = ttsEngines;
+ public TtsPreferenceController(Context context, String key) {
+ super(context, key);
+ mTtsEngines = new TtsEngines(context);
}
@Override
- public boolean isAvailable() {
+ public int getAvailabilityStatus() {
return !mTtsEngines.getEngines().isEmpty() &&
- mContext.getResources().getBoolean(R.bool.config_show_tts_settings_summary);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_TTS_SETTINGS;
+ mContext.getResources().getBoolean(R.bool.config_show_tts_settings_summary)
+ ? AVAILABLE_UNSEARCHABLE
+ : CONDITIONALLY_UNAVAILABLE;
}
}
diff --git a/src/com/android/settings/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java
index cc54b04..d7829c6 100644
--- a/src/com/android/settings/language/UserDictionaryPreferenceController.java
+++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java
@@ -19,6 +19,9 @@
import android.content.Context;
import android.os.Bundle;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.inputmethod.UserDictionaryList;
import com.android.settings.inputmethod.UserDictionaryListPreferenceController;
@@ -26,9 +29,6 @@
import java.util.TreeSet;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-
public class UserDictionaryPreferenceController extends BasePreferenceController {
public UserDictionaryPreferenceController(Context context, String key) {
diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
index b59fe78..a06c77e 100644
--- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
+++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java
@@ -29,6 +29,10 @@
import android.widget.CheckBox;
import android.widget.CompoundButton;
+import androidx.core.view.MotionEventCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.app.LocalePicker;
import com.android.internal.app.LocaleStore;
import com.android.settings.R;
@@ -39,10 +43,6 @@
import java.util.List;
import java.util.Locale;
-import androidx.core.view.MotionEventCompat;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import androidx.recyclerview.widget.RecyclerView;
-
class LocaleDragAndDropAdapter
extends RecyclerView.Adapter<LocaleDragAndDropAdapter.CustomViewHolder> {
diff --git a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
index d059ad9..9069812 100644
--- a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
+++ b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java
@@ -20,12 +20,12 @@
import android.os.Bundle;
import android.view.View;
-import com.android.settings.R;
-
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import com.android.settings.R;
+
/**
* Add accessibility actions to the drag-and-drop locale list
*
diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java
index dada1c8..cb66764 100644
--- a/src/com/android/settings/localepicker/LocaleListEditor.java
+++ b/src/com/android/settings/localepicker/LocaleListEditor.java
@@ -31,6 +31,9 @@
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.app.LocalePicker;
import com.android.internal.app.LocaleStore;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -41,9 +44,6 @@
import java.util.List;
import java.util.Locale;
-import androidx.appcompat.app.AlertDialog;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* Drag-and-drop editor for the user-ordered locale lists.
*/
diff --git a/src/com/android/settings/location/AppLocationPermissionPreferenceController.java b/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
index fabe295..f920fdc 100644
--- a/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
+++ b/src/com/android/settings/location/AppLocationPermissionPreferenceController.java
@@ -23,7 +23,6 @@
@Override
public boolean isAvailable() {
return Settings.Global.getInt(mContext.getContentResolver(),
- android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED, 1)
- == 1;
+ Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED, 1) == 1;
}
}
diff --git a/src/com/android/settings/location/AppSettingsInjector.java b/src/com/android/settings/location/AppSettingsInjector.java
index 6b79a7e..8120821 100644
--- a/src/com/android/settings/location/AppSettingsInjector.java
+++ b/src/com/android/settings/location/AppSettingsInjector.java
@@ -21,12 +21,10 @@
import androidx.preference.Preference;
-import com.android.settings.widget.AppPreference;
import com.android.settings.widget.RestrictedAppPreference;
import com.android.settingslib.location.InjectedSetting;
import com.android.settingslib.location.SettingsInjector;
-
-import java.util.List;
+import com.android.settingslib.widget.apppreference.AppPreference;
/**
* Adds the preferences specified by the {@link InjectedSetting} objects to a preference group.
diff --git a/src/com/android/settings/location/BluetoothScanningPreferenceController.java b/src/com/android/settings/location/BluetoothScanningPreferenceController.java
index a810dbf..d16e1e5 100644
--- a/src/com/android/settings/location/BluetoothScanningPreferenceController.java
+++ b/src/com/android/settings/location/BluetoothScanningPreferenceController.java
@@ -16,12 +16,12 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public class BluetoothScanningPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java
index 78dd206..20c2280 100644
--- a/src/com/android/settings/location/LocationEnabler.java
+++ b/src/com/android/settings/location/LocationEnabler.java
@@ -13,7 +13,7 @@
*/
package com.android.settings.location;
-import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
+import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfRestrictionEnforced;
import static com.android.settingslib.Utils.updateLocationEnabled;
import static com.android.settingslib.Utils.updateLocationMode;
@@ -28,15 +28,16 @@
import android.provider.Settings;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
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;
-import androidx.annotation.VisibleForTesting;
-
/**
* A class that listens to location settings change and modifies location settings
@@ -168,14 +169,14 @@
mContext, UserManager.DISALLOW_SHARE_LOCATION, userId);
if (admin == null) {
- admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_CONFIG_LOCATION, userId);
}
return admin;
}
boolean hasShareLocationRestriction(int userId) {
- return RestrictedLockUtils.hasBaseUserRestriction(
+ return RestrictedLockUtilsInternal.hasBaseUserRestriction(
mContext, UserManager.DISALLOW_SHARE_LOCATION, userId);
}
diff --git a/src/com/android/settings/location/LocationFooterPreferenceController.java b/src/com/android/settings/location/LocationFooterPreferenceController.java
index 6a2c89a..3431aa2 100644
--- a/src/com/android/settings/location/LocationFooterPreferenceController.java
+++ b/src/com/android/settings/location/LocationFooterPreferenceController.java
@@ -24,6 +24,10 @@
import android.location.LocationManager;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+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;
@@ -34,10 +38,6 @@
import java.util.Collections;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-
/**
* Preference controller for location footer preference category
*/
diff --git a/src/com/android/settings/location/LocationForWorkPreferenceController.java b/src/com/android/settings/location/LocationForWorkPreferenceController.java
index 84607a8..580f888 100644
--- a/src/com/android/settings/location/LocationForWorkPreferenceController.java
+++ b/src/com/android/settings/location/LocationForWorkPreferenceController.java
@@ -18,15 +18,15 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class LocationForWorkPreferenceController extends LocationBasePreferenceController {
/**
diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java
deleted file mode 100644
index d48a627..0000000
--- a/src/com/android/settings/location/LocationPreferenceController.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.location;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.location.LocationManager;
-import android.provider.Settings.Secure;
-
-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.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-public class LocationPreferenceController extends AbstractPreferenceController
- implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
-
- private static final String KEY_LOCATION = "location";
- private Context mContext;
- private Preference mPreference;
-
- @VisibleForTesting
- BroadcastReceiver mLocationProvidersChangedReceiver;
-
- public LocationPreferenceController(Context context, Lifecycle lifecycle) {
- super(context);
- mContext = context;
- mLocationProvidersChangedReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (intent.getAction().equals(LocationManager.PROVIDERS_CHANGED_ACTION)) {
- updateSummary();
- }
- }
- };
- if (lifecycle != null) {
- lifecycle.addObserver(this);
- }
- }
-
- @Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mPreference = screen.findPreference(KEY_LOCATION);
- }
-
- @Override
- public void onResume() {
- if (mLocationProvidersChangedReceiver != null) {
- mContext.registerReceiver(mLocationProvidersChangedReceiver, new IntentFilter(
- LocationManager.PROVIDERS_CHANGED_ACTION));
- }
- }
-
- @Override
- public void onPause() {
- if (mLocationProvidersChangedReceiver != null) {
- mContext.unregisterReceiver(mLocationProvidersChangedReceiver);
- }
- }
-
- @Override
- public void updateState(Preference preference) {
- preference.setSummary(getLocationSummary(mContext));
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_LOCATION;
- }
-
- @Override
- public boolean isAvailable() {
- return true;
- }
-
- public void updateSummary() {
- updateState(mPreference);
- }
-
- public static String getLocationSummary(Context context) {
- int mode = Secure.getInt(context.getContentResolver(),
- Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
- if (mode != Secure.LOCATION_MODE_OFF) {
- return context.getString(R.string.location_on_summary);
- }
- return context.getString(R.string.location_off_summary);
- }
-}
diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java
index 563a653..9d1bdc0 100644
--- a/src/com/android/settings/location/LocationScanningPreferenceController.java
+++ b/src/com/android/settings/location/LocationScanningPreferenceController.java
@@ -18,11 +18,11 @@
import android.content.Context;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
-import androidx.annotation.VisibleForTesting;
-
public class LocationScanningPreferenceController extends BasePreferenceController {
diff --git a/src/com/android/settings/location/LocationServicePreferenceController.java b/src/com/android/settings/location/LocationServicePreferenceController.java
index 035faad..43d35f1 100644
--- a/src/com/android/settings/location/LocationServicePreferenceController.java
+++ b/src/com/android/settings/location/LocationServicePreferenceController.java
@@ -21,6 +21,11 @@
import android.os.UserHandle;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.Utils;
import com.android.settings.widget.RestrictedAppPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -30,11 +35,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
public class LocationServicePreferenceController extends LocationBasePreferenceController
implements LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 18b1033..53076e8 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -22,6 +22,9 @@
import android.os.Bundle;
import android.provider.SearchIndexableResource;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -41,9 +44,6 @@
import java.util.Comparator;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
/**
* System location settings (Settings > Location). The screen has three parts:
* <ul>
@@ -133,34 +133,6 @@
return controllers;
}
- private static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- mSummaryLoader.setSummary(
- this, LocationPreferenceController.getLocationSummary(mContext));
- }
- }
- }
-
- 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);
- }
- };
-
/**
* For Search.
*/
@@ -180,12 +152,5 @@
return buildPreferenceControllers(context, null /* fragment */,
null /* lifecycle */);
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> niks = super.getNonIndexableKeys(context);
- niks.add("recent_location_requests_see_all_button"); // 'See all' button
- return niks;
- }
};
}
diff --git a/src/com/android/settings/location/LocationSliceBuilder.java b/src/com/android/settings/location/LocationSliceBuilder.java
index cbdf7f0..56cf676 100644
--- a/src/com/android/settings/location/LocationSliceBuilder.java
+++ b/src/com/android/settings/location/LocationSliceBuilder.java
@@ -18,6 +18,7 @@
package com.android.settings.location;
import static android.provider.SettingsSlicesContract.KEY_LOCATION;
+
import static androidx.slice.builders.ListBuilder.ICON_IMAGE;
import android.annotation.ColorInt;
@@ -28,17 +29,18 @@
import android.net.Uri;
import android.provider.SettingsSlicesContract;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SubSettings;
import com.android.settings.Utils;
import com.android.settings.slices.SliceBuilderUtils;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
/**
* Utility class to build an intent-based Location Slice.
*/
@@ -70,7 +72,7 @@
return new ListBuilder(context, LOCATION_URI, ListBuilder.INFINITY)
.setAccentColor(color)
- .addRow(b -> b
+ .addRow(new RowBuilder()
.setTitle(title)
.setTitleItem(icon, ICON_IMAGE)
.setPrimaryAction(primarySliceAction))
diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
index 77f1b10..60374eb 100644
--- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java
@@ -17,21 +17,21 @@
import android.os.Bundle;
import android.os.UserHandle;
-import com.android.settings.R;
-import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.widget.AppPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.location.RecentLocationApps;
-
-import java.util.List;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.location.RecentLocationApps;
+import com.android.settingslib.widget.apppreference.AppPreference;
+
+import java.util.List;
+
public class RecentLocationRequestPreferenceController extends LocationBasePreferenceController {
/** Key for preference category "Recent location requests" */
@@ -43,7 +43,7 @@
private PreferenceCategory mCategoryRecentLocationRequests;
private Preference mSeeAllButton;
- /** Used in this class and {@link RecentLocationRequestSeeAllPreferenceController}*/
+ /** Used in this class and {@link RecentLocationRequestSeeAllPreferenceController} */
static class PackageEntryClickedListener implements Preference.OnPreferenceClickListener {
private final DashboardFragment mFragment;
private final String mPackage;
@@ -111,7 +111,7 @@
if (recentLocationRequests.size() > 3) {
// Display the top 3 preferences to container in original order.
- for (int i = 0; i < 3; i ++) {
+ for (int i = 0; i < 3; i++) {
mCategoryRecentLocationRequests.addPreference(
createAppPreference(prefContext, recentLocationRequests.get(i)));
}
diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
index 644025e..3fa0f00 100644
--- a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
+++ b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java
@@ -18,17 +18,17 @@
import android.content.Context;
-import com.android.settings.widget.AppPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.location.RecentLocationApps;
-
-import java.util.List;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.location.RecentLocationApps;
+import com.android.settingslib.widget.apppreference.AppPreference;
+
+import java.util.List;
+
/** Preference controller for preference category displaying all recent location requests. */
public class RecentLocationRequestSeeAllPreferenceController
extends LocationBasePreferenceController {
diff --git a/src/com/android/settings/location/WifiScanningPreferenceController.java b/src/com/android/settings/location/WifiScanningPreferenceController.java
index 255ed31..234ec5e 100644
--- a/src/com/android/settings/location/WifiScanningPreferenceController.java
+++ b/src/com/android/settings/location/WifiScanningPreferenceController.java
@@ -16,12 +16,12 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public class WifiScanningPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java
index 094cefa..80cca2c 100644
--- a/src/com/android/settings/network/AirplaneModePreferenceController.java
+++ b/src/com/android/settings/network/AirplaneModePreferenceController.java
@@ -23,6 +23,11 @@
import android.os.SystemProperties;
import android.text.TextUtils;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties;
import com.android.settings.AirplaneModeEnabler;
@@ -34,11 +39,6 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
public class AirplaneModePreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnResume, OnPause,
AirplaneModeEnabler.OnAirplaneModeChangedListener {
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
index 91a094f..633fc45 100644
--- a/src/com/android/settings/network/ApnEditor.java
+++ b/src/com/android/settings/network/ApnEditor.java
@@ -40,6 +40,15 @@
import android.view.View;
import android.view.View.OnKeyListener;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.MultiSelectListPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.util.ArrayUtils;
@@ -53,15 +62,6 @@
import java.util.List;
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.EditTextPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.MultiSelectListPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.SwitchPreference;
-
public class ApnEditor extends SettingsPreferenceFragment
implements OnPreferenceChangeListener, OnKeyListener {
@@ -231,9 +231,13 @@
final Intent intent = getIntent();
final String action = intent.getAction();
+ if (TextUtils.isEmpty(action)) {
+ finish();
+ return;
+ }
+
mSubId = intent.getIntExtra(ApnSettings.SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-
mReadOnlyApn = false;
mReadOnlyApnTypes = null;
mReadOnlyApnFields = null;
@@ -241,7 +245,7 @@
CarrierConfigManager configManager = (CarrierConfigManager)
getSystemService(Context.CARRIER_CONFIG_SERVICE);
if (configManager != null) {
- PersistableBundle b = configManager.getConfig();
+ PersistableBundle b = configManager.getConfigForSubId(mSubId);
if (b != null) {
mReadOnlyApnTypes = b.getStringArray(
CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);
diff --git a/src/com/android/settings/network/ApnPreference.java b/src/com/android/settings/network/ApnPreference.java
index 603200f..412259b 100755
--- a/src/com/android/settings/network/ApnPreference.java
+++ b/src/com/android/settings/network/ApnPreference.java
@@ -30,11 +30,11 @@
import android.widget.RadioButton;
import android.widget.RelativeLayout;
-import com.android.settings.R;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
public class ApnPreference extends Preference implements
CompoundButton.OnCheckedChangeListener, OnClickListener {
final static String TAG = "ApnPreference";
diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
index 4661f4e..beeaab3 100755
--- a/src/com/android/settings/network/ApnSettings.java
+++ b/src/com/android/settings/network/ApnSettings.java
@@ -50,6 +50,9 @@
import android.view.MotionEvent;
import android.widget.Toast;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
@@ -62,9 +65,6 @@
import java.util.ArrayList;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
public class ApnSettings extends RestrictedSettingsFragment implements
Preference.OnPreferenceChangeListener {
static final String TAG = "ApnSettings";
@@ -105,6 +105,7 @@
private RestoreApnProcessHandler mRestoreApnProcessHandler;
private HandlerThread mRestoreDefaultApnThread;
private SubscriptionInfo mSubscriptionInfo;
+ private int mSubId;
private UiccController mUiccController;
private String mMvnoType;
private String mMvnoMatchData;
@@ -140,6 +141,13 @@
} else if(intent.getAction().equals(
TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED)) {
if (!mRestoreDefaultApnMode) {
+ int extraSubId = intent.getIntExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ if (extraSubId != mSubId) {
+ // subscription has changed
+ mSubId = extraSubId;
+ mSubscriptionInfo = getSubscriptionInfo(mSubId);
+ }
fillList();
}
}
@@ -164,7 +172,7 @@
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
final Activity activity = getActivity();
- final int subId = activity.getIntent().getIntExtra(SUB_ID,
+ mSubId = activity.getIntent().getIntExtra(SUB_ID,
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
mIntentFilter = new IntentFilter(
@@ -173,12 +181,12 @@
setIfOnlyAvailableForAdmins(true);
- mSubscriptionInfo = SubscriptionManager.from(activity).getActiveSubscriptionInfo(subId);
+ mSubscriptionInfo = getSubscriptionInfo(mSubId);
mUiccController = UiccController.getInstance();
CarrierConfigManager configManager = (CarrierConfigManager)
getSystemService(Context.CARRIER_CONFIG_SERVICE);
- PersistableBundle b = configManager.getConfig();
+ PersistableBundle b = configManager.getConfigForSubId(mSubId);
mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL);
mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL);
if (mAllowAddingApns) {
@@ -254,6 +262,10 @@
return null;
}
+ private SubscriptionInfo getSubscriptionInfo(int subId) {
+ return SubscriptionManager.from(getActivity()).getActiveSubscriptionInfo(subId);
+ }
+
private void fillList() {
final TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index 16d382c..3813435 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -19,6 +19,7 @@
import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
import android.content.BroadcastReceiver;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -27,9 +28,16 @@
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
+import android.util.FeatureFlagUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settings.network.telephony.MobileNetworkActivity;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -37,14 +45,15 @@
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class MobileNetworkPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
- private static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
+ @VisibleForTesting
+ static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
+ @VisibleForTesting
+ static final String MOBILE_NETWORK_PACKAGE = "com.android.phone";
+ @VisibleForTesting
+ static final String MOBILE_NETWORK_CLASS = "com.android.phone.MobileNetworkSettings";
private final boolean mIsSecondaryUser;
private final TelephonyManager mTelephonyManager;
@@ -76,7 +85,7 @@
public boolean isUserRestricted() {
return mIsSecondaryUser ||
- RestrictedLockUtils.hasBaseUserRestriction(
+ RestrictedLockUtilsInternal.hasBaseUserRestriction(
mContext,
DISALLOW_CONFIG_MOBILE_NETWORKS,
myUserId());
@@ -135,6 +144,23 @@
}
@Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (KEY_MOBILE_NETWORK_SETTINGS.equals(preference.getKey())) {
+ if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.MOBILE_NETWORK_V2)) {
+ final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
+ mContext.startActivity(intent);
+ } else {
+ final Intent intent = new Intent(Intent.ACTION_MAIN);
+ intent.setComponent(
+ new ComponentName(MOBILE_NETWORK_PACKAGE, MOBILE_NETWORK_CLASS));
+ mContext.startActivity(intent);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ @Override
public CharSequence getSummary() {
return mTelephonyManager.getNetworkOperatorName();
}
diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java
index 1e74bb1..dc41708 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -19,7 +19,8 @@
import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
import static android.os.UserHandle.myUserId;
import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
-import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
+
+import static com.android.settingslib.RestrictedLockUtilsInternal.hasBaseUserRestriction;
import android.content.ActivityNotFoundException;
import android.content.Context;
@@ -34,6 +35,8 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.Utils;
@@ -44,8 +47,6 @@
import java.util.List;
-import androidx.preference.Preference;
-
public class MobilePlanPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState {
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index d5ef9aa..70481f1 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -18,19 +18,19 @@
import static com.android.settings.network.MobilePlanPreferenceController
.MANAGE_MOBILE_PLAN_DIALOG_ID;
-import android.app.Activity;
import android.app.Dialog;
import android.content.Context;
-import android.icu.text.ListFormatter;
import android.provider.SearchIndexableResource;
-import android.text.BidiFormatter;
-import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
import android.util.Log;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.network.MobilePlanPreferenceController.MobilePlanPreferenceHost;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
@@ -43,10 +43,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
@SearchIndexable
public class NetworkDashboardFragment extends DashboardFragment implements
MobilePlanPreferenceHost {
@@ -65,7 +61,11 @@
@Override
protected int getPreferenceScreenResId() {
- return R.xml.network_and_internet;
+ if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2)) {
+ return R.xml.network_and_internet_v2;
+ } else {
+ return R.xml.network_and_internet;
+ }
}
@Override
@@ -149,75 +149,6 @@
return 0;
}
- @VisibleForTesting
- static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
- private final WifiMasterSwitchPreferenceController mWifiPreferenceController;
- private final MobileNetworkPreferenceController mMobileNetworkPreferenceController;
- private final TetherPreferenceController mTetherPreferenceController;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- this(context, summaryLoader,
- new WifiMasterSwitchPreferenceController(context, null),
- new MobileNetworkPreferenceController(context),
- new TetherPreferenceController(context, null /* lifecycle */));
- }
-
- @VisibleForTesting(otherwise = VisibleForTesting.NONE)
- SummaryProvider(Context context, SummaryLoader summaryLoader,
- WifiMasterSwitchPreferenceController wifiPreferenceController,
- MobileNetworkPreferenceController mobileNetworkPreferenceController,
- TetherPreferenceController tetherPreferenceController) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- mWifiPreferenceController = wifiPreferenceController;
- mMobileNetworkPreferenceController = mobileNetworkPreferenceController;
- mTetherPreferenceController = tetherPreferenceController;
- }
-
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- final String wifiSummary = BidiFormatter.getInstance()
- .unicodeWrap(mContext.getString(R.string.wifi_settings_title));
- final String mobileSummary = mContext.getString(
- R.string.network_dashboard_summary_mobile);
- final String dataUsageSummary = mContext.getString(
- R.string.network_dashboard_summary_data_usage);
- final String hotspotSummary = mContext.getString(
- R.string.network_dashboard_summary_hotspot);
-
- final List<String> summaries = new ArrayList<>();
- if (mWifiPreferenceController.isAvailable() && !TextUtils.isEmpty(wifiSummary)) {
- summaries.add(wifiSummary);
- }
- if (mMobileNetworkPreferenceController.isAvailable() && !TextUtils.isEmpty(mobileSummary)) {
- summaries.add(mobileSummary);
- }
- if (!TextUtils.isEmpty(dataUsageSummary)) {
- summaries.add(dataUsageSummary);
- }
- if (mTetherPreferenceController.isAvailable() && !TextUtils.isEmpty(hotspotSummary)) {
- summaries.add(hotspotSummary);
- }
- mSummaryLoader.setSummary(this, ListFormatter.getInstance().format(summaries));
- }
- }
- }
-
- 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);
- }
- };
-
-
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
diff --git a/src/com/android/settings/network/NetworkResetRestrictionChecker.java b/src/com/android/settings/network/NetworkResetRestrictionChecker.java
index 90ade21..46227f9 100644
--- a/src/com/android/settings/network/NetworkResetRestrictionChecker.java
+++ b/src/com/android/settings/network/NetworkResetRestrictionChecker.java
@@ -20,10 +20,10 @@
import android.os.UserHandle;
import android.os.UserManager;
-import com.android.settingslib.RestrictedLockUtils;
-
import androidx.annotation.VisibleForTesting;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+
public class NetworkResetRestrictionChecker {
private final Context mContext;
@@ -36,13 +36,13 @@
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
boolean hasUserBaseRestriction() {
- return RestrictedLockUtils.hasBaseUserRestriction(mContext,
+ return RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId());
}
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
boolean isRestrictionEnforcedByAdmin() {
- return RestrictedLockUtils.checkIfRestrictionEnforced(
+ return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId()) != null;
}
diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java
index c9d7459..d9c20ff 100644
--- a/src/com/android/settings/network/NetworkScorerPicker.java
+++ b/src/com/android/settings/network/NetworkScorerPicker.java
@@ -24,6 +24,10 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -31,10 +35,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Fragment for choosing default network scorer.
*/
diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
index 8a99b63..7239b00 100644
--- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
+++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
@@ -19,14 +19,14 @@
import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppData;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
-import androidx.preference.Preference;
-
/**
* {@link AbstractPreferenceController} that shows the active network scorer and toggles the
* preference based on whether or not there are valid scorers installed.
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index ad90e72..a4e7d2a 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -27,6 +27,7 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
+import android.net.NetworkUtils;
import android.provider.Settings;
import android.system.Os;
import android.text.Editable;
@@ -40,6 +41,9 @@
import android.widget.RadioGroup;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
@@ -50,9 +54,6 @@
import java.util.HashMap;
import java.util.Map;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Dialog to set the Private DNS
*/
@@ -72,8 +73,6 @@
PRIVATE_DNS_MAP.put(PRIVATE_DNS_MODE_PROVIDER_HOSTNAME, R.id.private_dns_mode_provider);
}
- private static final int[] ADDRESS_FAMILIES = new int[] {AF_INET, AF_INET6};
-
@VisibleForTesting
static final String MODE_KEY = Settings.Global.PRIVATE_DNS_MODE;
@VisibleForTesting
@@ -203,23 +202,6 @@
updateDialogInfo();
}
- private boolean isWeaklyValidatedHostname(String hostname) {
- // TODO(b/34953048): Use a validation method that permits more accurate,
- // but still inexpensive, checking of likely valid DNS hostnames.
- final String WEAK_HOSTNAME_REGEX = "^[a-zA-Z0-9_.-]+$";
- if (!hostname.matches(WEAK_HOSTNAME_REGEX)) {
- return false;
- }
-
- for (int address_family : ADDRESS_FAMILIES) {
- if (Os.inet_pton(address_family, hostname) != null) {
- return false;
- }
- }
-
- return true;
- }
-
private Button getSaveButton() {
final AlertDialog dialog = (AlertDialog) getDialog();
if (dialog == null) {
@@ -236,7 +218,7 @@
final Button saveButton = getSaveButton();
if (saveButton != null) {
saveButton.setEnabled(modeProvider
- ? isWeaklyValidatedHostname(mEditText.getText().toString())
+ ? NetworkUtils.isWeaklyValidatedHostname(mEditText.getText().toString())
: true);
}
}
diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java
index 1c62f81..8b3bfa0 100644
--- a/src/com/android/settings/network/PrivateDnsPreferenceController.java
+++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java
@@ -34,8 +34,13 @@
import android.net.Uri;
import android.os.Handler;
import android.os.Looper;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.util.ArrayUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -43,13 +48,12 @@
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.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import java.net.InetAddress;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class PrivateDnsPreferenceController extends BasePreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
private static final String KEY_PRIVATE_DNS_SETTINGS = "private_dns_settings";
@@ -136,6 +140,19 @@
return "";
}
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ //TODO(b/112982691): Add policy transparency explaining why this setting is disabled.
+ preference.setEnabled(!isManagedByAdmin());
+ }
+
+ private boolean isManagedByAdmin() {
+ EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+ mContext, UserManager.DISALLOW_CONFIG_PRIVATE_DNS, UserHandle.myUserId());
+ return enforcedAdmin != null;
+ }
+
private class PrivateDnsSettingsObserver extends ContentObserver {
public PrivateDnsSettingsObserver(Handler h) {
super(h);
diff --git a/src/com/android/settings/network/ProxyPreferenceController.java b/src/com/android/settings/network/ProxyPreferenceController.java
index a1e29c9..8f26bfb 100644
--- a/src/com/android/settings/network/ProxyPreferenceController.java
+++ b/src/com/android/settings/network/ProxyPreferenceController.java
@@ -18,12 +18,12 @@
import android.app.admin.DevicePolicyManager;
import android.content.Context;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public class ProxyPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index 0b49186..0d4a6a6 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -16,7 +16,8 @@
package com.android.settings.network;
import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
-import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
+
+import static com.android.settingslib.RestrictedLockUtilsInternal.checkIfRestrictionEnforced;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothPan;
@@ -33,6 +34,10 @@
import android.os.UserHandle;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.TetherSettings;
import com.android.settings.core.PreferenceControllerMixin;
@@ -47,10 +52,6 @@
import java.util.concurrent.atomic.AtomicReference;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class TetherPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, LifecycleObserver, OnCreate, OnResume, OnPause, OnDestroy {
diff --git a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
new file mode 100644
index 0000000..567e52e
--- /dev/null
+++ b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
@@ -0,0 +1,79 @@
+/*
+ * 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.network;
+
+import android.content.Context;
+import android.icu.text.ListFormatter;
+import android.text.BidiFormatter;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TopLevelNetworkEntryPreferenceController extends BasePreferenceController {
+
+ private final WifiMasterSwitchPreferenceController mWifiPreferenceController;
+ private final MobileNetworkPreferenceController mMobileNetworkPreferenceController;
+ private final TetherPreferenceController mTetherPreferenceController;
+
+ public TopLevelNetworkEntryPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mMobileNetworkPreferenceController = new MobileNetworkPreferenceController(mContext);
+ mTetherPreferenceController = new TetherPreferenceController(
+ mContext, null /* lifecycle */);
+ mWifiPreferenceController = new WifiMasterSwitchPreferenceController(
+ mContext, null /* metrics */);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE_UNSEARCHABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ final String wifiSummary = BidiFormatter.getInstance()
+ .unicodeWrap(mContext.getString(R.string.wifi_settings_title));
+ final String mobileSummary = mContext.getString(
+ R.string.network_dashboard_summary_mobile);
+ final String dataUsageSummary = mContext.getString(
+ R.string.network_dashboard_summary_data_usage);
+ final String hotspotSummary = mContext.getString(
+ R.string.network_dashboard_summary_hotspot);
+
+ final List<String> summaries = new ArrayList<>();
+ if (mWifiPreferenceController.isAvailable()
+ && !TextUtils.isEmpty(wifiSummary)) {
+ summaries.add(wifiSummary);
+ }
+ if (mMobileNetworkPreferenceController.isAvailable() && !TextUtils.isEmpty(mobileSummary)) {
+ summaries.add(mobileSummary);
+ }
+ if (!TextUtils.isEmpty(dataUsageSummary)) {
+ summaries.add(dataUsageSummary);
+ }
+ if (mTetherPreferenceController.isAvailable()
+ && !TextUtils.isEmpty(hotspotSummary)) {
+ summaries.add(hotspotSummary);
+ }
+ return ListFormatter.getInstance().format(summaries);
+ }
+}
diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java
index cb68d27..62589d5 100644
--- a/src/com/android/settings/network/VpnPreferenceController.java
+++ b/src/com/android/settings/network/VpnPreferenceController.java
@@ -32,11 +32,15 @@
import android.util.Log;
import android.util.SparseArray;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -45,10 +49,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class VpnPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
@@ -92,7 +92,7 @@
@Override
public boolean isAvailable() {
- return !RestrictedLockUtils.hasBaseUserRestriction(mContext,
+ return !RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_CONFIG_VPN, UserHandle.myUserId());
}
diff --git a/src/com/android/settings/network/telephony/ApnPreferenceController.java b/src/com/android/settings/network/telephony/ApnPreferenceController.java
new file mode 100644
index 0000000..f5cd140
--- /dev/null
+++ b/src/com/android/settings/network/telephony/ApnPreferenceController.java
@@ -0,0 +1,144 @@
+/*
+ * 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.network.telephony;
+
+import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
+
+import android.content.Context;
+import android.content.Intent;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.ApnSettings;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Preference controller for "Apn settings"
+ */
+public class ApnPreferenceController extends BasePreferenceController implements
+ LifecycleObserver, OnStart, OnStop {
+
+ @VisibleForTesting
+ CarrierConfigManager mCarrierConfigManager;
+ private int mSubId;
+ private Preference mPreference;
+ private DpcApnEnforcedObserver mDpcApnEnforcedObserver;
+
+ public ApnPreferenceController(Context context, String key) {
+ super(context, key);
+ mCarrierConfigManager = new CarrierConfigManager(context);
+ mDpcApnEnforcedObserver = new DpcApnEnforcedObserver(new Handler(Looper.getMainLooper()));
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
+ final boolean isCdmaApn = MobileNetworkUtils.isCdmaOptions(mContext, mSubId)
+ && carrierConfig != null
+ && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL);
+ final boolean isGsmApn = MobileNetworkUtils.isGsmOptions(mContext, mSubId)
+ && carrierConfig != null
+ && carrierConfig.getBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL);
+
+ return isCdmaApn || isGsmApn
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void onStart() {
+ mDpcApnEnforcedObserver.register(mContext);
+ }
+
+ @Override
+ public void onStop() {
+ mDpcApnEnforcedObserver.unRegister(mContext);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ ((RestrictedPreference) mPreference).setDisabledByAdmin(
+ MobileNetworkUtils.isDpcApnEnforced(mContext)
+ ? RestrictedLockUtilsInternal.getDeviceOwner(mContext)
+ : null);
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (getPreferenceKey().equals(preference.getKey())) {
+ // This activity runs in phone process, we must use intent to start
+ final Intent intent = new Intent(Settings.ACTION_APN_SETTINGS);
+ // This will setup the Home and Search affordance
+ intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);
+ intent.putExtra(ApnSettings.SUB_ID, mSubId);
+ mContext.startActivity(intent);
+ return true;
+ }
+
+ return false;
+ }
+
+ public void init(int subId) {
+ mSubId = subId;
+ }
+
+ @VisibleForTesting
+ void setPreference(Preference preference) {
+ mPreference = preference;
+ }
+
+ private class DpcApnEnforcedObserver extends ContentObserver {
+ DpcApnEnforcedObserver(Handler handler) {
+ super(handler);
+ }
+
+ public void register(Context context) {
+ context.getContentResolver().registerContentObserver(ENFORCE_MANAGED_URI, false, this);
+
+ }
+
+ public void unRegister(Context context) {
+ context.getContentResolver().unregisterContentObserver(this);
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ updateState(mPreference);
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/CarrierPreferenceController.java b/src/com/android/settings/network/telephony/CarrierPreferenceController.java
new file mode 100644
index 0000000..8210c4b
--- /dev/null
+++ b/src/com/android/settings/network/telephony/CarrierPreferenceController.java
@@ -0,0 +1,71 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Preference controller for "Carrier Settings"
+ */
+public class CarrierPreferenceController extends BasePreferenceController {
+
+ @VisibleForTesting
+ CarrierConfigManager mCarrierConfigManager;
+ private int mSubId;
+
+ public CarrierPreferenceController(Context context, String key) {
+ super(context, key);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ mCarrierConfigManager = new CarrierConfigManager(context);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ public void init(int subId) {
+ mSubId = subId;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
+
+ // Return available if it is in CDMA or GSM mode, and the flag is on
+ return carrierConfig != null
+ && carrierConfig.getBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL)
+ && (MobileNetworkUtils.isCdmaOptions(mContext, mSubId)
+ || MobileNetworkUtils.isGsmOptions(mContext, mSubId))
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (getPreferenceKey().equals(preference.getKey())) {
+ //TODO(b/117651939): start carrier settings activity
+ return true;
+ }
+
+ return false;
+ }
+}
diff --git a/src/com/android/settings/network/telephony/CellInfoUtil.java b/src/com/android/settings/network/telephony/CellInfoUtil.java
new file mode 100644
index 0000000..ce382eb
--- /dev/null
+++ b/src/com/android/settings/network/telephony/CellInfoUtil.java
@@ -0,0 +1,164 @@
+/*
+ * 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.network.telephony;
+
+import android.telephony.CellIdentity;
+import android.telephony.CellIdentityCdma;
+import android.telephony.CellIdentityGsm;
+import android.telephony.CellIdentityLte;
+import android.telephony.CellIdentityWcdma;
+import android.telephony.CellInfo;
+import android.telephony.CellInfoCdma;
+import android.telephony.CellInfoGsm;
+import android.telephony.CellInfoLte;
+import android.telephony.CellInfoWcdma;
+import android.text.BidiFormatter;
+import android.text.TextDirectionHeuristics;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.telephony.OperatorInfo;
+
+import java.util.List;
+
+/**
+ * Add static Utility functions to get information from the CellInfo object.
+ * TODO: Modify {@link CellInfo} for simplify those functions
+ */
+public final class CellInfoUtil {
+ private static final String TAG = "NetworkSelectSetting";
+
+ private CellInfoUtil() {
+ }
+
+ /**
+ * Wrap a CellIdentity into a CellInfo.
+ */
+ public static CellInfo wrapCellInfoWithCellIdentity(CellIdentity cellIdentity) {
+ if (cellIdentity instanceof CellIdentityLte) {
+ CellInfoLte cellInfo = new CellInfoLte();
+ cellInfo.setCellIdentity((CellIdentityLte) cellIdentity);
+ return cellInfo;
+ } else if (cellIdentity instanceof CellIdentityCdma) {
+ CellInfoCdma cellInfo = new CellInfoCdma();
+ cellInfo.setCellIdentity((CellIdentityCdma) cellIdentity);
+ return cellInfo;
+ } else if (cellIdentity instanceof CellIdentityWcdma) {
+ CellInfoWcdma cellInfo = new CellInfoWcdma();
+ cellInfo.setCellIdentity((CellIdentityWcdma) cellIdentity);
+ return cellInfo;
+ } else if (cellIdentity instanceof CellIdentityGsm) {
+ CellInfoGsm cellInfo = new CellInfoGsm();
+ cellInfo.setCellIdentity((CellIdentityGsm) cellIdentity);
+ return cellInfo;
+ } else {
+ Log.e(TAG, "Invalid CellInfo type");
+ return null;
+ }
+ }
+
+ /**
+ * Returns the title of the network obtained in the manual search.
+ *
+ * @param cellInfo contains the information of the network.
+ * @return Long Name if not null/empty, otherwise Short Name if not null/empty,
+ * else MCCMNC string.
+ */
+ public static String getNetworkTitle(CellInfo cellInfo) {
+ OperatorInfo oi = getOperatorInfoFromCellInfo(cellInfo);
+
+ if (!TextUtils.isEmpty(oi.getOperatorAlphaLong())) {
+ return oi.getOperatorAlphaLong();
+ } else if (!TextUtils.isEmpty(oi.getOperatorAlphaShort())) {
+ return oi.getOperatorAlphaShort();
+ } else {
+ BidiFormatter bidiFormatter = BidiFormatter.getInstance();
+ return bidiFormatter.unicodeWrap(oi.getOperatorNumeric(), TextDirectionHeuristics.LTR);
+ }
+ }
+
+ /**
+ * Wrap a cell info into an operator info.
+ */
+ public static OperatorInfo getOperatorInfoFromCellInfo(CellInfo cellInfo) {
+ OperatorInfo oi;
+ if (cellInfo instanceof CellInfoLte) {
+ CellInfoLte lte = (CellInfoLte) cellInfo;
+ oi = new OperatorInfo(
+ (String) lte.getCellIdentity().getOperatorAlphaLong(),
+ (String) lte.getCellIdentity().getOperatorAlphaShort(),
+ lte.getCellIdentity().getMobileNetworkOperator());
+ } else if (cellInfo instanceof CellInfoWcdma) {
+ CellInfoWcdma wcdma = (CellInfoWcdma) cellInfo;
+ oi = new OperatorInfo(
+ (String) wcdma.getCellIdentity().getOperatorAlphaLong(),
+ (String) wcdma.getCellIdentity().getOperatorAlphaShort(),
+ wcdma.getCellIdentity().getMobileNetworkOperator());
+ } else if (cellInfo instanceof CellInfoGsm) {
+ CellInfoGsm gsm = (CellInfoGsm) cellInfo;
+ oi = new OperatorInfo(
+ (String) gsm.getCellIdentity().getOperatorAlphaLong(),
+ (String) gsm.getCellIdentity().getOperatorAlphaShort(),
+ gsm.getCellIdentity().getMobileNetworkOperator());
+ } else if (cellInfo instanceof CellInfoCdma) {
+ CellInfoCdma cdma = (CellInfoCdma) cellInfo;
+ oi = new OperatorInfo(
+ (String) cdma.getCellIdentity().getOperatorAlphaLong(),
+ (String) cdma.getCellIdentity().getOperatorAlphaShort(),
+ "" /* operator numeric */);
+ } else {
+ Log.e(TAG, "Invalid CellInfo type");
+ oi = new OperatorInfo("", "", "");
+ }
+ return oi;
+ }
+
+ /**
+ * Creates a CellInfo object from OperatorInfo. GsmCellInfo is used here only because
+ * operatorInfo does not contain technology type while CellInfo is an abstract object that
+ * requires to specify technology type. It doesn't matter which CellInfo type to use here, since
+ * we only want to wrap the operator info and PLMN to a CellInfo object.
+ */
+ public static CellInfo convertOperatorInfoToCellInfo(OperatorInfo operatorInfo) {
+ String operatorNumeric = operatorInfo.getOperatorNumeric();
+ String mcc = null;
+ String mnc = null;
+ if (operatorNumeric != null && operatorNumeric.matches("^[0-9]{5,6}$")) {
+ mcc = operatorNumeric.substring(0, 3);
+ mnc = operatorNumeric.substring(3);
+ }
+ CellIdentityGsm cig = new CellIdentityGsm(
+ Integer.MAX_VALUE /* lac */,
+ Integer.MAX_VALUE /* cid */,
+ Integer.MAX_VALUE /* arfcn */,
+ Integer.MAX_VALUE /* bsic */,
+ mcc,
+ mnc,
+ operatorInfo.getOperatorAlphaLong(),
+ operatorInfo.getOperatorAlphaShort());
+
+ CellInfoGsm ci = new CellInfoGsm();
+ ci.setCellIdentity(cig);
+ return ci;
+ }
+
+ /** Checks whether the network operator is forbidden. */
+ public static boolean isForbidden(CellInfo cellInfo, List<String> forbiddenPlmns) {
+ String plmn = CellInfoUtil.getOperatorInfoFromCellInfo(cellInfo).getOperatorNumeric();
+ return forbiddenPlmns != null && forbiddenPlmns.contains(plmn);
+ }
+}
diff --git a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java
new file mode 100644
index 0000000..129ceb1
--- /dev/null
+++ b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java
@@ -0,0 +1,91 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Preference controller for "Data service setup"
+ */
+public class DataServiceSetupPreferenceController extends BasePreferenceController {
+
+ private CarrierConfigManager mCarrierConfigManager;
+ private TelephonyManager mTelephonyManager;
+ private PersistableBundle mCarrierConfig;
+ private String mSetupUrl;
+ private int mSubId;
+
+ public DataServiceSetupPreferenceController(Context context, String key) {
+ super(context, key);
+ mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
+ mTelephonyManager = context.getSystemService(TelephonyManager.class);
+ mSetupUrl = Settings.Global.getString(mContext.getContentResolver(),
+ Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode()
+ == PhoneConstants.LTE_ON_CDMA_TRUE;
+ return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
+ && mCarrierConfig != null
+ && !mCarrierConfig.getBoolean(
+ CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
+ && isLteOnCdma && !TextUtils.isEmpty(mSetupUrl)
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ public void init(int subId) {
+ mSubId = subId;
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+ mCarrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (getPreferenceKey().equals(preference.getKey())) {
+ if (!TextUtils.isEmpty(mSetupUrl)) {
+ String imsi = mTelephonyManager.getSubscriberId();
+ if (imsi == null) {
+ imsi = "";
+ }
+ final String url = TextUtils.expandTemplate(mSetupUrl, imsi).toString();
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+ mContext.startActivity(intent);
+ }
+ return true;
+ }
+
+ return false;
+ }
+}
diff --git a/src/com/android/settings/network/telephony/DataUsagePreferenceController.java b/src/com/android/settings/network/telephony/DataUsagePreferenceController.java
new file mode 100644
index 0000000..b94f7e5
--- /dev/null
+++ b/src/com/android/settings/network/telephony/DataUsagePreferenceController.java
@@ -0,0 +1,101 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.NetworkTemplate;
+import android.provider.Settings;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.text.format.Formatter;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.net.DataUsageController;
+
+/**
+ * Preference controller for "Data usage"
+ */
+public class DataUsagePreferenceController extends BasePreferenceController {
+
+ private NetworkTemplate mTemplate;
+ private DataUsageController.DataUsageInfo mDataUsageInfo;
+ private Intent mIntent;
+ private int mSubId;
+
+ public DataUsagePreferenceController(Context context, String key) {
+ super(context, key);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
+ ? AVAILABLE
+ : AVAILABLE_UNSEARCHABLE;
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+ mContext.startActivity(mIntent);
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final boolean enabled = mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ preference.setEnabled(enabled);
+
+ if (enabled) {
+ preference.setSummary(mContext.getString(R.string.data_usage_template,
+ Formatter.formatFileSize(mContext, mDataUsageInfo.usageLevel),
+ mDataUsageInfo.period));
+ }
+ }
+
+ public void init(int subId) {
+ mSubId = subId;
+
+ if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ mTemplate = getNetworkTemplate(mContext, subId);
+
+ final DataUsageController controller = new DataUsageController(mContext);
+ mDataUsageInfo = controller.getDataUsageInfo(mTemplate);
+
+ mIntent = new Intent(Settings.ACTION_MOBILE_DATA_USAGE);
+ mIntent.putExtra(Settings.EXTRA_NETWORK_TEMPLATE, mTemplate);
+ mIntent.putExtra(Settings.EXTRA_SUB_ID, mSubId);
+ }
+ }
+
+ private NetworkTemplate getNetworkTemplate(Context context, int subId) {
+ final TelephonyManager tm = TelephonyManager.from(context).createForSubscriptionId(subId);
+ NetworkTemplate mobileAll = NetworkTemplate.buildTemplateMobileAll(tm.getSubscriberId());
+
+ return NetworkTemplate.normalize(mobileAll, tm.getMergedSubscriberIds());
+ }
+
+}
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
new file mode 100644
index 0000000..b077dd5
--- /dev/null
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -0,0 +1,333 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Preference controller for "Enabled network mode"
+ */
+public class EnabledNetworkModePreferenceController extends BasePreferenceController implements
+ ListPreference.OnPreferenceChangeListener {
+
+ private CarrierConfigManager mCarrierConfigManager;
+ private TelephonyManager mTelephonyManager;
+ private PersistableBundle mPersistableBundle;
+ private int mSubId;
+ private boolean mIsGlobalCdma;
+ @VisibleForTesting
+ boolean mShow4GForLTE;
+
+ public EnabledNetworkModePreferenceController(Context context, String key) {
+ super(context, key);
+ mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ boolean visible;
+ if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ visible = false;
+ } else if (mPersistableBundle == null) {
+ visible = false;
+ } else if (mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)) {
+ visible = false;
+ } else if (mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)
+ && !mTelephonyManager.getServiceState().getRoaming()
+ && mTelephonyManager.getServiceState().getDataRegState()
+ == ServiceState.STATE_IN_SERVICE) {
+ visible = false;
+ } else if (mPersistableBundle.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
+ visible = false;
+ } else {
+ visible = true;
+ }
+
+ return visible ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final ListPreference listPreference = (ListPreference) preference;
+ final int networkMode = getPreferredNetworkMode();
+ updatePreferenceEntries(listPreference);
+ updatePreferenceValueAndSummary(listPreference, networkMode);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object object) {
+ final int settingsMode = Integer.parseInt((String) object);
+
+ if (mTelephonyManager.setPreferredNetworkType(mSubId, settingsMode)) {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
+ settingsMode);
+ updatePreferenceValueAndSummary((ListPreference) preference, settingsMode);
+ return true;
+ }
+
+ return false;
+ }
+
+ public void init(int subId) {
+ mSubId = subId;
+ mPersistableBundle = mCarrierConfigManager.getConfigForSubId(mSubId);
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+
+ final boolean isLteOnCdma =
+ mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
+ mIsGlobalCdma = isLteOnCdma
+ && mPersistableBundle.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
+ mShow4GForLTE = mPersistableBundle != null
+ ? mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL)
+ : false;
+ }
+
+ private int getPreferredNetworkMode() {
+ return Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
+ Phone.PREFERRED_NT_MODE);
+ }
+
+ private void updatePreferenceEntries(ListPreference preference) {
+ final int phoneType = mTelephonyManager.getPhoneType();
+ final Resources resources = mContext.getResources();
+ final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
+ if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
+ final int lteForced = android.provider.Settings.Global.getInt(
+ mContext.getContentResolver(),
+ android.provider.Settings.Global.LTE_SERVICE_FORCED + mSubId,
+ 0);
+ final boolean isLteOnCdma = mTelephonyManager.getLteOnCdmaMode()
+ == PhoneConstants.LTE_ON_CDMA_TRUE;
+ final int settingsNetworkMode = android.provider.Settings.Global.getInt(
+ mContext.getContentResolver(),
+ android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
+ Phone.PREFERRED_NT_MODE);
+ if (isLteOnCdma) {
+ if (lteForced == 0) {
+ preference.setEntries(
+ R.array.enabled_networks_cdma_choices);
+ preference.setEntryValues(
+ R.array.enabled_networks_cdma_values);
+ } else {
+ switch (settingsNetworkMode) {
+ case TelephonyManager.NETWORK_MODE_CDMA_EVDO:
+ case TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO:
+ case TelephonyManager.NETWORK_MODE_EVDO_NO_CDMA:
+ preference.setEntries(
+ R.array.enabled_networks_cdma_no_lte_choices);
+ preference.setEntryValues(
+ R.array.enabled_networks_cdma_no_lte_values);
+ break;
+ case TelephonyManager.NETWORK_MODE_GLOBAL:
+ case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO:
+ case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+ case TelephonyManager.NETWORK_MODE_LTE_ONLY:
+ preference.setEntries(
+ R.array.enabled_networks_cdma_only_lte_choices);
+ preference.setEntryValues(
+ R.array.enabled_networks_cdma_only_lte_values);
+ break;
+ default:
+ preference.setEntries(
+ R.array.enabled_networks_cdma_choices);
+ preference.setEntryValues(
+ R.array.enabled_networks_cdma_values);
+ break;
+ }
+ }
+ }
+ } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
+ if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) {
+ preference.setEntries(
+ R.array.enabled_networks_tdscdma_choices);
+ preference.setEntryValues(
+ R.array.enabled_networks_tdscdma_values);
+ } else if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL)
+ && !resources.getBoolean(R.bool.config_enabled_lte)) {
+ preference.setEntries(R.array.enabled_networks_except_gsm_lte_choices);
+ preference.setEntryValues(R.array.enabled_networks_except_gsm_lte_values);
+ } else if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL)) {
+ int select = mShow4GForLTE
+ ? R.array.enabled_networks_except_gsm_4g_choices
+ : R.array.enabled_networks_except_gsm_choices;
+ preference.setEntries(select);
+ preference.setEntryValues(
+ R.array.enabled_networks_except_gsm_values);
+ } else if (!resources.getBoolean(R.bool.config_enabled_lte)) {
+ preference.setEntries(
+ R.array.enabled_networks_except_lte_choices);
+ preference.setEntryValues(
+ R.array.enabled_networks_except_lte_values);
+ } else if (mIsGlobalCdma) {
+ preference.setEntries(R.array.enabled_networks_cdma_choices);
+ preference.setEntryValues(R.array.enabled_networks_cdma_values);
+ } else {
+ int select = mShow4GForLTE ? R.array.enabled_networks_4g_choices
+ : R.array.enabled_networks_choices;
+ preference.setEntries(select);
+ preference.setEntryValues(R.array.enabled_networks_values);
+ }
+ }
+ //TODO(b/117881708): figure out what world mode is, then we can optimize code. Otherwise
+ // I prefer to keep this old code
+ if (MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
+ preference.setEntries(
+ R.array.preferred_network_mode_choices_world_mode);
+ preference.setEntryValues(
+ R.array.preferred_network_mode_values_world_mode);
+ }
+ }
+
+ private void updatePreferenceValueAndSummary(ListPreference preference, int networkMode) {
+ switch (networkMode) {
+ case TelephonyManager.NETWORK_MODE_TDSCDMA_WCDMA:
+ case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
+ case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM:
+ preference.setValue(
+ Integer.toString(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
+ preference.setSummary(R.string.network_3G);
+ break;
+ case TelephonyManager.NETWORK_MODE_WCDMA_ONLY:
+ case TelephonyManager.NETWORK_MODE_GSM_UMTS:
+ case TelephonyManager.NETWORK_MODE_WCDMA_PREF:
+ if (!mIsGlobalCdma) {
+ preference.setValue(Integer.toString(TelephonyManager.NETWORK_MODE_WCDMA_PREF));
+ preference.setSummary(R.string.network_3G);
+ } else {
+ preference.setValue(Integer.toString(TelephonyManager
+ .NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+ preference.setSummary(R.string.network_global);
+ }
+ break;
+ case TelephonyManager.NETWORK_MODE_GSM_ONLY:
+ if (!mIsGlobalCdma) {
+ preference.setValue(
+ Integer.toString(TelephonyManager.NETWORK_MODE_GSM_ONLY));
+ preference.setSummary(R.string.network_2G);
+ } else {
+ preference.setValue(
+ Integer.toString(TelephonyManager
+ .NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+ preference.setSummary(R.string.network_global);
+ }
+ break;
+ case TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA:
+ if (MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
+ preference.setSummary(
+ R.string.preferred_network_mode_lte_gsm_umts_summary);
+ break;
+ }
+ case TelephonyManager.NETWORK_MODE_LTE_ONLY:
+ case TelephonyManager.NETWORK_MODE_LTE_WCDMA:
+ if (!mIsGlobalCdma) {
+ preference.setValue(
+ Integer.toString(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA));
+ preference.setSummary(
+ mShow4GForLTE ? R.string.network_4G : R.string.network_lte);
+ } else {
+ preference.setValue(
+ Integer.toString(TelephonyManager
+ .NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+ preference.setSummary(R.string.network_global);
+ }
+ break;
+ case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO:
+ if (MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
+ preference.setSummary(
+ R.string.preferred_network_mode_lte_cdma_summary);
+ } else {
+ preference.setValue(
+ Integer.toString(TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO));
+ preference.setSummary(R.string.network_lte);
+ }
+ break;
+ case TelephonyManager.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+ preference.setValue(Integer.toString(TelephonyManager
+ .NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
+ preference.setSummary(R.string.network_3G);
+ break;
+ case TelephonyManager.NETWORK_MODE_CDMA_EVDO:
+ case TelephonyManager.NETWORK_MODE_EVDO_NO_CDMA:
+ case TelephonyManager.NETWORK_MODE_GLOBAL:
+ preference.setValue(
+ Integer.toString(TelephonyManager.NETWORK_MODE_CDMA_EVDO));
+ preference.setSummary(R.string.network_3G);
+ break;
+ case TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO:
+ preference.setValue(
+ Integer.toString(TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO));
+ preference.setSummary(R.string.network_1x);
+ break;
+ case TelephonyManager.NETWORK_MODE_TDSCDMA_ONLY:
+ preference.setValue(
+ Integer.toString(TelephonyManager.NETWORK_MODE_TDSCDMA_ONLY));
+ preference.setSummary(R.string.network_3G);
+ break;
+ case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM:
+ case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
+ case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA:
+ case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
+ case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+ case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+ if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) {
+ preference.setValue(
+ Integer.toString(TelephonyManager
+ .NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
+ preference.setSummary(R.string.network_lte);
+ } else {
+ preference.setValue(
+ Integer.toString(TelephonyManager
+ .NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
+ if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
+ || mIsGlobalCdma
+ || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
+ preference.setSummary(R.string.network_global);
+ } else {
+ preference.setSummary(mShow4GForLTE
+ ? R.string.network_4G : R.string.network_lte);
+ }
+ }
+ break;
+ default:
+ preference.setSummary(
+ mContext.getString(R.string.mobile_network_mode_error, networkMode));
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java
new file mode 100644
index 0000000..cc8e78d
--- /dev/null
+++ b/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceController.java
@@ -0,0 +1,176 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.os.Looper;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneStateListener;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.ims.ImsManager;
+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;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Preference controller for "Enhanced 4G LTE"
+ */
+public class Enhanced4gLtePreferenceController extends TogglePreferenceController implements
+ LifecycleObserver, OnStart, OnStop {
+
+ private Preference mPreference;
+ private TelephonyManager mTelephonyManager;
+ private CarrierConfigManager mCarrierConfigManager;
+ private PersistableBundle mCarrierConfig;
+ @VisibleForTesting
+ ImsManager mImsManager;
+ private PhoneCallStateListener mPhoneStateListener;
+ private final List<On4gLteUpdateListener> m4gLteListeners;
+ private int mSubId;
+
+ public Enhanced4gLtePreferenceController(Context context, String key) {
+ super(context, key);
+ mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
+ m4gLteListeners = new ArrayList<>();
+ mPhoneStateListener = new PhoneCallStateListener(Looper.getMainLooper());
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ final boolean isVisible = mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
+ && mImsManager != null && mCarrierConfig != null
+ && mImsManager.isVolteEnabledByPlatform()
+ && mImsManager.isVolteProvisionedOnDevice()
+ && MobileNetworkUtils.isImsServiceStateReady(mImsManager)
+ && !mCarrierConfig.getBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL);
+ return isVisible
+ ? (is4gLtePrefEnabled() ? AVAILABLE : AVAILABLE_UNSEARCHABLE)
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void onStart() {
+ mPhoneStateListener.register(mSubId);
+ }
+
+ @Override
+ public void onStop() {
+ mPhoneStateListener.unregister();
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final SwitchPreference switchPreference = (SwitchPreference) preference;
+ final boolean useVariant4glteTitle = mCarrierConfig.getInt(
+ CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT) != 0;
+ int enhanced4glteModeTitleId = useVariant4glteTitle ?
+ R.string.enhanced_4g_lte_mode_title_variant :
+ R.string.enhanced_4g_lte_mode_title;
+ switchPreference.setTitle(enhanced4glteModeTitleId);
+ switchPreference.setEnabled(is4gLtePrefEnabled());
+ switchPreference.setChecked(mImsManager.isEnhanced4gLteModeSettingEnabledByUser()
+ && mImsManager.isNonTtyOrTtyOnVolteEnabled());
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ mImsManager.setEnhanced4gLteModeSetting(isChecked);
+ for (final On4gLteUpdateListener lsn : m4gLteListeners) {
+ lsn.on4gLteUpdated();
+ }
+ return true;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return mImsManager.isEnhanced4gLteModeSettingEnabledByUser();
+ }
+
+ public Enhanced4gLtePreferenceController init(int subId) {
+ mSubId = subId;
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+ mCarrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
+ if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ mImsManager = ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(mSubId));
+ }
+
+ return this;
+ }
+
+ public Enhanced4gLtePreferenceController addListener(On4gLteUpdateListener lsn) {
+ m4gLteListeners.add(lsn);
+ return this;
+ }
+
+ private boolean is4gLtePrefEnabled() {
+ return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
+ && mTelephonyManager.getCallState(mSubId) == TelephonyManager.CALL_STATE_IDLE
+ && mImsManager != null
+ && mImsManager.isNonTtyOrTtyOnVolteEnabled()
+ && mCarrierConfig.getBoolean(
+ CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
+ }
+
+ private class PhoneCallStateListener extends PhoneStateListener {
+
+ public PhoneCallStateListener(Looper looper) {
+ super(looper);
+ }
+
+ @Override
+ public void onCallStateChanged(int state, String incomingNumber) {
+ updateState(mPreference);
+ }
+
+ public void register(int subId) {
+ mSubId = subId;
+ mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+ }
+
+ public void unregister() {
+ mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+ }
+ }
+
+ /**
+ * Update other preferences when 4gLte state is changed
+ */
+ public interface On4gLteUpdateListener {
+ void on4gLteUpdated();
+ }
+}
diff --git a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
similarity index 98%
rename from src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java
rename to src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
index f8f1447..b198f92 100644
--- a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
@@ -30,6 +30,13 @@
import android.telephony.SubscriptionManager;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+
import com.android.ims.ImsManager;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -45,12 +52,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
/**
* Helper class to control slices for enhanced 4g LTE settings.
*/
@@ -183,7 +184,7 @@
return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
.setAccentColor(Utils.getColorAccentDefaultColor(mContext))
- .addRow(b -> b
+ .addRow(new RowBuilder()
.setTitle(getEnhanced4glteModeTitle(subId))
.addEndItem(
new SliceAction(
diff --git a/src/com/android/settings/network/telephony/EuiccPreferenceController.java b/src/com/android/settings/network/telephony/EuiccPreferenceController.java
new file mode 100644
index 0000000..8d03908
--- /dev/null
+++ b/src/com/android/settings/network/telephony/EuiccPreferenceController.java
@@ -0,0 +1,74 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.euicc.EuiccManager;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Preference controller for "Euicc preference"
+ */
+public class EuiccPreferenceController extends BasePreferenceController {
+
+ private TelephonyManager mTelephonyManager;
+ private int mSubId;
+
+ public EuiccPreferenceController(Context context, String key) {
+ super(context, key);
+ mTelephonyManager = context.getSystemService(TelephonyManager.class);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return MobileNetworkUtils.showEuiccSettings(mContext)
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ return mTelephonyManager.getSimOperatorName();
+ }
+
+ public void init(int subId) {
+ mSubId = subId;
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+ Intent intent = new Intent(EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS);
+ mContext.startActivity(intent);
+ return true;
+ }
+
+ return false;
+ }
+}
diff --git a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
new file mode 100644
index 0000000..be2da04
--- /dev/null
+++ b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
@@ -0,0 +1,133 @@
+/*
+ * 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.network.telephony;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+
+/**
+ * Dialog Fragment to show dialog for "mobile data"
+ *
+ * 1. When user want to disable data in single sim case, show dialog to confirm
+ * 2. When user want to enable data in multiple sim case, show dialog to confirm to disable other
+ * sim
+ */
+public class MobileDataDialogFragment extends InstrumentedDialogFragment implements
+ DialogInterface.OnClickListener {
+
+ public static final int TYPE_DISABLE_DIALOG = 0;
+ public static final int TYPE_MULTI_SIM_DIALOG = 1;
+
+ private static final String ARG_DIALOG_TYPE = "dialog_type";
+ private static final String ARG_SUB_ID = "subId";
+
+ private SubscriptionManager mSubscriptionManager;
+ private int mType;
+ private int mSubId;
+
+ public static MobileDataDialogFragment newInstance(int type, int subId) {
+ final MobileDataDialogFragment dialogFragment = new MobileDataDialogFragment();
+
+ Bundle args = new Bundle();
+ args.putInt(ARG_DIALOG_TYPE, type);
+ args.putInt(ARG_SUB_ID, subId);
+ dialogFragment.setArguments(args);
+
+ return dialogFragment;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mSubscriptionManager = getContext().getSystemService(SubscriptionManager.class);
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ final Bundle bundle = getArguments();
+ final Context context = getContext();
+
+ mType = bundle.getInt(ARG_DIALOG_TYPE);
+ mSubId = bundle.getInt(ARG_SUB_ID);
+
+ switch (mType) {
+ case TYPE_DISABLE_DIALOG:
+ return new AlertDialog.Builder(context)
+ .setMessage(R.string.data_usage_disable_mobile)
+ .setPositiveButton(android.R.string.ok, this)
+ .setNegativeButton(android.R.string.cancel, null)
+ .create();
+ case TYPE_MULTI_SIM_DIALOG:
+ final SubscriptionInfo currentSubInfo =
+ mSubscriptionManager.getActiveSubscriptionInfo(mSubId);
+ final SubscriptionInfo nextSubInfo =
+ mSubscriptionManager.getDefaultDataSubscriptionInfo();
+
+ final String previousName = (nextSubInfo == null)
+ ? getContext().getResources().getString(
+ R.string.sim_selection_required_pref)
+ : nextSubInfo.getDisplayName().toString();
+
+ return new AlertDialog.Builder(context)
+ .setTitle(R.string.sim_change_data_title)
+ .setMessage(context.getString(R.string.sim_change_data_message,
+ currentSubInfo != null
+ ? currentSubInfo.getDisplayName()
+ : "",
+ previousName))
+ .setPositiveButton(android.R.string.ok, this)
+ .setNegativeButton(R.string.cancel, null)
+ .create();
+ default:
+ throw new IllegalArgumentException("unknown type " + mType);
+ }
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ //TODO(b/114749736): add metric id for this fragment
+ return 0;
+ }
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ switch (mType) {
+ case TYPE_DISABLE_DIALOG:
+ MobileNetworkUtils.setMobileDataEnabled(getContext(), mSubId, false /* enabled */,
+ false /* disableOtherSubscriptions */);
+ break;
+ case TYPE_MULTI_SIM_DIALOG:
+ mSubscriptionManager.setDefaultDataSubId(mSubId);
+ MobileNetworkUtils.setMobileDataEnabled(getContext(), mSubId, true /* enabled */,
+ true /* disableOtherSubscriptions */);
+ break;
+ default:
+ throw new IllegalArgumentException("unknown type " + mType);
+ }
+ }
+
+}
diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
new file mode 100644
index 0000000..b1124f8
--- /dev/null
+++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
@@ -0,0 +1,191 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+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;
+
+/**
+ * Preference controller for "Mobile data"
+ */
+public class MobileDataPreferenceController extends TogglePreferenceController
+ implements LifecycleObserver, OnStart, OnStop {
+
+ private static final String DIALOG_TAG = "MobileDataDialog";
+
+ private SwitchPreference mPreference;
+ private TelephonyManager mTelephonyManager;
+ private SubscriptionManager mSubscriptionManager;
+ private DataContentObserver mDataContentObserver;
+ private FragmentManager mFragmentManager;
+ private int mSubId;
+ @VisibleForTesting
+ int mDialogType;
+ @VisibleForTesting
+ boolean mNeedDialog;
+
+ public MobileDataPreferenceController(Context context, String key) {
+ super(context, key);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
+ mDataContentObserver = new DataContentObserver(new Handler(Looper.getMainLooper()));
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = (SwitchPreference) screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void onStart() {
+ if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ mDataContentObserver.register(mContext, mSubId);
+ }
+ }
+
+ @Override
+ public void onStop() {
+ if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ mDataContentObserver.unRegister(mContext);
+ }
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+ if (mNeedDialog) {
+ showDialog(mDialogType);
+ }
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ mNeedDialog = isDialogNeeded();
+
+ if (!mNeedDialog) {
+ // Update data directly if we don't need dialog
+ MobileNetworkUtils.setMobileDataEnabled(mContext, mSubId, isChecked, false);
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return mTelephonyManager.isDataEnabled();
+ }
+
+ public void init(FragmentManager fragmentManager, int subId) {
+ mFragmentManager = fragmentManager;
+ mSubId = subId;
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+ }
+
+ @VisibleForTesting
+ boolean isDialogNeeded() {
+ final boolean enableData = !mTelephonyManager.isDataEnabled();
+ final SubscriptionInfo currentSir = mSubscriptionManager.getActiveSubscriptionInfo(
+ mSubId);
+ final SubscriptionInfo nextSir = mSubscriptionManager.getDefaultDataSubscriptionInfo();
+ final boolean isMultiSim = (mTelephonyManager.getSimCount() > 1);
+ final boolean isMultipleDataOnCapable =
+ (mTelephonyManager.getNumberOfModemsWithSimultaneousDataConnections() > 1);
+ final boolean isDefaultDataSubscription = (nextSir != null && currentSir != null
+ && currentSir.getSubscriptionId() == nextSir.getSubscriptionId());
+ if (enableData) {
+ if (isMultiSim && !isMultipleDataOnCapable && !isDefaultDataSubscription) {
+ mDialogType = MobileDataDialogFragment.TYPE_MULTI_SIM_DIALOG;
+ return true;
+ }
+ } else {
+ if (!isMultiSim) {
+ mDialogType = MobileDataDialogFragment.TYPE_DISABLE_DIALOG;
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ private void showDialog(int type) {
+ final MobileDataDialogFragment dialogFragment = MobileDataDialogFragment.newInstance(type,
+ mSubId);
+ dialogFragment.show(mFragmentManager, DIALOG_TAG);
+ }
+
+ /**
+ * Listener that listens mobile data state change.
+ */
+ public class DataContentObserver extends ContentObserver {
+
+ public DataContentObserver(Handler handler) {
+ super(handler);
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ super.onChange(selfChange);
+ updateState(mPreference);
+ }
+
+ public void register(Context context, int subId) {
+ Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA);
+ if (TelephonyManager.getDefault().getSimCount() != 1) {
+ uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + subId);
+ }
+ context.getContentResolver().registerContentObserver(uri, false, this);
+
+ }
+
+ public void unRegister(Context context) {
+ context.getContentResolver().unregisterContentObserver(this);
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
new file mode 100644
index 0000000..9f3dfb2
--- /dev/null
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -0,0 +1,220 @@
+/*
+ * 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.network.telephony;
+
+import android.app.ActionBar;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+import android.view.Menu;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.android.internal.telephony.TelephonyIntents;
+import com.android.internal.util.CollectionUtils;
+import com.android.settings.R;
+import com.android.settings.core.SettingsBaseActivity;
+
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+
+public class MobileNetworkActivity extends SettingsBaseActivity {
+
+ private static final String TAG = "MobileSettingsActivity";
+ @VisibleForTesting
+ static final String MOBILE_SETTINGS_TAG = "mobile_settings:";
+ @VisibleForTesting
+ static final int SUB_ID_NULL = Integer.MIN_VALUE;
+
+ @VisibleForTesting
+ SubscriptionManager mSubscriptionManager;
+ @VisibleForTesting
+ int mCurSubscriptionId;
+ @VisibleForTesting
+ List<SubscriptionInfo> mSubscriptionInfos = new ArrayList<>();
+ private PhoneChangeReceiver mPhoneChangeReceiver;
+
+ private final SubscriptionManager.OnSubscriptionsChangedListener
+ mOnSubscriptionsChangeListener
+ = new SubscriptionManager.OnSubscriptionsChangedListener() {
+ @Override
+ public void onSubscriptionsChanged() {
+ if (!Objects.equals(mSubscriptionInfos,
+ mSubscriptionManager.getActiveSubscriptionInfoList())) {
+ updateSubscriptions(null);
+ }
+ }
+ };
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.mobile_network_settings_container);
+ setActionBar(findViewById(R.id.mobile_action_bar));
+ mPhoneChangeReceiver = new PhoneChangeReceiver();
+ mSubscriptionManager = getSystemService(SubscriptionManager.class);
+ mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
+ mCurSubscriptionId = savedInstanceState != null
+ ? savedInstanceState.getInt(Settings.EXTRA_SUB_ID, SUB_ID_NULL)
+ : SUB_ID_NULL;
+
+ final ActionBar actionBar = getActionBar();
+ if (actionBar != null) {
+ actionBar.setDisplayHomeAsUpEnabled(true);
+ }
+
+ updateSubscriptions(savedInstanceState);
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+ final IntentFilter intentFilter = new IntentFilter(
+ TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
+ registerReceiver(mPhoneChangeReceiver, intentFilter);
+ mSubscriptionManager.addOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+ unregisterReceiver(mPhoneChangeReceiver);
+ mSubscriptionManager.removeOnSubscriptionsChangedListener(mOnSubscriptionsChangeListener);
+ }
+
+ @Override
+ protected void onSaveInstanceState(@NonNull Bundle outState) {
+ super.onSaveInstanceState(outState);
+ saveInstanceState(outState);
+ }
+
+ @VisibleForTesting
+ void saveInstanceState(@NonNull Bundle outState) {
+ outState.putInt(Settings.EXTRA_SUB_ID, mCurSubscriptionId);
+ }
+
+ @VisibleForTesting
+ void updateSubscriptions(Bundle savedInstanceState) {
+ mSubscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList();
+
+ updateBottomNavigationView();
+
+ if (savedInstanceState == null) {
+ switchFragment(new MobileNetworkSettings(), getSubscriptionId());
+ }
+ }
+
+ /**
+ * Get the current subId to display. First check whether intent has {@link
+ * Settings#EXTRA_SUB_ID}. If not, just display first one in list
+ * since it is already sorted by sim slot.
+ */
+ @VisibleForTesting
+ int getSubscriptionId() {
+ final Intent intent = getIntent();
+ if (intent != null) {
+ final int subId = intent.getIntExtra(Settings.EXTRA_SUB_ID, SUB_ID_NULL);
+ if (subId != SUB_ID_NULL && mSubscriptionManager.isActiveSubscriptionId(subId)) {
+ return subId;
+ }
+ }
+
+ if (CollectionUtils.isEmpty(mSubscriptionInfos)) {
+ return SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ return mSubscriptionInfos.get(0).getSubscriptionId();
+ }
+
+ @VisibleForTesting
+ void updateBottomNavigationView() {
+ final BottomNavigationView navigation = findViewById(R.id.bottom_nav);
+
+ if (CollectionUtils.size(mSubscriptionInfos) <= 1) {
+ navigation.setVisibility(View.GONE);
+ } else {
+ final Menu menu = navigation.getMenu();
+ menu.clear();
+ for (int i = 0, size = mSubscriptionInfos.size(); i < size; i++) {
+ final SubscriptionInfo subscriptionInfo = mSubscriptionInfos.get(i);
+ menu.add(0, subscriptionInfo.getSubscriptionId(), i,
+ subscriptionInfo.getDisplayName())
+ .setIcon(R.drawable.ic_settings_sim);
+ }
+ navigation.setOnNavigationItemSelectedListener(item -> {
+ switchFragment(new MobileNetworkSettings(), item.getItemId());
+ return true;
+ });
+ }
+ }
+
+ @VisibleForTesting
+ void switchFragment(Fragment fragment, int subscriptionId) {
+ switchFragment(fragment, subscriptionId, false /* forceUpdate */);
+ }
+
+ @VisibleForTesting
+ void switchFragment(Fragment fragment, int subscriptionId, boolean forceUpdate) {
+ if (mCurSubscriptionId != SUB_ID_NULL && subscriptionId == mCurSubscriptionId
+ && !forceUpdate) {
+ return;
+ }
+ final FragmentManager fragmentManager = getSupportFragmentManager();
+ final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+ final Bundle bundle = new Bundle();
+ bundle.putInt(Settings.EXTRA_SUB_ID, subscriptionId);
+
+ fragment.setArguments(bundle);
+ fragmentTransaction.replace(R.id.main_content, fragment,
+ buildFragmentTag(subscriptionId));
+ fragmentTransaction.commit();
+ mCurSubscriptionId = subscriptionId;
+ }
+
+ private String buildFragmentTag(int subscriptionId) {
+ return MOBILE_SETTINGS_TAG + subscriptionId;
+ }
+
+ private class PhoneChangeReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ // When the radio changes (ex: CDMA->GSM), refresh the fragment.
+ // This is very rare to happen.
+ if (mCurSubscriptionId != SUB_ID_NULL) {
+ switchFragment(new MobileNetworkSettings(), mCurSubscriptionId,
+ true /* forceUpdate */);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
new file mode 100644
index 0000000..ebc38e4
--- /dev/null
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -0,0 +1,218 @@
+/*
+ * 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.network.telephony;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.telephony.TelephonyIntents;
+import com.android.settings.R;
+import com.android.settings.dashboard.RestrictedDashboardFragment;
+import com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController;
+import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController;
+import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;
+import com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.widget.PreferenceCategoryController;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class MobileNetworkSettings extends RestrictedDashboardFragment {
+
+ private static final String LOG_TAG = "NetworkSettings";
+ public static final int REQUEST_CODE_EXIT_ECM = 17;
+ @VisibleForTesting
+ static final String KEY_CLICKED_PREF = "key_clicked_pref";
+
+ //String keys for preference lookup
+ private static final String BUTTON_CDMA_SYSTEM_SELECT_KEY = "cdma_system_select_key";
+ private static final String BUTTON_CDMA_SUBSCRIPTION_KEY = "cdma_subscription_key";
+
+ private TelephonyManager mTelephonyManager;
+ private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+
+ private CdmaSystemSelectPreferenceController mCdmaSystemSelectPreferenceController;
+ private CdmaSubscriptionPreferenceController mCdmaSubscriptionPreferenceController;
+
+ private UserManager mUserManager;
+ private String mClickedPrefKey;
+
+ public MobileNetworkSettings() {
+ super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.MOBILE_NETWORK;
+ }
+
+ /**
+ * Invoked on each preference click in this hierarchy, overrides
+ * PreferenceActivity's implementation. Used to make sure we track the
+ * preference click events.
+ */
+ @Override
+ public boolean onPreferenceTreeClick(Preference preference) {
+ if (super.onPreferenceTreeClick(preference)) {
+ return true;
+ }
+ final String key = preference.getKey();
+
+ if (TextUtils.equals(key, BUTTON_CDMA_SYSTEM_SELECT_KEY)
+ || TextUtils.equals(key, BUTTON_CDMA_SUBSCRIPTION_KEY)) {
+ if (mTelephonyManager.getEmergencyCallbackMode()) {
+ startActivityForResult(
+ new Intent(TelephonyIntents.ACTION_SHOW_NOTICE_ECM_BLOCK_OTHERS, null),
+ REQUEST_CODE_EXIT_ECM);
+ mClickedPrefKey = key;
+ }
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+
+ mSubId = getArguments().getInt(Settings.EXTRA_SUB_ID,
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ use(MobileDataPreferenceController.class).init(getFragmentManager(), mSubId);
+ use(RoamingPreferenceController.class).init(getFragmentManager(), mSubId);
+ use(ApnPreferenceController.class).init(mSubId);
+ use(CarrierPreferenceController.class).init(mSubId);
+ use(DataUsagePreferenceController.class).init(mSubId);
+ use(PreferredNetworkModePreferenceController.class).init(mSubId);
+ use(EnabledNetworkModePreferenceController.class).init(mSubId);
+ use(DataServiceSetupPreferenceController.class).init(mSubId);
+ use(EuiccPreferenceController.class).init(mSubId);
+ use(WifiCallingPreferenceController.class).init(mSubId);
+
+ final OpenNetworkSelectPagePreferenceController openNetworkSelectPagePreferenceController =
+ use(OpenNetworkSelectPagePreferenceController.class).init(mSubId);
+ final AutoSelectPreferenceController autoSelectPreferenceController =
+ use(AutoSelectPreferenceController.class)
+ .init(mSubId)
+ .addListener(openNetworkSelectPagePreferenceController);
+ use(PreferenceCategoryController.class).setChildren(
+ Arrays.asList(autoSelectPreferenceController));
+
+ mCdmaSystemSelectPreferenceController = use(CdmaSystemSelectPreferenceController.class);
+ mCdmaSystemSelectPreferenceController.init(getPreferenceManager(), mSubId);
+ mCdmaSubscriptionPreferenceController = use(CdmaSubscriptionPreferenceController.class);
+ mCdmaSubscriptionPreferenceController.init(getPreferenceManager(), mSubId);
+
+ final VideoCallingPreferenceController videoCallingPreferenceController =
+ use(VideoCallingPreferenceController.class).init(mSubId);
+ use(Enhanced4gLtePreferenceController.class).init(mSubId)
+ .addListener(videoCallingPreferenceController);
+ }
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ Log.i(LOG_TAG, "onCreate:+");
+ super.onCreate(icicle);
+ final Context context = getContext();
+
+ mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+ mTelephonyManager = TelephonyManager.from(context).createForSubscriptionId(mSubId);
+
+ onRestoreInstance(icicle);
+ }
+
+ @VisibleForTesting
+ void onRestoreInstance(Bundle icicle) {
+ if (icicle != null) {
+ mClickedPrefKey = icicle.getString(KEY_CLICKED_PREF);
+ }
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.mobile_network_settings;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return LOG_TAG;
+ }
+
+ @Override
+ public void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ outState.putString(KEY_CLICKED_PREF, mClickedPrefKey);
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ switch (requestCode) {
+ case REQUEST_CODE_EXIT_ECM:
+ if (resultCode != Activity.RESULT_CANCELED) {
+ // If the phone exits from ECM mode, show the CDMA
+ final Preference preference = getPreferenceScreen()
+ .findPreference(mClickedPrefKey);
+ if (preference != null) {
+ preference.performClick();
+ }
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ //TODO(b/114749736): update search provider
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ protected boolean isPageSearchEnabled(Context context) {
+ return false;
+ }
+
+ @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.mobile_network_settings;
+ result.add(sir);
+ return result;
+ }
+ };
+}
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
new file mode 100644
index 0000000..689799e
--- /dev/null
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -0,0 +1,416 @@
+/*
+ * 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.network.telephony;
+
+import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.database.Cursor;
+import android.os.PersistableBundle;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.euicc.EuiccManager;
+import android.telephony.ims.feature.ImsFeature;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.ims.ImsException;
+import com.android.ims.ImsManager;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.R;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class MobileNetworkUtils {
+
+ private static final String TAG = "MobileNetworkUtils";
+
+ // CID of the device.
+ private static final String KEY_CID = "ro.boot.cid";
+ // CIDs of devices which should not show anything related to eSIM.
+ private static final String KEY_ESIM_CID_IGNORE = "ro.setupwizard.esim_cid_ignore";
+ // System Property which is used to decide whether the default eSIM UI will be shown,
+ // the default value is false.
+ private static final String KEY_ENABLE_ESIM_UI_BY_DEFAULT =
+ "esim.enable_esim_system_ui_by_default";
+ private static final String LEGACY_ACTION_CONFIGURE_PHONE_ACCOUNT =
+ "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
+
+ /**
+ * Returns if DPC APNs are enforced.
+ */
+ public static boolean isDpcApnEnforced(Context context) {
+ try (Cursor enforceCursor = context.getContentResolver().query(ENFORCE_MANAGED_URI,
+ null, null, null, null)) {
+ if (enforceCursor == null || enforceCursor.getCount() != 1) {
+ return false;
+ }
+ enforceCursor.moveToFirst();
+ return enforceCursor.getInt(0) > 0;
+ }
+ }
+
+ /**
+ * Returns true if Wifi calling is enabled for at least one phone.
+ */
+ public static boolean isWifiCallingEnabled(Context context) {
+ int phoneCount = context.getSystemService(TelephonyManager.class).getPhoneCount();
+ for (int i = 0; i < phoneCount; i++) {
+ if (isWifiCallingEnabled(context, i)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Returns true if Wifi calling is enabled for the specific phone with id {@code phoneId}.
+ */
+ public static boolean isWifiCallingEnabled(Context context, int phoneId) {
+ final PhoneAccountHandle simCallManager =
+ TelecomManager.from(context).getSimCallManager();
+
+ boolean isWifiCallingEnabled;
+ if (simCallManager != null) {
+ Intent intent = buildPhoneAccountConfigureIntent(
+ context, simCallManager);
+
+ isWifiCallingEnabled = intent != null;
+ } else {
+ ImsManager imsMgr = ImsManager.getInstance(context, phoneId);
+ isWifiCallingEnabled = imsMgr != null
+ && imsMgr.isWfcEnabledByPlatform()
+ && imsMgr.isWfcProvisionedOnDevice()
+ && isImsServiceStateReady(imsMgr);
+ }
+
+ return isWifiCallingEnabled;
+ }
+
+ @VisibleForTesting
+ static Intent buildPhoneAccountConfigureIntent(
+ Context context, PhoneAccountHandle accountHandle) {
+ Intent intent = buildConfigureIntent(
+ context, accountHandle, TelecomManager.ACTION_CONFIGURE_PHONE_ACCOUNT);
+
+ if (intent == null) {
+ // If the new configuration didn't work, try the old configuration intent.
+ intent = buildConfigureIntent(context, accountHandle,
+ LEGACY_ACTION_CONFIGURE_PHONE_ACCOUNT);
+ }
+ return intent;
+ }
+
+ private static Intent buildConfigureIntent(
+ Context context, PhoneAccountHandle accountHandle, String actionStr) {
+ if (accountHandle == null || accountHandle.getComponentName() == null
+ || TextUtils.isEmpty(accountHandle.getComponentName().getPackageName())) {
+ return null;
+ }
+
+ // Build the settings intent.
+ Intent intent = new Intent(actionStr);
+ intent.setPackage(accountHandle.getComponentName().getPackageName());
+ intent.addCategory(Intent.CATEGORY_DEFAULT);
+ intent.putExtra(TelecomManager.EXTRA_PHONE_ACCOUNT_HANDLE, accountHandle);
+
+ // Check to see that the phone account package can handle the setting intent.
+ PackageManager pm = context.getPackageManager();
+ List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
+ if (resolutions.size() == 0) {
+ intent = null; // set no intent if the package cannot handle it.
+ }
+
+ return intent;
+ }
+
+ public static boolean isImsServiceStateReady(ImsManager imsMgr) {
+ boolean isImsServiceStateReady = false;
+
+ try {
+ if (imsMgr != null && imsMgr.getImsServiceState() == ImsFeature.STATE_READY) {
+ isImsServiceStateReady = true;
+ }
+ } catch (ImsException ex) {
+ Log.e(TAG, "Exception when trying to get ImsServiceStatus: " + ex);
+ }
+
+ Log.d(TAG, "isImsServiceStateReady=" + isImsServiceStateReady);
+ return isImsServiceStateReady;
+ }
+
+ /**
+ * Whether to show the entry point to eUICC settings.
+ *
+ * <p>We show the entry point on any device which supports eUICC as long as either the eUICC
+ * was ever provisioned (that is, at least one profile was ever downloaded onto it), or if
+ * the user has enabled development mode.
+ */
+ public static boolean showEuiccSettings(Context context) {
+ EuiccManager euiccManager =
+ (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
+ if (!euiccManager.isEnabled()) {
+ return false;
+ }
+
+ final ContentResolver cr = context.getContentResolver();
+
+ TelephonyManager tm =
+ (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+ String currentCountry = tm.getNetworkCountryIso().toLowerCase();
+ String supportedCountries =
+ Settings.Global.getString(cr, Settings.Global.EUICC_SUPPORTED_COUNTRIES);
+ boolean inEsimSupportedCountries = false;
+ if (TextUtils.isEmpty(currentCountry)) {
+ inEsimSupportedCountries = true;
+ } else if (!TextUtils.isEmpty(supportedCountries)) {
+ List<String> supportedCountryList =
+ Arrays.asList(TextUtils.split(supportedCountries.toLowerCase(), ","));
+ if (supportedCountryList.contains(currentCountry)) {
+ inEsimSupportedCountries = true;
+ }
+ }
+ final boolean esimIgnoredDevice =
+ Arrays.asList(TextUtils.split(SystemProperties.get(KEY_ESIM_CID_IGNORE, ""), ","))
+ .contains(SystemProperties.get(KEY_CID, null));
+ final boolean enabledEsimUiByDefault =
+ SystemProperties.getBoolean(KEY_ENABLE_ESIM_UI_BY_DEFAULT, true);
+ final boolean euiccProvisioned =
+ Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0;
+ final boolean inDeveloperMode =
+ Settings.Global.getInt(cr, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0;
+
+ return (inDeveloperMode || euiccProvisioned
+ || (!esimIgnoredDevice && enabledEsimUiByDefault && inEsimSupportedCountries));
+ }
+
+ /**
+ * Set whether to enable data for {@code subId}, also whether to disable data for other
+ * subscription
+ */
+ public static void setMobileDataEnabled(Context context, int subId, boolean enabled,
+ boolean disableOtherSubscriptions) {
+ final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
+ .createForSubscriptionId(subId);
+ final SubscriptionManager subscriptionManager = context.getSystemService(
+ SubscriptionManager.class);
+ telephonyManager.setDataEnabled(enabled);
+
+ if (disableOtherSubscriptions) {
+ List<SubscriptionInfo> subInfoList =
+ subscriptionManager.getActiveSubscriptionInfoList();
+ if (subInfoList != null) {
+ for (SubscriptionInfo subInfo : subInfoList) {
+ if (subInfo.getSubscriptionId() != subId) {
+ context.getSystemService(TelephonyManager.class).createForSubscriptionId(
+ subInfo.getSubscriptionId()).setDataEnabled(false);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Return {@code true} if show CDMA category
+ */
+ public static boolean isCdmaOptions(Context context, int subId) {
+ if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ return false;
+ }
+ final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
+ .createForSubscriptionId(subId);
+ final PersistableBundle carrierConfig = context.getSystemService(
+ CarrierConfigManager.class).getConfigForSubId(subId);
+
+
+ if (telephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
+ return true;
+ } else if (carrierConfig != null
+ && !carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
+ && carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
+ return true;
+ }
+
+ if (isWorldMode(context, subId)) {
+ final int settingsNetworkMode = android.provider.Settings.Global.getInt(
+ context.getContentResolver(),
+ android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
+ Phone.PREFERRED_NT_MODE);
+ if (settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA
+ || settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO) {
+ return true;
+ }
+
+ if (settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
+ && !isTdscdmaSupported(context, telephonyManager)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * return {@code true} if we need show Gsm related settings
+ */
+ public static boolean isGsmOptions(Context context, int subId) {
+ if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ return false;
+ }
+ if (isGsmBasicOptions(context, subId)) {
+ return true;
+ }
+ final int settingsNetworkMode = android.provider.Settings.Global.getInt(
+ context.getContentResolver(),
+ android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
+ Phone.PREFERRED_NT_MODE);
+ if (isWorldMode(context, subId)) {
+ if (settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO
+ || settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA) {
+ return true;
+ } else if (settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA
+ && !MobileNetworkUtils.isTdscdmaSupported(context, subId)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ private static boolean isGsmBasicOptions(Context context, int subId) {
+ final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
+ .createForSubscriptionId(subId);
+ final PersistableBundle carrierConfig = context.getSystemService(
+ CarrierConfigManager.class).getConfigForSubId(subId);
+
+ if (telephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM) {
+ return true;
+ } else if (carrierConfig != null
+ && !carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
+ && carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Return {@code true} if it is world mode, and we may show advanced options in telephony
+ * settings
+ */
+ public static boolean isWorldMode(Context context, int subId) {
+ final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
+ .createForSubscriptionId(subId);
+ boolean worldModeOn = false;
+ final String configString = context.getString(R.string.config_world_mode);
+
+ if (!TextUtils.isEmpty(configString)) {
+ String[] configArray = configString.split(";");
+ // Check if we have World mode configuration set to True only or config is set to True
+ // and SIM GID value is also set and matches to the current SIM GID.
+ if (configArray != null &&
+ ((configArray.length == 1 && configArray[0].equalsIgnoreCase("true"))
+ || (configArray.length == 2 && !TextUtils.isEmpty(configArray[1])
+ && telephonyManager != null
+ && configArray[1].equalsIgnoreCase(
+ telephonyManager.getGroupIdLevel1())))) {
+ worldModeOn = true;
+ }
+ }
+
+ Log.d(TAG, "isWorldMode=" + worldModeOn);
+
+ return worldModeOn;
+ }
+
+ /**
+ * Return {@code true} if we need show settings for network selection(i.e. Verizon)
+ */
+ public static boolean shouldDisplayNetworkSelectOptions(Context context, int subId) {
+ final TelephonyManager telephonyManager = TelephonyManager.from(context)
+ .createForSubscriptionId(subId);
+ final PersistableBundle carrierConfig = context.getSystemService(
+ CarrierConfigManager.class).getConfigForSubId(subId);
+ if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID
+ || !carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL)
+ || (carrierConfig.getBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL)
+ && !telephonyManager.isManualNetworkSelectionAllowed())) {
+ return false;
+ }
+
+ if (isGsmBasicOptions(context, subId)) {
+ return true;
+ }
+
+ final int settingsNetworkMode = android.provider.Settings.Global.getInt(
+ context.getContentResolver(),
+ android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,
+ Phone.PREFERRED_NT_MODE);
+ if (isWorldMode(context, subId)) {
+ if (settingsNetworkMode == TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Return {@code true} if Tdscdma is supported in current subscription
+ */
+ public static boolean isTdscdmaSupported(Context context, int subId) {
+ return isTdscdmaSupported(context,
+ context.getSystemService(TelephonyManager.class).createForSubscriptionId(subId));
+ }
+
+ //TODO(b/117651939): move it to telephony
+ private static boolean isTdscdmaSupported(Context context, TelephonyManager telephonyManager) {
+ if (context.getResources().getBoolean(R.bool.config_support_tdscdma)) {
+ return true;
+ }
+
+ String operatorNumeric = telephonyManager.getServiceState().getOperatorNumeric();
+ String[] numericArray = context.getResources().getStringArray(
+ R.array.config_support_tdscdma_roaming_on_networks);
+ if (numericArray.length == 0 || operatorNumeric == null) {
+ return false;
+ }
+ for (String numeric : numericArray) {
+ if (operatorNumeric.equals(numeric)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
new file mode 100644
index 0000000..fd57bf5
--- /dev/null
+++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
@@ -0,0 +1,144 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.telephony.CellInfo;
+import android.telephony.CellSignalStrength;
+import android.telephony.SignalStrength;
+import android.util.Log;
+import android.view.Gravity;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settingslib.graph.SignalDrawable;
+
+import java.util.List;
+
+/**
+ * A Preference represents a network operator in the NetworkSelectSetting fragment.
+ */
+public class NetworkOperatorPreference extends Preference {
+
+ private static final String TAG = "NetworkOperatorPref";
+ private static final boolean DBG = false;
+
+ private static final int LEVEL_NONE = -1;
+
+ // number of signal strength level
+ public static final int NUMBER_OF_LEVELS = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
+ private CellInfo mCellInfo;
+ private List<String> mForbiddenPlmns;
+ private int mLevel = LEVEL_NONE;
+ private boolean mShow4GForLTE;
+
+ // The following constants are used to draw signal icon.
+ private static final Drawable EMPTY_DRAWABLE = new ColorDrawable(Color.TRANSPARENT);
+ private static final int NO_CELL_DATA_CONNECTED_ICON = 0;
+
+ public NetworkOperatorPreference(
+ CellInfo cellinfo, Context context, List<String> forbiddenPlmns, boolean show4GForLTE) {
+ super(context);
+ mCellInfo = cellinfo;
+ mForbiddenPlmns = forbiddenPlmns;
+ mShow4GForLTE = show4GForLTE;
+ refresh();
+ }
+
+ public CellInfo getCellInfo() {
+ return mCellInfo;
+ }
+
+ /**
+ * Refresh the NetworkOperatorPreference by updating the title and the icon.
+ */
+ public void refresh() {
+ if (DBG) Log.d(TAG, "refresh the network: " + CellInfoUtil.getNetworkTitle(mCellInfo));
+ String networkTitle = CellInfoUtil.getNetworkTitle(mCellInfo);
+ if (CellInfoUtil.isForbidden(mCellInfo, mForbiddenPlmns)) {
+ networkTitle += " " + getContext().getResources().getString(R.string.forbidden_network);
+ }
+ setTitle(networkTitle);
+
+ final CellSignalStrength signalStrength = mCellInfo.getCellSignalStrength();
+ final int level = signalStrength != null ? signalStrength.getLevel() : LEVEL_NONE;
+ if (DBG) Log.d(TAG, "refresh level: " + String.valueOf(level));
+ if (mLevel != level) {
+ mLevel = level;
+ updateIcon(mLevel);
+ }
+ }
+
+ /**
+ * Update the icon according to the input signal strength level.
+ */
+ public void setIcon(int level) {
+ updateIcon(level);
+ }
+
+ private int getIconIdForCell(CellInfo ci) {
+ final int type = ci.getCellIdentity().getType();
+ switch (type) {
+ case CellInfo.TYPE_GSM:
+ return R.drawable.signal_strength_g;
+ case CellInfo.TYPE_WCDMA: // fall through
+ case CellInfo.TYPE_TDSCDMA:
+ return R.drawable.signal_strength_3g;
+ case CellInfo.TYPE_LTE:
+ return mShow4GForLTE
+ ? R.drawable.ic_signal_strength_4g : R.drawable.signal_strength_lte;
+ case CellInfo.TYPE_CDMA:
+ return R.drawable.signal_strength_1x;
+ default:
+ return 0;
+ }
+ }
+
+ private void updateIcon(int level) {
+ if (level < 0 || level >= NUMBER_OF_LEVELS) return;
+ Context context = getContext();
+ SignalDrawable signalDrawable = new SignalDrawable(getContext());
+ signalDrawable.setLevel(
+ SignalDrawable.getState(level, NUMBER_OF_LEVELS, false /* cutOut */));
+
+ // Make the network type drawable
+ int iconType = getIconIdForCell(mCellInfo);
+ Drawable networkDrawable =
+ iconType == NO_CELL_DATA_CONNECTED_ICON
+ ? EMPTY_DRAWABLE
+ : getContext()
+ .getResources().getDrawable(iconType, getContext().getTheme());
+
+ // Overlay the two drawables
+ final Drawable[] layers = {networkDrawable, signalDrawable};
+ final int iconSize =
+ context.getResources().getDimensionPixelSize(R.dimen.signal_strength_icon_size);
+
+ LayerDrawable icons = new LayerDrawable(layers);
+ // Set the network type icon at the top left
+ icons.setLayerGravity(0 /* index of networkDrawable */, Gravity.TOP | Gravity.LEFT);
+ // Set the signal strength icon at the bottom right
+ icons.setLayerGravity(1 /* index of SignalDrawable */, Gravity.BOTTOM | Gravity.RIGHT);
+ icons.setLayerSize(1 /* index of SignalDrawable */, iconSize, iconSize);
+ setIcon(icons);
+ }
+}
diff --git a/src/com/android/settings/network/telephony/NetworkScanHelper.java b/src/com/android/settings/network/telephony/NetworkScanHelper.java
new file mode 100644
index 0000000..b34e592
--- /dev/null
+++ b/src/com/android/settings/network/telephony/NetworkScanHelper.java
@@ -0,0 +1,286 @@
+/*
+ * 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.network.telephony;
+
+import android.annotation.IntDef;
+import android.telephony.AccessNetworkConstants.AccessNetworkType;
+import android.telephony.CellInfo;
+import android.telephony.NetworkScan;
+import android.telephony.NetworkScanRequest;
+import android.telephony.RadioAccessSpecifier;
+import android.telephony.TelephonyManager;
+import android.telephony.TelephonyScanManager;
+import android.util.Log;
+
+import com.android.internal.telephony.CellNetworkScanResult;
+
+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.SettableFuture;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
+
+/**
+ * A helper class that builds the common interface and performs the network scan for two different
+ * network scan APIs.
+ */
+public class NetworkScanHelper {
+ public static final String TAG = "NetworkScanHelper";
+ private static final boolean DBG = true;
+
+ /**
+ * Callbacks interface to inform the network scan results.
+ */
+ public interface NetworkScanCallback {
+ /**
+ * Called when the results is returned from {@link TelephonyManager}. This method will be
+ * called at least one time if there is no error occurred during the network scan.
+ *
+ * <p> This method can be called multiple times in one network scan, until
+ * {@link #onComplete()} or {@link #onError(int)} is called.
+ *
+ * @param results
+ */
+ void onResults(List<CellInfo> results);
+
+ /**
+ * Called when the current network scan process is finished. No more
+ * {@link #onResults(List)} will be called for the current network scan after this method is
+ * called.
+ */
+ void onComplete();
+
+ /**
+ * Called when an error occurred during the network scan process.
+ *
+ * <p> There is no more result returned from {@link TelephonyManager} if an error occurred.
+ *
+ * <p> {@link #onComplete()} will not be called if an error occurred.
+ *
+ * @see {@link NetworkScan.ScanErrorCode}
+ */
+ void onError(int errorCode);
+ }
+
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS, NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS})
+ public @interface NetworkQueryType {}
+
+ /**
+ * Performs the network scan using {@link TelephonyManager#getAvailableNetworks()}. The network
+ * scan results won't be returned to the caller until the network scan is completed.
+ *
+ * <p> This is typically used when the modem doesn't support the new network scan api
+ * {@link TelephonyManager#requestNetworkScan(
+ * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}.
+ */
+ public static final int NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS = 1;
+
+ /**
+ * Performs the network scan using {@link TelephonyManager#requestNetworkScan(
+ * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)} The network scan
+ * results will be returned to the caller periodically in a small time window until the network
+ * scan is completed. The complete results should be returned in the last called of
+ * {@link NetworkScanCallback#onResults(List)}.
+ *
+ * <p> This is recommended to be used if modem supports the new network scan api
+ * {@link TelephonyManager#requestNetworkScan(
+ * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}
+ */
+ public static final int NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS = 2;
+
+ /** The constants below are used in the async network scan. */
+ private static final boolean INCREMENTAL_RESULTS = true;
+ private static final int SEARCH_PERIODICITY_SEC = 5;
+ private static final int MAX_SEARCH_TIME_SEC = 300;
+ private static final int INCREMENTAL_RESULTS_PERIODICITY_SEC = 3;
+
+ private static final NetworkScanRequest NETWORK_SCAN_REQUEST =
+ new NetworkScanRequest(
+ NetworkScanRequest.SCAN_TYPE_ONE_SHOT,
+ new RadioAccessSpecifier[]{
+ // GSM
+ new RadioAccessSpecifier(
+ AccessNetworkType.GERAN,
+ null /* bands */,
+ null /* channels */),
+ // LTE
+ new RadioAccessSpecifier(
+ AccessNetworkType.EUTRAN,
+ null /* bands */,
+ null /* channels */),
+ // WCDMA
+ new RadioAccessSpecifier(
+ AccessNetworkType.UTRAN,
+ null /* bands */,
+ null /* channels */)
+ },
+ SEARCH_PERIODICITY_SEC,
+ MAX_SEARCH_TIME_SEC,
+ INCREMENTAL_RESULTS,
+ INCREMENTAL_RESULTS_PERIODICITY_SEC,
+ null /* List of PLMN ids (MCC-MNC) */);
+
+ private final NetworkScanCallback mNetworkScanCallback;
+ private final TelephonyManager mTelephonyManager;
+ private final TelephonyScanManager.NetworkScanCallback mInternalNetworkScanCallback;
+ private final Executor mExecutor;
+
+ private NetworkScan mNetworkScanRequester;
+
+ /** Callbacks for sync network scan */
+ private ListenableFuture<List<CellInfo>> mNetworkScanFuture;
+
+ public NetworkScanHelper(TelephonyManager tm, NetworkScanCallback callback, Executor executor) {
+ mTelephonyManager = tm;
+ mNetworkScanCallback = callback;
+ mInternalNetworkScanCallback = new NetworkScanCallbackImpl();
+ mExecutor = executor;
+ }
+
+ /**
+ * Performs a network scan for the given type {@code type}.
+ * {@link #NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS} is recommended if modem supports
+ * {@link TelephonyManager#requestNetworkScan(
+ * NetworkScanRequest, Executor, TelephonyScanManager.NetworkScanCallback)}.
+ *
+ * @param type used to tell which network scan API should be used.
+ */
+ public void startNetworkScan(@NetworkQueryType int type) {
+ if (type == NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS) {
+ mNetworkScanFuture = SettableFuture.create();
+ Futures.addCallback(mNetworkScanFuture, new FutureCallback<List<CellInfo>>() {
+ @Override
+ public void onSuccess(List<CellInfo> result) {
+ onResults(result);
+ onComplete();
+ }
+
+ @Override
+ public void onFailure(Throwable t) {
+ int errCode = Integer.parseInt(t.getMessage());
+ onError(errCode);
+ }
+ });
+ mExecutor.execute(new NetworkScanSyncTask(
+ mTelephonyManager, (SettableFuture) mNetworkScanFuture));
+ } else if (type == NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS) {
+ if (DBG) Log.d(TAG, "start network scan async");
+ mNetworkScanRequester = mTelephonyManager.requestNetworkScan(
+ NETWORK_SCAN_REQUEST,
+ mExecutor,
+ mInternalNetworkScanCallback);
+ }
+ }
+
+ /**
+ * The network scan of type {@link #NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS} can't be stopped,
+ * however, the result of the current network scan won't be returned to the callback after
+ * calling this method.
+ */
+ public void stopNetworkQuery() {
+ if (mNetworkScanRequester != null) {
+ mNetworkScanRequester.stopScan();
+ mNetworkScanFuture = null;
+ }
+
+ if (mNetworkScanFuture != null) {
+ mNetworkScanFuture.cancel(true /* mayInterruptIfRunning */);
+ mNetworkScanFuture = null;
+ }
+ }
+
+ private void onResults(List<CellInfo> cellInfos) {
+ mNetworkScanCallback.onResults(cellInfos);
+ }
+
+ private void onComplete() {
+ mNetworkScanCallback.onComplete();
+ }
+
+ private void onError(int errCode) {
+ mNetworkScanCallback.onError(errCode);
+ }
+
+ /**
+ * Converts the status code of {@link CellNetworkScanResult} to one of the
+ * {@link NetworkScan.ScanErrorCode}.
+ * @param errCode status code from {@link CellNetworkScanResult}.
+ *
+ * @return one of the scan error code from {@link NetworkScan.ScanErrorCode}.
+ */
+ private static int convertToScanErrorCode(int errCode) {
+ switch (errCode) {
+ case CellNetworkScanResult.STATUS_RADIO_NOT_AVAILABLE:
+ return NetworkScan.ERROR_RADIO_INTERFACE_ERROR;
+ case CellNetworkScanResult.STATUS_RADIO_GENERIC_FAILURE:
+ default:
+ return NetworkScan.ERROR_MODEM_ERROR;
+ }
+ }
+
+ private final class NetworkScanCallbackImpl extends TelephonyScanManager.NetworkScanCallback {
+ public void onResults(List<CellInfo> results) {
+ if (DBG) Log.d(TAG, "async scan onResults() results = " + results);
+ NetworkScanHelper.this.onResults(results);
+ }
+
+ public void onComplete() {
+ if (DBG) Log.d(TAG, "async scan onComplete()");
+ NetworkScanHelper.this.onComplete();
+ }
+
+ public void onError(@NetworkScan.ScanErrorCode int errCode) {
+ if (DBG) Log.d(TAG, "async scan onError() errorCode = " + errCode);
+ NetworkScanHelper.this.onError(errCode);
+ }
+ }
+
+ private static final class NetworkScanSyncTask implements Runnable {
+ private final SettableFuture<List<CellInfo>> mCallback;
+ private final TelephonyManager mTelephonyManager;
+
+ NetworkScanSyncTask(
+ TelephonyManager telephonyManager, SettableFuture<List<CellInfo>> callback) {
+ mTelephonyManager = telephonyManager;
+ mCallback = callback;
+ }
+
+ @Override
+ public void run() {
+ if (DBG) Log.d(TAG, "sync scan start");
+ CellNetworkScanResult result = mTelephonyManager.getAvailableNetworks();
+ if (result.getStatus() == CellNetworkScanResult.STATUS_SUCCESS) {
+ List<CellInfo> cellInfos = result.getOperators()
+ .stream()
+ .map(operatorInfo
+ -> CellInfoUtil.convertOperatorInfoToCellInfo(operatorInfo))
+ .collect(Collectors.toList());
+ if (DBG) Log.d(TAG, "sync scan complete");
+ mCallback.set(cellInfos);
+ } else {
+ mCallback.setException(new Throwable(
+ Integer.toString(convertToScanErrorCode(result.getStatus()))));
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
new file mode 100644
index 0000000..9df9d1e
--- /dev/null
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -0,0 +1,417 @@
+/*
+ * 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.network.telephony;
+
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.MOBILE_NETWORK_SELECT;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.AccessNetworkConstants;
+import android.telephony.CarrierConfigManager;
+import android.telephony.CellIdentity;
+import android.telephony.CellInfo;
+import android.telephony.NetworkRegistrationState;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.view.View;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.internal.telephony.OperatorInfo;
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * "Choose network" settings UI for the Phone app.
+ */
+public class NetworkSelectSettings extends DashboardFragment {
+
+ private static final String TAG = "NetworkSelectSettings";
+
+ private static final int EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE = 1;
+ private static final int EVENT_NETWORK_SCAN_RESULTS = 2;
+ private static final int EVENT_NETWORK_SCAN_ERROR = 3;
+ private static final int EVENT_NETWORK_SCAN_COMPLETED = 4;
+
+ private static final String PREF_KEY_CONNECTED_NETWORK_OPERATOR =
+ "connected_network_operator_preference";
+ private static final String PREF_KEY_NETWORK_OPERATORS = "network_operators_preference";
+
+ @VisibleForTesting
+ PreferenceCategory mPreferenceCategory;
+ @VisibleForTesting
+ PreferenceCategory mConnectedPreferenceCategory;
+ @VisibleForTesting
+ NetworkOperatorPreference mSelectedPreference;
+ private View mProgressHeader;
+ private Preference mStatusMessagePreference;
+ @VisibleForTesting
+ List<CellInfo> mCellInfoList;
+ private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ @VisibleForTesting
+ TelephonyManager mTelephonyManager;
+ private List<String> mForbiddenPlmns;
+ private boolean mShow4GForLTE = false;
+ private NetworkScanHelper mNetworkScanHelper;
+ private final ExecutorService mNetworkScanExecutor = Executors.newFixedThreadPool(1);
+ private MetricsFeatureProvider mMetricsFeatureProvider;
+ private boolean mUseNewApi;
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+
+ mUseNewApi = getContext().getResources().getBoolean(
+ com.android.internal.R.bool.config_enableNewAutoSelectNetworkUI);
+ mSubId = getArguments().getInt(Settings.EXTRA_SUB_ID);
+
+ mConnectedPreferenceCategory =
+ (PreferenceCategory) findPreference(PREF_KEY_CONNECTED_NETWORK_OPERATOR);
+ mPreferenceCategory =
+ (PreferenceCategory) findPreference(PREF_KEY_NETWORK_OPERATORS);
+ mStatusMessagePreference = new Preference(getContext());
+ mSelectedPreference = null;
+ mTelephonyManager = TelephonyManager.from(getContext()).createForSubscriptionId(mSubId);
+ mNetworkScanHelper = new NetworkScanHelper(
+ mTelephonyManager, mCallback, mNetworkScanExecutor);
+ PersistableBundle bundle = ((CarrierConfigManager) getContext().getSystemService(
+ Context.CARRIER_CONFIG_SERVICE)).getConfigForSubId(mSubId);
+ if (bundle != null) {
+ mShow4GForLTE = bundle.getBoolean(
+ CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL);
+ }
+
+ mMetricsFeatureProvider = FeatureFactory
+ .getFactory(getContext()).getMetricsFeatureProvider();
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ final Activity activity = getActivity();
+ if (activity != null) {
+ mProgressHeader = setPinnedHeaderView(R.layout.wifi_progress_header)
+ .findViewById(R.id.progress_bar_animation);
+ setProgressBarVisible(false);
+ }
+ forceUpdateConnectedPreferenceCategory();
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ mForbiddenPlmns = Arrays.asList(mTelephonyManager.getForbiddenPlmns());
+ setProgressBarVisible(true);
+
+ mNetworkScanHelper.startNetworkScan(
+ mUseNewApi
+ ? NetworkScanHelper.NETWORK_SCAN_TYPE_INCREMENTAL_RESULTS
+ : NetworkScanHelper.NETWORK_SCAN_TYPE_WAIT_FOR_ALL_RESULTS);
+ }
+
+ @Override
+ public void onStop() {
+ super.onStop();
+ stopNetworkQuery();
+ }
+
+ @Override
+ public boolean onPreferenceTreeClick(Preference preference) {
+ if (preference != mSelectedPreference) {
+ stopNetworkQuery();
+ // Refresh the last selected item in case users reselect network.
+ if (mSelectedPreference != null) {
+ mSelectedPreference.setSummary(null);
+ }
+
+ mSelectedPreference = (NetworkOperatorPreference) preference;
+ CellInfo cellInfo = mSelectedPreference.getCellInfo();
+ mSelectedPreference.setSummary(R.string.network_connecting);
+
+ mMetricsFeatureProvider.action(getContext(),
+ MetricsEvent.ACTION_MOBILE_NETWORK_MANUAL_SELECT_NETWORK);
+
+ // Set summary as "Disconnected" to the previously connected network
+ if (mConnectedPreferenceCategory.getPreferenceCount() > 0) {
+ NetworkOperatorPreference connectedNetworkOperator = (NetworkOperatorPreference)
+ (mConnectedPreferenceCategory.getPreference(0));
+ if (!CellInfoUtil.getNetworkTitle(cellInfo).equals(
+ CellInfoUtil.getNetworkTitle(connectedNetworkOperator.getCellInfo()))) {
+ connectedNetworkOperator.setSummary(R.string.network_disconnected);
+ }
+ }
+
+ setProgressBarVisible(true);
+ // Disable the screen until network is manually set
+ getPreferenceScreen().setEnabled(false);
+
+ final OperatorInfo operatorInfo = CellInfoUtil.getOperatorInfoFromCellInfo(cellInfo);
+ ThreadUtils.postOnBackgroundThread(() -> {
+ Message msg = mHandler.obtainMessage(EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE);
+ msg.obj = mTelephonyManager.setNetworkSelectionModeManual(
+ operatorInfo, true /* persistSelection */);
+ msg.sendToTarget();
+ });
+ }
+
+ return true;
+ }
+
+ @Override
+ protected int getPreferenceScreenResId() {
+ return R.xml.choose_network;
+ }
+
+ @Override
+ protected String getLogTag() {
+ return TAG;
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MOBILE_NETWORK_SELECT;
+ }
+
+ private final Handler mHandler = new Handler() {
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE:
+ setProgressBarVisible(false);
+ getPreferenceScreen().setEnabled(true);
+
+ boolean isSucceed = (boolean) msg.obj;
+ mSelectedPreference.setSummary(isSucceed
+ ? R.string.network_connected
+ : R.string.network_could_not_connect);
+ break;
+ case EVENT_NETWORK_SCAN_RESULTS:
+ List<CellInfo> results = aggregateCellInfoList((List<CellInfo>) msg.obj);
+ mCellInfoList = new ArrayList<>(results);
+ if (mCellInfoList != null && mCellInfoList.size() != 0) {
+ updateAllPreferenceCategory();
+ } else {
+ addMessagePreference(R.string.empty_networks_list);
+ }
+
+ break;
+
+ case EVENT_NETWORK_SCAN_ERROR:
+ stopNetworkQuery();
+ addMessagePreference(R.string.network_query_error);
+ break;
+
+ case EVENT_NETWORK_SCAN_COMPLETED:
+ stopNetworkQuery();
+ if (mCellInfoList == null) {
+ // In case the scan timeout before getting any results
+ addMessagePreference(R.string.empty_networks_list);
+ }
+ break;
+ }
+ return;
+ }
+ };
+
+ private final NetworkScanHelper.NetworkScanCallback mCallback =
+ new NetworkScanHelper.NetworkScanCallback() {
+ public void onResults(List<CellInfo> results) {
+ Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_RESULTS, results);
+ msg.sendToTarget();
+ }
+
+ public void onComplete() {
+ Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_COMPLETED);
+ msg.sendToTarget();
+ }
+
+ public void onError(int error) {
+ Message msg = mHandler.obtainMessage(EVENT_NETWORK_SCAN_ERROR, error,
+ 0 /* arg2 */);
+ msg.sendToTarget();
+ }
+ };
+
+ /**
+ * Update the currently available network operators list, which only contains the unregistered
+ * network operators. So if the device has no data and the network operator in the connected
+ * network operator category shows "Disconnected", it will also exist in the available network
+ * operator category for user to select. On the other hand, if the device has data and the
+ * network operator in the connected network operator category shows "Connected", it will not
+ * exist in the available network category.
+ */
+ @VisibleForTesting
+ void updateAllPreferenceCategory() {
+ updateConnectedPreferenceCategory();
+
+ mPreferenceCategory.removeAll();
+ for (int index = 0; index < mCellInfoList.size(); index++) {
+ if (!mCellInfoList.get(index).isRegistered()) {
+ NetworkOperatorPreference pref = new NetworkOperatorPreference(
+ mCellInfoList.get(index), getPrefContext(), mForbiddenPlmns, mShow4GForLTE);
+ pref.setKey(CellInfoUtil.getNetworkTitle(mCellInfoList.get(index)));
+ pref.setOrder(index);
+ mPreferenceCategory.addPreference(pref);
+ }
+ }
+ }
+
+ /**
+ * Config the connected network operator preference when the page was created. When user get
+ * into this page, the device might or might not have data connection.
+ * - If the device has data:
+ * 1. use {@code ServiceState#getNetworkRegistrationStates()} to get the currently
+ * registered cellIdentity, wrap it into a CellInfo;
+ * 2. set the signal strength level as strong;
+ * 3. use {@link TelephonyManager#getNetworkOperatorName()} to get the title of the
+ * previously connected network operator, since the CellIdentity got from step 1 only has
+ * PLMN.
+ * - If the device has no data, we will remove the connected network operators list from the
+ * screen.
+ */
+ private void forceUpdateConnectedPreferenceCategory() {
+ if (mTelephonyManager.getDataState() == mTelephonyManager.DATA_CONNECTED) {
+ // Try to get the network registration states
+ ServiceState ss = mTelephonyManager.getServiceState();
+ List<NetworkRegistrationState> networkList =
+ ss.getNetworkRegistrationStates(AccessNetworkConstants.TransportType.WWAN);
+ if (networkList == null || networkList.size() == 0) {
+ // Remove the connected network operators category
+ mConnectedPreferenceCategory.setVisible(false);
+ return;
+ }
+ CellIdentity cellIdentity = networkList.get(0).getCellIdentity();
+ CellInfo cellInfo = CellInfoUtil.wrapCellInfoWithCellIdentity(cellIdentity);
+ if (cellInfo != null) {
+ NetworkOperatorPreference pref = new NetworkOperatorPreference(
+ cellInfo, getPrefContext(), mForbiddenPlmns, mShow4GForLTE);
+ pref.setTitle(mTelephonyManager.getNetworkOperatorName());
+ pref.setSummary(R.string.network_connected);
+ // Update the signal strength icon, since the default signalStrength value would be
+ // zero (it would be quite confusing why the connected network has no signal)
+ pref.setIcon(NetworkOperatorPreference.NUMBER_OF_LEVELS - 1);
+ mConnectedPreferenceCategory.addPreference(pref);
+ } else {
+ // Remove the connected network operators category
+ mConnectedPreferenceCategory.setVisible(false);
+ }
+ } else {
+ // Remove the connected network operators category
+ mConnectedPreferenceCategory.setVisible(false);
+ }
+ }
+
+ /**
+ * Configure the ConnectedNetworkOperatorsPreferenceCategory. The category only need to be
+ * configured if the category is currently empty or the operator network title of the previous
+ * connected network is different from the new one.
+ */
+ private void updateConnectedPreferenceCategory() {
+ CellInfo connectedNetworkOperator = null;
+ for (CellInfo cellInfo : mCellInfoList) {
+ if (cellInfo.isRegistered()) {
+ connectedNetworkOperator = cellInfo;
+ break;
+ }
+ }
+
+ if (connectedNetworkOperator != null) {
+ addConnectedNetworkOperatorPreference(connectedNetworkOperator);
+ }
+ }
+
+ private void addConnectedNetworkOperatorPreference(CellInfo cellInfo) {
+ mConnectedPreferenceCategory.removeAll();
+ final NetworkOperatorPreference pref = new NetworkOperatorPreference(
+ cellInfo, getPrefContext(), mForbiddenPlmns, mShow4GForLTE);
+ pref.setSummary(R.string.network_connected);
+ mConnectedPreferenceCategory.addPreference(pref);
+ mConnectedPreferenceCategory.setVisible(true);
+ }
+
+ protected void setProgressBarVisible(boolean visible) {
+ if (mProgressHeader != null) {
+ mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
+ }
+ }
+
+ private void addMessagePreference(int messageId) {
+ setProgressBarVisible(false);
+ mStatusMessagePreference.setTitle(messageId);
+ mConnectedPreferenceCategory.setVisible(false);
+ mPreferenceCategory.removeAll();
+ mPreferenceCategory.addPreference(mStatusMessagePreference);
+ }
+
+ /**
+ * The Scan results may contains several cell infos with different radio technologies and signal
+ * strength for one network operator. Aggregate the CellInfoList by retaining only the cell info
+ * with the strongest signal strength.
+ */
+ private List<CellInfo> aggregateCellInfoList(List<CellInfo> cellInfoList) {
+ Map<String, CellInfo> map = new HashMap<>();
+ for (CellInfo cellInfo : cellInfoList) {
+ String plmn = CellInfoUtil.getOperatorInfoFromCellInfo(cellInfo).getOperatorNumeric();
+ if (cellInfo.isRegistered() || !map.containsKey(plmn)) {
+ map.put(plmn, cellInfo);
+ } else {
+ if (map.get(plmn).isRegistered()
+ || map.get(plmn).getCellSignalStrength().getLevel()
+ > cellInfo.getCellSignalStrength().getLevel()) {
+ // Skip if the stored cellInfo is registered or has higher signal strength level
+ continue;
+ }
+ // Otherwise replace it with the new CellInfo
+ map.put(plmn, cellInfo);
+ }
+ }
+ return new ArrayList<>(map.values());
+ }
+
+ private void stopNetworkQuery() {
+ setProgressBarVisible(false);
+ if (mNetworkScanHelper != null) {
+ mNetworkScanHelper.stopNetworkQuery();
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ mNetworkScanExecutor.shutdown();
+ super.onDestroy();
+ }
+}
diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
new file mode 100644
index 0000000..f60f927
--- /dev/null
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -0,0 +1,183 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Preference controller for "Preferred network mode"
+ */
+public class PreferredNetworkModePreferenceController extends BasePreferenceController implements
+ ListPreference.OnPreferenceChangeListener {
+
+ private CarrierConfigManager mCarrierConfigManager;
+ private TelephonyManager mTelephonyManager;
+ private PersistableBundle mPersistableBundle;
+ private int mSubId;
+ private boolean mIsGlobalCdma;
+
+ public PreferredNetworkModePreferenceController(Context context, String key) {
+ super(context, key);
+ mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ boolean visible;
+ if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ visible = false;
+ } else if (mPersistableBundle == null) {
+ visible = false;
+ } else if (mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)) {
+ visible = false;
+ } else if (mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)
+ && !mTelephonyManager.getServiceState().getRoaming()
+ && mTelephonyManager.getServiceState().getDataRegState()
+ == ServiceState.STATE_IN_SERVICE) {
+ visible = false;
+ } else if (mPersistableBundle.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
+ visible = true;
+ } else {
+ visible = false;
+ }
+
+ return visible ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final ListPreference listPreference = (ListPreference) preference;
+ final int networkMode = getPreferredNetworkMode();
+ listPreference.setValue(Integer.toString(networkMode));
+ listPreference.setSummary(getPreferredNetworkModeSummaryResId(networkMode));
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object object) {
+ final int settingsMode = Integer.parseInt((String) object);
+
+ if (mTelephonyManager.setPreferredNetworkType(mSubId, settingsMode)) {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
+ settingsMode);
+ return true;
+ }
+
+ return false;
+ }
+
+ public void init(int subId) {
+ mSubId = subId;
+ mPersistableBundle = mCarrierConfigManager.getConfigForSubId(mSubId);
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+
+ final boolean isLteOnCdma =
+ mTelephonyManager.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE;
+ mIsGlobalCdma = isLteOnCdma
+ && mPersistableBundle.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL);
+ }
+
+ private int getPreferredNetworkMode() {
+ return Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
+ Phone.PREFERRED_NT_MODE);
+ }
+
+ private int getPreferredNetworkModeSummaryResId(int NetworkMode) {
+ //TODO(b/114749736): refactor it to "Preferred network mode: <Mode>", instead of building
+ // string for each type...
+ switch (NetworkMode) {
+ case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA:
+ return R.string.preferred_network_mode_tdscdma_gsm_wcdma_summary;
+ case TelephonyManager.NETWORK_MODE_TDSCDMA_GSM:
+ return R.string.preferred_network_mode_tdscdma_gsm_summary;
+ case TelephonyManager.NETWORK_MODE_WCDMA_PREF:
+ return R.string.preferred_network_mode_wcdma_perf_summary;
+ case TelephonyManager.NETWORK_MODE_GSM_ONLY:
+ return R.string.preferred_network_mode_gsm_only_summary;
+ case TelephonyManager.NETWORK_MODE_TDSCDMA_WCDMA:
+ return R.string.preferred_network_mode_tdscdma_wcdma_summary;
+ case TelephonyManager.NETWORK_MODE_WCDMA_ONLY:
+ return R.string.preferred_network_mode_wcdma_only_summary;
+ case TelephonyManager.NETWORK_MODE_GSM_UMTS:
+ return R.string.preferred_network_mode_gsm_wcdma_summary;
+ case TelephonyManager.NETWORK_MODE_CDMA_EVDO:
+ switch (mTelephonyManager.getLteOnCdmaMode()) {
+ case PhoneConstants.LTE_ON_CDMA_TRUE:
+ return R.string.preferred_network_mode_cdma_summary;
+ default:
+ return R.string.preferred_network_mode_cdma_evdo_summary;
+ }
+ case TelephonyManager.NETWORK_MODE_CDMA_NO_EVDO:
+ return R.string.preferred_network_mode_cdma_only_summary;
+ case TelephonyManager.NETWORK_MODE_EVDO_NO_CDMA:
+ return R.string.preferred_network_mode_evdo_only_summary;
+ case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA:
+ return R.string.preferred_network_mode_lte_tdscdma_summary;
+ case TelephonyManager.NETWORK_MODE_LTE_ONLY:
+ return R.string.preferred_network_mode_lte_summary;
+ case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM:
+ return R.string.preferred_network_mode_lte_tdscdma_gsm_summary;
+ case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA:
+ return R.string.preferred_network_mode_lte_tdscdma_gsm_wcdma_summary;
+ case TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA:
+ return R.string.preferred_network_mode_lte_gsm_wcdma_summary;
+ case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO:
+ return R.string.preferred_network_mode_lte_cdma_evdo_summary;
+ case TelephonyManager.NETWORK_MODE_TDSCDMA_ONLY:
+ return R.string.preferred_network_mode_tdscdma_summary;
+ case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+ return R.string.preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary;
+ case TelephonyManager.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+ if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA
+ || mIsGlobalCdma
+ || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
+ return R.string.preferred_network_mode_global_summary;
+ } else {
+ return R.string.preferred_network_mode_lte_summary;
+ }
+ case TelephonyManager.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+ return R.string.preferred_network_mode_tdscdma_cdma_evdo_gsm_wcdma_summary;
+ case TelephonyManager.NETWORK_MODE_GLOBAL:
+ return R.string.preferred_network_mode_cdma_evdo_gsm_wcdma_summary;
+ case TelephonyManager.NETWORK_MODE_LTE_TDSCDMA_WCDMA:
+ return R.string.preferred_network_mode_lte_tdscdma_wcdma_summary;
+ case TelephonyManager.NETWORK_MODE_LTE_WCDMA:
+ return R.string.preferred_network_mode_lte_wcdma_summary;
+ default:
+ return R.string.preferred_network_mode_global_summary;
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/RoamingDialogFragment.java b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
new file mode 100644
index 0000000..4c82686
--- /dev/null
+++ b/src/com/android/settings/network/telephony/RoamingDialogFragment.java
@@ -0,0 +1,93 @@
+/*
+ * 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.network.telephony;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.TelephonyManager;
+
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+/**
+ * A dialog fragment that asks the user if they are sure they want to turn on data roaming
+ * to avoid accidental charges.
+ */
+public class RoamingDialogFragment extends InstrumentedDialogFragment implements OnClickListener {
+
+ public static final String SUB_ID_KEY = "sub_id_key";
+
+ private CarrierConfigManager mCarrierConfigManager;
+ private int mSubId;
+
+ public static RoamingDialogFragment newInstance(int subId) {
+ final RoamingDialogFragment dialogFragment = new RoamingDialogFragment();
+ Bundle args = new Bundle();
+ args.putInt(SUB_ID_KEY, subId);
+ dialogFragment.setArguments(args);
+
+ return dialogFragment;
+ }
+
+ @Override
+ public void onAttach(Context context) {
+ super.onAttach(context);
+ Bundle args = getArguments();
+ mSubId = args.getInt(SUB_ID_KEY);
+ mCarrierConfigManager = new CarrierConfigManager(context);
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+ int title = R.string.roaming_alert_title;
+ PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
+ if (carrierConfig != null && carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL)) {
+ title = R.string.roaming_check_price_warning;
+ }
+ builder.setMessage(getResources().getString(R.string.roaming_warning))
+ .setTitle(title)
+ .setIconAttribute(android.R.attr.alertDialogIcon)
+ .setPositiveButton(android.R.string.yes, this)
+ .setNegativeButton(android.R.string.no, this);
+ return builder.create();
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ //TODO(b/114749736): add category for roaming dialog
+ return 0;
+ }
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ // let the host know that the positive button has been clicked
+ if (which == dialog.BUTTON_POSITIVE) {
+ TelephonyManager.from(getContext()).createForSubscriptionId(
+ mSubId).setDataRoamingEnabled(true);
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/RoamingPreferenceController.java b/src/com/android/settings/network/telephony/RoamingPreferenceController.java
new file mode 100644
index 0000000..688268c
--- /dev/null
+++ b/src/com/android/settings/network/telephony/RoamingPreferenceController.java
@@ -0,0 +1,183 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Preference controller for "Roaming"
+ */
+public class RoamingPreferenceController extends TogglePreferenceController implements
+ LifecycleObserver, OnStart, OnStop {
+
+ private static final String DIALOG_TAG = "MobileDataDialog";
+
+ private RestrictedSwitchPreference mSwitchPreference;
+ private TelephonyManager mTelephonyManager;
+ private CarrierConfigManager mCarrierConfigManager;
+ private int mSubId;
+ private DataContentObserver mDataContentObserver;
+ @VisibleForTesting
+ boolean mNeedDialog;
+ @VisibleForTesting
+ FragmentManager mFragmentManager;
+
+ public RoamingPreferenceController(Context context, String key) {
+ super(context, key);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
+ mDataContentObserver = new DataContentObserver(new Handler(Looper.getMainLooper()));
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public void onStart() {
+ mDataContentObserver.register(mContext, mSubId);
+ }
+
+ @Override
+ public void onStop() {
+ mDataContentObserver.unRegister(mContext);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mSwitchPreference = (RestrictedSwitchPreference) screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
+ ? AVAILABLE
+ : AVAILABLE_UNSEARCHABLE;
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+ if (mNeedDialog) {
+ showDialog();
+ }
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ mNeedDialog = isDialogNeeded();
+
+ if (!mNeedDialog) {
+ // Update data directly if we don't need dialog
+ mTelephonyManager.setDataRoamingEnabled(isChecked);
+ return true;
+ }
+
+ return false;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final RestrictedSwitchPreference switchPreference = (RestrictedSwitchPreference) preference;
+ switchPreference.setEnabled(mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ switchPreference.setChecked(isChecked());
+ }
+
+ @VisibleForTesting
+ boolean isDialogNeeded() {
+ final boolean isRoamingEnabled = mTelephonyManager.isDataRoamingEnabled();
+ final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(
+ mSubId);
+
+ // Need dialog if we need to turn on roaming and the roaming charge indication is allowed
+ if (!isRoamingEnabled && (carrierConfig == null || !carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL))) {
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return mTelephonyManager.isDataRoamingEnabled();
+ }
+
+ public void init(FragmentManager fragmentManager, int subId) {
+ mFragmentManager = fragmentManager;
+ mSubId = subId;
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+ }
+
+ private void showDialog() {
+ final RoamingDialogFragment dialogFragment = RoamingDialogFragment.newInstance(mSubId);
+
+ dialogFragment.show(mFragmentManager, DIALOG_TAG);
+ }
+
+ /**
+ * Listener that listens data roaming change
+ */
+ public class DataContentObserver extends ContentObserver {
+
+ public DataContentObserver(Handler handler) {
+ super(handler);
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ super.onChange(selfChange);
+ updateState(mSwitchPreference);
+ }
+
+ public void register(Context context, int subId) {
+ Uri uri = Settings.Global.getUriFor(Settings.Global.DATA_ROAMING);
+ if (TelephonyManager.getDefault().getSimCount() != 1) {
+ uri = Settings.Global.getUriFor(Settings.Global.DATA_ROAMING + subId);
+ }
+ context.getContentResolver().registerContentObserver(uri, false, this);
+
+ }
+
+ public void unRegister(Context context) {
+ context.getContentResolver().unregisterContentObserver(this);
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
new file mode 100644
index 0000000..1007ef8
--- /dev/null
+++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
@@ -0,0 +1,197 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneStateListener;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.ims.ImsManager;
+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;
+
+/**
+ * Preference controller for "Video Calling"
+ */
+public class VideoCallingPreferenceController extends TogglePreferenceController implements
+ LifecycleObserver, OnStart, OnStop,
+ Enhanced4gLtePreferenceController.On4gLteUpdateListener {
+
+ private Preference mPreference;
+ private TelephonyManager mTelephonyManager;
+ private CarrierConfigManager mCarrierConfigManager;
+ private PersistableBundle mCarrierConfig;
+ @VisibleForTesting
+ ImsManager mImsManager;
+ private PhoneCallStateListener mPhoneStateListener;
+ private DataContentObserver mDataContentObserver;
+ private int mSubId;
+
+ public VideoCallingPreferenceController(Context context, String key) {
+ super(context, key);
+ mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
+ mDataContentObserver = new DataContentObserver(new Handler(Looper.getMainLooper()));
+ mPhoneStateListener = new PhoneCallStateListener(Looper.getMainLooper());
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
+ && MobileNetworkUtils.isWifiCallingEnabled(mContext,
+ SubscriptionManager.getPhoneId(mSubId))
+ && isVideoCallEnabled()
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void onStart() {
+ mPhoneStateListener.register(mSubId);
+ mDataContentObserver.register(mContext, mSubId);
+ }
+
+ @Override
+ public void onStop() {
+ mPhoneStateListener.unregister();
+ mDataContentObserver.unRegister(mContext);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final SwitchPreference switchPreference = (SwitchPreference) preference;
+ final boolean videoCallEnabled = isVideoCallEnabled();
+ switchPreference.setVisible(videoCallEnabled);
+ if (videoCallEnabled) {
+ final boolean is4gLteEnabled = mImsManager.isEnhanced4gLteModeSettingEnabledByUser()
+ && mImsManager.isNonTtyOrTtyOnVolteEnabled();
+ preference.setEnabled(is4gLteEnabled &&
+ mTelephonyManager.getCallState(mSubId) == TelephonyManager.CALL_STATE_IDLE);
+ switchPreference.setChecked(is4gLteEnabled && mImsManager.isVtEnabledByUser());
+ }
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ mImsManager.setVtSetting(isChecked);
+ return true;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return mImsManager.isVtEnabledByUser();
+ }
+
+ public VideoCallingPreferenceController init(int subId) {
+ mSubId = subId;
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+ mCarrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);
+ if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+ mImsManager = ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(mSubId));
+ }
+
+ return this;
+ }
+
+ @VisibleForTesting
+ boolean isVideoCallEnabled() {
+ return mCarrierConfig != null && mImsManager != null
+ && mImsManager.isVtEnabledByPlatform()
+ && mImsManager.isVtProvisionedOnDevice()
+ && MobileNetworkUtils.isImsServiceStateReady(mImsManager)
+ && (mCarrierConfig.getBoolean(
+ CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS)
+ || mTelephonyManager.isDataEnabled());
+ }
+
+ @Override
+ public void on4gLteUpdated() {
+ updateState(mPreference);
+ }
+
+ private class PhoneCallStateListener extends PhoneStateListener {
+
+ public PhoneCallStateListener(Looper looper) {
+ super(looper);
+ }
+
+ @Override
+ public void onCallStateChanged(int state, String incomingNumber) {
+ updateState(mPreference);
+ }
+
+ public void register(int subId) {
+ mSubId = subId;
+ mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+ }
+
+ public void unregister() {
+ mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+ }
+ }
+
+ /**
+ * Listener that listens mobile data state change.
+ */
+ public class DataContentObserver extends ContentObserver {
+
+ public DataContentObserver(Handler handler) {
+ super(handler);
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ super.onChange(selfChange);
+ updateState(mPreference);
+ }
+
+ public void register(Context context, int subId) {
+ Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA);
+ if (TelephonyManager.getDefault().getSimCount() != 1) {
+ uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + subId);
+ }
+ context.getContentResolver().registerContentObserver(uri,
+ false /* notifyForDescendants */, this /* observer */);
+ }
+
+ public void unRegister(Context context) {
+ context.getContentResolver().unregisterContentObserver(this);
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
new file mode 100644
index 0000000..48fb710
--- /dev/null
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -0,0 +1,165 @@
+/*
+ * 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.network.telephony;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Looper;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.PhoneStateListener;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.ims.ImsConfig;
+import com.android.ims.ImsManager;
+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 java.util.List;
+
+/**
+ * Preference controller for "Wifi Calling"
+ */
+public class WifiCallingPreferenceController extends BasePreferenceController implements
+ LifecycleObserver, OnStart, OnStop {
+
+ @VisibleForTesting
+ static final String KEY_PREFERENCE_CATEGORY = "calling_category";
+
+ private TelephonyManager mTelephonyManager;
+ @VisibleForTesting
+ ImsManager mImsManager;
+ @VisibleForTesting
+ PhoneAccountHandle mSimCallManager;
+ private PhoneCallStateListener mPhoneStateListener;
+ private Preference mPreference;
+ private int mSubId;
+
+ public WifiCallingPreferenceController(Context context, String key) {
+ super(context, key);
+ mTelephonyManager = context.getSystemService(TelephonyManager.class);
+ mSimCallManager = context.getSystemService(TelecomManager.class).getSimCallManager();
+ mPhoneStateListener = new PhoneCallStateListener(Looper.getMainLooper());
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID
+ && MobileNetworkUtils.isWifiCallingEnabled(mContext,
+ SubscriptionManager.getPhoneId(mSubId))
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void onStart() {
+ mPhoneStateListener.register(mSubId);
+ }
+
+ @Override
+ public void onStop() {
+ mPhoneStateListener.unregister();
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ if (!isAvailable()) {
+ // Set category as invisible
+ final Preference preferenceCateogry = screen.findPreference(KEY_PREFERENCE_CATEGORY);
+ if (preferenceCateogry != null) {
+ preferenceCateogry.setVisible(false);
+ }
+ }
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ if (mSimCallManager != null) {
+ Intent intent = MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
+ mSimCallManager);
+ final PackageManager pm = mContext.getPackageManager();
+ List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
+ preference.setTitle(resolutions.get(0).loadLabel(pm));
+ preference.setSummary(null);
+ preference.setIntent(intent);
+ } else {
+ int resId = com.android.internal.R.string.wifi_calling_off_summary;
+ if (mImsManager.isWfcEnabledByUser()) {
+ final boolean isRoaming = mTelephonyManager.isNetworkRoaming();
+ int wfcMode = mImsManager.getWfcMode(isRoaming);
+
+ switch (wfcMode) {
+ case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY:
+ resId = com.android.internal.R.string.wfc_mode_wifi_only_summary;
+ break;
+ case ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED:
+ resId = com.android.internal.R.string
+ .wfc_mode_cellular_preferred_summary;
+ break;
+ case ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED:
+ resId = com.android.internal.R.string.wfc_mode_wifi_preferred_summary;
+ break;
+ default:
+ break;
+ }
+ }
+ preference.setSummary(resId);
+ }
+ preference.setEnabled(
+ mTelephonyManager.getCallState(mSubId) == TelephonyManager.CALL_STATE_IDLE);
+ }
+
+ public void init(int subId) {
+ mSubId = subId;
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+ mImsManager = ImsManager.getInstance(mContext, SubscriptionManager.getPhoneId(mSubId));
+ }
+
+ private class PhoneCallStateListener extends PhoneStateListener {
+
+ public PhoneCallStateListener(Looper looper) {
+ super(looper);
+ }
+
+ @Override
+ public void onCallStateChanged(int state, String incomingNumber) {
+ updateState(mPreference);
+ }
+
+ public void register(int subId) {
+ mSubId = subId;
+ mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+ }
+
+ public void unregister() {
+ mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java
new file mode 100644
index 0000000..a5498bc
--- /dev/null
+++ b/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java
@@ -0,0 +1,117 @@
+/*
+ * 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.network.telephony.cdma;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.telephony.MobileNetworkUtils;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Preference controller related to CDMA category
+ */
+public abstract class CdmaBasePreferenceController extends BasePreferenceController
+ implements LifecycleObserver, OnStart, OnStop {
+
+ protected Preference mPreference;
+ protected TelephonyManager mTelephonyManager;
+ protected PreferenceManager mPreferenceManager;
+ protected int mSubId;
+ private DataContentObserver mDataContentObserver;
+
+ public CdmaBasePreferenceController(Context context, String key) {
+ super(context, key);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ mDataContentObserver = new DataContentObserver(new Handler(Looper.getMainLooper()));
+ }
+
+ @Override
+ public void onStart() {
+ mDataContentObserver.register(mContext, mSubId);
+ }
+
+ @Override
+ public void onStop() {
+ mDataContentObserver.unRegister(mContext);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return MobileNetworkUtils.isCdmaOptions(mContext, mSubId)
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ public void init(PreferenceManager preferenceManager, int subId) {
+ mPreferenceManager = preferenceManager;
+ mSubId = subId;
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+ }
+
+ public void init(int subId) {
+ init(null, subId);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ if (mPreference instanceof CdmaListPreference) {
+ ((CdmaListPreference) mPreference).setSubId(mSubId);
+ }
+ }
+
+ /**
+ * Listener that listens to mobile data state change.
+ */
+ public class DataContentObserver extends ContentObserver {
+
+ public DataContentObserver(Handler handler) {
+ super(handler);
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ super.onChange(selfChange);
+ updateState(mPreference);
+ }
+
+ public void register(Context context, int subId) {
+ final Uri uri = Settings.Global.getUriFor(
+ Settings.Global.PREFERRED_NETWORK_MODE + subId);
+ context.getContentResolver().registerContentObserver(uri, false, this);
+ }
+
+ public void unRegister(Context context) {
+ context.getContentResolver().unregisterContentObserver(this);
+ }
+ }
+}
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaListPreference.java b/src/com/android/settings/network/telephony/cdma/CdmaListPreference.java
new file mode 100644
index 0000000..14c7169
--- /dev/null
+++ b/src/com/android/settings/network/telephony/cdma/CdmaListPreference.java
@@ -0,0 +1,46 @@
+/*
+ * 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.network.telephony.cdma;
+
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import android.util.AttributeSet;
+
+import androidx.preference.ListPreference;
+
+/**
+ * {@link ListPreference} that will launch ECM dialog when in ECM mode
+ */
+public class CdmaListPreference extends ListPreference {
+ private TelephonyManager mTelephonyManager;
+
+ public CdmaListPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ @Override
+ protected void onClick() {
+ // Only show dialog when it is not in ECM
+ if (mTelephonyManager == null || !mTelephonyManager.getEmergencyCallbackMode()) {
+ super.onClick();
+ }
+ }
+
+ public void setSubId(int subId) {
+ mTelephonyManager = TelephonyManager.from(getContext()).createForSubscriptionId(subId);
+ }
+}
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
new file mode 100644
index 0000000..41bf3ef
--- /dev/null
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
@@ -0,0 +1,102 @@
+/*
+ * 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.network.telephony.cdma;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+
+import com.android.internal.telephony.Phone;
+import com.android.settings.network.telephony.MobileNetworkUtils;
+
+/**
+ * Preference controller for "CDMA subscription"
+ */
+public class CdmaSubscriptionPreferenceController extends CdmaBasePreferenceController
+ implements ListPreference.OnPreferenceChangeListener {
+ private static final String TYPE_NV = "NV";
+ private static final String TYPE_RUIM = "RUIM";
+
+ @VisibleForTesting
+ ListPreference mPreference;
+
+ public CdmaSubscriptionPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return MobileNetworkUtils.isCdmaOptions(mContext, mSubId) && deviceSupportsNvAndRuim()
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final ListPreference listPreference = (ListPreference) preference;
+ listPreference.setVisible(getAvailabilityStatus() == AVAILABLE);
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.CDMA_SUBSCRIPTION_MODE, Phone.PREFERRED_CDMA_SUBSCRIPTION);
+ if (mode != Phone.CDMA_SUBSCRIPTION_UNKNOWN) {
+ listPreference.setValue(Integer.toString(mode));
+ }
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object object) {
+ final int newMode = Integer.parseInt((String) object);
+ //TODO(b/117611981): only set it in one place
+ if (mTelephonyManager.setCdmaSubscriptionMode(newMode)) {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.CDMA_SUBSCRIPTION_MODE, newMode);
+ return true;
+ }
+
+ return false;
+ }
+
+ @VisibleForTesting
+ boolean deviceSupportsNvAndRuim() {
+ // retrieve the list of subscription types supported by device.
+ final String subscriptionsSupported = SystemProperties.get("ril.subscription.types");
+ boolean nvSupported = false;
+ boolean ruimSupported = false;
+
+ if (!TextUtils.isEmpty(subscriptionsSupported)) {
+ // Searches through the comma-separated list for a match for "NV"
+ // and "RUIM" to update nvSupported and ruimSupported.
+ for (String subscriptionType : subscriptionsSupported.split(",")) {
+ subscriptionType = subscriptionType.trim();
+ if (subscriptionType.equalsIgnoreCase(TYPE_NV)) {
+ nvSupported = true;
+ } else if (subscriptionType.equalsIgnoreCase(TYPE_RUIM)) {
+ ruimSupported = true;
+ }
+ }
+ }
+
+ return (nvSupported && ruimSupported);
+ }
+}
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
new file mode 100644
index 0000000..5f259f8
--- /dev/null
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
@@ -0,0 +1,83 @@
+/*
+ * 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.network.telephony.cdma;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
+import com.android.internal.telephony.Phone;
+
+/**
+ * Preference controller for "System Select"
+ */
+public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceController
+ implements ListPreference.OnPreferenceChangeListener {
+
+ public CdmaSystemSelectPreferenceController(Context context, String key) {
+ super(context, key);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ final ListPreference listPreference = (ListPreference) preference;
+ listPreference.setVisible(getAvailabilityStatus() == AVAILABLE);
+ final int mode = mTelephonyManager.getCdmaRoamingMode();
+ if (mode != TelephonyManager.CDMA_ROAMING_MODE_RADIO_DEFAULT) {
+ if (mode == TelephonyManager.CDMA_ROAMING_MODE_HOME
+ || mode == TelephonyManager.CDMA_ROAMING_MODE_ANY) {
+ listPreference.setValue(Integer.toString(mode));
+ } else {
+ resetCdmaRoamingModeToDefault();
+ }
+ }
+ final int settingsNetworkMode = Settings.Global.getInt(
+ mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
+ Phone.PREFERRED_NT_MODE);
+ listPreference.setEnabled(
+ settingsNetworkMode != TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object object) {
+ int newMode = Integer.parseInt((String) object);
+ //TODO(b/117611981): only set it in one place
+ if (mTelephonyManager.setCdmaRoamingMode(newMode)) {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.CDMA_ROAMING_MODE, newMode);
+ return true;
+ }
+
+ return false;
+ }
+
+ private void resetCdmaRoamingModeToDefault() {
+ final ListPreference listPreference = (ListPreference) mPreference;
+ //set the mButtonCdmaRoam
+ listPreference.setValue(Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_ANY));
+ //set the Settings.System
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.CDMA_ROAMING_MODE,
+ TelephonyManager.CDMA_ROAMING_MODE_ANY);
+ //Set the Status
+ mTelephonyManager.setCdmaRoamingMode(TelephonyManager.CDMA_ROAMING_MODE_ANY);
+ }
+}
diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
new file mode 100644
index 0000000..6899054
--- /dev/null
+++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
@@ -0,0 +1,136 @@
+/*
+ * 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.network.telephony.gsm;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.Preference;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.network.telephony.MobileNetworkUtils;
+import com.android.settings.network.telephony.MobileNetworkActivity;
+import com.android.settings.network.telephony.NetworkSelectSettings;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Preference controller for "Auto Select Network"
+ */
+public class AutoSelectPreferenceController extends TogglePreferenceController {
+
+ private int mSubId;
+ private TelephonyManager mTelephonyManager;
+ private boolean mOnlyAutoSelectInHome;
+ private List<OnNetworkSelectModeListener> mListeners;
+
+ public AutoSelectPreferenceController(Context context, String key) {
+ super(context, key);
+ mTelephonyManager = context.getSystemService(TelephonyManager.class);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ mListeners = new ArrayList<>();
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext,mSubId)
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public boolean isChecked() {
+ return mTelephonyManager.getNetworkSelectionMode()
+ == TelephonyManager.NETWORK_SELECTION_MODE_AUTO;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+
+ preference.setSummary(null);
+ if (mTelephonyManager.getServiceState().getRoaming()) {
+ preference.setEnabled(true);
+ } else {
+ preference.setEnabled(!mOnlyAutoSelectInHome);
+ if (mOnlyAutoSelectInHome) {
+ preference.setSummary(mContext.getString(
+ R.string.manual_mode_disallowed_summary,
+ mTelephonyManager.getSimOperatorName()));
+ }
+ }
+ }
+
+ @Override
+ public boolean setChecked(boolean isChecked) {
+ if (isChecked) {
+ mTelephonyManager.setNetworkSelectionModeAutomatic();
+
+ for (OnNetworkSelectModeListener lsn : mListeners) {
+ lsn.onNetworkSelectModeChanged();
+ }
+ // Manually check whether it is successfully
+ return mTelephonyManager.getNetworkSelectionMode()
+ == TelephonyManager.NETWORK_SELECTION_MODE_AUTO;
+ } else {
+ final Bundle bundle = new Bundle();
+ bundle.putInt(Settings.EXTRA_SUB_ID, mSubId);
+ new SubSettingLauncher(mContext)
+ .setDestination(NetworkSelectSettings.class.getName())
+ .setSourceMetricsCategory(MetricsProto.MetricsEvent.MOBILE_NETWORK_SELECT)
+ .setTitleRes(R.string.choose_network_title)
+ .setArguments(bundle)
+ .launch();
+ return false;
+ }
+ }
+
+ public AutoSelectPreferenceController init(int subId) {
+ mSubId = subId;
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+ final PersistableBundle carrierConfig = mContext.getSystemService(
+ CarrierConfigManager.class).getConfigForSubId(mSubId);
+ mOnlyAutoSelectInHome = carrierConfig.getBoolean(
+ CarrierConfigManager.KEY_ONLY_AUTO_SELECT_IN_HOME_NETWORK_BOOL);
+
+ return this;
+ }
+
+ public AutoSelectPreferenceController addListener(OnNetworkSelectModeListener lsn) {
+ mListeners.add(lsn);
+
+ return this;
+ }
+
+ /**
+ * Callback when network select mode is changed
+ *
+ * @see TelephonyManager#getNetworkSelectionMode()
+ */
+ public interface OnNetworkSelectModeListener {
+ void onNetworkSelectModeChanged();
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
new file mode 100644
index 0000000..23de056
--- /dev/null
+++ b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
@@ -0,0 +1,111 @@
+/*
+ * 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.network.telephony.gsm;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.network.telephony.MobileNetworkUtils;
+import com.android.settings.network.telephony.MobileNetworkActivity;
+import com.android.settings.network.telephony.NetworkSelectSettings;
+
+/**
+ * Preference controller for "Open network select"
+ */
+public class OpenNetworkSelectPagePreferenceController extends BasePreferenceController implements
+ AutoSelectPreferenceController.OnNetworkSelectModeListener {
+
+ private int mSubId;
+ private TelephonyManager mTelephonyManager;
+ private Preference mPreference;
+
+ public OpenNetworkSelectPagePreferenceController(Context context, String key) {
+ super(context, key);
+ mTelephonyManager = context.getSystemService(TelephonyManager.class);
+ mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, mSubId)
+ ? AVAILABLE
+ : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = screen.findPreference(getPreferenceKey());
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ preference.setEnabled(mTelephonyManager.getNetworkSelectionMode()
+ != TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ final ServiceState ss = mTelephonyManager.getServiceState();
+ if (ss != null && ss.getState() == ServiceState.STATE_IN_SERVICE) {
+ return mTelephonyManager.getNetworkOperatorName();
+ } else {
+ return mContext.getString(R.string.network_disconnected);
+ }
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+ final Bundle bundle = new Bundle();
+ bundle.putInt(Settings.EXTRA_SUB_ID, mSubId);
+ new SubSettingLauncher(mContext)
+ .setDestination(NetworkSelectSettings.class.getName())
+ .setSourceMetricsCategory(MetricsProto.MetricsEvent.MOBILE_NETWORK_SELECT)
+ .setTitleRes(R.string.choose_network_title)
+ .setArguments(bundle)
+ .launch();
+ return true;
+ }
+
+ return false;
+ }
+
+ public OpenNetworkSelectPagePreferenceController init(int subId) {
+ mSubId = subId;
+ mTelephonyManager = TelephonyManager.from(mContext).createForSubscriptionId(mSubId);
+ return this;
+ }
+
+ @Override
+ public void onNetworkSelectModeChanged() {
+ updateState(mPreference);
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index efa6041..2b7f872 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -38,7 +38,7 @@
import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.HelpUtils;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
public class AndroidBeam extends InstrumentedFragment
implements SwitchBar.OnSwitchChangeListener {
@@ -68,10 +68,10 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
getActivity(), UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
final UserManager um = UserManager.get(getActivity());
- mBeamDisallowedByBase = RestrictedLockUtils.hasBaseUserRestriction(getActivity(),
+ mBeamDisallowedByBase = RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
if (!mBeamDisallowedByBase && admin != null) {
new ActionDisabledByAdminDialogHelper(getActivity())
diff --git a/src/com/android/settings/nfc/AndroidBeamEnabler.java b/src/com/android/settings/nfc/AndroidBeamEnabler.java
index 1808775..4dda2fd 100644
--- a/src/com/android/settings/nfc/AndroidBeamEnabler.java
+++ b/src/com/android/settings/nfc/AndroidBeamEnabler.java
@@ -22,7 +22,7 @@
import android.os.UserManager;
import com.android.settings.R;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
/**
@@ -36,7 +36,7 @@
public AndroidBeamEnabler(Context context, RestrictedPreference preference) {
super(context);
mPreference = preference;
- mBeamDisallowedBySystem = RestrictedLockUtils.hasBaseUserRestriction(context,
+ mBeamDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(context,
UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId());
if (!isNfcAvailable()) {
// NFC is not supported
diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
index f6b9412..181faa5 100644
--- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
+++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java
@@ -18,14 +18,14 @@
import android.content.Context;
import android.nfc.NfcAdapter;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.preference.PreferenceScreen;
-
public class AndroidBeamPreferenceController extends BasePreferenceController
implements LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/nfc/NfcForegroundPreferenceController.java b/src/com/android/settings/nfc/NfcForegroundPreferenceController.java
index cee24c2..7f8d084 100644
--- a/src/com/android/settings/nfc/NfcForegroundPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcForegroundPreferenceController.java
@@ -17,6 +17,10 @@
import android.content.pm.PackageManager;
import android.text.TextUtils;
+import androidx.preference.DropDownPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -25,10 +29,6 @@
import java.util.List;
-import androidx.preference.DropDownPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class NfcForegroundPreferenceController extends BasePreferenceController implements
PaymentBackend.Callback, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnStart, OnStop {
diff --git a/src/com/android/settings/nfc/NfcPaymentPreference.java b/src/com/android/settings/nfc/NfcPaymentPreference.java
index f5275ec..421148b 100644
--- a/src/com/android/settings/nfc/NfcPaymentPreference.java
+++ b/src/com/android/settings/nfc/NfcPaymentPreference.java
@@ -19,11 +19,11 @@
import android.content.DialogInterface;
import android.util.AttributeSet;
-import com.android.settingslib.CustomDialogPreferenceCompat;
-
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.CustomDialogPreferenceCompat;
+
public class NfcPaymentPreference extends CustomDialogPreferenceCompat {
private Listener mListener;
diff --git a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
index 8996cb1..a7dd2a6 100644
--- a/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPaymentPreferenceController.java
@@ -29,6 +29,11 @@
import android.widget.ImageView;
import android.widget.RadioButton;
+import androidx.appcompat.app.AlertDialog.Builder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
@@ -38,11 +43,6 @@
import java.util.List;
-import androidx.appcompat.app.AlertDialog.Builder;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-
public class NfcPaymentPreferenceController extends BasePreferenceController implements
PaymentBackend.Callback, View.OnClickListener, NfcPaymentPreference.Listener,
LifecycleObserver, OnStart, OnStop {
diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java
index d0ba58b..04f288d 100644
--- a/src/com/android/settings/nfc/NfcPreferenceController.java
+++ b/src/com/android/settings/nfc/NfcPreferenceController.java
@@ -20,15 +20,15 @@
import android.nfc.NfcAdapter;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
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;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
public class NfcPreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
index 530a226..5b4c245 100644
--- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
+++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
@@ -27,6 +27,9 @@
import android.service.notification.ConditionProviderService;
import android.service.notification.ZenModeConfig;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -37,9 +40,6 @@
import java.util.Map;
import java.util.Set;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-
abstract public class AbstractZenModeAutomaticRulePreferenceController extends
AbstractZenModePreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/AbstractZenModePreferenceController.java
index 791e28c..383934a 100644
--- a/src/com/android/settings/notification/AbstractZenModePreferenceController.java
+++ b/src/com/android/settings/notification/AbstractZenModePreferenceController.java
@@ -30,6 +30,10 @@
import android.service.notification.ScheduleCalendar;
import android.service.notification.ZenModeConfig;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -39,10 +43,6 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
abstract public class AbstractZenModePreferenceController extends
AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver,
OnResume, OnPause {
diff --git a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java
index 6af4d06..df2cd45 100644
--- a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java
+++ b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java
@@ -22,14 +22,14 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.accounts.AccountRestrictionHelper;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SliderPreferenceController;
import com.android.settingslib.RestrictedPreference;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
/**
* Base class for preference controller that handles preference that enforce adjust volume
* restriction
diff --git a/src/com/android/settings/notification/AllowSoundPreferenceController.java b/src/com/android/settings/notification/AllowSoundPreferenceController.java
index 0943a8a..cbabd2d 100644
--- a/src/com/android/settings/notification/AllowSoundPreferenceController.java
+++ b/src/com/android/settings/notification/AllowSoundPreferenceController.java
@@ -24,11 +24,11 @@
import android.content.Context;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedSwitchPreference;
-import androidx.preference.Preference;
-
public class AllowSoundPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/AppLinkPreferenceController.java b/src/com/android/settings/notification/AppLinkPreferenceController.java
index b510602..c696e8e 100644
--- a/src/com/android/settings/notification/AppLinkPreferenceController.java
+++ b/src/com/android/settings/notification/AppLinkPreferenceController.java
@@ -18,10 +18,10 @@
import android.content.Context;
-import com.android.settings.core.PreferenceControllerMixin;
-
import androidx.preference.Preference;
+import com.android.settings.core.PreferenceControllerMixin;
+
/**
* Controls link to reach more preference settings inside the app.
*/
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 9d8f6f6..c628da9 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -24,6 +24,12 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
@@ -36,12 +42,6 @@
import java.util.Comparator;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
/** These settings are per app, so should not be returned in global search results. */
public class AppNotificationSettings extends NotificationSettingsBase {
private static final String TAG = "AppNotificationSettings";
@@ -67,12 +67,18 @@
// if showing legacy settings, pull advanced settings out of the advanced category
Preference badge = findPreference(KEY_BADGE);
Preference appLink = findPreference(KEY_APP_LINK);
+ PreferenceGroup advanced = (PreferenceGroup) findPreference(KEY_ADVANCED_CATEGORY);
removePreference(KEY_ADVANCED_CATEGORY);
if (badge != null) {
+ if (advanced != null) {
+ advanced.removePreference(badge);
+ }
screen.addPreference(badge);
-
}
if (appLink != null) {
+ if (advanced != null) {
+ advanced.removePreference(appLink);
+ }
screen.addPreference(appLink);
}
}
diff --git a/src/com/android/settings/notification/BadgePreferenceController.java b/src/com/android/settings/notification/BadgePreferenceController.java
index 35a8f3f..ad417b0 100644
--- a/src/com/android/settings/notification/BadgePreferenceController.java
+++ b/src/com/android/settings/notification/BadgePreferenceController.java
@@ -21,11 +21,11 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedSwitchPreference;
-import androidx.preference.Preference;
-
public class BadgePreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
index fd24976..613204b 100644
--- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java
@@ -26,16 +26,16 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.PreferenceControllerMixin;
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;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class BadgingNotificationPreferenceController extends TogglePreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/BlockPreferenceController.java
index 096ec08..bee32f5 100644
--- a/src/com/android/settings/notification/BlockPreferenceController.java
+++ b/src/com/android/settings/notification/BlockPreferenceController.java
@@ -24,13 +24,13 @@
import android.content.Context;
import android.widget.Switch;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.SwitchBar;
-import androidx.preference.Preference;
-
public class BlockPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, SwitchBar.OnSwitchChangeListener {
@@ -65,6 +65,7 @@
public void updateState(Preference preference) {
LayoutPreference pref = (LayoutPreference) preference;
+ pref.setSelectable(false);
SwitchBar bar = pref.findViewById(R.id.switch_bar);
if (bar != null) {
bar.setSwitchBarText(R.string.notification_switch_label,
diff --git a/src/com/android/settings/notification/BootSoundPreferenceController.java b/src/com/android/settings/notification/BootSoundPreferenceController.java
index b3db7dd..a687163 100644
--- a/src/com/android/settings/notification/BootSoundPreferenceController.java
+++ b/src/com/android/settings/notification/BootSoundPreferenceController.java
@@ -19,14 +19,14 @@
import android.content.Context;
import android.os.SystemProperties;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public class BootSoundPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java
index 897a497..17710c4 100644
--- a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java
@@ -20,6 +20,8 @@
import android.content.Context;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -28,8 +30,6 @@
import java.util.Collections;
import java.util.List;
-import androidx.preference.Preference;
-
public class ChannelGroupNotificationSettings extends NotificationSettingsBase {
private static final String TAG = "ChannelGroupSettings";
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index 56508d9..3580967 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -23,6 +23,8 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
@@ -31,8 +33,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.PreferenceScreen;
-
public class ChannelNotificationSettings extends NotificationSettingsBase {
private static final String TAG = "ChannelSettings";
diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java
index 7120cf6..9da8ca1 100644
--- a/src/com/android/settings/notification/ConfigureNotificationSettings.java
+++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java
@@ -24,6 +24,10 @@
import android.os.UserHandle;
import android.provider.SearchIndexableResource;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.RingtonePreference;
@@ -40,10 +44,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-
@SearchIndexable
public class ConfigureNotificationSettings extends DashboardFragment implements
OnActivityResultListener {
@@ -218,9 +218,6 @@
public List<String> getNonIndexableKeys(Context context) {
final List<String> keys = super.getNonIndexableKeys(context);
keys.add(KEY_SWIPE_DOWN);
- keys.add(KEY_LOCKSCREEN);
- keys.add(KEY_LOCKSCREEN_WORK_PROFILE);
- keys.add(KEY_LOCKSCREEN_WORK_PROFILE_HEADER);
return keys;
}
};
diff --git a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java
index cbc6691..14e0c84 100644
--- a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java
+++ b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java
@@ -18,11 +18,11 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
-import androidx.preference.Preference;
-
public class DeletedChannelsPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/notification/DescriptionPreferenceController.java b/src/com/android/settings/notification/DescriptionPreferenceController.java
index bb59cae..1e99646 100644
--- a/src/com/android/settings/notification/DescriptionPreferenceController.java
+++ b/src/com/android/settings/notification/DescriptionPreferenceController.java
@@ -19,10 +19,10 @@
import android.content.Context;
import android.text.TextUtils;
-import com.android.settings.core.PreferenceControllerMixin;
-
import androidx.preference.Preference;
+import com.android.settings.core.PreferenceControllerMixin;
+
public class DescriptionPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/notification/DndPreferenceController.java b/src/com/android/settings/notification/DndPreferenceController.java
index 79efef5..a615221 100644
--- a/src/com/android/settings/notification/DndPreferenceController.java
+++ b/src/com/android/settings/notification/DndPreferenceController.java
@@ -19,11 +19,11 @@
import android.app.NotificationChannel;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedSwitchPreference;
-import androidx.preference.Preference;
-
public class DndPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
index 052bbeb..7add167 100644
--- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
+++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
@@ -21,14 +21,14 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.settings.accounts.AccountRestrictionHelper;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
/**
* Base class for preference controller that handles preference that enforce adjust volume
* restriction
diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java
index 6ddafc3..f0c860f 100644
--- a/src/com/android/settings/notification/HeaderPreferenceController.java
+++ b/src/com/android/settings/notification/HeaderPreferenceController.java
@@ -25,17 +25,17 @@
import android.text.TextUtils;
import android.view.View;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-
public class HeaderPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, LifecycleObserver {
diff --git a/src/com/android/settings/notification/ImportancePreferenceController.java b/src/com/android/settings/notification/ImportancePreferenceController.java
index e9606f4..4c20a46 100644
--- a/src/com/android/settings/notification/ImportancePreferenceController.java
+++ b/src/com/android/settings/notification/ImportancePreferenceController.java
@@ -27,12 +27,12 @@
import android.content.Context;
import android.media.RingtoneManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.core.PreferenceControllerMixin;
-import androidx.preference.Preference;
-
public class ImportancePreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/LightsPreferenceController.java b/src/com/android/settings/notification/LightsPreferenceController.java
index fa35bfd..04f2551 100644
--- a/src/com/android/settings/notification/LightsPreferenceController.java
+++ b/src/com/android/settings/notification/LightsPreferenceController.java
@@ -20,11 +20,11 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedSwitchPreference;
-import androidx.preference.Preference;
-
public class LightsPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
index a05e27b..1563bc4 100644
--- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java
@@ -31,6 +31,9 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.RestrictedListPreference;
@@ -38,6 +41,7 @@
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -45,9 +49,6 @@
import java.util.ArrayList;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class LockScreenNotificationPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {
@@ -246,7 +247,7 @@
private void setRestrictedIfNotificationFeaturesDisabled(CharSequence entry,
CharSequence entryValue, int keyguardNotificationFeatures) {
RestrictedLockUtils.EnforcedAdmin admin =
- RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+ RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
mContext, keyguardNotificationFeatures, UserHandle.myUserId());
if (admin != null && mLockscreen != null) {
RestrictedListPreference.RestrictedItem item =
@@ -255,7 +256,7 @@
}
if (mProfileUserId != UserHandle.USER_NULL) {
RestrictedLockUtils.EnforcedAdmin profileAdmin =
- RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+ RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
mContext, keyguardNotificationFeatures, mProfileUserId);
if (profileAdmin != null && mLockscreenProfile != null) {
RestrictedListPreference.RestrictedItem item =
diff --git a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
index 16d255b..54a0d5e 100644
--- a/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
+++ b/src/com/android/settings/notification/NotificationAccessConfirmationActivity.java
@@ -87,13 +87,13 @@
public void onResume() {
super.onResume();
getWindow().addFlags(
- WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+ WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
}
@Override
public void onPause() {
getWindow().clearFlags(
- WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+ WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
super.onPause();
}
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index 9bfbd2c..4d581bb 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -26,8 +26,12 @@
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.service.notification.NotificationListenerService;
-
import android.widget.Toast;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -40,10 +44,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
/**
* Settings screen for managing notification listener permissions
*/
diff --git a/src/com/android/settings/notification/NotificationAppPreference.java b/src/com/android/settings/notification/NotificationAppPreference.java
index 9cc9345..dfa3e368 100644
--- a/src/com/android/settings/notification/NotificationAppPreference.java
+++ b/src/com/android/settings/notification/NotificationAppPreference.java
@@ -20,12 +20,12 @@
import android.view.View;
import android.widget.Switch;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settingslib.RestrictedLockUtils;
-import androidx.preference.PreferenceViewHolder;
-
/**
* Shows an app icon, title and summary. Has a second switch touch target.
*/
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 83e427b..03b4ec3 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -38,6 +38,8 @@
import android.util.IconDrawableFactory;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settingslib.R;
import com.android.settingslib.Utils;
import com.android.settingslib.utils.StringUtil;
@@ -47,8 +49,6 @@
import java.util.List;
import java.util.Map;
-import androidx.annotation.VisibleForTesting;
-
public class NotificationBackend {
private static final String TAG = "NotificationBackend";
@@ -78,6 +78,12 @@
return row;
}
+ public boolean isBlockable(Context context, ApplicationInfo info) {
+ final boolean blocked = getNotificationsBanned(info.packageName, info.uid);
+ final boolean systemApp = isSystemApp(context, info);
+ return !systemApp || (systemApp && blocked);
+ }
+
public AppRow loadAppRow(Context context, PackageManager pm, PackageInfo app) {
final AppRow row = loadAppRow(context, pm, app.applicationInfo);
recordCanBeBlocked(context, pm, app, row);
diff --git a/src/com/android/settings/notification/NotificationFooterPreference.java b/src/com/android/settings/notification/NotificationFooterPreference.java
index d3d29a3..abaffc8 100644
--- a/src/com/android/settings/notification/NotificationFooterPreference.java
+++ b/src/com/android/settings/notification/NotificationFooterPreference.java
@@ -21,12 +21,12 @@
import android.util.AttributeSet;
import android.widget.TextView;
-import com.android.settingslib.R;
-
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.R;
+
/**
* FooterPreference that can have any key or ordering.
*/
diff --git a/src/com/android/settings/notification/NotificationLockscreenPreference.java b/src/com/android/settings/notification/NotificationLockscreenPreference.java
index 3370f3e..8c04e16 100644
--- a/src/com/android/settings/notification/NotificationLockscreenPreference.java
+++ b/src/com/android/settings/notification/NotificationLockscreenPreference.java
@@ -30,14 +30,14 @@
import android.widget.ListAdapter;
import android.widget.ListView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog.Builder;
+
import com.android.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AlertDialog.Builder;
-
public class NotificationLockscreenPreference extends RestrictedListPreference {
private boolean mAllowRemoteInput;
diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java
index 90dd852..22f07be 100644
--- a/src/com/android/settings/notification/NotificationPreferenceController.java
+++ b/src/com/android/settings/notification/NotificationPreferenceController.java
@@ -27,14 +27,13 @@
import android.os.UserManager;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Objects;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
/**
* Parent class for preferences appearing on notification setting pages at the app,
* notification channel group, or notification channel level.
@@ -83,24 +82,6 @@
return true;
}
- // finds the preference recursively and removes it from its parent
- private void findAndRemovePreference(PreferenceGroup prefGroup, String key) {
- final int preferenceCount = prefGroup.getPreferenceCount();
- for (int i = preferenceCount - 1; i >= 0; i--) {
- final Preference preference = prefGroup.getPreference(i);
- final String curKey = preference.getKey();
-
- if (curKey != null && curKey.equals(key)) {
- mPreference = preference;
- prefGroup.removePreference(preference);
- }
-
- if (preference instanceof PreferenceGroup) {
- findAndRemovePreference((PreferenceGroup) preference, key);
- }
- }
- }
-
protected void onResume(NotificationBackend.AppRow appRow,
@Nullable NotificationChannel channel, @Nullable NotificationChannelGroup group,
RestrictedLockUtils.EnforcedAdmin admin) {
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index 44f77cf..ed0b123 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -18,6 +18,7 @@
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
+
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.Notification;
@@ -40,22 +41,22 @@
import android.util.Log;
import android.widget.Toast;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.AppInfoBase;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.widget.MasterCheckBoxPreference;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
abstract public class NotificationSettingsBase extends DashboardFragment {
private static final String TAG = "NotifiSettingsBase";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -111,19 +112,22 @@
mPkgInfo = findPackageInfo(mPkg, mUid);
- mUserId = UserHandle.getUserId(mUid);
- mSuspendedAppsAdmin = RestrictedLockUtils.checkIfApplicationIsSuspended(
- mContext, mPkg, mUserId);
+ if (mPkgInfo != null) {
+ mUserId = UserHandle.getUserId(mUid);
+ mSuspendedAppsAdmin = RestrictedLockUtilsInternal.checkIfApplicationIsSuspended(
+ mContext, mPkg, mUserId);
- loadChannel();
- loadAppRow();
- loadChannelGroup();
- collectConfigActivities();
- getSettingsLifecycle().addObserver(use(HeaderPreferenceController.class));
+ loadChannel();
+ loadAppRow();
+ loadChannelGroup();
+ collectConfigActivities();
- for (NotificationPreferenceController controller : mControllers) {
- controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);
+ getSettingsLifecycle().addObserver(use(HeaderPreferenceController.class));
+
+ for (NotificationPreferenceController controller : mControllers) {
+ controller.onResume(mAppRow, mChannel, mChannelGroup, mSuspendedAppsAdmin);
+ }
}
}
diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java
index 4288373..d3ebc08 100644
--- a/src/com/android/settings/notification/NotificationStation.java
+++ b/src/com/android/settings/notification/NotificationStation.java
@@ -49,6 +49,10 @@
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -59,10 +63,6 @@
import java.util.Comparator;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-import androidx.recyclerview.widget.RecyclerView;
-
public class NotificationStation extends SettingsPreferenceFragment {
private static final String TAG = NotificationStation.class.getSimpleName();
diff --git a/src/com/android/settings/notification/NotificationSwitchBarPreference.java b/src/com/android/settings/notification/NotificationSwitchBarPreference.java
index d9c339b..ff42987 100644
--- a/src/com/android/settings/notification/NotificationSwitchBarPreference.java
+++ b/src/com/android/settings/notification/NotificationSwitchBarPreference.java
@@ -20,12 +20,12 @@
import android.util.AttributeSet;
import android.view.View;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.applications.LayoutPreference;
import com.android.settings.widget.ToggleSwitch;
import com.android.settingslib.RestrictedLockUtils;
-import androidx.preference.PreferenceViewHolder;
-
public class NotificationSwitchBarPreference extends LayoutPreference {
private ToggleSwitch mSwitch;
private boolean mChecked;
diff --git a/src/com/android/settings/notification/NotificationsOffPreferenceController.java b/src/com/android/settings/notification/NotificationsOffPreferenceController.java
index 99f6063..8762f91 100644
--- a/src/com/android/settings/notification/NotificationsOffPreferenceController.java
+++ b/src/com/android/settings/notification/NotificationsOffPreferenceController.java
@@ -18,11 +18,11 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
-import androidx.preference.Preference;
-
public class NotificationsOffPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
index bcf7b17..7885520 100644
--- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java
@@ -25,14 +25,14 @@
import android.os.Handler;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
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;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class PulseNotificationPreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
index c7a3201..bbc01f5 100644
--- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
@@ -29,6 +29,12 @@
import android.util.IconDrawableFactory;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.AppInfoBase;
@@ -47,12 +53,6 @@
import java.util.Map;
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
/**
* This controller displays a list of recently used apps and a "See all" button. If there is
* no recently used app, "See all" will be displayed as "Notifications".
@@ -82,17 +82,6 @@
private Preference mSeeAllPref;
private Preference mDivider;
- static {
- SKIP_SYSTEM_PACKAGES.addAll(Arrays.asList(
- "android",
- "com.android.phone",
- "com.android.settings",
- "com.android.systemui",
- "com.android.providers.calendar",
- "com.android.providers.media"
- ));
- }
-
public RecentNotifyingAppsPreferenceController(Context context, NotificationBackend backend,
Application app, Fragment host) {
this(context, backend, app == null ? null : ApplicationsState.getInstance(app), host);
@@ -226,6 +215,7 @@
.setSourceMetricsCategory(
MetricsProto.MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS)
.toIntent());
+ pref.setEnabled(mNotificationBackend.isBlockable(mContext, appEntry.info));
pref.setOnPreferenceChangeListener((preference, newValue) -> {
boolean blocked = !(Boolean) newValue;
mNotificationBackend.setNotificationsEnabledForPackage(
@@ -272,10 +262,6 @@
* Whether or not the app should be included in recent list.
*/
private boolean shouldIncludePkgInRecents(String pkgName) {
- if (SKIP_SYSTEM_PACKAGES.contains(pkgName)) {
- Log.d(TAG, "System package, skipping " + pkgName);
- return false;
- }
final Intent launchIntent = new Intent().addCategory(Intent.CATEGORY_LAUNCHER)
.setPackage(pkgName);
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index b602543..32dc52d 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -20,6 +20,7 @@
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS;
import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;
+
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.content.Context;
@@ -46,6 +47,7 @@
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
public class RedactionInterstitial extends SettingsActivity {
@@ -159,7 +161,7 @@
private void checkNotificationFeaturesAndSetDisabled(RestrictedRadioButton button,
int keyguardNotifications) {
- EnforcedAdmin admin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+ EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
getActivity(), keyguardNotifications, mUserId);
button.setDisabledByAdmin(admin);
}
diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java
index e2668a3..75ad4a7 100644
--- a/src/com/android/settings/notification/RingVolumePreferenceController.java
+++ b/src/com/android/settings/notification/RingVolumePreferenceController.java
@@ -29,14 +29,14 @@
import android.os.Vibrator;
import android.text.TextUtils;
+import androidx.lifecycle.OnLifecycleEvent;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.Objects;
-import androidx.lifecycle.OnLifecycleEvent;
-
public class RingVolumePreferenceController extends VolumeSeekBarPreferenceController {
private static final String TAG = "RingVolumeController";
diff --git a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
index e7fffd1..7b37855 100644
--- a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
+++ b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java
@@ -21,10 +21,11 @@
import android.media.RingtoneManager;
import android.net.Uri;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
-
-import androidx.preference.Preference;
+import com.android.settingslib.utils.ThreadUtils;
public abstract class RingtonePreferenceControllerBase extends AbstractPreferenceController
implements PreferenceControllerMixin {
@@ -45,11 +46,17 @@
@Override
public void updateState(Preference preference) {
+ ThreadUtils.postOnBackgroundThread(() -> updateSummary(preference));
+ }
+
+ private void updateSummary(Preference preference) {
Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(mContext, getRingtoneType());
final CharSequence summary = Ringtone.getTitle(
mContext, ringtoneUri, false /* followSettingsUri */, true /* allowRemote */);
if (summary != null) {
- preference.setSummary(summary);
+ ThreadUtils.postOnMainThread(() -> {
+ preference.setSummary(summary);
+ });
}
}
diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java
index f7152fa..9a37455 100644
--- a/src/com/android/settings/notification/SettingPref.java
+++ b/src/com/android/settings/notification/SettingPref.java
@@ -24,13 +24,13 @@
import android.provider.Settings.Secure;
import android.provider.Settings.System;
-import com.android.settings.SettingsPreferenceFragment;
-
import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.TwoStatePreference;
+import com.android.settings.SettingsPreferenceFragment;
+
/** Helper to manage a two-state or dropdown preference bound to a global or system setting. */
public class SettingPref {
public static final int TYPE_GLOBAL = 1;
diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java
index 71f02f1..8d48d53 100644
--- a/src/com/android/settings/notification/SettingPrefController.java
+++ b/src/com/android/settings/notification/SettingPrefController.java
@@ -22,6 +22,10 @@
import android.net.Uri;
import android.os.Handler;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -30,10 +34,6 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public abstract class SettingPrefController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/notification/SoundPreferenceController.java b/src/com/android/settings/notification/SoundPreferenceController.java
index 2a21bcb..d0b098c 100644
--- a/src/com/android/settings/notification/SoundPreferenceController.java
+++ b/src/com/android/settings/notification/SoundPreferenceController.java
@@ -23,12 +23,12 @@
import android.net.Uri;
import android.preference.PreferenceManager;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.PreferenceControllerMixin;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.PreferenceControllerMixin;
+
public class SoundPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
PreferenceManager.OnActivityResultListener {
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index cc3b7c9..99fd3d5 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -27,6 +27,10 @@
import android.provider.SearchIndexableResource;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -47,10 +51,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
@SearchIndexable
public class SoundSettings extends DashboardFragment implements OnActivityResultListener {
private static final String TAG = "SoundSettings";
diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
index 2bd2c27..ae111b2 100644
--- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
+++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java
@@ -26,15 +26,15 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.Utils;
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;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class VibrateWhenRingPreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/notification/VibrationPreferenceController.java b/src/com/android/settings/notification/VibrationPreferenceController.java
index 75a19a9..ec5554a 100644
--- a/src/com/android/settings/notification/VibrationPreferenceController.java
+++ b/src/com/android/settings/notification/VibrationPreferenceController.java
@@ -20,11 +20,11 @@
import android.content.Context;
import android.os.Vibrator;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedSwitchPreference;
-import androidx.preference.Preference;
-
public class VibrationPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/VisibilityPreferenceController.java
index 02bdee6..fe036e9 100644
--- a/src/com/android/settings/notification/VisibilityPreferenceController.java
+++ b/src/com/android/settings/notification/VisibilityPreferenceController.java
@@ -26,16 +26,17 @@
import android.provider.Settings;
import android.service.notification.NotificationListenerService;
+import androidx.preference.Preference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.RestrictedListPreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.ArrayList;
-import androidx.preference.Preference;
-
public class VisibilityPreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
@@ -128,7 +129,7 @@
private void setRestrictedIfNotificationFeaturesDisabled(RestrictedListPreference pref,
CharSequence entry, CharSequence entryValue, int keyguardNotificationFeatures) {
RestrictedLockUtils.EnforcedAdmin admin =
- RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(
+ RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
mContext, keyguardNotificationFeatures, mAppRow.userId);
if (admin != null) {
RestrictedListPreference.RestrictedItem item =
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 6c84fba..2ef33d4 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -28,14 +28,14 @@
import android.widget.SeekBar;
import android.widget.TextView;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.widget.SeekBarPreference;
import java.util.Objects;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceViewHolder;
-
/** A slider preference that directly controls an audio stream volume (no dialog) **/
public class VolumeSeekBarPreference extends SeekBarPreference {
private static final String TAG = "VolumeSeekBarPreference";
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
index 7df1dcf..32f2aa6 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
@@ -18,14 +18,14 @@
import android.content.Context;
-import com.android.settings.notification.VolumeSeekBarPreference.Callback;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
+import com.android.settings.notification.VolumeSeekBarPreference.Callback;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
/**
* Base class for preference controller that handles VolumeSeekBarPreference
*/
diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java
index 26cd8aa..b640d5a 100644
--- a/src/com/android/settings/notification/WorkSoundPreferenceController.java
+++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java
@@ -31,6 +31,15 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.DefaultRingtonePreference;
import com.android.settings.R;
@@ -45,15 +54,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
public class WorkSoundPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, OnPreferenceChangeListener, LifecycleObserver,
OnResume, OnPause {
diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java
index 2e4bb4e..70c7150 100644
--- a/src/com/android/settings/notification/ZenAccessSettings.java
+++ b/src/com/android/settings/notification/ZenAccessSettings.java
@@ -42,6 +42,13 @@
import android.util.Log;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -56,13 +63,6 @@
import java.util.Collections;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@SearchIndexable
public class ZenAccessSettings extends EmptyTextSettings {
private final String TAG = "ZenAccessSettings";
diff --git a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java
index 6468f1d..41eb111 100644
--- a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java
+++ b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java
@@ -24,6 +24,7 @@
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.service.notification.ZenModeConfig;
+import android.text.TextUtils;
import android.util.Slog;
import android.view.View;
@@ -128,9 +129,13 @@
@Override
public void onOk(String ruleName, Fragment parent) {
+ if (TextUtils.equals(ruleName, mRule.getName())) {
+ return;
+ }
mMetricsFeatureProvider.action(mContext,
MetricsProto.MetricsEvent.ACTION_ZEN_MODE_RULE_NAME_CHANGE_OK);
mRule.setName(ruleName);
+ mRule.setModified(true);
mBackend.setZenRule(mId, mRule);
}
}
diff --git a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java
index c980d90..d411402 100644
--- a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java
+++ b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java
@@ -20,15 +20,15 @@
import android.content.Context;
import android.widget.Switch;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class ZenAutomaticRuleSwitchPreferenceController extends
AbstractZenModeAutomaticRulePreferenceController implements
SwitchBar.OnSwitchChangeListener {
diff --git a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java
index ad66265..000a756 100644
--- a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java
+++ b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java
@@ -21,11 +21,11 @@
import android.view.View;
import android.widget.RadioButton;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settingslib.TwoTargetPreference;
-import androidx.preference.PreferenceViewHolder;
-
/**
* A radio button preference with a divider and a settings icon that links to another screen.
*/
diff --git a/src/com/android/settings/notification/ZenDeleteRuleDialog.java b/src/com/android/settings/notification/ZenDeleteRuleDialog.java
index c460d84..804196e 100644
--- a/src/com/android/settings/notification/ZenDeleteRuleDialog.java
+++ b/src/com/android/settings/notification/ZenDeleteRuleDialog.java
@@ -19,6 +19,7 @@
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
+import android.text.BidiFormatter;
import android.view.View;
import com.android.internal.logging.nano.MetricsProto;
@@ -43,8 +44,9 @@
public static void show(Fragment parent, String ruleName, String id, PositiveClickListener
listener) {
+ final BidiFormatter bidi = BidiFormatter.getInstance();
final Bundle args = new Bundle();
- args.putString(EXTRA_ZEN_RULE_NAME, ruleName);
+ args.putString(EXTRA_ZEN_RULE_NAME, bidi.unicodeWrap(ruleName));
args.putString(EXTRA_ZEN_RULE_ID, id);
mPositiveClickListener = listener;
diff --git a/src/com/android/settings/notification/ZenDurationDialogPreference.java b/src/com/android/settings/notification/ZenDurationDialogPreference.java
index a161d6e..6d6d085 100644
--- a/src/com/android/settings/notification/ZenDurationDialogPreference.java
+++ b/src/com/android/settings/notification/ZenDurationDialogPreference.java
@@ -20,11 +20,11 @@
import android.content.DialogInterface;
import android.util.AttributeSet;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settingslib.CustomDialogPreferenceCompat;
import com.android.settingslib.notification.ZenDurationDialog;
-import androidx.appcompat.app.AlertDialog;
-
public class ZenDurationDialogPreference extends CustomDialogPreferenceCompat {
public ZenDurationDialogPreference(Context context, AttributeSet attrs, int defStyleAttr,
diff --git a/src/com/android/settings/notification/ZenFooterPreferenceController.java b/src/com/android/settings/notification/ZenFooterPreferenceController.java
index be66f26..15a2252 100644
--- a/src/com/android/settings/notification/ZenFooterPreferenceController.java
+++ b/src/com/android/settings/notification/ZenFooterPreferenceController.java
@@ -19,12 +19,12 @@
import android.app.NotificationManager.Policy;
import android.content.Context;
-import com.android.settings.R;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
public class ZenFooterPreferenceController extends AbstractZenModePreferenceController {
public ZenFooterPreferenceController(Context context, Lifecycle lifecycle,
diff --git a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java
index ffe07ee..c5ddf48 100644
--- a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.content.Intent;
-import com.android.settings.utils.ZenServiceListing;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.utils.ZenServiceListing;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
public class ZenModeAddAutomaticRulePreferenceController extends
AbstractZenModeAutomaticRulePreferenceController implements
Preference.OnPreferenceClickListener {
diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
index 8d844d1..67d9e93 100644
--- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java
@@ -30,10 +30,11 @@
public class ZenModeAlarmsPreferenceController extends
AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
- protected static final String KEY = "zen_mode_alarms";
+ private final String KEY;
- public ZenModeAlarmsPreferenceController(Context context, Lifecycle lifecycle) {
- super(context, KEY, lifecycle);
+ public ZenModeAlarmsPreferenceController(Context context, Lifecycle lifecycle, String key) {
+ super(context, key, lifecycle);
+ KEY = key;
}
@Override
diff --git a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java
index 665d5e9..7679b0b 100644
--- a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java
@@ -19,16 +19,16 @@
import android.app.AutomaticZenRule;
import android.content.Context;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import java.util.Map;
-
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.Map;
+
public class ZenModeAutomaticRulesPreferenceController extends
AbstractZenModeAutomaticRulePreferenceController {
diff --git a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java
index d747e8c..4220a42 100644
--- a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java
@@ -18,11 +18,11 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class ZenModeAutomationPreferenceController extends
AbstractPreferenceController implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java
index ee85c4e..44bc5f1 100644
--- a/src/com/android/settings/notification/ZenModeAutomationSettings.java
+++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java
@@ -20,6 +20,8 @@
import android.provider.SearchIndexableResource;
import android.service.notification.ConditionProviderService;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -33,8 +35,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.Fragment;
-
@SearchIndexable
public class ZenModeAutomationSettings extends ZenModeSettingsBase {
protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();
diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java
index d63bed4..de30e5d 100644
--- a/src/com/android/settings/notification/ZenModeBackend.java
+++ b/src/com/android/settings/notification/ZenModeBackend.java
@@ -28,10 +28,10 @@
import android.service.notification.ZenModeConfig;
import android.util.Log;
-import com.android.settings.R;
-
import androidx.annotation.VisibleForTesting;
+import com.android.settings.R;
+
public class ZenModeBackend {
@VisibleForTesting
protected static final String ZEN_MODE_FROM_ANYONE = "zen_mode_from_anyone";
diff --git a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java
deleted file mode 100644
index 55c621f..0000000
--- a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java
+++ /dev/null
@@ -1,53 +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.notification;
-
-import android.content.Context;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import androidx.preference.Preference;
-
-public class ZenModeBehaviorCallsPreferenceController extends
- AbstractZenModePreferenceController implements PreferenceControllerMixin {
-
- protected static final String KEY_BEHAVIOR_SETTINGS = "zen_mode_calls_settings";
- private final ZenModeSettings.SummaryBuilder mSummaryBuilder;
-
- public ZenModeBehaviorCallsPreferenceController(Context context, Lifecycle lifecycle) {
- super(context, KEY_BEHAVIOR_SETTINGS, lifecycle);
- mSummaryBuilder = new ZenModeSettings.SummaryBuilder(context);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_BEHAVIOR_SETTINGS;
- }
-
- @Override
- public boolean isAvailable() {
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- super.updateState(preference);
-
- preference.setSummary(mSummaryBuilder.getCallsSettingSummary(getPolicy()));
- }
-}
diff --git a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java
index 5353e91..e9f74d2 100644
--- a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java
@@ -22,11 +22,11 @@
import android.provider.Settings;
import android.service.notification.ZenModeConfig;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.preference.Preference;
-
public class ZenModeBehaviorFooterPreferenceController extends AbstractZenModePreferenceController {
protected static final String KEY = "footer_preference";
diff --git a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java
deleted file mode 100644
index 9346654..0000000
--- a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java
+++ /dev/null
@@ -1,54 +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.notification;
-
-import android.content.Context;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import androidx.preference.Preference;
-
-public class ZenModeBehaviorMsgEventReminderPreferenceController extends
- AbstractZenModePreferenceController implements PreferenceControllerMixin {
-
- protected static final String KEY_BEHAVIOR_SETTINGS = "zen_mode_msg_event_reminder_settings";
- private final ZenModeSettings.SummaryBuilder mSummaryBuilder;
-
- public ZenModeBehaviorMsgEventReminderPreferenceController(Context context,
- Lifecycle lifecycle) {
- super(context, KEY_BEHAVIOR_SETTINGS, lifecycle);
- mSummaryBuilder = new ZenModeSettings.SummaryBuilder(context);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_BEHAVIOR_SETTINGS;
- }
-
- @Override
- public boolean isAvailable() {
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- super.updateState(preference);
-
- preference.setSummary(mSummaryBuilder.getMsgEventReminderSettingSummary(getPolicy()));
- }
-}
diff --git a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java
deleted file mode 100644
index 16426ff..0000000
--- a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java
+++ /dev/null
@@ -1,53 +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.notification;
-
-import android.content.Context;
-
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import androidx.preference.Preference;
-
-public class ZenModeBehaviorSoundPreferenceController extends
- AbstractZenModePreferenceController implements PreferenceControllerMixin {
-
- protected static final String KEY_BEHAVIOR_SETTINGS = "zen_sound_vibration_settings";
- private final ZenModeSettings.SummaryBuilder mSummaryBuilder;
-
- public ZenModeBehaviorSoundPreferenceController(Context context, Lifecycle lifecycle) {
- super(context, KEY_BEHAVIOR_SETTINGS, lifecycle);
- mSummaryBuilder = new ZenModeSettings.SummaryBuilder(context);
- }
-
- @Override
- public String getPreferenceKey() {
- return KEY_BEHAVIOR_SETTINGS;
- }
-
- @Override
- public boolean isAvailable() {
- return true;
- }
-
- @Override
- public void updateState(Preference preference) {
- super.updateState(preference);
-
- preference.setSummary(mSummaryBuilder.getSoundSettingSummary(getPolicy()));
- }
-}
diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
index c105a1a..6c7477a 100644
--- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
+++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java
@@ -108,12 +108,6 @@
return result;
}
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> keys = super.getNonIndexableKeys(context);
- return keys;
- }
-
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, null);
diff --git a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
index 03e63e3..3e45899 100644
--- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java
@@ -21,15 +21,15 @@
import android.view.View;
import android.widget.Button;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
-
public class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
index ced28cd..5bacafb 100644
--- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java
@@ -16,36 +16,29 @@
package com.android.settings.notification;
-import android.app.NotificationManager;
import android.content.Context;
-import android.provider.Settings;
-import android.text.TextUtils;
-import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-public class ZenModeCallsPreferenceController extends AbstractZenModePreferenceController implements
- Preference.OnPreferenceChangeListener {
+public class ZenModeCallsPreferenceController extends
+ AbstractZenModePreferenceController implements PreferenceControllerMixin {
- protected static final String KEY = "zen_mode_calls";
- private final ZenModeBackend mBackend;
- private ListPreference mPreference;
- private final String[] mListValues;
+ private final String KEY_BEHAVIOR_SETTINGS;
+ private final ZenModeSettings.SummaryBuilder mSummaryBuilder;
- public ZenModeCallsPreferenceController(Context context, Lifecycle lifecycle) {
- super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
- mListValues = context.getResources().getStringArray(R.array.zen_mode_contacts_values);
+ public ZenModeCallsPreferenceController(Context context, Lifecycle lifecycle,
+ String key) {
+ super(context, key, lifecycle);
+ KEY_BEHAVIOR_SETTINGS = key;
+ mSummaryBuilder = new ZenModeSettings.SummaryBuilder(context);
}
@Override
public String getPreferenceKey() {
- return KEY;
+ return KEY_BEHAVIOR_SETTINGS;
}
@Override
@@ -54,54 +47,9 @@
}
@Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mPreference = (ListPreference) screen.findPreference(KEY);
- }
-
- @Override
public void updateState(Preference preference) {
super.updateState(preference);
- updateFromContactsValue(preference);
- }
- @Override
- public boolean onPreferenceChange(Preference preference, Object selectedContactsFrom) {
- mBackend.saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
- ZenModeBackend.getSettingFromPrefKey(selectedContactsFrom.toString()));
- updateFromContactsValue(preference);
- return true;
- }
-
- private void updateFromContactsValue(Preference preference) {
- mPreference = (ListPreference) preference;
- switch (getZenMode()) {
- case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
- case Settings.Global.ZEN_MODE_ALARMS:
- mPreference.setEnabled(false);
- mPreference.setValue(ZenModeBackend.ZEN_MODE_FROM_NONE);
- mPreference.setSummary(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE));
- break;
- default:
- preference.setEnabled(true);
- preference.setSummary(mBackend.getContactsSummary(
- NotificationManager.Policy.PRIORITY_CATEGORY_CALLS));
-
- final String currentVal = ZenModeBackend.getKeyFromSetting(
- mBackend.getPriorityCallSenders());
- mPreference.setValue(mListValues[getIndexOfSendersValue(currentVal)]);
- }
- }
-
- @VisibleForTesting
- protected int getIndexOfSendersValue(String currentVal) {
- int index = 3; // defaults to "none" based on R.array.zen_mode_contacts_values
- for (int i = 0; i < mListValues.length; i++) {
- if (TextUtils.equals(currentVal, mListValues[i])) {
- return i;
- }
- }
-
- return index;
+ preference.setSummary(mSummaryBuilder.getCallsSettingSummary(getPolicy()));
}
}
diff --git a/src/com/android/settings/notification/ZenModeCallsSettings.java b/src/com/android/settings/notification/ZenModeCallsSettings.java
index bff1c9f..fa77bb0 100644
--- a/src/com/android/settings/notification/ZenModeCallsSettings.java
+++ b/src/com/android/settings/notification/ZenModeCallsSettings.java
@@ -43,7 +43,7 @@
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new ZenModeCallsPreferenceController(context, lifecycle));
+ controllers.add(new ZenModePriorityCallsPreferenceController(context, lifecycle));
controllers.add(new ZenModeStarredContactsPreferenceController(context, lifecycle,
PRIORITY_CATEGORY_CALLS, "zen_mode_starred_contacts_callers"));
controllers.add(new ZenModeRepeatCallersPreferenceController(context, lifecycle,
@@ -82,14 +82,9 @@
}
@Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> keys = super.getNonIndexableKeys(context);
- return keys;
+ public List<AbstractPreferenceController> createPreferenceControllers(
+ Context context) {
+ return buildPreferenceControllers(context, null);
}
-
- @Override
- public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, null);
- }
- };
+ };
}
diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java
index a6aba11..c11a672 100644
--- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java
+++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java
@@ -27,6 +27,7 @@
import android.service.notification.ZenModeConfig;
import android.service.notification.ZenModeConfig.EventInfo;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -35,6 +36,7 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.Objects;
import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
@@ -51,7 +53,7 @@
private DropDownPreference mReply;
private EventInfo mEvent;
- private List<CalendarInfo> mCalendars;
+
private boolean mCreate;
@Override
@@ -91,24 +93,20 @@
}
private void reloadCalendar() {
- mCalendars = getCalendars(mContext);
+ List<CalendarInfo> calendars = getCalendars(mContext);
ArrayList<CharSequence> entries = new ArrayList<>();
ArrayList<CharSequence> values = new ArrayList<>();
entries.add(getString(R.string.zen_mode_event_rule_calendar_any));
- values.add(key(0, null));
- final String eventCalendar = mEvent != null ? mEvent.calendar : null;
- boolean found = false;
- for (CalendarInfo calendar : mCalendars) {
+ values.add(key(0, null, ""));
+ final String eventCalendar = mEvent != null ? mEvent.calName : null;
+ for (CalendarInfo calendar : calendars) {
entries.add(calendar.name);
values.add(key(calendar));
- if (eventCalendar != null && eventCalendar.equals(calendar.name)) {
- found = true;
+ if (eventCalendar != null && (mEvent.calendarId == null
+ && eventCalendar.equals(calendar.name))) {
+ mEvent.calendarId = calendar.calendarId;
}
}
- if (eventCalendar != null && !found) {
- entries.add(eventCalendar);
- values.add(key(mEvent.userId, eventCalendar));
- }
mCalendar.setEntries(entries.toArray(new CharSequence[entries.size()]));
mCalendar.setEntryValues(values.toArray(new CharSequence[values.size()]));
}
@@ -124,12 +122,10 @@
public boolean onPreferenceChange(Preference preference, Object newValue) {
final String calendarKey = (String) newValue;
if (calendarKey.equals(key(mEvent))) return false;
- final int i = calendarKey.indexOf(':');
- mEvent.userId = Integer.parseInt(calendarKey.substring(0, i));
- mEvent.calendar = calendarKey.substring(i + 1);
- if (mEvent.calendar.isEmpty()) {
- mEvent.calendar = null;
- }
+ String[] key = calendarKey.split(":", 3);
+ mEvent.userId = Integer.parseInt(key[0]);
+ mEvent.calendarId = key[1].equals("") ? null : Long.parseLong(key[1]);
+ mEvent.calName = key[2].equals("") ? null : key[2];
updateRule(ZenModeConfig.toEventConditionId(mEvent));
return true;
}
@@ -172,18 +168,7 @@
return MetricsEvent.NOTIFICATION_ZEN_MODE_EVENT_RULE;
}
- public static CalendarInfo findCalendar(Context context, EventInfo event) {
- if (context == null || event == null) return null;
- final String eventKey = key(event);
- for (CalendarInfo calendar : getCalendars(context)) {
- if (eventKey.equals(key(calendar))) {
- return calendar;
- }
- }
- return null;
- }
-
- private static List<CalendarInfo> getCalendars(Context context) {
+ private List<CalendarInfo> getCalendars(Context context) {
final List<CalendarInfo> calendars = new ArrayList<>();
for (UserHandle user : UserManager.get(context).getUserProfiles()) {
final Context userContext = getContextForUser(context, user);
@@ -203,11 +188,11 @@
}
}
- public static void addCalendars(Context context, List<CalendarInfo> outCalendars) {
- final String primary = "\"primary\"";
- final String[] projection = { Calendars._ID, Calendars.CALENDAR_DISPLAY_NAME,
- "(" + Calendars.ACCOUNT_NAME + "=" + Calendars.OWNER_ACCOUNT + ") AS " + primary };
- final String selection = primary + " = 1";
+ private void addCalendars(Context context, List<CalendarInfo> outCalendars) {
+ final String[] projection = { Calendars._ID, Calendars.CALENDAR_DISPLAY_NAME };
+ final String selection = Calendars.CALENDAR_ACCESS_LEVEL + " >= "
+ + Calendars.CAL_ACCESS_CONTRIBUTOR
+ + " AND " + Calendars.SYNC_EVENTS + " = 1";
Cursor cursor = null;
try {
cursor = context.getContentResolver().query(Calendars.CONTENT_URI, projection,
@@ -216,10 +201,8 @@
return;
}
while (cursor.moveToNext()) {
- final CalendarInfo ci = new CalendarInfo();
- ci.name = cursor.getString(1);
- ci.userId = context.getUserId();
- outCalendars.add(ci);
+ addCalendar(cursor.getLong(0), cursor.getString(1),
+ context.getUserId(), outCalendars);
}
} finally {
if (cursor != null) {
@@ -228,16 +211,29 @@
}
}
+ @VisibleForTesting
+ void addCalendar(long calendarId, String calName, int userId, List<CalendarInfo>
+ outCalendars) {
+ final CalendarInfo ci = new CalendarInfo();
+ ci.calendarId = calendarId;
+ ci.name = calName;
+ ci.userId = userId;
+ if (!outCalendars.contains(ci)) {
+ outCalendars.add(ci);
+ }
+ }
+
private static String key(CalendarInfo calendar) {
- return key(calendar.userId, calendar.name);
+ return key(calendar.userId, calendar.calendarId, calendar.name);
}
private static String key(EventInfo event) {
- return key(event.userId, event.calendar);
+ return key(event.userId, event.calendarId, event.calName);
}
- private static String key(int userId, String calendar) {
- return EventInfo.resolveUserId(userId) + ":" + (calendar == null ? "" : calendar);
+ private static String key(int userId, Long calendarId, String displayName) {
+ return EventInfo.resolveUserId(userId) + ":" + (calendarId == null ? "" : calendarId)
+ + ":" + displayName;
}
private static final Comparator<CalendarInfo> CALENDAR_NAME = new Comparator<CalendarInfo>() {
@@ -250,5 +246,20 @@
public static class CalendarInfo {
public String name;
public int userId;
+ public Long calendarId;
+
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof CalendarInfo)) return false;
+ if (o == this) return true;
+ final CalendarInfo other = (CalendarInfo) o;
+ return Objects.equals(other.name, name)
+ && Objects.equals(other.calendarId, calendarId);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(name, calendarId);
+ }
}
}
diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
index e1aa28c..235ebd5 100644
--- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java
@@ -21,12 +21,12 @@
import android.provider.Settings;
import android.util.Log;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
public class ZenModeEventsPreferenceController extends AbstractZenModePreferenceController
implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java
index d4b9371..2bec84f 100644
--- a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java
@@ -21,11 +21,11 @@
import android.provider.Settings;
import android.util.Log;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
public class ZenModeMediaPreferenceController extends AbstractZenModePreferenceController
implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
index 1e2bdc2..19ee809 100644
--- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java
@@ -1,31 +1,38 @@
+/*
+ * 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.notification;
-import android.app.NotificationManager;
import android.content.Context;
-import android.provider.Settings;
-import android.text.TextUtils;
-import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.ListPreference;
import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-public class ZenModeMessagesPreferenceController extends AbstractZenModePreferenceController
- implements Preference.OnPreferenceChangeListener {
+public class ZenModeMessagesPreferenceController extends
+ AbstractZenModePreferenceController implements PreferenceControllerMixin {
- protected static final String KEY = "zen_mode_messages";
+ private final String KEY;
+ private final ZenModeSettings.SummaryBuilder mSummaryBuilder;
- private final ZenModeBackend mBackend;
- private ListPreference mPreference;
- private final String[] mListValues;
-
- public ZenModeMessagesPreferenceController(Context context, Lifecycle lifecycle) {
- super(context, KEY, lifecycle);
- mBackend = ZenModeBackend.getInstance(context);
- mListValues = context.getResources().getStringArray(R.array.zen_mode_contacts_values);
+ public ZenModeMessagesPreferenceController(Context context, Lifecycle lifecycle, String key) {
+ super(context, key, lifecycle);
+ KEY = key;
+ mSummaryBuilder = new ZenModeSettings.SummaryBuilder(context);
}
@Override
@@ -39,54 +46,8 @@
}
@Override
- public void displayPreference(PreferenceScreen screen) {
- super.displayPreference(screen);
- mPreference = (ListPreference) screen.findPreference(KEY);
- }
-
- @Override
public void updateState(Preference preference) {
super.updateState(preference);
- updateFromContactsValue(preference);
- }
-
- @Override
- public boolean onPreferenceChange(Preference preference, Object selectedContactsFrom) {
- mBackend.saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
- ZenModeBackend.getSettingFromPrefKey(selectedContactsFrom.toString()));
- updateFromContactsValue(preference);
- return true;
- }
-
- private void updateFromContactsValue(Preference preference) {
- mPreference = (ListPreference) preference;
- switch (getZenMode()) {
- case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
- case Settings.Global.ZEN_MODE_ALARMS:
- mPreference.setEnabled(false);
- mPreference.setValue(ZenModeBackend.ZEN_MODE_FROM_NONE);
- mPreference.setSummary(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE));
- break;
- default:
- preference.setEnabled(true);
- preference.setSummary(mBackend.getContactsSummary(
- NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES));
-
- final String currentVal = ZenModeBackend.getKeyFromSetting(
- mBackend.getPriorityMessageSenders());
- mPreference.setValue(mListValues[getIndexOfSendersValue(currentVal)]);
- }
- }
-
- @VisibleForTesting
- protected int getIndexOfSendersValue(String currentVal) {
- int index = 3; // defaults to "none" based on R.array.zen_mode_contacts_values
- for (int i = 0; i < mListValues.length; i++) {
- if (TextUtils.equals(currentVal, mListValues[i])) {
- return i;
- }
- }
-
- return index;
+ // TODO: (b/111475013 - beverlyt) set messages summary
}
}
diff --git a/src/com/android/settings/notification/ZenModeMsgEventReminderSettings.java b/src/com/android/settings/notification/ZenModeMessagesSettings.java
similarity index 71%
rename from src/com/android/settings/notification/ZenModeMsgEventReminderSettings.java
rename to src/com/android/settings/notification/ZenModeMessagesSettings.java
index b61b76e..e09d583 100644
--- a/src/com/android/settings/notification/ZenModeMsgEventReminderSettings.java
+++ b/src/com/android/settings/notification/ZenModeMessagesSettings.java
@@ -33,7 +33,7 @@
import java.util.List;
@SearchIndexable
-public class ZenModeMsgEventReminderSettings extends ZenModeSettingsBase implements Indexable {
+public class ZenModeMessagesSettings extends ZenModeSettingsBase implements Indexable {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
@@ -43,19 +43,17 @@
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new ZenModeEventsPreferenceController(context, lifecycle));
- controllers.add(new ZenModeRemindersPreferenceController(context, lifecycle));
- controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle));
+ controllers.add(new ZenModePriorityMessagesPreferenceController(context, lifecycle));
controllers.add(new ZenModeStarredContactsPreferenceController(context, lifecycle,
PRIORITY_CATEGORY_MESSAGES, "zen_mode_starred_contacts_messages"));
- controllers.add(new ZenModeBehaviorFooterPreferenceController(context, lifecycle,
- R.string.zen_msg_event_reminder_footer));
+ controllers.add(new ZenModeBehaviorFooterPreferenceController(
+ context, lifecycle, R.string.zen_mode_messages_footer));
return controllers;
}
@Override
protected int getPreferenceScreenResId() {
- return R.xml.zen_mode_msg_event_reminder_settings;
+ return R.xml.zen_mode_messages_settings;
}
@Override
@@ -66,7 +64,7 @@
/**
* For Search.
*/
- public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
@@ -75,20 +73,15 @@
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = R.xml.zen_mode_msg_event_reminder_settings;
+ sir.xmlResId = R.xml.zen_mode_messages_settings;
result.add(sir);
return result;
}
@Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> keys = super.getNonIndexableKeys(context);
- return keys;
+ public List<AbstractPreferenceController> createPreferenceControllers(
+ Context context) {
+ return buildPreferenceControllers(context, null);
}
-
- @Override
- public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- return buildPreferenceControllers(context, null);
- }
- };
+ };
}
diff --git a/src/com/android/settings/notification/ZenModePreferenceController.java b/src/com/android/settings/notification/ZenModePreferenceController.java
index d70ffe2..44ad2ff 100644
--- a/src/com/android/settings/notification/ZenModePreferenceController.java
+++ b/src/com/android/settings/notification/ZenModePreferenceController.java
@@ -24,14 +24,14 @@
import android.os.UserHandle;
import android.provider.Settings;
+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.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class ZenModePreferenceController extends BasePreferenceController
implements LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/notification/ZenModePriorityCallsPreferenceController.java b/src/com/android/settings/notification/ZenModePriorityCallsPreferenceController.java
new file mode 100644
index 0000000..44b6c24
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModePriorityCallsPreferenceController.java
@@ -0,0 +1,107 @@
+/*
+ * 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.notification;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+public class ZenModePriorityCallsPreferenceController extends AbstractZenModePreferenceController
+ implements Preference.OnPreferenceChangeListener {
+
+ protected static final String KEY = "zen_mode_calls";
+ private final ZenModeBackend mBackend;
+ private ListPreference mPreference;
+ private final String[] mListValues;
+
+ public ZenModePriorityCallsPreferenceController(Context context, Lifecycle lifecycle) {
+ super(context, KEY, lifecycle);
+ mBackend = ZenModeBackend.getInstance(context);
+ mListValues = context.getResources().getStringArray(R.array.zen_mode_contacts_values);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = (ListPreference) screen.findPreference(KEY);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ updateFromContactsValue(preference);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object selectedContactsFrom) {
+ mBackend.saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS,
+ ZenModeBackend.getSettingFromPrefKey(selectedContactsFrom.toString()));
+ updateFromContactsValue(preference);
+ return true;
+ }
+
+ private void updateFromContactsValue(Preference preference) {
+ mPreference = (ListPreference) preference;
+ switch (getZenMode()) {
+ case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+ case Settings.Global.ZEN_MODE_ALARMS:
+ mPreference.setEnabled(false);
+ mPreference.setValue(ZenModeBackend.ZEN_MODE_FROM_NONE);
+ mPreference.setSummary(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE));
+ break;
+ default:
+ preference.setEnabled(true);
+ preference.setSummary(mBackend.getContactsSummary(
+ NotificationManager.Policy.PRIORITY_CATEGORY_CALLS));
+
+ final String currentVal = ZenModeBackend.getKeyFromSetting(
+ mBackend.getPriorityCallSenders());
+ mPreference.setValue(mListValues[getIndexOfSendersValue(currentVal)]);
+ }
+ }
+
+ @VisibleForTesting
+ protected int getIndexOfSendersValue(String currentVal) {
+ int index = 3; // defaults to "none" based on R.array.zen_mode_contacts_values
+ for (int i = 0; i < mListValues.length; i++) {
+ if (TextUtils.equals(currentVal, mListValues[i])) {
+ return i;
+ }
+ }
+
+ return index;
+ }
+}
diff --git a/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceController.java
new file mode 100644
index 0000000..56829a7
--- /dev/null
+++ b/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceController.java
@@ -0,0 +1,107 @@
+/*
+ * 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.notification;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+public class ZenModePriorityMessagesPreferenceController extends AbstractZenModePreferenceController
+ implements Preference.OnPreferenceChangeListener {
+
+ protected static final String KEY = "zen_mode_messages";
+ private final ZenModeBackend mBackend;
+ private ListPreference mPreference;
+ private final String[] mListValues;
+
+ public ZenModePriorityMessagesPreferenceController(Context context, Lifecycle lifecycle) {
+ super(context, KEY, lifecycle);
+ mBackend = ZenModeBackend.getInstance(context);
+ mListValues = context.getResources().getStringArray(R.array.zen_mode_contacts_values);
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return KEY;
+ }
+
+ @Override
+ public boolean isAvailable() {
+ return true;
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mPreference = (ListPreference) screen.findPreference(KEY);
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ super.updateState(preference);
+ updateFromContactsValue(preference);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object selectedContactsFrom) {
+ mBackend.saveSenders(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES,
+ ZenModeBackend.getSettingFromPrefKey(selectedContactsFrom.toString()));
+ updateFromContactsValue(preference);
+ return true;
+ }
+
+ private void updateFromContactsValue(Preference preference) {
+ mPreference = (ListPreference) preference;
+ switch (getZenMode()) {
+ case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
+ case Settings.Global.ZEN_MODE_ALARMS:
+ mPreference.setEnabled(false);
+ mPreference.setValue(ZenModeBackend.ZEN_MODE_FROM_NONE);
+ mPreference.setSummary(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE));
+ break;
+ default:
+ preference.setEnabled(true);
+ preference.setSummary(mBackend.getContactsSummary(
+ NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES));
+
+ final String currentVal = ZenModeBackend.getKeyFromSetting(
+ mBackend.getPriorityMessageSenders());
+ mPreference.setValue(mListValues[getIndexOfSendersValue(currentVal)]);
+ }
+ }
+
+ @VisibleForTesting
+ protected int getIndexOfSendersValue(String currentVal) {
+ int index = 3; // defaults to "none" based on R.array.zen_mode_contacts_values
+ for (int i = 0; i < mListValues.length; i++) {
+ if (TextUtils.equals(currentVal, mListValues[i])) {
+ return i;
+ }
+ }
+
+ return index;
+ }
+}
diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
index cc332f6..41f1eb1 100644
--- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java
@@ -21,12 +21,12 @@
import android.provider.Settings;
import android.util.Log;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
public class ZenModeRemindersPreferenceController extends AbstractZenModePreferenceController
implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
index 4a384b1..db5c6e1 100644
--- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
@@ -21,14 +21,14 @@
import android.provider.Settings;
import android.util.Log;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePreferenceController
implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
index bf170df..56ed086 100644
--- a/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
+++ b/src/com/android/settings/notification/ZenModeRestrictNotificationsSettings.java
@@ -90,12 +90,6 @@
return result;
}
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> keys = super.getNonIndexableKeys(context);
- return keys;
- }
-
@Override
public List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, null);
diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
index 0aaf310..9e5dbc3 100644
--- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
+++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java
@@ -26,12 +26,12 @@
import android.util.Log;
import android.widget.Toast;
-import com.android.settings.R;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase {
protected static final String TAG = ZenModeSettingsBase.TAG;
diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
index 1769871..f65a8b0 100644
--- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
+++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java
@@ -30,6 +30,13 @@
import android.util.Log;
import android.widget.TimePicker;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -41,13 +48,6 @@
import java.util.Calendar;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
private static final String KEY_DAYS = "days";
private static final String KEY_START_TIME = "start_time";
diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index f2ebd2b..3a270d2 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -34,6 +34,9 @@
import android.provider.Settings;
import android.service.notification.ZenModeConfig;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.FragmentManager;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -49,9 +52,6 @@
import java.util.Map.Entry;
import java.util.function.Predicate;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.FragmentManager;
-
@SearchIndexable
public class ZenModeSettings extends ZenModeSettingsBase {
@Override
@@ -82,9 +82,12 @@
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle, FragmentManager fragmentManager) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new ZenModeBehaviorMsgEventReminderPreferenceController(context, lifecycle));
- controllers.add(new ZenModeBehaviorSoundPreferenceController(context, lifecycle));
- controllers.add(new ZenModeBehaviorCallsPreferenceController(context, lifecycle));
+ controllers.add(new ZenModeCallsPreferenceController(context, lifecycle,
+ "zen_mode_behavior_calls"));
+ controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle,
+ "zen_mode_behavior_messages"));
+ controllers.add(new ZenModeAlarmsPreferenceController(context, lifecycle,
+ "zen_mode_behavior_alarms"));
controllers.add(new ZenModeBlockedEffectsPreferenceController(context, lifecycle));
controllers.add(new ZenModeDurationPreferenceController(context, lifecycle));
controllers.add(new ZenModeAutomationPreferenceController(context));
diff --git a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java
index 462320f..6d5aac9 100644
--- a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java
@@ -21,11 +21,11 @@
import android.provider.Settings;
import android.service.notification.ZenModeConfig;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.preference.Preference;
-
public class ZenModeSettingsFooterPreferenceController extends AbstractZenModePreferenceController {
protected static final String KEY = "footer_preference";
diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java
index ad39d71..bd6ad0b 100644
--- a/src/com/android/settings/notification/ZenModeSliceBuilder.java
+++ b/src/com/android/settings/notification/ZenModeSliceBuilder.java
@@ -29,6 +29,12 @@
import android.provider.Settings;
import android.provider.SettingsSlicesContract;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SubSettings;
@@ -37,11 +43,6 @@
import com.android.settings.slices.SliceBroadcastReceiver;
import com.android.settings.slices.SliceBuilderUtils;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
public class ZenModeSliceBuilder {
private static final String TAG = "ZenModeSliceBuilder";
@@ -94,7 +95,7 @@
return new ListBuilder(context, ZEN_MODE_URI, ListBuilder.INFINITY)
.setAccentColor(color)
- .addRow(b -> b
+ .addRow(new RowBuilder()
.setTitle(title)
.addEndItem(toggleSliceAction)
.setPrimaryAction(primarySliceAction))
diff --git a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java b/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java
index 32ff2d1..df92446 100644
--- a/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java
+++ b/src/com/android/settings/notification/ZenModeSoundVibrationSettings.java
@@ -16,6 +16,8 @@
package com.android.settings.notification;
+import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
+
import android.content.Context;
import android.provider.SearchIndexableResource;
@@ -41,9 +43,16 @@
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle) {
List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new ZenModeAlarmsPreferenceController(context, lifecycle));
+ controllers.add(new ZenModeCallsPreferenceController(context, lifecycle,
+ "zen_mode_calls_settings"));
+ controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle,
+ "zen_mode_messages_settings"));
+ controllers.add(new ZenModeAlarmsPreferenceController(context, lifecycle,
+ "zen_mode_alarms"));
controllers.add(new ZenModeMediaPreferenceController(context, lifecycle));
controllers.add(new ZenModeSystemPreferenceController(context, lifecycle));
+ controllers.add(new ZenModeRemindersPreferenceController(context, lifecycle));
+ controllers.add(new ZenModeEventsPreferenceController(context, lifecycle));
controllers.add(new ZenModeBehaviorFooterPreferenceController(context, lifecycle,
R.string.zen_sound_footer));
return controllers;
diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
index 1813a57..adb65b6 100644
--- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java
@@ -28,16 +28,16 @@
import android.provider.Contacts;
import android.provider.ContactsContract;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class ZenModeStarredContactsPreferenceController extends
AbstractZenModePreferenceController implements Preference.OnPreferenceClickListener {
diff --git a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java
index 36b017f..73907b9 100644
--- a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java
@@ -21,12 +21,12 @@
import android.provider.Settings;
import android.util.Log;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
public class ZenModeSystemPreferenceController extends
AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java
index 37cf99c..e3098f0 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java
@@ -19,14 +19,14 @@
import android.app.NotificationManager;
import android.content.Context;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.DisabledCheckBoxPreference;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.preference.CheckBoxPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.widget.DisabledCheckBoxPreference;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
public class ZenModeVisEffectPreferenceController
extends AbstractZenModePreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
diff --git a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java
index 00d2477..66b2c7b 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java
@@ -19,12 +19,12 @@
import android.app.NotificationManager.Policy;
import android.content.Context;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
public class ZenModeVisEffectsAllPreferenceController
extends AbstractZenModePreferenceController
implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener {
diff --git a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
index 86790f2..414465f 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
@@ -19,14 +19,14 @@
import android.app.NotificationManager;
import android.content.Context;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
import com.android.settingslib.core.lifecycle.Lifecycle;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class ZenModeVisEffectsCustomPreferenceController
extends AbstractZenModePreferenceController {
diff --git a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java
index a266141..17fbdb2 100644
--- a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java
+++ b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java
@@ -19,12 +19,12 @@
import android.app.NotificationManager.Policy;
import android.content.Context;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
public class ZenModeVisEffectsNonePreferenceController
extends AbstractZenModePreferenceController
implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener {
diff --git a/src/com/android/settings/notification/ZenOnboardingActivity.java b/src/com/android/settings/notification/ZenOnboardingActivity.java
index 3f12358..9e90415 100644
--- a/src/com/android/settings/notification/ZenOnboardingActivity.java
+++ b/src/com/android/settings/notification/ZenOnboardingActivity.java
@@ -29,14 +29,14 @@
import android.view.View;
import android.widget.RadioButton;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.MetricsLogger;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
-import androidx.annotation.VisibleForTesting;
-
public class ZenOnboardingActivity extends Activity {
private static final String TAG = "ZenOnboardingActivity";
diff --git a/src/com/android/settings/notification/ZenRuleNameDialog.java b/src/com/android/settings/notification/ZenRuleNameDialog.java
index 62c83cd..9ae32ff 100644
--- a/src/com/android/settings/notification/ZenRuleNameDialog.java
+++ b/src/com/android/settings/notification/ZenRuleNameDialog.java
@@ -27,13 +27,13 @@
import android.view.View;
import android.widget.EditText;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
public class ZenRuleNameDialog extends InstrumentedDialogFragment {
protected static final String TAG = "ZenRuleNameDialog";
private static final String EXTRA_ZEN_RULE_NAME = "zen_rule_name";
diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/ZenRulePreference.java
index e0873c5..8058e6c 100644
--- a/src/com/android/settings/notification/ZenRulePreference.java
+++ b/src/com/android/settings/notification/ZenRulePreference.java
@@ -25,6 +25,10 @@
import android.service.notification.ZenModeConfig;
import android.view.View;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.utils.ManagedServiceSettings;
@@ -34,10 +38,6 @@
import java.util.Map;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
public class ZenRulePreference extends TwoTargetPreference {
private static final ManagedServiceSettings.Config CONFIG =
ZenModeAutomationSettings.getConditionProviderConfig();
diff --git a/src/com/android/settings/notification/ZenRuleSelectionDialog.java b/src/com/android/settings/notification/ZenRuleSelectionDialog.java
index b1a3939..abda376 100644
--- a/src/com/android/settings/notification/ZenRuleSelectionDialog.java
+++ b/src/com/android/settings/notification/ZenRuleSelectionDialog.java
@@ -170,7 +170,8 @@
private ZenRuleInfo defaultNewEvent() {
final ZenModeConfig.EventInfo event = new ZenModeConfig.EventInfo();
- event.calendar = null; // any calendar
+ event.calName = null; // any calendar
+ event.calendarId = null;
event.reply = ZenModeConfig.EventInfo.REPLY_ANY_EXCEPT_NO;
final ZenRuleInfo rt = new ZenRuleInfo();
rt.settingsAction = ZenModeEventRuleSettings.ACTION;
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index ef8d1ee..38d48c8 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -29,7 +29,6 @@
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.gestures.AssistGestureFeatureProvider;
import com.android.settings.localepicker.LocaleFeatureProvider;
-import com.android.settings.search.DeviceIndexFeatureProvider;
import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.security.SecurityFeatureProvider;
import com.android.settings.slices.SlicesFeatureProvider;
@@ -106,8 +105,6 @@
public abstract AccountFeatureProvider getAccountFeatureProvider();
- public abstract DeviceIndexFeatureProvider getDeviceIndexFeatureProvider();
-
public static final class FactoryNotFoundException extends RuntimeException {
public FactoryNotFoundException(Throwable throwable) {
super("Unable to create factory. Did you misconfigure Proguard?", throwable);
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 61be109..1f57529 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -41,8 +41,6 @@
import com.android.settings.gestures.AssistGestureFeatureProviderImpl;
import com.android.settings.localepicker.LocaleFeatureProvider;
import com.android.settings.localepicker.LocaleFeatureProviderImpl;
-import com.android.settings.search.DeviceIndexFeatureProvider;
-import com.android.settings.search.DeviceIndexFeatureProviderImpl;
import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.search.SearchFeatureProviderImpl;
import com.android.settings.security.SecurityFeatureProvider;
@@ -73,7 +71,6 @@
private UserFeatureProvider mUserFeatureProvider;
private SlicesFeatureProvider mSlicesFeatureProvider;
private AccountFeatureProvider mAccountFeatureProvider;
- private DeviceIndexFeatureProviderImpl mDeviceIndexFeatureProvider;
@Override
public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -211,12 +208,4 @@
}
return mAccountFeatureProvider;
}
-
- @Override
- public DeviceIndexFeatureProvider getDeviceIndexFeatureProvider() {
- if (mDeviceIndexFeatureProvider == null) {
- mDeviceIndexFeatureProvider = new DeviceIndexFeatureProviderImpl();
- }
- return mDeviceIndexFeatureProvider;
- }
}
diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java
index a9b66d6..b22b458 100644
--- a/src/com/android/settings/overlay/SupportFeatureProvider.java
+++ b/src/com/android/settings/overlay/SupportFeatureProvider.java
@@ -16,55 +16,17 @@
package com.android.settings.overlay;
-import android.accounts.Account;
-import android.annotation.IntDef;
-import android.annotation.NonNull;
import android.app.Activity;
-import android.content.Context;
-
-import com.android.settings.support.SupportPhone;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
/**
* Feature provider for support tab.
*/
public interface SupportFeatureProvider {
- @IntDef({SupportType.EMAIL, SupportType.PHONE, SupportType.CHAT})
- @Retention(RetentionPolicy.SOURCE)
- @interface SupportType {
- int EMAIL = 1;
- int PHONE = 2;
- int CHAT = 3;
- }
-
/**
- * Refreshes all operation rules.
- */
- void refreshOperationRules();
-
- /**
- * Returns the current country code if it has a operation config, otherwise returns null.
- */
- String getCurrentCountryCodeIfHasConfig(@SupportType int type);
-
- /**
- * Returns a support phone for specified country.
- */
- SupportPhone getSupportPhones(String countryCode, boolean isTollfree);
-
- /**
- * Returns array of {@link Account} that's eligible for support options.
- */
- @NonNull
- Account[] getSupportEligibleAccounts(Context context);
-
- /**
- * Starts support v2, invokes the support home page. Will no-op if support v2 is not enabled.
+ * Starts support, invokes the support home page.
*
* @param activity Calling activity.
*/
- void startSupportV2(Activity activity);
+ void startSupport(Activity activity);
}
diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
new file mode 100644
index 0000000..6e1ae10
--- /dev/null
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -0,0 +1,198 @@
+/*
+ * 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.password;
+
+import android.app.settings.SettingsEnums;
+import android.content.DialogInterface;
+import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricPrompt;
+import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
+import android.hardware.biometrics.BiometricPrompt.AuthenticationResult;
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.os.Handler;
+import android.os.Looper;
+
+import com.android.settings.core.InstrumentedFragment;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.concurrent.Executor;
+
+/**
+ * A fragment that wraps the BiometricPrompt and manages its lifecycle.
+ */
+public class BiometricFragment extends InstrumentedFragment {
+
+ private static final String KEY_TITLE = "title";
+ private static final String KEY_SUBTITLE = "subtitle";
+ private static final String KEY_DESCRIPTION = "description";
+ private static final String KEY_NEGATIVE_TEXT = "negative_text";
+
+ // Re-set by the application. Should be done upon orientation changes, etc
+ private Executor mClientExecutor;
+ private AuthenticationCallback mClientCallback;
+
+ // Created/Initialized once and retained
+ private final Handler mHandler = new Handler(Looper.getMainLooper());
+ private PromptInfo mPromptInfo;
+ private BiometricPrompt mBiometricPrompt;
+ private CancellationSignal mCancellationSignal;
+
+ private AuthenticationCallback mAuthenticationCallback =
+ new AuthenticationCallback() {
+ @Override
+ public void onAuthenticationError(int error, @NonNull CharSequence message) {
+ mClientExecutor.execute(() -> {
+ mClientCallback.onAuthenticationError(error, message);
+ });
+ cleanup();
+ }
+
+ @Override
+ public void onAuthenticationSucceeded(AuthenticationResult result) {
+ mClientExecutor.execute(() -> {
+ mClientCallback.onAuthenticationSucceeded(result);
+ });
+ cleanup();
+ }
+ };
+
+ private final DialogInterface.OnClickListener mNegativeButtonListener =
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ mAuthenticationCallback.onAuthenticationError(
+ BiometricConstants.BIOMETRIC_ERROR_NEGATIVE_BUTTON,
+ mPromptInfo.getNegativeButtonText());
+ }
+ };
+
+ public static BiometricFragment newInstance(PromptInfo info) {
+ BiometricFragment biometricFragment = new BiometricFragment();
+ biometricFragment.setArguments(info.getBundle());
+ return biometricFragment;
+ }
+
+ public void setCallbacks(Executor executor, AuthenticationCallback callback) {
+ mClientExecutor = executor;
+ mClientCallback = callback;
+ }
+
+ public void cancel() {
+ if (mCancellationSignal != null) {
+ mCancellationSignal.cancel();
+ }
+ cleanup();
+ }
+
+ private void cleanup() {
+ if (getActivity() != null) {
+ getActivity().getSupportFragmentManager().beginTransaction().remove(this).commit();
+ }
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setRetainInstance(true);
+
+ mPromptInfo = new PromptInfo(getArguments());
+ mBiometricPrompt = new BiometricPrompt.Builder(getContext())
+ .setTitle(mPromptInfo.getTitle())
+ .setUseDefaultTitle() // use default title if title is null/empty
+ .setSubtitle(mPromptInfo.getSubtitle())
+ .setDescription(mPromptInfo.getDescription())
+ .setNegativeButton(mPromptInfo.getNegativeButtonText(), mClientExecutor,
+ mNegativeButtonListener)
+ .build();
+ mCancellationSignal = new CancellationSignal();
+
+ // TODO: CC doesn't use crypto for now
+ mBiometricPrompt.authenticate(mCancellationSignal, mClientExecutor,
+ mAuthenticationCallback);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return SettingsEnums.BIOMETRIC_FRAGMENT;
+ }
+
+ /**
+ * A simple wrapper for BiometricPrompt.PromptInfo. Since we want to manage the lifecycle
+ * of BiometricPrompt correctly, the information needs to be stored in here.
+ */
+ static class PromptInfo {
+ private final Bundle mBundle;
+
+ private PromptInfo(Bundle bundle) {
+ mBundle = bundle;
+ }
+
+ Bundle getBundle() {
+ return mBundle;
+ }
+
+ public CharSequence getTitle() {
+ return mBundle.getCharSequence(KEY_TITLE);
+ }
+
+ public CharSequence getSubtitle() {
+ return mBundle.getCharSequence(KEY_SUBTITLE);
+ }
+
+ public CharSequence getDescription() {
+ return mBundle.getCharSequence(KEY_DESCRIPTION);
+ }
+
+ public CharSequence getNegativeButtonText() {
+ return mBundle.getCharSequence(KEY_NEGATIVE_TEXT);
+ }
+
+ public static class Builder {
+ private final Bundle mBundle = new Bundle();
+
+ public Builder setTitle(@NonNull CharSequence title) {
+ mBundle.putCharSequence(KEY_TITLE, title);
+ return this;
+ }
+
+ public Builder setSubtitle(@Nullable CharSequence subtitle) {
+ mBundle.putCharSequence(KEY_SUBTITLE, subtitle);
+ return this;
+ }
+
+ public Builder setDescription(@Nullable CharSequence description) {
+ mBundle.putCharSequence(KEY_DESCRIPTION, description);
+ return this;
+ }
+
+ public Builder setNegativeButtonText(@NonNull CharSequence text) {
+ mBundle.putCharSequence(KEY_NEGATIVE_TEXT, text);
+ return this;
+ }
+
+ public PromptInfo build() {
+ return new PromptInfo(mBundle);
+ }
+ }
+ }
+}
+
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index a45bea7..7f04bde 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -18,6 +18,7 @@
import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD;
import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;
+
import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment
.RESULT_FINISHED;
@@ -43,6 +44,14 @@
import android.view.accessibility.AccessibilityManager;
import android.widget.TextView;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.EncryptionInterstitial;
@@ -54,20 +63,13 @@
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settings.search.SearchFeatureProvider;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import java.util.List;
-import androidx.annotation.StringRes;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class ChooseLockGeneric extends SettingsActivity {
public static final String CONFIRM_CREDENTIALS = "confirm_credentials";
@@ -131,10 +133,14 @@
@VisibleForTesting
static final int CONFIRM_EXISTING_REQUEST = 100;
- private static final int ENABLE_ENCRYPTION_REQUEST = 101;
- private static final int CHOOSE_LOCK_REQUEST = 102;
- private static final int CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST = 103;
- private static final int SKIP_FINGERPRINT_REQUEST = 104;
+ @VisibleForTesting
+ static final int ENABLE_ENCRYPTION_REQUEST = 101;
+ @VisibleForTesting
+ static final int CHOOSE_LOCK_REQUEST = 102;
+ @VisibleForTesting
+ static final int CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST = 103;
+ @VisibleForTesting
+ static final int SKIP_FINGERPRINT_REQUEST = 104;
private ChooseLockSettingsHelper mChooseLockSettingsHelper;
private DevicePolicyManager mDPM;
@@ -400,6 +406,8 @@
resultCode == RESULT_FINISHED ? RESULT_OK : resultCode, data);
finish();
}
+ } else if (requestCode == SearchFeatureProvider.REQUEST_CODE) {
+ return;
} else {
getActivity().setResult(Activity.RESULT_CANCELED);
finish();
@@ -427,7 +435,14 @@
@VisibleForTesting
void updatePreferencesOrFinish(boolean isRecreatingActivity) {
Intent intent = getActivity().getIntent();
- int quality = intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
+ int quality = -1;
+ if (StorageManager.isFileEncryptedNativeOrEmulated()) {
+ quality = intent.getIntExtra(LockPatternUtils.PASSWORD_TYPE_KEY, -1);
+ } else {
+ // For non-file encrypted devices we need to show encryption interstitial, so always
+ // show the lock type picker and ignore PASSWORD_TYPE_KEY.
+ Log.i(TAG, "Ignoring PASSWORD_TYPE_KEY because device is not file encrypted");
+ }
if (quality == -1) {
// If caller didn't specify password quality, show UI and allow the user to choose.
quality = intent.getIntExtra(MINIMUM_QUALITY_KEY, -1);
@@ -554,7 +569,7 @@
final PreferenceScreen entries = getPreferenceScreen();
int adminEnforcedQuality = mDPM.getPasswordQuality(null, mUserId);
- EnforcedAdmin enforcedAdmin = RestrictedLockUtils.checkIfPasswordQualityIsSet(
+ EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal.checkIfPasswordQualityIsSet(
getActivity(), mUserId);
for (ScreenLockType lock : ScreenLockType.values()) {
@@ -805,7 +820,7 @@
// TODO: figure out how to eliminate duplicated code. It's a bit hard due to the async-ness
private void removeAllFaceForUserAndFinish(final int userId, RemovalTracker tracker) {
if (mFaceManager != null && mFaceManager.isHardwareDetected()) {
- if (mFaceManager.hasEnrolledFaces(userId)) {
+ if (mFaceManager.hasEnrolledTemplates(userId)) {
mFaceManager.setActiveUser(userId);
Face face = new Face(null, 0, 0);
mFaceManager.remove(face, userId,
diff --git a/src/com/android/settings/password/ChooseLockGenericController.java b/src/com/android/settings/password/ChooseLockGenericController.java
index 9677a43..eb7ff4e 100644
--- a/src/com/android/settings/password/ChooseLockGenericController.java
+++ b/src/com/android/settings/password/ChooseLockGenericController.java
@@ -20,14 +20,14 @@
import android.content.Context;
import android.os.UserHandle;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
-
/**
* A controller for ChooseLockGeneric, and other similar classes which shows a list of possible
* screen locks for the user to choose from.
@@ -72,13 +72,14 @@
* Whether the given screen lock type should be visible in the given context.
*/
public boolean isScreenLockVisible(ScreenLockType type) {
+ final boolean managedProfile = mUserId != UserHandle.myUserId();
switch (type) {
case NONE:
- return !mContext.getResources().getBoolean(R.bool.config_hide_none_security_option);
+ return !mContext.getResources().getBoolean(R.bool.config_hide_none_security_option)
+ && !managedProfile; // Profiles should use unified challenge instead.
case SWIPE:
return !mContext.getResources().getBoolean(R.bool.config_hide_swipe_security_option)
- // Swipe doesn't make sense for profiles.
- && mUserId == UserHandle.myUserId();
+ && !managedProfile; // Swipe doesn't make sense for profiles.
case MANAGED:
return mManagedPasswordProvider.isManagedPasswordChoosable();
}
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index f65b3ad..cd04193 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -51,6 +51,11 @@
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
+import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
@@ -68,11 +73,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.StringRes;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
public class ChooseLockPassword extends SettingsActivity {
private static final String TAG = "ChooseLockPassword";
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index a6cf36f..4e4730f 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -32,6 +32,8 @@
import android.widget.ScrollView;
import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
import com.android.internal.widget.LockPatternUtils;
@@ -54,8 +56,6 @@
import java.util.Collections;
import java.util.List;
-import androidx.fragment.app.Fragment;
-
/**
* If the user has a lock pattern set already, makes them confirm the existing one.
*
diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java
index 652db17..d5182b3 100644
--- a/src/com/android/settings/password/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java
@@ -25,14 +25,14 @@
import android.os.Bundle;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.setupwizardlib.util.WizardManagerHelper;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-
public final class ChooseLockSettingsHelper {
public static final String EXTRA_KEY_TYPE = "type";
@@ -78,7 +78,13 @@
* @see Activity#onActivityResult(int, int, android.content.Intent)
*/
public boolean launchConfirmationActivity(int request, CharSequence title) {
- return launchConfirmationActivity(request, title, null, null, false, false);
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ null /* header */,
+ null /* description */,
+ false /* returnCredentials */,
+ false /* external */);
}
/**
@@ -91,7 +97,13 @@
* @see Activity#onActivityResult(int, int, android.content.Intent)
*/
public boolean launchConfirmationActivity(int request, CharSequence title, boolean returnCredentials) {
- return launchConfirmationActivity(request, title, null, null, returnCredentials, false);
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ null /* header */,
+ null /* description */,
+ returnCredentials /* returnCredentials */,
+ false /* external */);
}
/**
@@ -106,8 +118,16 @@
*/
public boolean launchConfirmationActivity(int request, CharSequence title,
boolean returnCredentials, int userId) {
- return launchConfirmationActivity(request, title, null, null,
- returnCredentials, false, false, 0, Utils.enforceSameOwner(mActivity, userId));
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ null /* header */,
+ null /* description */,
+ returnCredentials /* returnCredentials */,
+ false /* external */,
+ false /* hasChallenge */,
+ 0 /* challenge */,
+ Utils.enforceSameOwner(mActivity, userId) /* userId */);
}
/**
@@ -127,8 +147,16 @@
boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
@Nullable CharSequence header, @Nullable CharSequence description,
boolean returnCredentials, boolean external) {
- return launchConfirmationActivity(request, title, header, description,
- returnCredentials, external, false, 0, Utils.getCredentialOwnerUserId(mActivity));
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ header /* header */,
+ description /* description */,
+ returnCredentials /* returnCredentials */,
+ external /* external */,
+ false /* hasChallenge */,
+ 0 /* challenge */,
+ Utils.getCredentialOwnerUserId(mActivity) /* userId */);
}
/**
@@ -149,8 +177,16 @@
boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
@Nullable CharSequence header, @Nullable CharSequence description,
boolean returnCredentials, boolean external, int userId) {
- return launchConfirmationActivity(request, title, header, description,
- returnCredentials, external, false, 0, Utils.enforceSameOwner(mActivity, userId));
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ header /* header */,
+ description /* description */,
+ returnCredentials /* returnCredentials */,
+ external /* external */,
+ false /* hasChallenge */,
+ 0 /* challenge */,
+ Utils.enforceSameOwner(mActivity, userId) /* userId */);
}
/**
@@ -166,8 +202,16 @@
public boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
@Nullable CharSequence header, @Nullable CharSequence description,
long challenge) {
- return launchConfirmationActivity(request, title, header, description,
- true, false, true, challenge, Utils.getCredentialOwnerUserId(mActivity));
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ header /* header */,
+ description /* description */,
+ true /* returnCredentials */,
+ false /* external */,
+ true /* hasChallenge */,
+ challenge /* challenge */,
+ Utils.getCredentialOwnerUserId(mActivity) /* userId */);
}
/**
@@ -184,8 +228,16 @@
public boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
@Nullable CharSequence header, @Nullable CharSequence description,
long challenge, int userId) {
- return launchConfirmationActivity(request, title, header, description,
- true, false, true, challenge, Utils.enforceSameOwner(mActivity, userId));
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ header /* header */,
+ description /* description */,
+ true /* returnCredentials */,
+ false /* external */,
+ true /* hasChallenge */,
+ challenge /* challenge */,
+ Utils.enforceSameOwner(mActivity, userId) /* userId */);
}
/**
@@ -205,8 +257,16 @@
public boolean launchConfirmationActivityWithExternalAndChallenge(int request,
@Nullable CharSequence title, @Nullable CharSequence header,
@Nullable CharSequence description, boolean external, long challenge, int userId) {
- return launchConfirmationActivity(request, title, header, description, false,
- external, true, challenge, Utils.enforceSameOwner(mActivity, userId));
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ header /* header */,
+ description /* description */,
+ false /* returnCredentials */,
+ external /* external */,
+ true /* hasChallenge */,
+ challenge /* challenge */,
+ Utils.enforceSameOwner(mActivity, userId) /* userId */);
}
/**
@@ -219,31 +279,69 @@
@Nullable CharSequence description, int userId) {
final Bundle extras = new Bundle();
extras.putBoolean(EXTRA_ALLOW_ANY_USER, true);
- return launchConfirmationActivity(request, title, header, description, false,
- false, true, 0, userId, extras);
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ header /* header */,
+ description /* description */,
+ false /* returnCredentials */,
+ false /* external */,
+ true /* hasChallenge */,
+ 0 /* challenge */,
+ userId /* userId */,
+ extras /* extras */);
}
private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
@Nullable CharSequence header, @Nullable CharSequence description,
boolean returnCredentials, boolean external, boolean hasChallenge,
long challenge, int userId) {
- return launchConfirmationActivity(request, title, header, description, returnCredentials,
- external, hasChallenge, challenge, userId, null /* alternateButton */, null);
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ header /* header */,
+ description /* description */,
+ returnCredentials /* returnCredentials */,
+ external /* external */,
+ hasChallenge /* hasChallenge */,
+ challenge /* challenge */,
+ userId /* userId */,
+ null /* alternateButton */,
+ null /* extras */);
}
private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
@Nullable CharSequence header, @Nullable CharSequence description,
boolean returnCredentials, boolean external, boolean hasChallenge,
long challenge, int userId, Bundle extras) {
- return launchConfirmationActivity(request, title, header, description, returnCredentials,
- external, hasChallenge, challenge, userId, null /* alternateButton */, extras);
+ return launchConfirmationActivity(
+ request /* request */,
+ title /* title */,
+ header /* header */,
+ description /* description */,
+ returnCredentials /* returnCredentials */,
+ external /* external */,
+ hasChallenge /* hasChallenge */,
+ challenge /* challenge */,
+ userId /* userId */,
+ null /* alternateButton */,
+ extras /* extras */);
}
public boolean launchFrpConfirmationActivity(int request, @Nullable CharSequence header,
@Nullable CharSequence description, @Nullable CharSequence alternateButton) {
- return launchConfirmationActivity(request, null /* title */, header, description,
- false /* returnCredentials */, true /* external */, false /* hasChallenge */,
- 0 /* challenge */, LockPatternUtils.USER_FRP, alternateButton, null);
+ return launchConfirmationActivity(
+ request /* request */,
+ null /* title */,
+ header /* header */,
+ description /* description */,
+ false /* returnCredentials */,
+ true /* external */,
+ false /* hasChallenge */,
+ 0 /* challenge */,
+ LockPatternUtils.USER_FRP /* userId */,
+ alternateButton /* alternateButton */,
+ null /* extras */);
}
private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
@@ -285,11 +383,11 @@
intent.putExtra(ConfirmDeviceCredentialBaseFragment.TITLE_TEXT, title);
intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header);
intent.putExtra(ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT, message);
- intent.putExtra(ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, external);
// TODO: Remove dark theme and show_cancel_button options since they are no longer used
intent.putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, false);
intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false);
intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, external);
+ intent.putExtra(ConfirmDeviceCredentialBaseFragment.USE_FADE_ANIMATION, external);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, returnCredentials);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, hasChallenge);
intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
diff --git a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
index 8969eec..10c73c5 100644
--- a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
+++ b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
@@ -31,6 +31,9 @@
import android.widget.ArrayAdapter;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog.Builder;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
@@ -40,9 +43,6 @@
import java.util.List;
-import androidx.appcompat.app.AlertDialog.Builder;
-import androidx.fragment.app.Fragment;
-
/**
* A dialog fragment similar to {@link ChooseLockGeneric} where the user can select from a few
* lock screen types.
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index 65d72f1..f68c04a 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -22,20 +22,40 @@
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.Intent;
+import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricManager;
+import android.hardware.biometrics.BiometricPrompt;
+import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.UserHandle;
import android.os.UserManager;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
import com.android.settings.Utils;
+import java.util.concurrent.Executor;
+
/**
* Launch this when you want to confirm the user is present by asking them to enter their
* PIN/password/pattern.
*/
-public class ConfirmDeviceCredentialActivity extends Activity {
+public class ConfirmDeviceCredentialActivity extends FragmentActivity {
public static final String TAG = ConfirmDeviceCredentialActivity.class.getSimpleName();
+ // The normal flow that apps go through
+ private static final int CREDENTIAL_NORMAL = 1;
+ // Unlocks the managed profile when the primary profile is unlocked
+ private static final int CREDENTIAL_MANAGED = 2;
+
+ private static final String TAG_BIOMETRIC_FRAGMENT = "fragment";
+
public static class InternalActivity extends ConfirmDeviceCredentialActivity {
}
@@ -59,57 +79,217 @@
return intent;
}
+ private BiometricManager mBiometricManager;
+ private BiometricFragment mBiometricFragment;
+ private DevicePolicyManager mDevicePolicyManager;
+ private LockPatternUtils mLockPatternUtils;
+ private UserManager mUserManager;
+ private ChooseLockSettingsHelper mChooseLockSettingsHelper;
+ private Handler mHandler = new Handler(Looper.getMainLooper());
+
+ private String mTitle;
+ private String mDetails;
+ private int mUserId;
+ private int mEffectiveUserId;
+ private int mCredentialMode;
+ private boolean mGoingToBackground;
+
+ private Executor mExecutor = (runnable -> {
+ mHandler.post(runnable);
+ });
+
+ private AuthenticationCallback mAuthenticationCallback = new AuthenticationCallback() {
+ public void onAuthenticationError(int errorCode, @NonNull CharSequence errString) {
+ if (!mGoingToBackground) {
+ if (errorCode == BiometricPrompt.BIOMETRIC_ERROR_USER_CANCELED) {
+ finish();
+ } else {
+ // All other errors go to some version of CC
+ showConfirmCredentials();
+ }
+ }
+
+ }
+
+ public void onAuthenticationSucceeded(BiometricPrompt.AuthenticationResult result) {
+ setResult(Activity.RESULT_OK);
+ finish();
+ }
+ };
+
@Override
- public void onCreate(Bundle savedInstanceState) {
+ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ mBiometricManager = getSystemService(BiometricManager.class);
+ mDevicePolicyManager = getSystemService(DevicePolicyManager.class);
+ mUserManager = UserManager.get(this);
+ mLockPatternUtils = new LockPatternUtils(this);
+
Intent intent = getIntent();
- String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
- String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
+ mTitle = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
+ mDetails = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
String alternateButton = intent.getStringExtra(
KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
boolean frp = KeyguardManager.ACTION_CONFIRM_FRP_CREDENTIAL.equals(intent.getAction());
- int userId = Utils.getCredentialOwnerUserId(this);
+ mUserId = UserHandle.myUserId();
+ mEffectiveUserId = mUserManager.getCredentialOwnerProfile(mUserId);
if (isInternalActivity()) {
try {
- userId = Utils.getUserIdFromBundle(this, intent.getExtras());
+ mUserId = Utils.getUserIdFromBundle(this, intent.getExtras());
} catch (SecurityException se) {
Log.e(TAG, "Invalid intent extra", se);
}
}
- final boolean isManagedProfile = UserManager.get(this).isManagedProfile(userId);
+ final boolean isManagedProfile = UserManager.get(this).isManagedProfile(mUserId);
// if the client app did not hand in a title and we are about to show the work challenge,
// check whether there is a policy setting the organization name and use that as title
- if ((title == null) && isManagedProfile) {
- title = getTitleFromOrganizationName(userId);
+ if ((mTitle == null) && isManagedProfile) {
+ mTitle = getTitleFromOrganizationName(mUserId);
}
- ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
+ mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this);
final LockPatternUtils lockPatternUtils = new LockPatternUtils(this);
- boolean launched;
+
+ boolean launchedBiometric = false;
+ boolean launchedCDC = false;
// If the target is a managed user and user key not unlocked yet, we will force unlock
// tied profile so it will enable work mode and unlock managed profile, when personal
// challenge is unlocked.
if (frp) {
- launched = helper.launchFrpConfirmationActivity(0, title, details, alternateButton);
+ launchedCDC = mChooseLockSettingsHelper.launchFrpConfirmationActivity(
+ 0, mTitle, mDetails, alternateButton);
} else if (isManagedProfile && isInternalActivity()
- && !lockPatternUtils.isSeparateProfileChallengeEnabled(userId)) {
+ && !lockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) {
+ mCredentialMode = CREDENTIAL_MANAGED;
+ if (isBiometricAllowed()) {
+ showBiometricPrompt();
+ launchedBiometric = true;
+ } else {
+ showConfirmCredentials();
+ }
+ } else {
+ mCredentialMode = CREDENTIAL_NORMAL;
+ if (isBiometricAllowed()) {
+ // Don't need to check if biometrics / pin/pattern/pass are enrolled. It will go to
+ // onAuthenticationError and do the right thing automatically.
+ showBiometricPrompt();
+ launchedBiometric = true;
+ } else {
+ showConfirmCredentials();
+ }
+ }
+
+ if (launchedCDC) {
+ finish();
+ } else if (launchedBiometric) {
+ // Keep this activity alive until BiometricPrompt goes away
+ } else {
+ Log.d(TAG, "No pattern, password or PIN set.");
+ setResult(Activity.RESULT_OK);
+ finish();
+ }
+ }
+
+ @Override
+ protected void onStart() {
+ super.onStart();
+ // Translucent activity that is "visible", so it doesn't complain about finish()
+ // not being called before onResume().
+ setVisible(true);
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ if (!isChangingConfigurations()) {
+ mGoingToBackground = true;
+ if (mBiometricFragment != null) {
+ mBiometricFragment.cancel();
+ }
+ finish();
+ } else {
+ mGoingToBackground = false;
+ }
+ }
+
+ // User could be locked while Effective user is unlocked even though the effective owns the
+ // credential. Otherwise, biometric can't unlock fbe/keystore through
+ // verifyTiedProfileChallenge. In such case, we also wanna show the user message that
+ // biometric is disabled due to device restart.
+ private boolean isStrongAuthRequired() {
+ return !mLockPatternUtils.isBiometricAllowedForUser(mEffectiveUserId)
+ || !mUserManager.isUserUnlocked(mUserId);
+ }
+
+ private boolean isBiometricDisabledByAdmin() {
+ final int disabledFeatures =
+ mDevicePolicyManager.getKeyguardDisabledFeatures(null, mEffectiveUserId);
+ return (disabledFeatures & DevicePolicyManager.KEYGUARD_DISABLE_BIOMETRICS) != 0;
+ }
+
+ private boolean isBiometricAllowed() {
+ return !isStrongAuthRequired() && !isBiometricDisabledByAdmin();
+ }
+
+ private void showBiometricPrompt() {
+ mBiometricManager.setActiveUser(mUserId);
+
+ mBiometricFragment = (BiometricFragment) getSupportFragmentManager()
+ .findFragmentByTag(TAG_BIOMETRIC_FRAGMENT);
+ boolean newFragment = false;
+
+ if (mBiometricFragment == null) {
+ final BiometricFragment.PromptInfo info = new BiometricFragment.PromptInfo.Builder()
+ .setTitle(mTitle)
+ .setSubtitle(mDetails)
+ .setNegativeButtonText(getResources()
+ .getString(R.string.confirm_device_credential_use_alternate_method))
+ .build();
+ mBiometricFragment = BiometricFragment.newInstance(info);
+ newFragment = true;
+ }
+ mBiometricFragment.setCallbacks(mExecutor, mAuthenticationCallback);
+
+ if (newFragment) {
+ getSupportFragmentManager().beginTransaction()
+ .add(mBiometricFragment, TAG_BIOMETRIC_FRAGMENT).commit();
+ }
+ }
+
+ /**
+ * Shows ConfirmDeviceCredentials for normal apps.
+ */
+ private void showConfirmCredentials() {
+ boolean launched = false;
+ if (mCredentialMode == CREDENTIAL_MANAGED) {
// We set the challenge as 0L, so it will force to unlock managed profile when it
// unlocks primary profile screen lock, by calling verifyTiedProfileChallenge()
- launched = helper.launchConfirmationActivityWithExternalAndChallenge(
- 0 /* request code */, null /* title */, title, details, true /* isExternal */,
- 0L /* challenge */, userId);
- } else {
- launched = helper.launchConfirmationActivity(0 /* request code */, null /* title */,
- title, details, false /* returnCredentials */, true /* isExternal */, userId);
+ launched = mChooseLockSettingsHelper
+ .launchConfirmationActivityWithExternalAndChallenge(
+ 0 /* request code */, null /* title */, mTitle, mDetails,
+ true /* isExternal */, 0L /* challenge */, mUserId);
+ } else if (mCredentialMode == CREDENTIAL_NORMAL){
+ launched = mChooseLockSettingsHelper.launchConfirmationActivity(
+ 0 /* request code */, null /* title */,
+ mTitle, mDetails, false /* returnCredentials */, true /* isExternal */,
+ mUserId);
}
if (!launched) {
- Log.d(TAG, "No pattern, password or PIN set.");
+ Log.d(TAG, "No pin/pattern/pass set");
setResult(Activity.RESULT_OK);
}
finish();
}
+ @Override
+ public void finish() {
+ super.finish();
+ // Finish without animation since the activity is just there so we can launch
+ // BiometricPrompt.
+ overridePendingTransition(R.anim.confirm_credential_biometric_transition_enter, 0);
+ }
+
private boolean isInternalActivity() {
return this instanceof ConfirmDeviceCredentialActivity.InternalActivity;
}
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 3818ac9..c00f9ab 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -23,13 +23,13 @@
import android.view.WindowManager;
import android.widget.LinearLayout;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SetupWizardUtils;
import com.android.settings.Utils;
-import androidx.fragment.app.Fragment;
-
public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivity {
private static final String STATE_IS_KEYGUARD_LOCKED = "STATE_IS_KEYGUARD_LOCKED";
@@ -140,6 +140,15 @@
}
}
+ @Override
+ public void finish() {
+ super.finish();
+ if (getIntent().getBooleanExtra(
+ ConfirmDeviceCredentialBaseFragment.USE_FADE_ANIMATION, false)) {
+ overridePendingTransition(0, R.anim.confirm_credential_biometric_transition_exit);
+ }
+ }
+
public void prepareEnterAnimation() {
getFragment().prepareEnterAnimation();
}
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index 0f6eeb3..9b677aa 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -46,33 +46,31 @@
import android.widget.ImageView;
import android.widget.TextView;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.biometrics.fingerprint.FingerprintUiHelper;
-import com.android.settings.core.InstrumentedFragment;
-
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentManager;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.core.InstrumentedFragment;
+
/**
* Base fragment to be shared for PIN/Pattern/Password confirmation fragments.
*/
-public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFragment
- implements FingerprintUiHelper.Callback {
+public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFragment {
public static final String PACKAGE = "com.android.settings";
public static final String TITLE_TEXT = PACKAGE + ".ConfirmCredentials.title";
public static final String HEADER_TEXT = PACKAGE + ".ConfirmCredentials.header";
public static final String DETAILS_TEXT = PACKAGE + ".ConfirmCredentials.details";
- public static final String ALLOW_FP_AUTHENTICATION =
- PACKAGE + ".ConfirmCredentials.allowFpAuthentication";
public static final String DARK_THEME = PACKAGE + ".ConfirmCredentials.darkTheme";
public static final String SHOW_CANCEL_BUTTON =
PACKAGE + ".ConfirmCredentials.showCancelButton";
public static final String SHOW_WHEN_LOCKED =
PACKAGE + ".ConfirmCredentials.showWhenLocked";
+ public static final String USE_FADE_ANIMATION =
+ PACKAGE + ".ConfirmCredentials.useFadeAnimation";
protected static final int USER_TYPE_PRIMARY = 1;
protected static final int USER_TYPE_MANAGED_PROFILE = 2;
@@ -81,10 +79,8 @@
/** Time we wait before clearing a wrong input attempt (e.g. pattern) and the error message. */
protected static final long CLEAR_WRONG_ATTEMPT_TIMEOUT_MS = 3000;
- private FingerprintUiHelper mFingerprintHelper;
protected boolean mReturnCredentials = false;
protected Button mCancelButton;
- protected ImageView mFingerprintIcon;
protected int mEffectiveUserId;
protected int mUserId;
protected UserManager mUserManager;
@@ -123,10 +119,7 @@
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
mCancelButton = (Button) view.findViewById(R.id.cancelButton);
- mFingerprintIcon = (ImageView) view.findViewById(R.id.fingerprintIcon);
- mFingerprintHelper = new FingerprintUiHelper(
- mFingerprintIcon,
- (TextView) view.findViewById(R.id.errorText), this, mEffectiveUserId);
+
boolean showCancelButton = getActivity().getIntent().getBooleanExtra(
SHOW_CANCEL_BUTTON, false);
boolean hasAlternateButton = mFrp && !TextUtils.isEmpty(mFrpAlternateButtonText);
@@ -154,29 +147,16 @@
}
}
- private boolean isFingerprintDisabledByAdmin() {
- final int disabledFeatures =
- mDevicePolicyManager.getKeyguardDisabledFeatures(null, mEffectiveUserId);
- return (disabledFeatures & DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT) != 0;
- }
-
// User could be locked while Effective user is unlocked even though the effective owns the
// credential. Otherwise, fingerprint can't unlock fbe/keystore through
// verifyTiedProfileChallenge. In such case, we also wanna show the user message that
// fingerprint is disabled due to device restart.
protected boolean isStrongAuthRequired() {
return mFrp
- || !mLockPatternUtils.isFingerprintAllowedForUser(mEffectiveUserId)
+ || !mLockPatternUtils.isBiometricAllowedForUser(mEffectiveUserId)
|| !mUserManager.isUserUnlocked(mUserId);
}
- private boolean isFingerprintAllowed() {
- return !mReturnCredentials
- && getActivity().getIntent().getBooleanExtra(ALLOW_FP_AUTHENTICATION, false)
- && !isStrongAuthRequired()
- && !isFingerprintDisabledByAdmin();
- }
-
@Override
public void onResume() {
super.onResume();
@@ -184,13 +164,6 @@
}
protected void refreshLockScreen() {
- if (isFingerprintAllowed()) {
- mFingerprintHelper.startListening();
- } else {
- if (mFingerprintHelper.isListening()) {
- mFingerprintHelper.stopListening();
- }
- }
updateErrorMessage(mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId));
}
@@ -215,28 +188,10 @@
@Override
public void onPause() {
super.onPause();
- if (mFingerprintHelper.isListening()) {
- mFingerprintHelper.stopListening();
- }
- }
-
- @Override
- public void onAuthenticated() {
- // Check whether we are still active.
- if (getActivity() != null && getActivity().isResumed()) {
- TrustManager trustManager =
- (TrustManager) getActivity().getSystemService(Context.TRUST_SERVICE);
- trustManager.setDeviceLockedForUser(mEffectiveUserId, false);
- authenticationSucceeded();
- checkForPendingIntent();
- }
}
protected abstract void authenticationSucceeded();
- @Override
- public void onFingerprintIconVisibilityChanged(boolean visible) {
- }
public void prepareEnterAnimation() {
}
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index b381226..d380fc9 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -39,6 +39,8 @@
import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternChecker;
import com.android.internal.widget.LockPatternUtils;
@@ -50,8 +52,6 @@
import java.util.ArrayList;
-import androidx.fragment.app.Fragment;
-
public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
// The index of the array is isStrongAuth << 2 + isProfile << 1 + isAlpha.
@@ -105,7 +105,6 @@
private CountDownTimer mCountdownTimer;
private boolean mIsAlpha;
private InputMethodManager mImm;
- private boolean mUsingFingerprint = false;
private AppearAnimationUtils mAppearAnimationUtils;
private DisappearAnimationUtils mDisappearAnimationUtils;
@@ -243,7 +242,6 @@
mCancelButton.setAlpha(0f);
mPasswordEntry.setAlpha(0f);
mErrorTextView.setAlpha(0f);
- mFingerprintIcon.setAlpha(0f);
}
private View[] getActiveViews() {
@@ -255,9 +253,6 @@
}
result.add(mPasswordEntry);
result.add(mErrorTextView);
- if (mFingerprintIcon.getVisibility() == View.VISIBLE) {
- result.add(mFingerprintIcon);
- }
return result.toArray(new View[] {});
}
@@ -303,17 +298,12 @@
mCredentialCheckResultTracker.setResult(true, new Intent(), 0, mEffectiveUserId);
}
- @Override
- public void onFingerprintIconVisibilityChanged(boolean visible) {
- mUsingFingerprint = visible;
- }
-
private void updatePasswordEntry() {
final boolean isLockedOut =
mLockPatternUtils.getLockoutAttemptDeadline(mEffectiveUserId) != 0;
mPasswordEntry.setEnabled(!isLockedOut);
mPasswordEntryInputDisabler.setInputEnabled(!isLockedOut);
- if (isLockedOut || mUsingFingerprint) {
+ if (isLockedOut) {
mImm.hideSoftInputFromWindow(mPasswordEntry.getWindowToken(), 0 /*flags*/);
} else {
mPasswordEntry.scheduleShowSoftInput();
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index 84db540..95a0aca 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -231,7 +231,6 @@
mCancelButton.setAlpha(0f);
mLockPatternView.setAlpha(0f);
mDetailsTextView.setAlpha(0f);
- mFingerprintIcon.setAlpha(0f);
}
private int getDefaultDetails() {
@@ -265,9 +264,6 @@
}
result.add(row);
}
- if (mFingerprintIcon.getVisibility() == View.VISIBLE) {
- result.add(new ArrayList<Object>(Collections.singletonList(mFingerprintIcon)));
- }
Object[][] resultArr = new Object[result.size()][cellStates[0].length];
for (int i = 0; i < result.size(); i++) {
ArrayList<Object> row = result.get(i);
@@ -377,16 +373,6 @@
}
}
- @Override
- public void onFingerprintIconVisibilityChanged(boolean visible) {
- if (mLeftSpacerLandscape != null && mRightSpacerLandscape != null) {
-
- // In landscape, adjust spacing depending on fingerprint icon visibility.
- mLeftSpacerLandscape.setVisibility(visible ? View.GONE : View.VISIBLE);
- mRightSpacerLandscape.setVisibility(visible ? View.GONE : View.VISIBLE);
- }
- }
-
/**
* The pattern listener that responds according to a user confirming
* an existing lock pattern.
diff --git a/src/com/android/settings/password/PasswordRequirementAdapter.java b/src/com/android/settings/password/PasswordRequirementAdapter.java
index 62ddd75..0e194af 100644
--- a/src/com/android/settings/password/PasswordRequirementAdapter.java
+++ b/src/com/android/settings/password/PasswordRequirementAdapter.java
@@ -21,11 +21,11 @@
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.R;
import com.android.settings.password.PasswordRequirementAdapter.PasswordRequirementViewHolder;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* Used in {@link ChooseLockPassword} to show password requirements.
*/
diff --git a/src/com/android/settings/password/SaveChosenLockWorkerBase.java b/src/com/android/settings/password/SaveChosenLockWorkerBase.java
index f76ffd9..5b6a812 100644
--- a/src/com/android/settings/password/SaveChosenLockWorkerBase.java
+++ b/src/com/android/settings/password/SaveChosenLockWorkerBase.java
@@ -22,10 +22,10 @@
import android.os.Bundle;
import android.os.UserManager;
-import com.android.internal.widget.LockPatternUtils;
-
import androidx.fragment.app.Fragment;
+import com.android.internal.widget.LockPatternUtils;
+
/**
* An invisible retained worker fragment to track the AsyncWork that saves (and optionally
* verifies if a challenge is given) the chosen lock credential (pattern/pin/password).
diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java
index 94bc928..bf55271 100644
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -20,6 +20,7 @@
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FACE;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
+
import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.Nullable;
@@ -34,11 +35,11 @@
import android.os.IBinder;
import android.os.UserManager;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.Utils;
-import androidx.annotation.VisibleForTesting;
-
/**
* Business logic for {@link SetNewPasswordActivity}.
*
@@ -114,7 +115,7 @@
if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)
&& mFaceManager != null
&& mFaceManager.isHardwareDetected()
- && !mFaceManager.hasEnrolledFaces(mTargetUserId)
+ && !mFaceManager.hasEnrolledTemplates(mTargetUserId)
&& !isFaceDisabledByAdmin()) {
extras = getFaceChooseLockExtras();
} else if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)
@@ -147,7 +148,7 @@
private Bundle getFaceChooseLockExtras() {
Bundle chooseLockExtras = new Bundle();
- long challenge = mFaceManager.preEnroll();
+ long challenge = mFaceManager.generateChallenge();
chooseLockExtras.putInt(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
PASSWORD_QUALITY_SOMETHING);
chooseLockExtras.putBoolean(
diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index 1642bf0..700cc2d 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -27,6 +27,10 @@
import android.view.ViewGroup;
import android.widget.LinearLayout;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.SetupEncryptionInterstitial;
@@ -35,10 +39,6 @@
import com.android.settings.utils.SettingsDividerItemDecoration;
import com.android.setupwizardlib.GlifPreferenceLayout;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure
* from ChooseLockGeneric class, and should remain similar to that behaviorally. This class should
diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java
index 56c6a7b..b96c57df 100644
--- a/src/com/android/settings/password/SetupChooseLockPassword.java
+++ b/src/com/android/settings/password/SetupChooseLockPassword.java
@@ -26,13 +26,13 @@
import android.widget.Button;
import android.widget.LinearLayout;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.R;
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
/**
* Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure
* from ChooseLockPassword class, and should remain similar to that behaviorally. This class should
diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java
index cc1633a..696380c 100644
--- a/src/com/android/settings/password/SetupChooseLockPattern.java
+++ b/src/com/android/settings/password/SetupChooseLockPattern.java
@@ -24,12 +24,12 @@
import android.view.ViewGroup;
import android.widget.Button;
-import com.android.settings.R;
-import com.android.settings.SetupRedactionInterstitial;
-
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
+import com.android.settings.R;
+import com.android.settings.SetupRedactionInterstitial;
+
/**
* Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure
* from ChooseLockPattern class, and should remain similar to that behaviorally. This class should
diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java
index c93d12d..ad28ddb 100644
--- a/src/com/android/settings/password/SetupSkipDialog.java
+++ b/src/com/android/settings/password/SetupSkipDialog.java
@@ -21,14 +21,14 @@
import android.content.DialogInterface;
import android.os.Bundle;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.FragmentManager;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
public class SetupSkipDialog extends InstrumentedDialogFragment
implements DialogInterface.OnClickListener {
diff --git a/src/com/android/settings/password/StorageManagerWrapper.java b/src/com/android/settings/password/StorageManagerWrapper.java
deleted file mode 100644
index 5adfaf2..0000000
--- a/src/com/android/settings/password/StorageManagerWrapper.java
+++ /dev/null
@@ -1,29 +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.password;
-
-import android.os.storage.StorageManager;
-
-/**
- * Wrapper class to allow Robolectric to shadow methods introduced in newer API
- */
-public class StorageManagerWrapper {
-
- public static boolean isFileEncryptedNativeOrEmulated() {
- return StorageManager.isFileEncryptedNativeOrEmulated();
- }
-}
diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 10759ce..ba0172b 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -35,14 +35,14 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import java.text.DateFormat;
-import androidx.preference.Preference;
-
/**
* Fragment for management of a print job.
*/
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 345b4ae..58e4ada 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -49,6 +49,12 @@
import android.widget.Switch;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -61,12 +67,6 @@
import java.util.List;
import java.util.Map;
-import androidx.annotation.NonNull;
-import androidx.loader.app.LoaderManager;
-import androidx.loader.content.Loader;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
-
/**
* Fragment with print service settings.
*/
@@ -190,8 +190,6 @@
if (emptyView == null) {
emptyView = getActivity().getLayoutInflater().inflate(
R.layout.empty_print_state, contentRoot, false);
- ImageView iconView = (ImageView) emptyView.findViewById(R.id.icon);
- iconView.setContentDescription(getString(R.string.print_service_disabled));
TextView textView = (TextView) emptyView.findViewById(R.id.message);
textView.setText(R.string.print_service_disabled);
contentRoot.addView(emptyView);
@@ -216,8 +214,6 @@
if (emptyView == null) {
emptyView = getActivity().getLayoutInflater().inflate(
R.layout.empty_print_state, contentRoot, false);
- ImageView iconView = (ImageView) emptyView.findViewById(R.id.icon);
- iconView.setContentDescription(getString(R.string.print_no_printers_found));
TextView textView = (TextView) emptyView.findViewById(R.id.message);
textView.setText(R.string.print_no_printers_found);
contentRoot.addView(emptyView);
diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java
index 3bd80fd..16c4320 100644
--- a/src/com/android/settings/print/PrintSettingPreferenceController.java
+++ b/src/com/android/settings/print/PrintSettingPreferenceController.java
@@ -25,6 +25,9 @@
import android.print.PrintManager;
import android.printservice.PrintServiceInfo;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.RestrictedPreference;
@@ -34,9 +37,6 @@
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* {@link BasePreferenceController} for Print settings.
*/
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 2f1f63d..63ffe87 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -55,8 +55,8 @@
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.apppreference.AppPreference;
import java.text.DateFormat;
import java.util.ArrayList;
@@ -356,7 +356,7 @@
printJob.getCreationTime(), printJob.getCreationTime(),
DateFormat.SHORT, DateFormat.SHORT)));
- TypedArray a = getActivity().obtainStyledAttributes(new int[] {
+ TypedArray a = getActivity().obtainStyledAttributes(new int[]{
android.R.attr.colorControlNormal});
int tintColor = a.getColor(0, 0);
a.recycle();
diff --git a/src/com/android/settings/print/SettingsPrintServicesLoader.java b/src/com/android/settings/print/SettingsPrintServicesLoader.java
index 758f4d3..e94c589 100644
--- a/src/com/android/settings/print/SettingsPrintServicesLoader.java
+++ b/src/com/android/settings/print/SettingsPrintServicesLoader.java
@@ -22,12 +22,12 @@
import android.print.PrintServicesLoader;
import android.printservice.PrintServiceInfo;
+import androidx.loader.content.Loader;
+
import com.android.internal.util.Preconditions;
import java.util.List;
-import androidx.loader.content.Loader;
-
/**
* Loader for the list of print services. Can be parametrized to select a subset.
*/
diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java
index fcfa8aa..efbefde 100644
--- a/src/com/android/settings/search/BaseSearchIndexProvider.java
+++ b/src/com/android/settings/search/BaseSearchIndexProvider.java
@@ -16,14 +16,21 @@
package com.android.settings.search;
+import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
+import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_SEARCHABLE;
+import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag
+ .FLAG_INCLUDE_PREF_SCREEN;
+import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_KEY;
+import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_SEARCHABLE;
+
import android.annotation.XmlRes;
import android.content.Context;
-import android.content.res.XmlResourceParser;
+import android.os.Bundle;
import android.provider.SearchIndexableResource;
-import android.text.TextUtils;
-import android.util.AttributeSet;
import android.util.Log;
-import android.util.Xml;
+
+import androidx.annotation.CallSuper;
+import androidx.annotation.VisibleForTesting;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerListHelper;
@@ -31,16 +38,12 @@
import com.android.settings.core.PreferenceXmlParserUtils;
import com.android.settingslib.core.AbstractPreferenceController;
-import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.CallSuper;
-import androidx.annotation.VisibleForTesting;
-
/**
* A basic SearchIndexProvider that returns no data to index.
*/
@@ -66,11 +69,12 @@
public List<String> getNonIndexableKeys(Context context) {
if (!isPageSearchEnabled(context)) {
// Entire page should be suppressed, mark all keys from this page as non-indexable.
- return getNonIndexableKeysFromXml(context);
+ return getNonIndexableKeysFromXml(context, true /* suppressAllPage */);
}
+ final List<String> nonIndexableKeys = new ArrayList<>();
+ nonIndexableKeys.addAll(getNonIndexableKeysFromXml(context, false /* suppressAllPage */));
final List<AbstractPreferenceController> controllers = getPreferenceControllers(context);
if (controllers != null && !controllers.isEmpty()) {
- final List<String> nonIndexableKeys = new ArrayList<>();
for (AbstractPreferenceController controller : controllers) {
if (controller instanceof PreferenceControllerMixin) {
((PreferenceControllerMixin) controller)
@@ -85,10 +89,8 @@
nonIndexableKeys.add(controller.getPreferenceKey());
}
}
- return nonIndexableKeys;
- } else {
- return new ArrayList<>();
}
+ return nonIndexableKeys;
}
@Override
@@ -131,7 +133,11 @@
return true;
}
- private List<String> getNonIndexableKeysFromXml(Context context) {
+ /**
+ * Get all non-indexable keys from xml. If {@param suppressAllPage} is set, all keys are
+ * considered non-indexable. Otherwise, only keys with searchable="false" are included.
+ */
+ private List<String> getNonIndexableKeysFromXml(Context context, boolean suppressAllPage) {
final List<SearchIndexableResource> resources = getXmlResourcesToIndex(
context, true /* not used*/);
if (resources == null || resources.isEmpty()) {
@@ -139,27 +145,32 @@
}
final List<String> nonIndexableKeys = new ArrayList<>();
for (SearchIndexableResource res : resources) {
- nonIndexableKeys.addAll(getNonIndexableKeysFromXml(context, res.xmlResId));
+ nonIndexableKeys.addAll(
+ getNonIndexableKeysFromXml(context, res.xmlResId, suppressAllPage));
}
return nonIndexableKeys;
}
@VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
- public List<String> getNonIndexableKeysFromXml(Context context, @XmlRes int xmlResId) {
- final List<String> nonIndexableKeys = new ArrayList<>();
- final XmlResourceParser parser = context.getResources().getXml(xmlResId);
- final AttributeSet attrs = Xml.asAttributeSet(parser);
+ public List<String> getNonIndexableKeysFromXml(Context context, @XmlRes int xmlResId,
+ boolean suppressAllPage) {
+ return getKeysFromXml(context, xmlResId, suppressAllPage);
+ }
+
+ private List<String> getKeysFromXml(Context context, @XmlRes int xmlResId,
+ boolean suppressAllPage) {
+ final List<String> keys = new ArrayList<>();
try {
- while (parser.next() != XmlPullParser.END_DOCUMENT) {
- final String key = PreferenceXmlParserUtils.getDataKey(context, attrs);
- if (!TextUtils.isEmpty(key)) {
- nonIndexableKeys.add(key);
+ final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(context,
+ xmlResId, FLAG_NEED_KEY | FLAG_INCLUDE_PREF_SCREEN | FLAG_NEED_SEARCHABLE);
+ for (Bundle bundle : metadata) {
+ if (suppressAllPage || !bundle.getBoolean(METADATA_SEARCHABLE, true)) {
+ keys.add(bundle.getString(METADATA_KEY));
}
}
} catch (IOException | XmlPullParserException e) {
Log.w(TAG, "Error parsing non-indexable from xml " + xmlResId);
}
- return nonIndexableKeys;
+ return keys;
}
-
}
diff --git a/src/com/android/settings/search/DeviceIndexFeatureProvider.java b/src/com/android/settings/search/DeviceIndexFeatureProvider.java
deleted file mode 100644
index e6b3e93..0000000
--- a/src/com/android/settings/search/DeviceIndexFeatureProvider.java
+++ /dev/null
@@ -1,134 +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.search;
-
-import static com.android.settings.slices.SliceDeepLinkSpringBoard.INTENT;
-import static com.android.settings.slices.SliceDeepLinkSpringBoard.SETTINGS;
-
-import android.app.job.JobInfo;
-import android.app.job.JobScheduler;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.ServiceInfo;
-import android.net.Uri;
-import android.os.Binder;
-import android.os.Build;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.slices.SettingsSliceProvider;
-
-import java.util.List;
-import java.util.Locale;
-
-public interface DeviceIndexFeatureProvider {
-
- String TAG = "DeviceIndex";
-
- String INDEX_VERSION = "settings:index_version";
- String INDEX_LANGUAGE = "settings:language";
-
- // Increment when new items are added to ensure they get pushed to the device index.
- String VERSION = Build.FINGERPRINT;
-
- // When the device language changes, re-index so Slices trigger in device language.
- Locale LANGUAGE = Locale.getDefault();
-
- boolean isIndexingEnabled();
-
- void index(Context context, CharSequence title, Uri sliceUri, Uri launchUri,
- List<String> keywords);
-
- void clearIndex(Context context);
-
- default void updateIndex(Context context, boolean force) {
- if (!isIndexingEnabled()) {
- Log.i(TAG, "Skipping: device index is not enabled");
- return;
- }
-
- if (!Utils.isDeviceProvisioned(context)) {
- Log.w(TAG, "Skipping: device is not provisioned");
- return;
- }
-
- final ComponentName jobComponent = new ComponentName(context.getPackageName(),
- DeviceIndexUpdateJobService.class.getName());
-
- try {
- final int callerUid = Binder.getCallingUid();
- final ServiceInfo si = context.getPackageManager().getServiceInfo(jobComponent,
- PackageManager.MATCH_DIRECT_BOOT_AWARE
- | PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
- if (si == null) {
- Log.w(TAG, "Skipping: No such service " + jobComponent);
- return;
- }
- if (si.applicationInfo.uid != callerUid) {
- Log.w(TAG, "Skipping: Uid cannot schedule DeviceIndexUpdate: " + callerUid);
- return;
- }
- } catch (PackageManager.NameNotFoundException e) {
- Log.w(TAG, "Skipping: error finding DeviceIndexUpdateJobService from packageManager");
- return;
- }
-
- if (!force && skipIndex(context)) {
- Log.i(TAG, "Skipping: already indexed.");
- // No need to update.
- return;
- }
-
- // Prevent scheduling multiple jobs
- setIndexState(context);
-
- final int jobId = context.getResources().getInteger(R.integer.device_index_update);
- // Schedule a job so that we know it'll be able to complete, but try to run as
- // soon as possible.
- context.getSystemService(JobScheduler.class).schedule(
- new JobInfo.Builder(jobId, jobComponent)
- .setPersisted(true)
- .setMinimumLatency(1000)
- .setOverrideDeadline(1)
- .build());
-
- }
-
- static Uri createDeepLink(String s) {
- return new Uri.Builder().scheme(SETTINGS)
- .authority(SettingsSliceProvider.SLICE_AUTHORITY)
- .appendQueryParameter(INTENT, s)
- .build();
- }
-
- static boolean skipIndex(Context context) {
- final boolean isSameVersion = TextUtils.equals(
- Settings.Secure.getString(context.getContentResolver(), INDEX_VERSION), VERSION);
- final boolean isSameLanguage = TextUtils.equals(
- Settings.Secure.getString(context.getContentResolver(), INDEX_LANGUAGE),
- LANGUAGE.toString());
- return isSameLanguage && isSameVersion;
- }
-
- static void setIndexState(Context context) {
- Settings.Secure.putString(context.getContentResolver(), INDEX_VERSION, VERSION);
- Settings.Secure.putString(context.getContentResolver(), INDEX_LANGUAGE,
- LANGUAGE.toString());
- }
-}
diff --git a/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java b/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java
deleted file mode 100644
index 087ecf8..0000000
--- a/src/com/android/settings/search/DeviceIndexFeatureProviderImpl.java
+++ /dev/null
@@ -1,39 +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.search;
-
-import android.content.Context;
-import android.net.Uri;
-
-import java.util.List;
-
-public class DeviceIndexFeatureProviderImpl implements DeviceIndexFeatureProvider {
-
- @Override
- public boolean isIndexingEnabled() {
- return false;
- }
-
- @Override
- public void index(Context context, CharSequence title, Uri sliceUri, Uri launchUri,
- List<String> keywords) {
- // Not enabled by default.
- }
-
- @Override
- public void clearIndex(Context context) {
- // Not enabled by default.
- }
-}
diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java
deleted file mode 100644
index b8f35a6..0000000
--- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java
+++ /dev/null
@@ -1,190 +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.search;
-
-import static android.app.slice.Slice.HINT_LARGE;
-import static android.app.slice.Slice.HINT_TITLE;
-import static android.app.slice.SliceItem.FORMAT_TEXT;
-import static com.android.settings.search.DeviceIndexFeatureProvider.createDeepLink;
-
-import android.app.job.JobParameters;
-import android.app.job.JobService;
-import android.content.ContentResolver;
-import android.content.Intent;
-import android.net.Uri;
-import android.net.Uri.Builder;
-import android.provider.SettingsSlicesContract;
-import android.util.Log;
-
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.slices.SettingsSliceProvider;
-import com.android.settings.slices.SliceDeepLinkSpringBoard;
-
-import java.util.Collection;
-import java.util.concurrent.CountDownLatch;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceViewManager;
-import androidx.slice.SliceViewManager.SliceCallback;
-import androidx.slice.core.SliceQuery;
-import androidx.slice.widget.ListContent;
-
-public class DeviceIndexUpdateJobService extends JobService {
-
- private static final String TAG = "DeviceIndexUpdate";
- private static final boolean DEBUG = false;
- @VisibleForTesting
- protected boolean mRunningJob;
-
- @Override
- public boolean onStartJob(JobParameters params) {
- if (DEBUG) Log.d(TAG, "onStartJob");
- if (!mRunningJob) {
- mRunningJob = true;
- Thread thread = new Thread(() -> updateIndex(params));
- thread.setPriority(Thread.MIN_PRIORITY);
- thread.start();
- }
- return true;
- }
-
- @Override
- public boolean onStopJob(JobParameters params) {
- if (DEBUG) Log.d(TAG, "onStopJob " + mRunningJob);
- if (mRunningJob) {
- mRunningJob = false;
- return true;
- }
- return false;
- }
-
- @VisibleForTesting
- protected void updateIndex(JobParameters params) {
- if (DEBUG) {
- Log.d(TAG, "Starting index");
- }
- final DeviceIndexFeatureProvider indexProvider = FeatureFactory.getFactory(this)
- .getDeviceIndexFeatureProvider();
- final SliceViewManager manager = getSliceViewManager();
- final Uri baseUri = new Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSliceProvider.SLICE_AUTHORITY)
- .build();
- final Uri platformBaseUri = new Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSlicesContract.AUTHORITY)
- .build();
- final Collection<Uri> slices = manager.getSliceDescendants(baseUri);
- slices.addAll(manager.getSliceDescendants(platformBaseUri));
-
- if (DEBUG) {
- Log.d(TAG, "Indexing " + slices.size() + " slices");
- }
-
- indexProvider.clearIndex(this /* context */);
-
- for (Uri slice : slices) {
- if (!mRunningJob) {
- return;
- }
- Slice loadedSlice = bindSliceSynchronous(manager, slice);
- // TODO: Get Title APIs on SliceMetadata and use that.
- SliceMetadata metaData = getMetadata(loadedSlice);
- CharSequence title = findTitle(loadedSlice, metaData);
- if (title != null) {
- if (DEBUG) {
- Log.d(TAG, "Indexing: " + slice + " " + title + " " + loadedSlice);
- }
- indexProvider.index(this, title, slice, createDeepLink(
- new Intent(SliceDeepLinkSpringBoard.ACTION_VIEW_SLICE)
- .setPackage(getPackageName())
- .putExtra(SliceDeepLinkSpringBoard.EXTRA_SLICE, slice.toString())
- .toUri(Intent.URI_ANDROID_APP_SCHEME)),
- metaData.getSliceKeywords());
- }
- }
- if (DEBUG) {
- Log.d(TAG, "Done indexing");
- }
- jobFinished(params, false);
- }
-
- protected SliceViewManager getSliceViewManager() {
- return SliceViewManager.getInstance(this);
- }
-
- protected SliceMetadata getMetadata(Slice loadedSlice) {
- return SliceMetadata.from(this, loadedSlice);
- }
-
- protected CharSequence findTitle(Slice loadedSlice, SliceMetadata metaData) {
- ListContent content = new ListContent(null, loadedSlice);
- SliceItem headerItem = content.getHeaderItem();
- if (headerItem == null) {
- if (content.getRowItems().size() != 0) {
- headerItem = content.getRowItems().get(0);
- } else {
- return null;
- }
- }
- // Look for a title, then large text, then any text at all.
- SliceItem title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_TITLE, null);
- if (title != null) {
- return title.getText();
- }
- title = SliceQuery.find(headerItem, FORMAT_TEXT, HINT_LARGE, null);
- if (title != null) {
- return title.getText();
- }
- title = SliceQuery.find(headerItem, FORMAT_TEXT);
- if (title != null) {
- return title.getText();
- }
- return null;
- }
-
- protected Slice bindSliceSynchronous(SliceViewManager manager, Uri slice) {
- final Slice[] returnSlice = new Slice[1];
- CountDownLatch latch = new CountDownLatch(1);
- SliceCallback callback = new SliceCallback() {
- @Override
- public void onSliceUpdated(Slice s) {
- try {
- SliceMetadata m = SliceMetadata.from(DeviceIndexUpdateJobService.this, s);
- if (m.getLoadingState() == SliceMetadata.LOADED_ALL) {
- returnSlice[0] = s;
- latch.countDown();
- manager.unregisterSliceCallback(slice, this);
- }
- } catch (Exception e) {
- Log.w(TAG, slice + " cannot be indexed", e);
- returnSlice[0] = s;
- }
- }
- };
- // Register a callback until we get a loaded slice.
- manager.registerSliceCallback(slice, callback);
- // Trigger the first bind in case no loading is needed.
- callback.onSliceUpdated(manager.bindSlice(slice));
- try {
- latch.await();
- } catch (InterruptedException e) {
- }
- return returnSlice[0];
- }
-}
diff --git a/src/com/android/settings/search/Indexable.java b/src/com/android/settings/search/Indexable.java
index 8048995..eef7184 100644
--- a/src/com/android/settings/search/Indexable.java
+++ b/src/com/android/settings/search/Indexable.java
@@ -19,12 +19,12 @@
import android.content.Context;
import android.provider.SearchIndexableResource;
+import androidx.annotation.Keep;
+
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
-import androidx.annotation.Keep;
-
/**
* Interface for classes whose instances can provide data for indexing.
*
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index bce6911..b2eb8bb 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -16,13 +16,18 @@
*/
package com.android.settings.search;
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
+
import android.annotation.NonNull;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.provider.Settings;
+import android.view.View;
import android.widget.Toolbar;
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.search.SearchIndexableResources;
@@ -31,7 +36,8 @@
*/
public interface SearchFeatureProvider {
- Intent SEARCH_UI_INTENT = new Intent("com.android.settings.action.SETTINGS_SEARCH");
+ Intent SEARCH_UI_INTENT = new Intent(Settings.ACTION_APP_SEARCH_SETTINGS);
+ int REQUEST_CODE = 0;
/**
* Ensures the caller has necessary privilege to launch search result page.
@@ -58,14 +64,25 @@
if (activity == null || toolbar == null) {
return;
}
+ // Please forgive me for what I am about to do.
+ //
+ // Need to make the navigation icon non-clickable so that the entire card is clickable
+ // and goes to the search UI. Also set the background to null so there's no ripple.
+ final View navView = toolbar.getNavigationView();
+ navView.setClickable(false);
+ navView.setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
+ navView.setBackground(null);
+
toolbar.setOnClickListener(tb -> {
final Intent intent = SEARCH_UI_INTENT;
intent.setPackage(getSettingsIntelligencePkgName());
+ final Context context = activity.getApplicationContext();
- FeatureFactory.getFactory(
- activity.getApplicationContext()).getSlicesFeatureProvider()
+ FeatureFactory.getFactory(context).getSlicesFeatureProvider()
.indexSliceDataAsync(activity.getApplicationContext());
- activity.startActivityForResult(intent, 0 /* requestCode */);
+ FeatureFactory.getFactory(context).getMetricsFeatureProvider()
+ .action(context, MetricsProto.MetricsEvent.ACTION_SEARCH_RESULTS);
+ activity.startActivityForResult(intent, REQUEST_CODE);
});
}
}
diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
index 26d15f5..0a846de 100644
--- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -41,6 +41,7 @@
import static android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS;
import static android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS;
import static android.provider.SearchIndexablesContract.SITE_MAP_COLUMNS;
+
import static com.android.settings.dashboard.DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP;
import android.content.Context;
diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java
index 54fae7e..81e9e60 100644
--- a/src/com/android/settings/search/actionbar/SearchMenuController.java
+++ b/src/com/android/settings/search/actionbar/SearchMenuController.java
@@ -17,12 +17,16 @@
package com.android.settings.search.actionbar;
import android.annotation.NonNull;
+import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
+import androidx.fragment.app.Fragment;
+
+import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.overlay.FeatureFactory;
@@ -32,8 +36,6 @@
import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
-import androidx.fragment.app.Fragment;
-
public class SearchMenuController implements LifecycleObserver, OnCreateOptionsMenu {
public static final String NEED_SEARCH_ICON_IN_ACTION_BAR = "need_search_icon_in_action_bar";
@@ -70,10 +72,12 @@
searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
searchItem.setOnMenuItemClickListener(target -> {
+ final Context context = mHost.getContext();
final Intent intent = SearchFeatureProvider.SEARCH_UI_INTENT;
intent.setPackage(FeatureFactory.getFactory(mHost.getContext())
.getSearchFeatureProvider().getSettingsIntelligencePkgName());
-
+ FeatureFactory.getFactory(context).getMetricsFeatureProvider()
+ .action(context, MetricsProto.MetricsEvent.ACTION_SEARCH_RESULTS);
mHost.startActivityForResult(intent, 0 /* requestCode */);
return true;
});
diff --git a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
index 47bd0b8..26370d9 100644
--- a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
+++ b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
@@ -23,13 +23,13 @@
import android.os.UserHandle;
import android.text.TextUtils;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.password.ChooseLockGeneric;
-import androidx.preference.Preference;
-
public class ChangeProfileScreenLockPreferenceController extends
ChangeScreenLockPreferenceController {
diff --git a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java
index 1284b6a..a58c528 100644
--- a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java
+++ b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java
@@ -23,6 +23,9 @@
import android.os.storage.StorageManager;
import android.text.TextUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -33,12 +36,10 @@
import com.android.settings.security.screenlock.ScreenLockSettings;
import com.android.settings.widget.GearPreference;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class ChangeScreenLockPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, GearPreference.OnGearClickListener {
@@ -170,7 +171,7 @@
* DO or PO installed in the user may disallow to change password.
*/
void disableIfPasswordQualityManaged(int userId) {
- final RestrictedLockUtils.EnforcedAdmin admin = RestrictedLockUtils
+ final RestrictedLockUtils.EnforcedAdmin admin = RestrictedLockUtilsInternal
.checkIfPasswordQualityIsSet(mContext, userId);
final DevicePolicyManager dpm = (DevicePolicyManager) mContext
.getSystemService(Context.DEVICE_POLICY_SERVICE);
diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java
index f09e077..01c0e9e 100644
--- a/src/com/android/settings/security/ConfigureKeyGuardDialog.java
+++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java
@@ -23,15 +23,15 @@
import android.content.Intent;
import android.os.Bundle;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.CredentialStorage;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockGeneric;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Prompt for key guard configuration confirmation.
*/
diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java
index 1df5e9e..060d964 100644
--- a/src/com/android/settings/security/CredentialStoragePreferenceController.java
+++ b/src/com/android/settings/security/CredentialStoragePreferenceController.java
@@ -20,10 +20,10 @@
import android.os.UserManager;
import android.security.KeyStore;
-import com.android.settings.R;
-
import androidx.preference.Preference;
+import com.android.settings.R;
+
public class CredentialStoragePreferenceController extends
RestrictedEncryptionPreferenceController {
diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java
index b7c5db7..a0e5a8e 100644
--- a/src/com/android/settings/security/CryptKeeperSettings.java
+++ b/src/com/android/settings/security/CryptKeeperSettings.java
@@ -33,6 +33,9 @@
import android.view.ViewGroup;
import android.widget.Button;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.CryptKeeperConfirm;
import com.android.settings.R;
@@ -41,9 +44,6 @@
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-
public class CryptKeeperSettings extends InstrumentedPreferenceFragment {
private static final String TAG = "CryptKeeper";
private static final String TYPE = "type";
diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
index 4128358..ea38068 100644
--- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java
+++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java
@@ -20,12 +20,12 @@
import android.os.UserManager;
import android.text.TextUtils;
+import androidx.preference.Preference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
-import androidx.preference.Preference;
-
public class EncryptionStatusPreferenceController extends BasePreferenceController {
diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java
index a8fa744..1aebe24 100644
--- a/src/com/android/settings/security/LockUnificationPreferenceController.java
+++ b/src/com/android/settings/security/LockUnificationPreferenceController.java
@@ -28,6 +28,9 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -36,13 +39,10 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockGeneric;
import com.android.settings.password.ChooseLockSettingsHelper;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller for password unification/un-unification flows.
*
@@ -136,8 +136,9 @@
mLockPatternUtils.isSeparateProfileChallengeEnabled(mProfileUserId);
mUnifyProfile.setChecked(!separate);
if (separate) {
- mUnifyProfile.setDisabledByAdmin(RestrictedLockUtils.checkIfRestrictionEnforced(
- mContext, UserManager.DISALLOW_UNIFIED_PASSWORD, mProfileUserId));
+ mUnifyProfile.setDisabledByAdmin(RestrictedLockUtilsInternal
+ .checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_UNIFIED_PASSWORD,
+ mProfileUserId));
}
}
}
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index 71130ea..62c8d6b 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -29,6 +29,7 @@
import com.android.settings.display.AmbientDisplayNotificationsPreferenceController;
import com.android.settings.gestures.DoubleTapScreenPreferenceController;
import com.android.settings.gestures.PickupGesturePreferenceController;
+import com.android.settings.gestures.WakeScreenGesturePreferenceController;
import com.android.settings.notification.LockScreenNotificationPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.screenlock.LockScreenPreferenceController;
@@ -154,8 +155,6 @@
public List<String> getNonIndexableKeys(Context context) {
final List<String> niks = super.getNonIndexableKeys(context);
niks.add(KEY_ADD_USER_FROM_LOCK_SCREEN);
- niks.add(KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE);
- niks.add(KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER);
return niks;
}
diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java
index a462916..f7a20ba 100644
--- a/src/com/android/settings/security/OwnerInfoPreferenceController.java
+++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java
@@ -18,23 +18,23 @@
import android.content.Context;
import android.os.UserHandle;
-import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.users.OwnerInfoSettings;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.RestrictedPreference;
-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.OnResume;
-
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceScreen;
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.users.OwnerInfoSettings;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedPreference;
+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.OnResume;
+
public class OwnerInfoPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume {
@@ -140,6 +140,6 @@
@VisibleForTesting
EnforcedAdmin getDeviceOwner() {
- return RestrictedLockUtils.getDeviceOwner(mContext);
+ return RestrictedLockUtilsInternal.getDeviceOwner(mContext);
}
}
diff --git a/src/com/android/settings/security/ResetCredentialsPreferenceController.java b/src/com/android/settings/security/ResetCredentialsPreferenceController.java
index 4635590..ee09bca 100644
--- a/src/com/android/settings/security/ResetCredentialsPreferenceController.java
+++ b/src/com/android/settings/security/ResetCredentialsPreferenceController.java
@@ -20,13 +20,13 @@
import android.os.UserManager;
import android.security.KeyStore;
+import androidx.preference.PreferenceScreen;
+
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.preference.PreferenceScreen;
-
public class ResetCredentialsPreferenceController extends RestrictedEncryptionPreferenceController
implements LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index 8a51449..092ec91 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -27,6 +27,11 @@
import android.view.ViewGroup;
import android.widget.Switch;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
@@ -40,11 +45,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
/**
* Screen pinning settings.
*/
diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java
index 72dd91b..e00d387 100644
--- a/src/com/android/settings/security/SecuritySettings.java
+++ b/src/com/android/settings/security/SecuritySettings.java
@@ -18,23 +18,17 @@
import static com.android.settings.security.EncryptionStatusPreferenceController
.PREF_KEY_ENCRYPTION_SECURITY_PAGE;
-import android.app.Activity;
import android.content.Context;
import android.content.Intent;
-import android.hardware.face.FaceManager;
-import android.hardware.fingerprint.FingerprintManager;
import android.provider.SearchIndexableResource;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.Utils;
import com.android.settings.biometrics.face.FaceStatusPreferenceController;
import com.android.settings.biometrics.fingerprint.FingerprintProfileStatusPreferenceController;
import com.android.settings.biometrics.fingerprint.FingerprintStatusPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.enterprise.EnterprisePrivacyPreferenceController;
-import com.android.settings.location.LocationPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.security.trustagent.ManageTrustAgentsPreferenceController;
import com.android.settings.security.trustagent.TrustAgentListPreferenceController;
@@ -110,7 +104,6 @@
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
Lifecycle lifecycle, SecuritySettings host) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
- controllers.add(new LocationPreferenceController(context, lifecycle));
controllers.add(new EnterprisePrivacyPreferenceController(context));
controllers.add(new ManageTrustAgentsPreferenceController(context));
controllers.add(new ScreenPinningPreferenceController(context));
@@ -166,44 +159,4 @@
null /* host*/);
}
};
-
- static class SummaryProvider implements SummaryLoader.SummaryProvider {
-
- private final Context mContext;
- private final SummaryLoader mSummaryLoader;
-
- public SummaryProvider(Context context, SummaryLoader summaryLoader) {
- mContext = context;
- mSummaryLoader = summaryLoader;
- }
-
- @Override
- public void setListening(boolean listening) {
- if (listening) {
- final FingerprintManager fpm =
- Utils.getFingerprintManagerOrNull(mContext);
- final FaceManager faceManager =
- Utils.getFaceManagerOrNull(mContext);
- if (faceManager != null && faceManager.isHardwareDetected()) {
- mSummaryLoader.setSummary(this,
- mContext.getString(R.string.security_dashboard_summary_face));
- } else if (fpm != null && fpm.isHardwareDetected()) {
- mSummaryLoader.setSummary(this,
- mContext.getString(R.string.security_dashboard_summary));
- } else {
- mSummaryLoader.setSummary(this, mContext.getString(
- R.string.security_dashboard_summary_no_fingerprint));
- }
- }
- }
- }
-
- 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/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java
index 03dd9da..d8d6252 100644
--- a/src/com/android/settings/security/SimLockPreferenceController.java
+++ b/src/com/android/settings/security/SimLockPreferenceController.java
@@ -24,13 +24,13 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class SimLockPreferenceController extends BasePreferenceController {
private static final String KEY_SIM_LOCK = "sim_lock_settings";
diff --git a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
new file mode 100644
index 0000000..4b00424
--- /dev/null
+++ b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
@@ -0,0 +1,52 @@
+/*
+ * 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.security;
+
+import android.content.Context;
+import android.hardware.face.FaceManager;
+import android.hardware.fingerprint.FingerprintManager;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.core.BasePreferenceController;
+
+public class TopLevelSecurityEntryPreferenceController extends BasePreferenceController {
+
+ public TopLevelSecurityEntryPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return AVAILABLE_UNSEARCHABLE;
+ }
+
+ @Override
+ public CharSequence getSummary() {
+ final FingerprintManager fpm =
+ Utils.getFingerprintManagerOrNull(mContext);
+ final FaceManager faceManager =
+ Utils.getFaceManagerOrNull(mContext);
+ if (faceManager != null && faceManager.isHardwareDetected()) {
+ return mContext.getText(R.string.security_dashboard_summary_face);
+ } else if (fpm != null && fpm.isHardwareDetected()) {
+ return mContext.getText(R.string.security_dashboard_summary);
+ } else {
+ return mContext.getText(R.string.security_dashboard_summary_no_fingerprint);
+ }
+ }
+}
diff --git a/src/com/android/settings/security/UnificationConfirmationDialog.java b/src/com/android/settings/security/UnificationConfirmationDialog.java
index e862bd0..ba4065f 100644
--- a/src/com/android/settings/security/UnificationConfirmationDialog.java
+++ b/src/com/android/settings/security/UnificationConfirmationDialog.java
@@ -20,13 +20,13 @@
import android.content.DialogInterface;
import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentManager;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentManager;
-
public class UnificationConfirmationDialog extends InstrumentedDialogFragment {
static final String TAG_UNIFICATION_DIALOG = "unification_dialog";
diff --git a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
index 117946a..2db8c24 100644
--- a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
+++ b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java
@@ -24,6 +24,9 @@
import android.os.UserManager;
import android.util.Log;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.Utils;
import com.android.settings.core.TogglePreferenceController;
@@ -35,9 +38,6 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class VisiblePatternProfilePreferenceController extends TogglePreferenceController
implements LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
index f6db180..999c945 100644
--- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
@@ -25,6 +25,8 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
@@ -32,10 +34,9 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.security.trustagent.TrustAgentManager;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-
public class LockAfterTimeoutPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
@@ -106,7 +107,7 @@
preference.setValue(String.valueOf(currentTimeout));
if (mDPM != null) {
final RestrictedLockUtils.EnforcedAdmin admin =
- RestrictedLockUtils.checkIfMaximumTimeToLockIsSet(mContext);
+ RestrictedLockUtilsInternal.checkIfMaximumTimeToLockIsSet(mContext);
final long adminTimeout =
mDPM.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
final long displayTimeout = Math.max(0,
diff --git a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java
index 58576e8..7d83f40 100644
--- a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java
@@ -21,6 +21,9 @@
import android.content.Context;
import android.os.UserHandle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.notification.LockScreenNotificationPreferenceController;
@@ -28,9 +31,6 @@
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class LockScreenPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnResume {
diff --git a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java
index 9f90667..133078c 100644
--- a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java
+++ b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java
@@ -19,13 +19,13 @@
import android.app.admin.DevicePolicyManager;
import android.content.Context;
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-import androidx.preference.TwoStatePreference;
-
public class PatternVisiblePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
index 54a13c2..ffd0183 100644
--- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
@@ -20,6 +20,9 @@
import android.content.Context;
import android.text.TextUtils;
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
@@ -27,9 +30,6 @@
import com.android.settings.security.trustagent.TrustAgentManager;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.preference.Preference;
-import androidx.preference.TwoStatePreference;
-
public class PowerButtonInstantLockPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java
index abb4b33..90b5e3f 100644
--- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java
+++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java
@@ -20,6 +20,8 @@
import android.os.UserHandle;
import android.provider.SearchIndexableResource;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
@@ -34,16 +36,12 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.Fragment;
-
@SearchIndexable
public class ScreenLockSettings extends DashboardFragment
implements OwnerInfoPreferenceController.OwnerInfoCallback {
private static final String TAG = "ScreenLockSettings";
- private static final String KEY_LOCK_SCREEN_TITLE = "security_settings_password_sub_screen";
-
private static final int MY_USER_ID = UserHandle.myUserId();
private LockPatternUtils mLockPatternUtils;
@@ -107,12 +105,5 @@
return buildPreferenceControllers(context, null /* parent */,
null /* lifecycle */, new LockPatternUtils(context));
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> keys = super.getNonIndexableKeys(context);
- keys.add(KEY_LOCK_SCREEN_TITLE);
- return keys;
- }
};
}
diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
index ca3208c..056c1f2 100644
--- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
@@ -19,15 +19,15 @@
import android.content.Context;
import android.os.UserHandle;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.security.SecurityFeatureProvider;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class ManageTrustAgentsPreferenceController extends BasePreferenceController {
@VisibleForTesting
diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
index ab9099c..6f5d7eb 100644
--- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
@@ -25,6 +25,11 @@
import android.os.UserHandle;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
@@ -42,11 +47,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
public class TrustAgentListPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnSaveInstanceState,
OnCreate, OnResume {
diff --git a/src/com/android/settings/security/trustagent/TrustAgentManager.java b/src/com/android/settings/security/trustagent/TrustAgentManager.java
index acce2d8..e039db8 100644
--- a/src/com/android/settings/security/trustagent/TrustAgentManager.java
+++ b/src/com/android/settings/security/trustagent/TrustAgentManager.java
@@ -35,8 +35,11 @@
import android.util.Slog;
import android.util.Xml;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -45,8 +48,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/** A manager for trust agent state. */
public class TrustAgentManager {
@@ -113,7 +114,7 @@
final List<ResolveInfo> resolveInfos = pm.queryIntentServices(TRUST_AGENT_INTENT,
PackageManager.GET_META_DATA);
final List<ComponentName> enabledTrustAgents = utils.getEnabledTrustAgents(myUserId);
- final RestrictedLockUtils.EnforcedAdmin admin = RestrictedLockUtils
+ final RestrictedLockUtils.EnforcedAdmin admin = RestrictedLockUtilsInternal
.checkIfKeyguardFeaturesDisabled(
context, DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS, myUserId);
diff --git a/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java
index 604583b..4268839 100644
--- a/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java
@@ -32,21 +32,21 @@
import android.util.ArraySet;
import android.util.IconDrawableFactory;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
public class TrustAgentsPreferenceController extends BasePreferenceController
implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart {
@@ -97,8 +97,8 @@
loadActiveAgents();
removeUselessExistingPreferences();
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfKeyguardFeaturesDisabled(mContext,
- DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS, UserHandle.myUserId());
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
+ mContext, DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS, UserHandle.myUserId());
for (TrustAgentInfo agent : mAvailableAgents.values()) {
final ComponentName componentName = agent.getComponentName();
diff --git a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
index 4848bf6..3576034 100644
--- a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
+++ b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
@@ -37,6 +37,11 @@
import android.view.View;
import android.widget.ImageView;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Settings.TetherSettingsActivity;
@@ -49,11 +54,6 @@
import java.util.Comparator;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceGroup;
-
/**
* {@link BasePreferenceController} that populates a list of widgets that Settings app support.
*/
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 803e1cf..8a99e66 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -38,14 +38,14 @@
import android.widget.TextView;
import android.widget.Toast;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-
public class SimDialogActivity extends Activity {
private static String TAG = "SimDialogActivity";
diff --git a/src/com/android/settings/sim/SimPreferenceDialog.java b/src/com/android/settings/sim/SimPreferenceDialog.java
index a657a6b..0f22d2b 100644
--- a/src/com/android/settings/sim/SimPreferenceDialog.java
+++ b/src/com/android/settings/sim/SimPreferenceDialog.java
@@ -38,11 +38,11 @@
import android.widget.Spinner;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settings.Utils;
-import androidx.appcompat.app.AlertDialog;
-
public class SimPreferenceDialog extends Activity {
private Context mContext;
diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index 4cc3c31..6806f9f 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -28,6 +28,8 @@
import android.telephony.TelephonyManager;
import android.util.Log;
+import androidx.core.app.NotificationCompat;
+
import com.android.internal.telephony.IccCardConstants;
import com.android.settings.R;
import com.android.settings.Settings.SimSettingsActivity;
@@ -35,8 +37,6 @@
import java.util.List;
-import androidx.core.app.NotificationCompat;
-
public class SimSelectNotification extends BroadcastReceiver {
private static final String TAG = "SimSelectNotification";
private static final int NOTIFICATION_ID = 1;
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index fa65b07..cf6d5f3 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -33,6 +33,9 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.telephony.TelephonyProperties;
import com.android.settings.R;
@@ -45,9 +48,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@SearchIndexable
public class SimSettings extends RestrictedSettingsFragment implements Indexable {
private static final String TAG = "SimSettings";
diff --git a/src/com/android/settings/slices/CopyableSlice.java b/src/com/android/settings/slices/CopyableSlice.java
new file mode 100644
index 0000000..31fc151
--- /dev/null
+++ b/src/com/android/settings/slices/CopyableSlice.java
@@ -0,0 +1,28 @@
+/*
+ * 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.slices;
+
+/**
+ * Provide the copy ability for preference controller to copy the data to the clipboard.
+ */
+public interface CopyableSlice {
+ /**
+ * Copy the key slice information to the clipboard.
+ * It is highly recommended to show the toast to notify users when implemented this function.
+ */
+ void copy();
+}
diff --git a/src/com/android/settings/slices/CustomSliceManager.java b/src/com/android/settings/slices/CustomSliceManager.java
index f3df3c1..556c698 100644
--- a/src/com/android/settings/slices/CustomSliceManager.java
+++ b/src/com/android/settings/slices/CustomSliceManager.java
@@ -20,7 +20,15 @@
import android.net.Uri;
import android.util.ArrayMap;
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice;
+import com.android.settings.homepage.contextualcards.slices.ConnectedDeviceSlice;
+import com.android.settings.wifi.WifiSlice;
+
import java.util.Map;
+import java.util.WeakHashMap;
/**
* Manages custom {@link androidx.slice.Slice Slices}, which are all Slices not backed by
@@ -34,10 +42,12 @@
protected final Map<Uri, Class<? extends CustomSliceable>> mUriMap;
private final Context mContext;
+ private final Map<Uri, CustomSliceable> mSliceableCache;
public CustomSliceManager(Context context) {
- mContext = context;
+ mContext = context.getApplicationContext();
mUriMap = new ArrayMap<>();
+ mSliceableCache = new WeakHashMap<>();
addSlices();
}
@@ -48,13 +58,18 @@
* the only thing that should be needed to create the object.
*/
public CustomSliceable getSliceableFromUri(Uri uri) {
- final Class clazz = mUriMap.get(uri);
+ if (mSliceableCache.containsKey(uri)) {
+ return mSliceableCache.get(uri);
+ }
+ final Class clazz = mUriMap.get(uri);
if (clazz == null) {
throw new IllegalArgumentException("No Slice found for uri: " + uri);
}
- return CustomSliceable.createInstance(mContext, clazz);
+ final CustomSliceable sliceable = CustomSliceable.createInstance(mContext, clazz);
+ mSliceableCache.put(uri, sliceable);
+ return sliceable;
}
/**
@@ -84,5 +99,11 @@
}
private void addSlices() {
+ mUriMap.put(WifiSlice.WIFI_URI, WifiSlice.class);
+ mUriMap.put(DataUsageSlice.DATA_USAGE_CARD_URI, DataUsageSlice.class);
+ mUriMap.put(DeviceInfoSlice.DEVICE_INFO_CARD_URI, DeviceInfoSlice.class);
+ mUriMap.put(StorageSlice.STORAGE_CARD_URI, StorageSlice.class);
+ mUriMap.put(BatterySlice.BATTERY_CARD_URI, BatterySlice.class);
+ mUriMap.put(ConnectedDeviceSlice.CONNECTED_DEVICE_URI, ConnectedDeviceSlice.class);
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/slices/CustomSliceable.java b/src/com/android/settings/slices/CustomSliceable.java
index afe7170..b538b89 100644
--- a/src/com/android/settings/slices/CustomSliceable.java
+++ b/src/com/android/settings/slices/CustomSliceable.java
@@ -16,16 +16,17 @@
package com.android.settings.slices;
+import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.Uri;
+import androidx.slice.Slice;
+
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import androidx.slice.Slice;
-
/**
* Common functions for custom Slices.
@@ -56,34 +57,65 @@
/**
* @return an complete instance of the {@link Slice}.
*/
- Slice getSlice(Context context);
+ Slice getSlice();
/**
* @return a {@link android.content.ContentResolver#SCHEME_CONTENT content} {@link Uri} which
- * backs the {@link Slice} returned by {@link #getSlice(Context)}.
+ * backs the {@link Slice} returned by {@link #getSlice()}.
*/
Uri getUri();
/**
* Handles the actions sent by the {@link Intent intents} bound to the {@link Slice} returned by
- * {@link #getSlice(Context)}.
+ * {@link #getSlice()}.
*
* @param intent which has the action taken on a {@link Slice}.
*/
void onNotifyChange(Intent intent);
/**
+ * @return an {@link Intent} to the source of the Slice data.
+ */
+ Intent getIntent();
+
+ /**
* Settings Slices which can represent components that are updatable by the framework should
* listen to changes matched to the {@link IntentFilter} returned here.
*
* @return an {@link IntentFilter} for updates related to the {@link Slice} returned by
- * {@link #getSlice(Context)}.
+ * {@link #getSlice()}.
*/
default IntentFilter getIntentFilter() {
return null;
}
/**
+ * Settings Slices which can represent component lists that are updatable by the
+ * {@link SliceBackgroundWorker} class returned here.
+ *
+ * @return a {@link SliceBackgroundWorker} class for fetching the list of results in the
+ * background.
+ */
+ default Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
+ return null;
+ }
+
+ /**
+ * Standardize the intents returned to indicate actions by the Slice.
+ * <p>
+ * The {@link PendingIntent} is linked to {@link SliceBroadcastReceiver} where the Intent
+ * Action is found by {@code getUri().toString()}.
+ *
+ * @return a {@link PendingIntent} linked to {@link SliceBroadcastReceiver}.
+ */
+ default PendingIntent getBroadcastIntent(Context context) {
+ final Intent intent = new Intent(getUri().toString());
+ intent.setClass(context, SliceBroadcastReceiver.class);
+ return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
+ PendingIntent.FLAG_CANCEL_CURRENT);
+ }
+
+ /**
* Build an instance of a {@link CustomSliceable} which has a {@link Context}-only constructor.
*/
static CustomSliceable createInstance(Context context, Class<CustomSliceable> sliceableClass) {
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index f6c08ce..fa669bb 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -20,6 +20,7 @@
import android.app.slice.SliceManager;
import android.content.ContentResolver;
+import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.Uri;
@@ -27,19 +28,26 @@
import android.provider.Settings;
import android.provider.SettingsSlicesContract;
import android.text.TextUtils;
+import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.KeyValueListParser;
import android.util.Log;
import android.util.Pair;
+import androidx.annotation.VisibleForTesting;
+import androidx.slice.Slice;
+import androidx.slice.SliceProvider;
+
+import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothSliceBuilder;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.flashlight.FlashlightSliceBuilder;
+import com.android.settings.homepage.contextualcards.deviceinfo.EmergencyInfoSlice;
import com.android.settings.location.LocationSliceBuilder;
-import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
+import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
import com.android.settings.notification.ZenModeSliceBuilder;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.wifi.WifiSliceBuilder;
+import com.android.settings.wifi.WifiSlice;
import com.android.settings.wifi.calling.WifiCallingSliceHelper;
import com.android.settingslib.SliceBroadcastRelay;
import com.android.settingslib.utils.ThreadUtils;
@@ -55,10 +63,6 @@
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
-import androidx.annotation.VisibleForTesting;
-import androidx.slice.Slice;
-import androidx.slice.SliceProvider;
-
/**
* A {@link SliceProvider} for Settings to enabled inline results in system apps.
*
@@ -103,6 +107,12 @@
"com.android.settings.slice.action.SLIDER_CHANGED";
/**
+ * Action passed for copy data for the Copyable Slices.
+ */
+ public static final String ACTION_COPY =
+ "com.android.settings.slice.action.COPY";
+
+ /**
* Intent Extra passed for the key identifying the Setting Slice.
*/
public static final String EXTRA_SLICE_KEY = "com.android.settings.slice.extra.key";
@@ -113,6 +123,8 @@
public static final String EXTRA_SLICE_PLATFORM_DEFINED =
"com.android.settings.slice.extra.platform";
+ private static final KeyValueListParser KEY_VALUE_LIST_PARSER = new KeyValueListParser(',');
+
@VisibleForTesting
CustomSliceManager mCustomSliceManager;
@@ -125,13 +137,12 @@
@VisibleForTesting
Map<Uri, SliceData> mSliceDataCache;
- private final KeyValueListParser mParser;
-
final Set<Uri> mRegisteredUris = new ArraySet<>();
+ final Map<Uri, SliceBackgroundWorker> mPinnedWorkers = new ArrayMap<>();
+
public SettingsSliceProvider() {
super(READ_SEARCH_INDEXABLES);
- mParser = new KeyValueListParser(',');
}
@Override
@@ -151,6 +162,7 @@
SliceDeepLinkSpringBoard.parse(
intent.getData(), getContext().getPackageName()));
} catch (URISyntaxException e) {
+ Log.e(TAG, "Uri syntax error, can't map intent to uri.", e);
return null;
}
}
@@ -163,14 +175,13 @@
if (filter != null) {
registerIntentToUri(filter, sliceUri);
}
+ ThreadUtils.postOnMainThread(() -> {
+ startBackgroundWorker(sliceable);
+ });
return;
}
- if (WifiSliceBuilder.WIFI_URI.equals(sliceUri)) {
- registerIntentToUri(WifiSliceBuilder.INTENT_FILTER, sliceUri);
- mRegisteredUris.add(sliceUri);
- return;
- } else if (ZenModeSliceBuilder.ZEN_MODE_URI.equals(sliceUri)) {
+ if (ZenModeSliceBuilder.ZEN_MODE_URI.equals(sliceUri)) {
registerIntentToUri(ZenModeSliceBuilder.INTENT_FILTER, sliceUri);
return;
} else if (BluetoothSliceBuilder.BLUETOOTH_URI.equals(sliceUri)) {
@@ -180,6 +191,8 @@
registerIntentToUri(FlashlightSliceBuilder.INTENT_FILTER, sliceUri);
mRegisteredUris.add(sliceUri);
return;
+ } else if (EmergencyInfoSlice.EMERGENCY_INFO_CARD_URI.equals(sliceUri)) {
+ return;
}
// Start warming the slice, we expect someone will want it soon.
@@ -193,6 +206,9 @@
SliceBroadcastRelay.unregisterReceivers(getContext(), sliceUri);
mRegisteredUris.remove(sliceUri);
}
+ ThreadUtils.postOnMainThread(() -> {
+ stopBackgroundWorker(sliceUri);
+ });
mSliceDataCache.remove(sliceUri);
}
@@ -217,7 +233,7 @@
if (mCustomSliceManager.isValidUri(sliceUri)) {
final CustomSliceable sliceable = mCustomSliceManager.getSliceableFromUri(
sliceUri);
- return sliceable.getSlice(getContext());
+ return sliceable.getSlice();
}
if (WifiCallingSliceHelper.WIFI_CALLING_URI.equals(sliceUri)) {
@@ -225,8 +241,6 @@
.getSlicesFeatureProvider()
.getNewWifiCallingSliceHelper(getContext())
.createWifiCallingSlice(sliceUri);
- } else if (WifiSliceBuilder.WIFI_URI.equals(sliceUri)) {
- return WifiSliceBuilder.getSlice(getContext());
} else if (ZenModeSliceBuilder.ZEN_MODE_URI.equals(sliceUri)) {
return ZenModeSliceBuilder.getSlice(getContext());
} else if (BluetoothSliceBuilder.BLUETOOTH_URI.equals(sliceUri)) {
@@ -245,6 +259,8 @@
.createWifiCallingPreferenceSlice(sliceUri);
} else if (FlashlightSliceBuilder.FLASHLIGHT_URI.equals(sliceUri)) {
return FlashlightSliceBuilder.getSlice(getContext());
+ } else if (EmergencyInfoSlice.EMERGENCY_INFO_CARD_URI.equals(sliceUri)) {
+ return EmergencyInfoSlice.getSlice(getContext());
}
SliceData cachedSliceData = mSliceWeakDataCache.get(sliceUri);
@@ -325,9 +341,67 @@
final List<String> keys = mSlicesDatabaseAccessor.getSliceKeys(isPlatformUri);
descendants.addAll(buildUrisFromKeys(keys, authority));
descendants.addAll(getSpecialCaseUris(isPlatformUri));
+ grantWhitelistedPackagePermissions(getContext(), descendants);
return descendants;
}
+ @VisibleForTesting
+ static void grantWhitelistedPackagePermissions(Context context, List<Uri> descendants) {
+ if (descendants == null) {
+ Log.d(TAG, "No descendants to grant permission with, skipping.");
+ }
+ final String[] whitelistPackages =
+ context.getResources().getStringArray(R.array.slice_whitelist_package_names);
+ if (whitelistPackages == null || whitelistPackages.length == 0) {
+ Log.d(TAG, "No packages to whitelist, skipping.");
+ return;
+ } else {
+ Log.d(TAG, String.format(
+ "Whitelisting %d uris to %d pkgs.",
+ descendants.size(), whitelistPackages.length));
+ }
+ final SliceManager sliceManager = context.getSystemService(SliceManager.class);
+ for (Uri descendant : descendants) {
+ for (String toPackage : whitelistPackages) {
+ sliceManager.grantSlicePermission(toPackage, descendant);
+ }
+ }
+ }
+
+ private void startBackgroundWorker(CustomSliceable sliceable) {
+ final Class workerClass = sliceable.getBackgroundWorkerClass();
+ if (workerClass == null) {
+ return;
+ }
+
+ final Uri uri = sliceable.getUri();
+ if (mPinnedWorkers.containsKey(uri)) {
+ return;
+ }
+
+ Log.d(TAG, "Starting background worker for: " + uri);
+ final SliceBackgroundWorker worker = SliceBackgroundWorker.getInstance(
+ getContext(), sliceable);
+ 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(() -> {
+ SliceBackgroundWorker.shutdown();
+ });
+ }
+
private List<Uri> buildUrisFromKeys(List<String> keys, String authority) {
final List<Uri> descendants = new ArrayList<>();
@@ -402,7 +476,7 @@
private List<Uri> getSpecialCasePlatformUris() {
return Arrays.asList(
- WifiSliceBuilder.WIFI_URI,
+ WifiSlice.WIFI_URI,
BluetoothSliceBuilder.BLUETOOTH_URI,
LocationSliceBuilder.LOCATION_URI
);
@@ -423,7 +497,7 @@
void registerIntentToUri(IntentFilter intentFilter, Uri sliceUri) {
Log.d(TAG, "Registering Uri for broadcast relay: " + sliceUri);
mRegisteredUris.add(sliceUri);
- SliceBroadcastRelay.registerReceiver(getContext(), sliceUri, SliceBroadcastReceiver.class,
+ SliceBroadcastRelay.registerReceiver(getContext(), sliceUri, SliceRelayReceiver.class,
intentFilter);
}
@@ -434,7 +508,7 @@
final Set<String> set = new ArraySet<>();
try {
- mParser.setString(value);
+ KEY_VALUE_LIST_PARSER.setString(value);
} catch (IllegalArgumentException e) {
Log.e(TAG, "Bad Settings Slices Whitelist flags", e);
return set;
@@ -454,4 +528,4 @@
}
return new String[0];
}
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/slices/SliceBackgroundWorker.java b/src/com/android/settings/slices/SliceBackgroundWorker.java
new file mode 100644
index 0000000..a663ece
--- /dev/null
+++ b/src/com/android/settings/slices/SliceBackgroundWorker.java
@@ -0,0 +1,140 @@
+/*
+ * 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.slices;
+
+import android.annotation.MainThread;
+import android.content.Context;
+import android.net.Uri;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The Slice background worker is used to make Settings Slices be able to work with data that is
+ * changing continuously, e.g. available Wi-Fi networks.
+ *
+ * The background worker will be started at {@link SettingsSliceProvider#onSlicePinned(Uri)}, be
+ * stopped at {@link SettingsSliceProvider#onSliceUnpinned(Uri)}, and be closed at {@link
+ * SettingsSliceProvider#shutdown()}.
+ *
+ * {@link SliceBackgroundWorker} caches the results, uses the cache to compare if there is any data
+ * changed, and then notifies the Slice {@link Uri} to update.
+ *
+ * It also stores all instances of all workers to ensure each worker is a Singleton.
+ */
+public abstract class SliceBackgroundWorker<E> implements Closeable {
+
+ private static final String TAG = "SliceBackgroundWorker";
+
+ private static final Map<Uri, SliceBackgroundWorker> LIVE_WORKERS = new ArrayMap<>();
+
+ private final Context mContext;
+ private final Uri mUri;
+
+ private List<E> mCachedResults;
+
+ protected SliceBackgroundWorker(Context context, Uri uri) {
+ mContext = context;
+ mUri = uri;
+ }
+
+ /**
+ * Returns the singleton instance of the {@link SliceBackgroundWorker} for specified {@link
+ * CustomSliceable}
+ */
+ public static SliceBackgroundWorker getInstance(Context context, CustomSliceable sliceable) {
+ final Uri uri = sliceable.getUri();
+ final Class<? extends SliceBackgroundWorker> workerClass =
+ sliceable.getBackgroundWorkerClass();
+ SliceBackgroundWorker worker = LIVE_WORKERS.get(uri);
+ if (worker == null) {
+ worker = createInstance(context, uri, workerClass);
+ LIVE_WORKERS.put(uri, worker);
+ }
+ return worker;
+ }
+
+ private static SliceBackgroundWorker createInstance(Context context, Uri uri,
+ Class<? extends SliceBackgroundWorker> clazz) {
+ Log.d(TAG, "create instance: " + clazz);
+ try {
+ return clazz.getConstructor(Context.class, Uri.class).newInstance(context, uri);
+ } catch (NoSuchMethodException | IllegalAccessException | InstantiationException |
+ InvocationTargetException e) {
+ throw new IllegalStateException(
+ "Invalid slice background worker: " + clazz, e);
+ }
+ }
+
+ static void shutdown() {
+ for (SliceBackgroundWorker worker : LIVE_WORKERS.values()) {
+ try {
+ worker.close();
+ } catch (IOException e) {
+ Log.w(TAG, "Shutting down worker failed", e);
+ }
+ }
+ LIVE_WORKERS.clear();
+ }
+
+ /**
+ * Called when the Slice is pinned. This is the place to register callbacks or initialize scan
+ * tasks.
+ */
+ @MainThread
+ protected abstract void onSlicePinned();
+
+ /**
+ * Called when the Slice is unpinned. This is the place to unregister callbacks or perform any
+ * final cleanup.
+ */
+ @MainThread
+ protected abstract void onSliceUnpinned();
+
+ /**
+ * @return a {@link List} of cached results
+ */
+ public final List<E> getResults() {
+ return mCachedResults == null ? null : new ArrayList<>(mCachedResults);
+ }
+
+ /**
+ * Update the results when data changes
+ */
+ protected final void updateResults(List<E> results) {
+ boolean needNotify = false;
+
+ if (results == null) {
+ if (mCachedResults != null) {
+ needNotify = true;
+ }
+ } else {
+ needNotify = !results.equals(mCachedResults);
+ }
+
+ if (needNotify) {
+ mCachedResults = results;
+ mContext.getContentResolver().notifyChange(mUri, null);
+ }
+ }
+}
diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java
index a44a2cd..4b86f33 100644
--- a/src/com/android/settings/slices/SliceBroadcastReceiver.java
+++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java
@@ -19,14 +19,14 @@
import static com.android.settings.bluetooth.BluetoothSliceBuilder.ACTION_BLUETOOTH_SLICE_CHANGED;
import static com.android.settings.flashlight.FlashlightSliceBuilder
.ACTION_FLASHLIGHT_SLICE_CHANGED;
-import static com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper
+import static com.android.settings.network.telephony.Enhanced4gLteSliceHelper
.ACTION_ENHANCED_4G_LTE_CHANGED;
import static com.android.settings.notification.ZenModeSliceBuilder.ACTION_ZEN_MODE_SLICE_CHANGED;
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.ACTION_COPY;
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.WifiSliceBuilder.ACTION_WIFI_SLICE_CHANGED;
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;
@@ -54,8 +54,6 @@
import com.android.settings.flashlight.FlashlightSliceBuilder;
import com.android.settings.notification.ZenModeSliceBuilder;
import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.wifi.WifiSliceBuilder;
-import com.android.settingslib.SliceBroadcastRelay;
/**
* Responds to actions performed on slices and notifies slices of updates in state changes.
@@ -92,9 +90,6 @@
case ACTION_BLUETOOTH_SLICE_CHANGED:
BluetoothSliceBuilder.handleUriChange(context, intent);
break;
- case ACTION_WIFI_SLICE_CHANGED:
- WifiSliceBuilder.handleUriChange(context, intent);
- break;
case ACTION_WIFI_CALLING_CHANGED:
FeatureFactory.getFactory(context)
.getSlicesFeatureProvider()
@@ -121,12 +116,9 @@
case ACTION_FLASHLIGHT_SLICE_CHANGED:
FlashlightSliceBuilder.handleUriChange(context, intent);
break;
- default:
- final String uriString = intent.getStringExtra(SliceBroadcastRelay.EXTRA_URI);
- if (!TextUtils.isEmpty(uriString)) {
- final Uri uri = Uri.parse(uriString);
- context.getContentResolver().notifyChange(uri, null /* observer */);
- }
+ case ACTION_COPY:
+ handleCopyAction(context, key, isPlatformSlice);
+ break;
}
}
@@ -196,6 +188,29 @@
updateUri(context, key, isPlatformSlice);
}
+ private void handleCopyAction(Context context, String key, boolean isPlatformSlice) {
+ if (TextUtils.isEmpty(key)) {
+ throw new IllegalArgumentException("No key passed to Intent for controller");
+ }
+
+ final BasePreferenceController controller = getPreferenceController(context, key);
+
+ if (!(controller instanceof CopyableSlice)) {
+ throw new IllegalArgumentException(
+ "Copyable action passed for a non-copyable key:" + key);
+ }
+
+ if (!controller.isAvailable()) {
+ Log.w(TAG, "Can't update " + key + " since the setting is unavailable");
+ if (!controller.hasAsyncUpdate()) {
+ updateUri(context, key, isPlatformSlice);
+ }
+ return;
+ }
+
+ ((CopyableSlice) controller).copy();
+ }
+
/**
* Log Slice value update events into MetricsFeatureProvider. The logging schema generally
* follows the pattern in SharedPreferenceLogger.
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index c1c3b8e8..f6cc57f 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -29,9 +29,18 @@
import android.os.Bundle;
import android.provider.SettingsSlicesContract;
import android.text.TextUtils;
+import android.util.ArraySet;
import android.util.Log;
import android.util.Pair;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.InputRangeBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -44,17 +53,11 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Set;
import java.util.stream.Collectors;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
/**
* Utility class to build Slices objects and Preference Controllers based on the Database managed
@@ -90,6 +93,10 @@
return buildUnavailableSlice(context, sliceData);
}
+ if (controller instanceof CopyableSlice) {
+ return buildCopyableSlice(context, sliceData, controller);
+ }
+
switch (sliceData.getSliceType()) {
case SliceData.SliceType.INTENT:
return buildIntentSlice(context, sliceData, controller);
@@ -181,12 +188,23 @@
*/
public static CharSequence getSubtitleText(Context context,
AbstractPreferenceController controller, SliceData sliceData) {
- CharSequence summaryText = sliceData.getScreenTitle();
+ final boolean isDynamicSummaryAllowed = sliceData.isDynamicSummaryAllowed();
+ CharSequence summaryText = controller.getSummary();
+
+ // Priority 1 : User prefers showing the dynamic summary in slice view rather than static
+ // summary.
+ if (isDynamicSummaryAllowed && isValidSummary(context, summaryText)) {
+ return summaryText;
+ }
+
+ // Priority 2 : Show screen title.
+ summaryText = sliceData.getScreenTitle();
if (isValidSummary(context, summaryText) && !TextUtils.equals(summaryText,
sliceData.getTitle())) {
return summaryText;
}
+ // Priority 3 : Show dynamic summary from preference controller.
if (controller != null) {
summaryText = controller.getSummary();
@@ -195,11 +213,13 @@
}
}
+ // Priority 4 : Show summary from slice data.
summaryText = sliceData.getSummary();
if (isValidSummary(context, summaryText)) {
return summaryText;
}
+ // Priority 5 : Show empty text.
return "";
}
@@ -214,7 +234,7 @@
.build();
}
- public static Intent buildSearchResultPageIntent(Context context, String className, String key,
+ public static Intent buildSearchResultPageIntent(Context context, String className, String key,
String screenTitle, int sourceMetricsCategory) {
final Bundle args = new Bundle();
args.putString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key);
@@ -250,11 +270,11 @@
(TogglePreferenceController) controller;
final SliceAction sliceAction = getToggleAction(context, sliceData,
toggleController.isChecked());
- final List<String> keywords = buildSliceKeywords(sliceData);
+ final Set<String> keywords = buildSliceKeywords(sliceData);
return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
.setAccentColor(color)
- .addRow(rowBuilder -> rowBuilder
+ .addRow(new RowBuilder()
.setTitle(sliceData.getTitle())
.setSubtitle(subtitleText)
.setPrimaryAction(
@@ -270,11 +290,11 @@
final IconCompat icon = getSafeIcon(context, sliceData);
final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
@ColorInt final int color = Utils.getColorAccentDefaultColor(context);
- final List<String> keywords = buildSliceKeywords(sliceData);
+ final Set<String> keywords = buildSliceKeywords(sliceData);
return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
.setAccentColor(color)
- .addRow(rowBuilder -> rowBuilder
+ .addRow(new RowBuilder()
.setTitle(sliceData.getTitle())
.setSubtitle(subtitleText)
.setPrimaryAction(
@@ -293,11 +313,11 @@
final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
final SliceAction primaryAction = new SliceAction(contentIntent, icon,
sliceData.getTitle());
- final List<String> keywords = buildSliceKeywords(sliceData);
+ final Set<String> keywords = buildSliceKeywords(sliceData);
return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
.setAccentColor(color)
- .addInputRange(builder -> builder
+ .addInputRange(new InputRangeBuilder()
.setTitle(sliceData.getTitle())
.setSubtitle(subtitleText)
.setPrimaryAction(primaryAction)
@@ -308,6 +328,28 @@
.build();
}
+ private static Slice buildCopyableSlice(Context context, SliceData sliceData,
+ BasePreferenceController controller) {
+ final SliceAction copyableAction = getCopyableAction(context, sliceData);
+ final PendingIntent contentIntent = getContentPendingIntent(context, sliceData);
+ final IconCompat icon = getSafeIcon(context, sliceData);
+ final SliceAction primaryAction = new SliceAction(contentIntent, icon,
+ sliceData.getTitle());
+ final CharSequence subtitleText = getSubtitleText(context, controller, sliceData);
+ @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
+ final Set<String> keywords = buildSliceKeywords(sliceData);
+
+ return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
+ .setAccentColor(color)
+ .addRow(new RowBuilder()
+ .setTitle(sliceData.getTitle())
+ .setSubtitle(subtitleText)
+ .setPrimaryAction(primaryAction)
+ .addEndItem(copyableAction))
+ .setKeywords(keywords)
+ .build();
+ }
+
private static BasePreferenceController getPreferenceController(Context context,
String controllerClassName, String controllerKey) {
try {
@@ -330,6 +372,14 @@
return getActionIntent(context, SettingsSliceProvider.ACTION_SLIDER_CHANGED, sliceData);
}
+ private static SliceAction getCopyableAction(Context context, SliceData sliceData) {
+ final PendingIntent intent = getActionIntent(context,
+ SettingsSliceProvider.ACTION_COPY, sliceData);
+ final IconCompat icon = IconCompat.createWithResource(context,
+ R.drawable.ic_content_copy_grey600_24dp);
+ return new SliceAction(intent, icon, sliceData.getTitle());
+ }
+
private static boolean isValidSummary(Context context, CharSequence summary) {
if (summary == null || TextUtils.isEmpty(summary.toString().trim())) {
return false;
@@ -343,8 +393,8 @@
|| TextUtils.equals(summary, doublePlaceHolder));
}
- private static List<String> buildSliceKeywords(SliceData data) {
- final List<String> keywords = new ArrayList<>();
+ private static Set<String> buildSliceKeywords(SliceData data) {
+ final Set<String> keywords = new ArraySet<>();
keywords.add(data.getTitle());
@@ -366,18 +416,18 @@
private static Slice buildUnavailableSlice(Context context, SliceData data) {
final String title = data.getTitle();
- final List<String> keywords = buildSliceKeywords(data);
+ final Set<String> keywords = buildSliceKeywords(data);
@ColorInt final int color = Utils.getColorAccentDefaultColor(context);
final CharSequence summary = context.getText(R.string.disabled_dependent_setting_summary);
- final IconCompat icon = IconCompat.createWithResource(context, data.getIconResource());
+ final IconCompat icon = getSafeIcon(context, data);
final SliceAction primaryAction = new SliceAction(getContentPendingIntent(context, data),
icon, title);
return new ListBuilder(context, data.getUri(), ListBuilder.INFINITY)
.setAccentColor(color)
- .addRow(builder -> builder
+ .addRow(new RowBuilder()
.setTitle(title)
- .setTitleItem(icon)
+ .setTitleItem(icon, ListBuilder.SMALL_IMAGE)
.setSubtitle(summary)
.setPrimaryAction(primaryAction))
.setKeywords(keywords)
diff --git a/src/com/android/settings/slices/SliceData.java b/src/com/android/settings/slices/SliceData.java
index 72729a8..8705884 100644
--- a/src/com/android/settings/slices/SliceData.java
+++ b/src/com/android/settings/slices/SliceData.java
@@ -74,6 +74,8 @@
private final boolean mIsPlatformDefined;
+ private final boolean mIsDynamicSummaryAllowed;
+
public String getKey() {
return mKey;
}
@@ -118,6 +120,10 @@
return mIsPlatformDefined;
}
+ public boolean isDynamicSummaryAllowed() {
+ return mIsDynamicSummaryAllowed;
+ }
+
private SliceData(Builder builder) {
mKey = builder.mKey;
mTitle = builder.mTitle;
@@ -130,6 +136,7 @@
mPreferenceController = builder.mPrefControllerClassName;
mSliceType = builder.mSliceType;
mIsPlatformDefined = builder.mIsPlatformDefined;
+ mIsDynamicSummaryAllowed = builder.mIsDynamicSummaryAllowed;
}
@Override
@@ -169,6 +176,8 @@
private boolean mIsPlatformDefined;
+ private boolean mIsDynamicSummaryAllowed;
+
public Builder setKey(String key) {
mKey = key;
return this;
@@ -224,6 +233,11 @@
return this;
}
+ public Builder setDynamicSummaryAllowed(boolean isDynamicSummaryAllowed) {
+ mIsDynamicSummaryAllowed = isDynamicSummaryAllowed;
+ return this;
+ }
+
public SliceData build() {
if (TextUtils.isEmpty(mKey)) {
throw new InvalidSliceDataException("Key cannot be empty");
diff --git a/src/com/android/settings/slices/SliceDataConverter.java b/src/com/android/settings/slices/SliceDataConverter.java
index 7b98fe4..cb2980d 100644
--- a/src/com/android/settings/slices/SliceDataConverter.java
+++ b/src/com/android/settings/slices/SliceDataConverter.java
@@ -16,6 +16,8 @@
package com.android.settings.slices;
+import static com.android.settings.core.PreferenceXmlParserUtils
+ .METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE;
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;
@@ -39,6 +41,8 @@
import android.util.Xml;
import android.view.accessibility.AccessibilityManager;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.accessibility.AccessibilitySettings;
import com.android.settings.accessibility.AccessibilitySlicePreferenceController;
@@ -61,8 +65,6 @@
import java.util.List;
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-
/**
* Converts all Slice sources into {@link SliceData}.
* This includes:
@@ -186,7 +188,8 @@
| MetadataFlag.FLAG_NEED_PREF_TITLE
| MetadataFlag.FLAG_NEED_PREF_ICON
| MetadataFlag.FLAG_NEED_PREF_SUMMARY
- | MetadataFlag.FLAG_NEED_PLATFORM_SLICE_FLAG);
+ | MetadataFlag.FLAG_NEED_PLATFORM_SLICE_FLAG
+ | MetadataFlag.FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE);
for (Bundle bundle : metadata) {
// TODO (b/67996923) Non-controller Slices should become intent-only slices.
@@ -203,6 +206,8 @@
final int sliceType = SliceBuilderUtils.getSliceType(mContext, controllerClassName,
key);
final boolean isPlatformSlice = bundle.getBoolean(METADATA_PLATFORM_SLICE_FLAG);
+ final boolean isDynamicSummaryAllowed = bundle.getBoolean(
+ METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE);
final SliceData xmlSlice = new SliceData.Builder()
.setKey(key)
@@ -214,13 +219,14 @@
.setFragmentName(fragmentName)
.setSliceType(sliceType)
.setPlatformDefined(isPlatformSlice)
+ .setDynamicSummaryAllowed(isDynamicSummaryAllowed)
.build();
final BasePreferenceController controller =
SliceBuilderUtils.getPreferenceController(mContext, xmlSlice);
// Only add pre-approved Slices available on the device.
- if (controller.isAvailable() && controller.isSliceable()) {
+ if (controller.isSliceable() && controller.isAvailable()) {
xmlSliceData.add(xmlSlice);
}
}
@@ -271,7 +277,7 @@
final String title = resolveInfo.loadLabel(packageManager).toString();
int iconResource = resolveInfo.getIconResource();
if (iconResource == 0) {
- iconResource = R.mipmap.ic_accessibility_generic;
+ iconResource = R.drawable.ic_accessibility_generic;
}
sliceDataBuilder.setKey(flattenedName)
diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
index 60a96ae..7531778 100644
--- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
+++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java
@@ -21,10 +21,12 @@
import android.provider.Settings;
import android.util.Log;
+import androidx.annotation.Keep;
+
import com.android.settings.bluetooth.BluetoothSliceBuilder;
import com.android.settings.location.LocationSliceBuilder;
import com.android.settings.notification.ZenModeSliceBuilder;
-import com.android.settings.wifi.WifiSliceBuilder;
+import com.android.settings.overlay.FeatureFactory;
import java.net.URISyntaxException;
@@ -50,23 +52,28 @@
if (ACTION_VIEW_SLICE.equals(intent.getAction())) {
// This shouldn't matter since the slice is shown instead of the device
// index caring about the launch uri.
- final Uri slice = Uri.parse(intent.getStringExtra(EXTRA_SLICE));
- final Intent launchIntent;
+ final Uri sliceUri = Uri.parse(intent.getStringExtra(EXTRA_SLICE));
+ Intent launchIntent;
// TODO (b/80263568) Avoid duplicating this list of Slice Uris.
- if (WifiSliceBuilder.WIFI_URI.equals(slice)) {
- launchIntent = WifiSliceBuilder.getIntent(this /* context */);
- } else if (ZenModeSliceBuilder.ZEN_MODE_URI.equals(slice)) {
+ final CustomSliceManager customSliceManager = FeatureFactory.getFactory(this)
+ .getSlicesFeatureProvider().getCustomSliceManager(this);
+ if (customSliceManager.isValidUri(sliceUri)) {
+ final CustomSliceable sliceable =
+ customSliceManager.getSliceableFromUri(sliceUri);
+ launchIntent = sliceable.getIntent();
+ } else if (ZenModeSliceBuilder.ZEN_MODE_URI.equals(sliceUri)) {
launchIntent = ZenModeSliceBuilder.getIntent(this /* context */);
- } else if (BluetoothSliceBuilder.BLUETOOTH_URI.equals(slice)) {
+ } else if (BluetoothSliceBuilder.BLUETOOTH_URI.equals(sliceUri)) {
launchIntent = BluetoothSliceBuilder.getIntent(this /* context */);
- } else if (LocationSliceBuilder.LOCATION_URI.equals(slice)) {
+ } else if (LocationSliceBuilder.LOCATION_URI.equals(sliceUri)) {
launchIntent = LocationSliceBuilder.getIntent(this /* context */);
} else {
final SlicesDatabaseAccessor slicesDatabaseAccessor =
new SlicesDatabaseAccessor(this /* context */);
// Sadly have to block here because we don't know where to go.
- final SliceData sliceData = slicesDatabaseAccessor.getSliceDataFromUri(slice);
+ final SliceData sliceData =
+ slicesDatabaseAccessor.getSliceDataFromUri(sliceUri);
launchIntent = SliceBuilderUtils.getContentIntent(this, sliceData);
}
@@ -85,6 +92,14 @@
}
}
+ @Keep
+ public static Uri createDeepLink(String s) {
+ return new Uri.Builder().scheme(SETTINGS)
+ .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+ .appendQueryParameter(INTENT, s)
+ .build();
+ }
+
public static Intent parse(Uri uri, String pkg) throws URISyntaxException {
Intent intent = Intent.parseUri(uri.getQueryParameter(INTENT),
Intent.URI_ANDROID_APP_SCHEME);
diff --git a/src/com/android/settings/slices/SliceRelayReceiver.java b/src/com/android/settings/slices/SliceRelayReceiver.java
new file mode 100644
index 0000000..b4d868d
--- /dev/null
+++ b/src/com/android/settings/slices/SliceRelayReceiver.java
@@ -0,0 +1,40 @@
+/*
+ * 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.slices;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.android.settingslib.SliceBroadcastRelay;
+
+/**
+ * Receives broadcasts to notify that Settings Slices are potentially stale.
+ */
+public class SliceRelayReceiver extends BroadcastReceiver {
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ final String uriString = intent.getStringExtra(SliceBroadcastRelay.EXTRA_URI);
+ if (!TextUtils.isEmpty(uriString)) {
+ final Uri uri = Uri.parse(uriString);
+ context.getContentResolver().notifyChange(uri, null /* observer */);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
index 877c108..35a0a5d 100644
--- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java
+++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java
@@ -25,14 +25,14 @@
import android.os.Binder;
import android.util.Pair;
+import androidx.slice.Slice;
+
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns;
import java.util.ArrayList;
import java.util.List;
-import androidx.slice.Slice;
-
/**
* Class used to map a {@link Uri} from {@link SettingsSliceProvider} to a Slice.
*/
@@ -49,6 +49,7 @@
IndexColumns.CONTROLLER,
IndexColumns.PLATFORM_SLICE,
IndexColumns.SLICE_TYPE,
+ IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE,
};
// Cursor value for boolean true
@@ -159,6 +160,8 @@
cursor.getColumnIndex(IndexColumns.CONTROLLER));
final boolean isPlatformDefined = cursor.getInt(
cursor.getColumnIndex(IndexColumns.PLATFORM_SLICE)) == TRUE;
+ final boolean isDynamicSummaryAllowed = cursor.getInt(
+ cursor.getColumnIndex(IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE)) == TRUE;
int sliceType = cursor.getInt(
cursor.getColumnIndex(IndexColumns.SLICE_TYPE));
@@ -178,6 +181,7 @@
.setUri(uri)
.setPlatformDefined(isPlatformDefined)
.setSliceType(sliceType)
+ .setDynamicSummaryAllowed(isDynamicSummaryAllowed)
.build();
}
diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java
index 4024235..e463099 100644
--- a/src/com/android/settings/slices/SlicesDatabaseHelper.java
+++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java
@@ -22,10 +22,10 @@
import android.os.Build;
import android.util.Log;
-import java.util.Locale;
-
import androidx.annotation.VisibleForTesting;
+import java.util.Locale;
+
/**
* Defines the schema for the Slices database.
*/
@@ -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 = 2;
+ private static final int DATABASE_VERSION = 3;
public interface Tables {
String TABLE_SLICES_INDEX = "slices_index";
@@ -93,6 +93,12 @@
* {@link SliceData.SliceType} representing the inline type of the result.
*/
String SLICE_TYPE = "slice_type";
+
+ /**
+ * Boolean flag, {@code true} when the slice object prefers using the dynamic summary from
+ * preference controller.
+ */
+ String ALLOW_DYNAMIC_SUMMARY_IN_SLICE = "allow_dynamic_summary_in_slice";
}
private static final String CREATE_SLICES_TABLE =
@@ -117,6 +123,8 @@
IndexColumns.PLATFORM_SLICE +
", " +
IndexColumns.SLICE_TYPE +
+ ", " +
+ IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE +
");";
private final Context mContext;
diff --git a/src/com/android/settings/slices/SlicesFeatureProvider.java b/src/com/android/settings/slices/SlicesFeatureProvider.java
index 5940aa4..1a9fd98 100644
--- a/src/com/android/settings/slices/SlicesFeatureProvider.java
+++ b/src/com/android/settings/slices/SlicesFeatureProvider.java
@@ -2,7 +2,7 @@
import android.content.Context;
-import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
+import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
import com.android.settings.wifi.calling.WifiCallingSliceHelper;
/**
diff --git a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
index fc2298c..39d385e 100644
--- a/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
+++ b/src/com/android/settings/slices/SlicesFeatureProviderImpl.java
@@ -2,7 +2,7 @@
import android.content.Context;
-import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
+import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
import com.android.settings.wifi.calling.WifiCallingSliceHelper;
import com.android.settingslib.utils.ThreadUtils;
diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java
index a4c27f6..0c39429 100644
--- a/src/com/android/settings/slices/SlicesIndexer.java
+++ b/src/com/android/settings/slices/SlicesIndexer.java
@@ -21,6 +21,8 @@
import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
@@ -29,8 +31,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
/**
* Manages the conversion of {@link DashboardFragment} and {@link BasePreferenceController} to
* indexable data {@link SliceData} to be stored for Slices.
@@ -66,12 +66,11 @@
return;
}
- SQLiteDatabase database = mHelper.getWritableDatabase();
+ final SQLiteDatabase database = mHelper.getWritableDatabase();
+ long startTime = System.currentTimeMillis();
+ database.beginTransaction();
try {
- long startTime = System.currentTimeMillis();
- database.beginTransaction();
-
mHelper.reconstruct(mHelper.getWritableDatabase());
List<SliceData> indexData = getSliceData();
insertSliceData(database, indexData);
@@ -85,6 +84,7 @@
} finally {
database.endTransaction();
}
+ database.close();
}
@VisibleForTesting
@@ -111,6 +111,8 @@
values.put(IndexColumns.CONTROLLER, dataRow.getPreferenceController());
values.put(IndexColumns.PLATFORM_SLICE, dataRow.isPlatformDefined());
values.put(IndexColumns.SLICE_TYPE, dataRow.getSliceType());
+ values.put(IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE,
+ dataRow.isDynamicSummaryAllowed());
database.replaceOrThrow(Tables.TABLE_SLICES_INDEX, null /* nullColumnHack */,
values);
diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
index dcbed15..f77dfca 100644
--- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java
+++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java
@@ -36,6 +36,10 @@
import android.util.FeatureFlagUtils;
import android.util.Log;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.bluetooth.Utils;
import com.android.settings.core.BasePreferenceController;
@@ -56,10 +60,6 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* Abstract class for audio switcher controller to notify subclass
* updating the current status of switcher entry. Subclasses must overwrite
@@ -184,14 +184,6 @@
unregister();
}
- /**
- * Only concerned about whether the local adapter is connected to any profile of any device and
- * are not really concerned about which profile.
- */
- @Override
- public void onConnectionStateChanged(CachedBluetoothDevice cachedDevice, int state) {
- }
-
@Override
public void onActiveDeviceChanged(CachedBluetoothDevice activeDevice, int bluetoothProfile) {
updateState(mPreference);
@@ -208,17 +200,6 @@
updateState(mPreference);
}
- @Override
- public void onBluetoothStateChanged(int bluetoothState) {
- }
-
- /**
- * The local Bluetooth adapter has started the remote device discovery process.
- */
- @Override
- public void onScanningStateChanged(boolean started) {
- }
-
/**
* Indicates a change in the bond state of a remote
* device. For example, if a device is bonded (paired).
@@ -228,14 +209,6 @@
updateState(mPreference);
}
- @Override
- public void onDeviceDeleted(CachedBluetoothDevice cachedDevice) {
- }
-
- @Override
- public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice, int bondState) {
- }
-
public void setCallback(AudioSwitchCallback callback) {
mAudioSwitchPreferenceCallback = callback;
}
diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
index 348d7d3..a02c0b2 100644
--- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
+++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java
@@ -21,13 +21,13 @@
import android.bluetooth.BluetoothDevice;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settingslib.Utils;
import com.android.settingslib.bluetooth.HeadsetProfile;
import com.android.settingslib.bluetooth.HearingAidProfile;
-import androidx.preference.Preference;
-
/**
* This class allows switching between HFP-connected & HAP-connected BT devices
* while in on-call state.
@@ -93,12 +93,9 @@
if (hapProfile != null && hfpProfile != null && device == null) {
hfpProfile.setActiveDevice(null);
hapProfile.setActiveDevice(null);
- return;
- }
- if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
+ } else if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
hapProfile.setActiveDevice(device);
- }
- if (hfpProfile != null) {
+ } else if (hfpProfile != null) {
hfpProfile.setActiveDevice(device);
}
}
diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java
index dba82eb..2ac460c 100644
--- a/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@ -24,13 +24,13 @@
import android.content.Context;
import android.media.AudioManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settingslib.Utils;
import com.android.settingslib.bluetooth.A2dpProfile;
import com.android.settingslib.bluetooth.HearingAidProfile;
-import androidx.preference.Preference;
-
/**
* This class which allows switching between A2dp-connected & HAP-connected BT devices.
* A few conditions will disable this switcher:
@@ -106,12 +106,9 @@
if (hapProfile != null && a2dpProfile != null && device == null) {
hapProfile.setActiveDevice(null);
a2dpProfile.setActiveDevice(null);
- return;
- }
- if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
+ } else if (hapProfile != null && hapProfile.getHiSyncId(device) != HI_SYNC_ID_INVALID) {
hapProfile.setActiveDevice(device);
- }
- if (a2dpProfile != null) {
+ } else if (a2dpProfile != null) {
a2dpProfile.setActiveDevice(device);
}
}
diff --git a/src/com/android/settings/support/SupportDashboardActivity.java b/src/com/android/settings/support/SupportDashboardActivity.java
index ed7e76c..8703ec7 100644
--- a/src/com/android/settings/support/SupportDashboardActivity.java
+++ b/src/com/android/settings/support/SupportDashboardActivity.java
@@ -43,9 +43,9 @@
SupportFeatureProvider supportFeatureProvider = FeatureFactory.getFactory(this)
.getSupportFeatureProvider(this);
- // try to launch support v2 if we have the feature provider
+ // try to launch support if we have the feature provider
if (supportFeatureProvider != null) {
- supportFeatureProvider.startSupportV2(this);
+ supportFeatureProvider.startSupport(this);
finish();
}
}
@@ -68,7 +68,6 @@
data.title = context.getString(R.string.page_tab_title_support);
data.screenTitle = context.getString(R.string.settings_label);
data.summaryOn = context.getString(R.string.support_summary);
- data.iconResId = R.drawable.ic_homepage_support;
data.intentTargetPackage = context.getPackageName();
data.intentTargetClass = SupportDashboardActivity.class.getName();
data.intentAction = Intent.ACTION_MAIN;
diff --git a/src/com/android/settings/support/SupportPhone.java b/src/com/android/settings/support/SupportPhone.java
deleted file mode 100644
index d27dca5..0000000
--- a/src/com/android/settings/support/SupportPhone.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.support;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.TextUtils;
-
-import java.text.ParseException;
-
-/**
- * Data model for a support phone number.
- */
-public final class SupportPhone implements Parcelable {
-
- public final String language;
- public final String number;
- public final boolean isTollFree;
-
- public SupportPhone(String config) throws ParseException {
- // Config follows this format: language:[tollfree|tolled]:number
- final String[] tokens = config.split(":");
- if (tokens.length != 3) {
- throw new ParseException("Phone config is invalid " + config, 0);
- }
- language = tokens[0];
- isTollFree = TextUtils.equals(tokens[1], "tollfree");
- number = tokens[2];
- }
-
- protected SupportPhone(Parcel in) {
- language = in.readString();
- number = in.readString();
- isTollFree = in.readInt() != 0;
- }
-
- public Intent getDialIntent() {
- return new Intent(Intent.ACTION_DIAL)
- .setData(new Uri.Builder()
- .scheme("tel")
- .appendPath(number)
- .build());
- }
-
- @Override
- public int describeContents() {
- return 0;
- }
-
- @Override
- public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(language);
- dest.writeString(number);
- dest.writeInt(isTollFree ? 1 : 0);
- }
-
- public static final Creator<SupportPhone> CREATOR = new Creator<SupportPhone>() {
- @Override
- public SupportPhone createFromParcel(Parcel in) {
- return new SupportPhone(in);
- }
-
- @Override
- public SupportPhone[] newArray(int size) {
- return new SupportPhone[size];
- }
- };
-}
diff --git a/src/com/android/settings/support/SupportPreferenceController.java b/src/com/android/settings/support/SupportPreferenceController.java
new file mode 100644
index 0000000..793842f
--- /dev/null
+++ b/src/com/android/settings/support/SupportPreferenceController.java
@@ -0,0 +1,60 @@
+/*
+ * 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.support;
+
+import android.app.Activity;
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SupportFeatureProvider;
+
+public class SupportPreferenceController extends BasePreferenceController {
+
+ private final SupportFeatureProvider mSupportFeatureProvider;
+
+ private Activity mActivity;
+
+ public SupportPreferenceController(Context context, String preferenceKey) {
+ super(context, preferenceKey);
+ mSupportFeatureProvider = FeatureFactory.getFactory(context)
+ .getSupportFeatureProvider(context);
+ }
+
+ public void setActivity(Activity activity) {
+ mActivity = activity;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return mSupportFeatureProvider == null ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
+ }
+
+ @Override
+ public boolean handlePreferenceTreeClick(Preference preference) {
+ if (preference == null || mActivity == null ||
+ !TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+ return false;
+ }
+ mSupportFeatureProvider.startSupport(mActivity);
+ return true;
+
+ }
+}
diff --git a/src/com/android/settings/support/actionbar/HelpMenuController.java b/src/com/android/settings/support/actionbar/HelpMenuController.java
index 3ac248c..498cc3e 100644
--- a/src/com/android/settings/support/actionbar/HelpMenuController.java
+++ b/src/com/android/settings/support/actionbar/HelpMenuController.java
@@ -24,14 +24,14 @@
import android.view.Menu;
import android.view.MenuInflater;
+import androidx.fragment.app.Fragment;
+
import com.android.settingslib.HelpUtils;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.ObservableFragment;
import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
-import androidx.fragment.app.Fragment;
-
/**
* A controller that adds help menu to any Settings page.
*/
diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java
index ab2e21a..5de2653 100644
--- a/src/com/android/settings/survey/SurveyMixin.java
+++ b/src/com/android/settings/survey/SurveyMixin.java
@@ -18,14 +18,14 @@
import android.app.Activity;
import android.content.BroadcastReceiver;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.overlay.SurveyFeatureProvider;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.fragment.app.Fragment;
-
/**
* attaches extra, survey related work to the onResume method of registered observable classes
* in settings. This allows new classes to automatically support settings provided the extend
diff --git a/src/com/android/settings/system/ResetPreferenceController.java b/src/com/android/settings/system/ResetPreferenceController.java
index ec0c27b..050efc4 100644
--- a/src/com/android/settings/system/ResetPreferenceController.java
+++ b/src/com/android/settings/system/ResetPreferenceController.java
@@ -29,7 +29,7 @@
@Override
public int getAvailabilityStatus() {
return mContext.getResources().getBoolean(R.bool.config_show_reset_dashboard)
- ? AVAILABLE
+ ? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
}
}
diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java
index 52349ae..4f0c738 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -19,9 +19,12 @@
import android.os.Bundle;
import android.provider.SearchIndexableResource;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
-import com.android.settings.backup.BackupSettingsActivityPreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -30,10 +33,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
@SearchIndexable
public class SystemDashboardFragment extends DashboardFragment {
@@ -97,14 +96,5 @@
sir.xmlResId = R.xml.system_dashboard_fragment;
return Arrays.asList(sir);
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- List<String> keys = super.getNonIndexableKeys(context);
- keys.add((new BackupSettingsActivityPreferenceController(
- context).getPreferenceKey()));
- keys.add(KEY_RESET);
- return keys;
- }
};
}
\ No newline at end of file
diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java
index b2de2b3..dd04409 100644
--- a/src/com/android/settings/system/SystemUpdatePreferenceController.java
+++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java
@@ -29,6 +29,9 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
@@ -36,9 +39,6 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.FutureTask;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class SystemUpdatePreferenceController extends BasePreferenceController {
private static final String TAG = "SysUpdatePrefContr";
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index d21d0c8..cce871b 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -34,6 +34,10 @@
import android.util.Log;
import android.util.Pair;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -56,10 +60,6 @@
import java.util.Objects;
import java.util.Set;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
@SearchIndexable
public class TextToSpeechSettings extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener,
@@ -147,12 +147,7 @@
* screen for the first time (as opposed to when a user changes his choice
* of engine).
*/
- private final TextToSpeech.OnInitListener mInitListener = new TextToSpeech.OnInitListener() {
- @Override
- public void onInit(int status) {
- onInitEngine(status);
- }
- };
+ private final TextToSpeech.OnInitListener mInitListener = this::onInitEngine;
@Override
public int getMetricsCategory() {
@@ -215,6 +210,11 @@
@Override
public void onResume() {
super.onResume();
+ // We tend to change the summary contents of our widgets, which at higher text sizes causes
+ // them to resize, which results in the recyclerview smoothly animating them at inopportune
+ // times. Disable the animation so widgets snap to their positions rather than sliding
+ // around while the user is interacting with it.
+ getListView().getItemAnimator().setMoveDuration(0);
if (mTts == null || mCurrentDefaultLocale == null) {
return;
@@ -251,15 +251,20 @@
mTts.setOnUtteranceProgressListener(new UtteranceProgressListener() {
@Override
public void onStart(String utteranceId) {
+ updateWidgetState(false);
}
@Override
public void onDone(String utteranceId) {
+ updateWidgetState(true);
}
@Override
public void onError(String utteranceId) {
Log.e(TAG, "Error while trying to synthesize sample text");
+ // Re-enable just in case, although there isn't much hope that following synthesis
+ // requests are going to succeed.
+ updateWidgetState(true);
}
});
}
@@ -323,7 +328,6 @@
if (mCurrentEngine != null) {
EngineInfo info = mEnginesHelper.getEngineInfo(mCurrentEngine);
-
Preference mEnginePreference = findPreference(KEY_TTS_ENGINE_PREFERENCE);
((GearPreference) mEnginePreference).setOnGearClickListener(this);
mEnginePreference.setSummary(info.label);
@@ -365,14 +369,7 @@
if (status == TextToSpeech.SUCCESS) {
if (DBG) Log.d(TAG, "TTS engine for settings screen initialized.");
checkDefaultLocale();
- getActivity()
- .runOnUiThread(
- new Runnable() {
- @Override
- public void run() {
- mLocalePreference.setEnabled(true);
- }
- });
+ getActivity().runOnUiThread(() -> mLocalePreference.setEnabled(true));
} else {
if (DBG) {
Log.d(TAG,
@@ -516,14 +513,7 @@
}
// Sort it
- Collections.sort(
- entryPairs,
- new Comparator<Pair<String, Locale>>() {
- @Override
- public int compare(Pair<String, Locale> lhs, Pair<String, Locale> rhs) {
- return lhs.first.compareToIgnoreCase(rhs.first);
- }
- });
+ Collections.sort(entryPairs, (lhs, rhs) -> lhs.first.compareToIgnoreCase(rhs.first));
// Get two arrays out of one of pairs
mSelectedLocaleIndex = 0; // Will point to the R.string.tts_lang_use_system value
@@ -711,9 +701,11 @@
}
private void updateWidgetState(boolean enable) {
- mActionButtons.setButton1Enabled(enable);
- mDefaultRatePref.setEnabled(enable);
- mDefaultPitchPref.setEnabled(enable);
+ getActivity().runOnUiThread(() -> {
+ mActionButtons.setButton1Enabled(enable);
+ mDefaultRatePref.setEnabled(enable);
+ mDefaultPitchPref.setEnabled(enable);
+ });
}
private void displayNetworkAlert() {
@@ -790,13 +782,6 @@
sir.xmlResId = R.xml.tts_settings;
return Arrays.asList(sir);
}
-
- @Override
- public List<String> getNonIndexableKeys(Context context) {
- final List<String> keys = super.getNonIndexableKeys(context);
- keys.add("tts_engine_preference");
- return keys;
- }
};
}
diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java
index 41684c5..7dc00fe 100644
--- a/src/com/android/settings/tts/TtsEnginePreference.java
+++ b/src/com/android/settings/tts/TtsEnginePreference.java
@@ -25,13 +25,13 @@
import android.widget.CompoundButton;
import android.widget.RadioButton;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+
public class TtsEnginePreference extends Preference {
diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
index 01f2e42..27c9547 100644
--- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
+++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java
@@ -11,6 +11,8 @@
import android.util.Log;
import android.widget.Checkable;
+import androidx.preference.PreferenceCategory;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -23,8 +25,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.preference.PreferenceCategory;
-
@SearchIndexable
public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment
implements RadioButtonGroupState {
diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
index 2a61cac..c097d41 100644
--- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
+++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java
@@ -18,11 +18,11 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedSwitchPreference;
-import androidx.preference.Preference;
-
public class AddUserWhenLockedPreferenceController extends TogglePreferenceController {
private final UserCapabilities mUserCaps;
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 15e721a..5f899eb 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -44,6 +44,15 @@
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.Switch;
+import androidx.preference.ListPreference;
+import androidx.preference.MultiSelectListPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -58,15 +67,6 @@
import java.util.Set;
import java.util.StringTokenizer;
-import androidx.preference.ListPreference;
-import androidx.preference.MultiSelectListPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceViewHolder;
-import androidx.preference.SwitchPreference;
-
public class AppRestrictionsFragment extends SettingsPreferenceFragment implements
OnPreferenceChangeListener, OnClickListener, OnPreferenceClickListener,
AppRestrictionsHelper.OnDisableUiForPackageListener {
@@ -450,7 +450,7 @@
private void addLocationAppRestrictionsPreference(AppRestrictionsHelper.SelectableAppInfo app,
AppRestrictionsPreference p) {
String packageName = app.packageName;
- p.setIcon(R.drawable.ic_settings_location);
+ p.setIcon(R.drawable.ic_preference_location);
p.setKey(getKeyForPackage(packageName));
ArrayList<RestrictionEntry> restrictions = RestrictionUtils.getRestrictions(
getActivity(), mUser);
diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java
index 5856f71..13a2cdf 100644
--- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java
+++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java
@@ -26,17 +26,17 @@
import android.os.UserManager;
import android.util.Log;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.core.AbstractPreferenceController;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
public class AutoSyncDataPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java
index de7c24a..1e62845 100644
--- a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java
+++ b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java
@@ -18,10 +18,10 @@
import android.content.Context;
import android.os.UserHandle;
-import com.android.settings.Utils;
-
import androidx.fragment.app.Fragment;
+import com.android.settings.Utils;
+
public class AutoSyncWorkDataPreferenceController extends AutoSyncPersonalDataPreferenceController {
private static final String TAG = "AutoSyncWorkData";
diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java
index 6045516..4d9244a 100644
--- a/src/com/android/settings/users/EditUserInfoController.java
+++ b/src/com/android/settings/users/EditUserInfoController.java
@@ -34,15 +34,16 @@
import android.widget.EditText;
import android.widget.ImageView;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.R;
import com.android.settingslib.Utils;
import com.android.settingslib.drawable.CircleFramedDrawable;
import java.io.File;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
/**
* This class encapsulates a Dialog for editing the user nickname and photo.
*/
@@ -103,9 +104,8 @@
public void onActivityResult(int requestCode, int resultCode, Intent data) {
mWaitingForActivityResult = false;
- if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
- && mEditUserPhotoController.onActivityResult(requestCode, resultCode, data)) {
- return;
+ if (mEditUserInfoDialog != null) {
+ mEditUserPhotoController.onActivityResult(requestCode, resultCode, data);
}
}
@@ -115,7 +115,7 @@
Activity activity = fragment.getActivity();
mUser = user;
if (mUserManager == null) {
- mUserManager = UserManager.get(activity);
+ mUserManager = activity.getSystemService(UserManager.class);
}
LayoutInflater inflater = activity.getLayoutInflater();
View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);
@@ -136,8 +136,7 @@
}
}
userPhotoView.setImageDrawable(drawable);
- mEditUserPhotoController = new EditUserPhotoController(fragment, userPhotoView,
- mSavedPhoto, drawable, mWaitingForActivityResult);
+ mEditUserPhotoController = createEditUserPhotoController(fragment, userPhotoView, drawable);
mEditUserInfoDialog = new AlertDialog.Builder(activity)
.setTitle(R.string.profile_info_settings_title)
.setView(content)
@@ -195,4 +194,11 @@
return mEditUserInfoDialog;
}
+
+ @VisibleForTesting
+ EditUserPhotoController createEditUserPhotoController(Fragment fragment,
+ ImageView userPhotoView, Drawable drawable) {
+ return new EditUserPhotoController(fragment, userPhotoView,
+ mSavedPhoto, drawable, mWaitingForActivityResult);
+ }
}
diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java
index 4685bb1..3253f79 100644
--- a/src/com/android/settings/users/EditUserPhotoController.java
+++ b/src/com/android/settings/users/EditUserPhotoController.java
@@ -48,8 +48,12 @@
import android.widget.ListPopupWindow;
import android.widget.TextView;
+import androidx.core.content.FileProvider;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.drawable.CircleFramedDrawable;
import libcore.io.Streams;
@@ -63,9 +67,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.core.content.FileProvider;
-import androidx.fragment.app.Fragment;
-
public class EditUserPhotoController {
private static final String TAG = "EditUserPhotoController";
@@ -419,9 +420,9 @@
mAction = action;
final int myUserId = UserHandle.myUserId();
- mAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(context,
+ mAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
restriction, myUserId);
- mIsRestrictedByBase = RestrictedLockUtils.hasBaseUserRestriction(mContext,
+ mIsRestrictedByBase = RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
restriction, myUserId);
}
diff --git a/src/com/android/settings/users/MultiUserFooterPreferenceController.java b/src/com/android/settings/users/MultiUserFooterPreferenceController.java
index f42f190..1573bbd 100644
--- a/src/com/android/settings/users/MultiUserFooterPreferenceController.java
+++ b/src/com/android/settings/users/MultiUserFooterPreferenceController.java
@@ -18,14 +18,14 @@
import android.content.Context;
+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;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
public class MultiUserFooterPreferenceController extends BasePreferenceController {
@VisibleForTesting
diff --git a/src/com/android/settings/users/OwnerInfoSettings.java b/src/com/android/settings/users/OwnerInfoSettings.java
index 7576917..8915a27 100644
--- a/src/com/android/settings/users/OwnerInfoSettings.java
+++ b/src/com/android/settings/users/OwnerInfoSettings.java
@@ -26,15 +26,15 @@
import android.view.View;
import android.widget.EditText;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.security.OwnerInfoPreferenceController.OwnerInfoCallback;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
public class OwnerInfoSettings extends InstrumentedDialogFragment implements OnClickListener {
private static final String TAG_OWNER_INFO = "ownerInfo";
diff --git a/src/com/android/settings/users/UserCapabilities.java b/src/com/android/settings/users/UserCapabilities.java
index b9a2228..473c9c5 100644
--- a/src/com/android/settings/users/UserCapabilities.java
+++ b/src/com/android/settings/users/UserCapabilities.java
@@ -25,6 +25,7 @@
import com.android.settings.Utils;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
public class UserCapabilities {
boolean mEnabled = true;
@@ -67,9 +68,9 @@
public void updateAddUserCapabilities(Context context) {
final UserManager userManager =
(UserManager) context.getSystemService(Context.USER_SERVICE);
- mEnforcedAdmin = RestrictedLockUtils.checkIfRestrictionEnforced(context,
+ mEnforcedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
UserManager.DISALLOW_ADD_USER, UserHandle.myUserId());
- final boolean hasBaseUserRestriction = RestrictedLockUtils.hasBaseUserRestriction(
+ final boolean hasBaseUserRestriction = RestrictedLockUtilsInternal.hasBaseUserRestriction(
context, UserManager.DISALLOW_ADD_USER, UserHandle.myUserId());
mDisallowAddUserSetByAdmin = mEnforcedAdmin != null && !hasBaseUserRestriction;
mDisallowAddUser = (mEnforcedAdmin != null || hasBaseUserRestriction);
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 80f493f..99d3ca4 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -24,17 +24,17 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
/**
* Settings screen for configuring a specific user. It can contain user restrictions
* and deletion controls. It is shown when you tap on the settings icon in the
@@ -105,7 +105,7 @@
mPhonePref.setChecked(
!mDefaultGuestRestrictions.getBoolean(UserManager.DISALLOW_OUTGOING_CALLS));
}
- if (RestrictedLockUtils.hasBaseUserRestriction(context,
+ if (RestrictedLockUtilsInternal.hasBaseUserRestriction(context,
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId())) {
removePreference(KEY_REMOVE_USER);
}
diff --git a/src/com/android/settings/users/UserDialogs.java b/src/com/android/settings/users/UserDialogs.java
index 137c938..2361e44 100644
--- a/src/com/android/settings/users/UserDialogs.java
+++ b/src/com/android/settings/users/UserDialogs.java
@@ -30,11 +30,11 @@
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settings.Utils;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Helper class for displaying dialogs related to user settings.
*/
diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java
index 544dd72..d87d78e 100644
--- a/src/com/android/settings/users/UserPreference.java
+++ b/src/com/android/settings/users/UserPreference.java
@@ -25,14 +25,14 @@
import android.view.View.OnClickListener;
import android.widget.ImageView;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import java.util.Comparator;
-import androidx.preference.PreferenceViewHolder;
-
public class UserPreference extends RestrictedPreference {
private static final int ALPHA_ENABLED = 255;
private static final int ALPHA_DISABLED = 102;
@@ -142,7 +142,7 @@
private boolean canDeleteUser() {
return mDeleteClickListener != null
- && !RestrictedLockUtils.hasBaseUserRestriction(getContext(),
+ && !RestrictedLockUtilsInternal.hasBaseUserRestriction(getContext(),
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 9aa56c2..5b4055c 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -49,6 +49,13 @@
import android.view.View;
import android.widget.SimpleAdapter;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.UserIcons;
import com.android.internal.widget.LockPatternUtils;
@@ -65,6 +72,7 @@
import com.android.settings.widget.SwitchBarController;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.drawable.CircleFramedDrawable;
import com.android.settingslib.search.SearchIndexable;
@@ -76,13 +84,6 @@
import java.util.HashMap;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
/**
* Screen that manages the list of users on the device.
* Guest user is an always visible entry, even if the guest is not currently
@@ -343,14 +344,18 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
int pos = 0;
- UserManager um = getContext().getSystemService(UserManager.class);
- boolean allowRemoveUser = !um.hasUserRestriction(UserManager.DISALLOW_REMOVE_USER);
- boolean canSwitchUsers = um.canSwitchUsers();
- if (!mUserCaps.mIsAdmin && allowRemoveUser && canSwitchUsers) {
+ final boolean canSwitchUsers = mUserManager.canSwitchUsers();
+ if (!mUserCaps.mIsAdmin && canSwitchUsers) {
String nickname = mUserManager.getUserName();
MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, pos++,
getResources().getString(R.string.user_remove_user_menu, nickname));
removeThisUser.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+
+ final EnforcedAdmin disallowRemoveUserAdmin =
+ RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getContext(),
+ UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
+ RestrictedLockUtilsInternal.setMenuItemAsDisabledByAdmin(getContext(), removeThisUser,
+ disallowRemoveUserAdmin);
}
super.onCreateOptionsMenu(menu, inflater);
}
@@ -635,8 +640,8 @@
AlertDialog.Builder builder = new AlertDialog.Builder(context);
SimpleAdapter adapter = new SimpleAdapter(builder.getContext(),
data, R.layout.two_line_list_item,
- new String[] {KEY_TITLE, KEY_SUMMARY},
- new int[] {R.id.title, R.id.summary});
+ new String[]{KEY_TITLE, KEY_SUMMARY},
+ new int[]{R.id.title, R.id.summary});
builder.setTitle(R.string.user_add_user_type_title);
builder.setAdapter(adapter,
new DialogInterface.OnClickListener() {
@@ -912,7 +917,7 @@
if (mUserCaps.mDisallowAddUser) {
pref.setDisabledByAdmin(mUserCaps.mEnforcedAdmin);
} else if (mUserCaps.mDisallowSwitchUser) {
- pref.setDisabledByAdmin(RestrictedLockUtils.getDeviceOwner(context));
+ pref.setDisabledByAdmin(RestrictedLockUtilsInternal.getDeviceOwner(context));
} else {
pref.setDisabledByAdmin(null);
}
@@ -963,7 +968,8 @@
mAddUserWhenLockedPreferenceController.getPreferenceKey());
mAddUserWhenLockedPreferenceController.updateState(addUserOnLockScreen);
mMultiUserFooterPreferenceController.updateState(null /* preference */);
- mAddUser.setVisible(mUserCaps.mUserSwitcherEnabled);
+ mAddUser.setVisible(mUserCaps.mCanAddUser && Utils.isDeviceProvisioned(context)
+ && mUserCaps.mUserSwitcherEnabled);
mUserListCategory.setVisible(mUserCaps.mUserSwitcherEnabled);
if (!mUserCaps.mUserSwitcherEnabled) {
return;
@@ -1090,7 +1096,7 @@
switch (v.getId()) {
case UserPreference.DELETE_ID:
final EnforcedAdmin removeDisallowedAdmin =
- RestrictedLockUtils.checkIfRestrictionEnforced(getContext(),
+ RestrictedLockUtilsInternal.checkIfRestrictionEnforced(getContext(),
UserManager.DISALLOW_REMOVE_USER, UserHandle.myUserId());
if (removeDisallowedAdmin != null) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
@@ -1238,8 +1244,10 @@
}
@Override
- public List<String> getNonIndexableKeysFromXml(Context context, int xmlResId) {
- final List<String> niks = super.getNonIndexableKeysFromXml(context, xmlResId);
+ public List<String> getNonIndexableKeysFromXml(Context context, int xmlResId,
+ boolean suppressAllPage) {
+ final List<String> niks = super.getNonIndexableKeysFromXml(context, xmlResId,
+ suppressAllPage);
new AddUserWhenLockedPreferenceController(context, KEY_ADD_USER_WHEN_LOCKED)
.updateNonIndexableKeys(niks);
new AutoSyncDataPreferenceController(context, null /* parent */)
diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index e222e56..e5dfb06 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -117,11 +117,12 @@
CharSequence title = null;
try {
title = mPm.getApplicationInfoAsUser(
- service.packageName, 0, getCurrentUser(managedProfileId)).loadLabel(mPm);
+ service.packageName, 0, UserHandle.myUserId()).loadLabel(mPm);
} catch (PackageManager.NameNotFoundException e) {
// unlikely, as we are iterating over live services.
Log.e(TAG, "can't find package name", e);
}
+ final CharSequence finalTitle = title;
final String summary = service.loadLabel(mPm).toString();
final SwitchPreference pref = new AppSwitchPreference(getPrefContext());
pref.setPersistent(false);
@@ -142,7 +143,11 @@
}
pref.setOnPreferenceChangeListener((preference, newValue) -> {
final boolean enable = (boolean) newValue;
- return setEnabled(cn, summary, enable);
+ if (finalTitle != null) {
+ return setEnabled(cn, finalTitle.toString(), enable);
+ } else {
+ return setEnabled(cn, null, enable);
+ }
});
pref.setKey(cn.flattenToString());
screen.addPreference(pref);
diff --git a/src/com/android/settings/utils/SettingsDividerItemDecoration.java b/src/com/android/settings/utils/SettingsDividerItemDecoration.java
index 70b0188..85cd961 100644
--- a/src/com/android/settings/utils/SettingsDividerItemDecoration.java
+++ b/src/com/android/settings/utils/SettingsDividerItemDecoration.java
@@ -18,11 +18,11 @@
import android.content.Context;
-import com.android.setupwizardlib.DividerItemDecoration;
-
import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
+import com.android.setupwizardlib.DividerItemDecoration;
+
public class SettingsDividerItemDecoration extends DividerItemDecoration {
public SettingsDividerItemDecoration(Context context) {
diff --git a/src/com/android/settings/vpn2/AppDialog.java b/src/com/android/settings/vpn2/AppDialog.java
index 6641bf3..815b28b 100644
--- a/src/com/android/settings/vpn2/AppDialog.java
+++ b/src/com/android/settings/vpn2/AppDialog.java
@@ -21,10 +21,10 @@
import android.content.pm.PackageInfo;
import android.os.Bundle;
-import com.android.settings.R;
-
import androidx.appcompat.app.AlertDialog;
+import com.android.settings.R;
+
/**
* UI for managing the connection controlled by an app.
*
diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java
index 759adbf..0bf5215 100644
--- a/src/com/android/settings/vpn2/AppDialogFragment.java
+++ b/src/com/android/settings/vpn2/AppDialogFragment.java
@@ -28,14 +28,14 @@
import android.os.UserManager;
import android.util.Log;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.net.VpnConfig;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
/**
* Fragment wrapper around an {@link AppDialog}.
*/
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index a141919..6a80a54 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -35,6 +35,11 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.DialogFragment;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.net.VpnConfig;
import com.android.internal.util.ArrayUtils;
@@ -47,11 +52,6 @@
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.DialogFragment;
-import androidx.preference.Preference;
-
public class AppManagementFragment extends SettingsPreferenceFragment
implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
ConfirmLockdownFragment.ConfirmLockdownListener {
diff --git a/src/com/android/settings/vpn2/AppPreference.java b/src/com/android/settings/vpn2/AppPreference.java
index e2c26ea..6b64250 100644
--- a/src/com/android/settings/vpn2/AppPreference.java
+++ b/src/com/android/settings/vpn2/AppPreference.java
@@ -22,11 +22,11 @@
import android.graphics.drawable.Drawable;
import android.os.UserHandle;
+import androidx.preference.Preference;
+
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
-import androidx.preference.Preference;
-
/**
* {@link androidx.preference.Preference} containing information about a VPN
* application. Tracks the package name and connection state.
diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
index 376dba7..de2755e 100644
--- a/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -33,13 +33,13 @@
import android.widget.Spinner;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.net.VpnProfile;
import com.android.settings.R;
import java.net.InetAddress;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Dialog showing information about a VPN configuration. The dialog
* can be launched to either edit or prompt for credentials to connect
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 1517bf7..5714515 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -31,14 +31,14 @@
import android.view.View;
import android.widget.Toast;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnProfile;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-
/**
* Fragment wrapper around a {@link ConfigDialog}.
*/
diff --git a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java
index d73e928..08f3752 100644
--- a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java
+++ b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java
@@ -19,13 +19,13 @@
import android.content.DialogInterface;
import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
public class ConfirmLockdownFragment extends InstrumentedDialogFragment
implements DialogInterface.OnClickListener {
public interface ConfirmLockdownListener {
diff --git a/src/com/android/settings/vpn2/LegacyVpnPreference.java b/src/com/android/settings/vpn2/LegacyVpnPreference.java
index 167cdda..e44a057 100644
--- a/src/com/android/settings/vpn2/LegacyVpnPreference.java
+++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java
@@ -22,11 +22,11 @@
import android.text.TextUtils;
import android.view.View;
+import androidx.preference.Preference;
+
import com.android.internal.net.VpnProfile;
import com.android.settings.R;
-import androidx.preference.Preference;
-
/**
* {@link androidx.preference.Preference} tracks the underlying legacy vpn profile and
* its connection state.
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 00c4e49..ed36da8 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -49,6 +49,10 @@
import android.view.MenuInflater;
import android.view.MenuItem;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
import com.android.internal.annotations.GuardedBy;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.net.LegacyVpnInfo;
@@ -59,7 +63,7 @@
import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.widget.GearPreference;
import com.android.settings.widget.GearPreference.OnGearClickListener;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.android.collect.Lists;
@@ -70,10 +74,6 @@
import java.util.Map;
import java.util.Set;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
/**
* Settings screen listing VPNs. Configured VPNs and networks managed by apps
* are shown in the same list.
@@ -143,7 +143,7 @@
// Disable all actions if VPN configuration has been disallowed
for (int i = 0; i < menu.size(); i++) {
if (isUiRestrictedByOnlyAdmin()) {
- RestrictedLockUtils.setMenuItemAsDisabledByAdmin(getPrefContext(),
+ RestrictedLockUtilsInternal.setMenuItemAsDisabledByAdmin(getPrefContext(),
menu.getItem(i), getRestrictionEnforcedAdmin());
} else {
menu.getItem(i).setEnabled(!mUnavailable);
diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
index 8c6286c..c047357 100644
--- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
+++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
@@ -23,12 +23,12 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.SubSettingLauncher;
-import androidx.annotation.VisibleForTesting;
-
public class WallpaperSuggestionActivity extends Activity {
@Override
diff --git a/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java b/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java
index b7dd84f..9579786 100644
--- a/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java
+++ b/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java
@@ -23,6 +23,9 @@
import android.content.pm.ResolveInfo;
import android.text.TextUtils;
+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;
@@ -30,9 +33,6 @@
import java.util.List;
import java.util.stream.Collectors;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class WallpaperTypePreferenceController extends BasePreferenceController
implements LifecycleObserver, OnStart {
diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java
index 1dd80fb..72d7918 100644
--- a/src/com/android/settings/webview/WebViewAppPicker.java
+++ b/src/com/android/settings/webview/WebViewAppPicker.java
@@ -28,6 +28,8 @@
import android.text.TextUtils;
import android.webkit.UserPackage;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
@@ -36,8 +38,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
public class WebViewAppPicker extends DefaultAppPickerFragment {
private WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
@@ -118,9 +118,9 @@
}
private static class WebViewAppInfo extends DefaultAppInfo {
- public WebViewAppInfo(Context context, PackageManager pm,
+ public WebViewAppInfo(Context context, PackageManager pm, int userId,
PackageItemInfo packageItemInfo, String summary, boolean enabled) {
- super(context, pm, packageItemInfo, summary, enabled);
+ super(context, pm, userId, packageItemInfo, summary, enabled);
}
@Override
@@ -138,7 +138,7 @@
@VisibleForTesting
DefaultAppInfo createDefaultAppInfo(Context context, PackageManager pm,
PackageItemInfo packageItemInfo, String disabledReason) {
- return new WebViewAppInfo(context, pm, packageItemInfo, disabledReason,
+ return new WebViewAppInfo(context, pm, mUserId, packageItemInfo, disabledReason,
TextUtils.isEmpty(disabledReason) /* enabled */);
}
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index dbb4e21..0bd2a1e 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -50,6 +50,16 @@
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.app.MediaRouteDialogPresenter;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -62,16 +72,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-import androidx.preference.SwitchPreference;
-
/**
* The Settings screen for WifiDisplay configuration and connection management.
*
diff --git a/src/com/android/settings/widget/ActionBarShadowController.java b/src/com/android/settings/widget/ActionBarShadowController.java
index 7e2e91a..1b8d319 100644
--- a/src/com/android/settings/widget/ActionBarShadowController.java
+++ b/src/com/android/settings/widget/ActionBarShadowController.java
@@ -20,14 +20,14 @@
import android.app.Activity;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.RecyclerView;
-
/**
* A controller that adds shadow to actionbar when content view scrolls.
* <p/>
diff --git a/src/com/android/settings/widget/ActionButtonPreference.java b/src/com/android/settings/widget/ActionButtonPreference.java
index 7f8bd4e..347a784 100644
--- a/src/com/android/settings/widget/ActionButtonPreference.java
+++ b/src/com/android/settings/widget/ActionButtonPreference.java
@@ -22,12 +22,12 @@
import android.view.View;
import android.widget.Button;
-import com.android.settings.R;
-
import androidx.annotation.StringRes;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
public class ActionButtonPreference extends Preference {
private final ButtonInfo mButton1Info = new ButtonInfo();
diff --git a/src/com/android/settings/widget/AppCheckBoxPreference.java b/src/com/android/settings/widget/AppCheckBoxPreference.java
index bd643ba..e56efd9 100644
--- a/src/com/android/settings/widget/AppCheckBoxPreference.java
+++ b/src/com/android/settings/widget/AppCheckBoxPreference.java
@@ -23,11 +23,11 @@
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.android.settings.R;
-
import androidx.preference.CheckBoxPreference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
/**
* {@link CheckBoxPreference} that used only to display app
*/
diff --git a/src/com/android/settings/widget/AppPreference.java b/src/com/android/settings/widget/AppPreference.java
deleted file mode 100644
index 77ff0cc..0000000
--- a/src/com/android/settings/widget/AppPreference.java
+++ /dev/null
@@ -1,64 +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.ProgressBar;
-
-import com.android.settings.R;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
-public class AppPreference extends Preference {
-
- private int mProgress;
- private boolean mProgressVisible;
-
- public AppPreference(Context context) {
- super(context);
- setLayoutResource(R.layout.preference_app);
- }
-
- public AppPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- setLayoutResource(R.layout.preference_app);
- }
-
- public void setProgress(int amount) {
- mProgress = amount;
- mProgressVisible = true;
- notifyChanged();
- }
-
- @Override
- public void onBindViewHolder(PreferenceViewHolder view) {
- super.onBindViewHolder(view);
-
- view.findViewById(R.id.summary_container)
- .setVisibility(TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);
- final ProgressBar progress = (ProgressBar) view.findViewById(android.R.id.progress);
- if (mProgressVisible) {
- progress.setProgress(mProgress);
- progress.setVisibility(View.VISIBLE);
- } else {
- progress.setVisibility(View.GONE);
- }
- }
-}
diff --git a/src/com/android/settings/widget/AppSwitchPreference.java b/src/com/android/settings/widget/AppSwitchPreference.java
index 12aef6d..288096e 100644
--- a/src/com/android/settings/widget/AppSwitchPreference.java
+++ b/src/com/android/settings/widget/AppSwitchPreference.java
@@ -20,11 +20,11 @@
import android.text.TextUtils;
import android.view.View;
-import com.android.settings.R;
-
import androidx.preference.PreferenceViewHolder;
import androidx.preference.SwitchPreference;
+import com.android.settings.R;
+
public class AppSwitchPreference extends SwitchPreference {
public AppSwitchPreference(Context context) {
diff --git a/src/com/android/settings/widget/AspectRatioFrameLayout.java b/src/com/android/settings/widget/AspectRatioFrameLayout.java
index 066c94a..aa3d3c4 100644
--- a/src/com/android/settings/widget/AspectRatioFrameLayout.java
+++ b/src/com/android/settings/widget/AspectRatioFrameLayout.java
@@ -19,10 +19,10 @@
import android.util.AttributeSet;
import android.widget.FrameLayout;
-import com.android.settings.R;
-
import androidx.annotation.VisibleForTesting;
+import com.android.settings.R;
+
/**
* A {@link FrameLayout} with customizable aspect ratio.
* This is used to avoid dynamically calculating the height for the frame. Default aspect
diff --git a/src/com/android/settings/widget/BottomLabelLayout.java b/src/com/android/settings/widget/BottomLabelLayout.java
index b72be36..6323c4d 100644
--- a/src/com/android/settings/widget/BottomLabelLayout.java
+++ b/src/com/android/settings/widget/BottomLabelLayout.java
@@ -23,10 +23,10 @@
import android.view.View;
import android.widget.LinearLayout;
-import com.android.settingslib.R;
-
import androidx.annotation.VisibleForTesting;
+import com.android.settingslib.R;
+
/**
* An extension of LinearLayout that automatically switches to vertical
* orientation when it can't fit its child views horizontally.
diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java
deleted file mode 100644
index d1ddc14..0000000
--- a/src/com/android/settings/widget/ChartDataUsageView.java
+++ /dev/null
@@ -1,606 +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.widget;
-
-import static android.net.TrafficStats.MB_IN_BYTES;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.net.NetworkPolicy;
-import android.net.NetworkStatsHistory;
-import android.net.TrafficStats;
-import android.os.Handler;
-import android.os.Message;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.text.format.Formatter;
-import android.text.format.Formatter.BytesResult;
-import android.text.format.Time;
-import android.util.AttributeSet;
-import android.util.MathUtils;
-import android.view.MotionEvent;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.widget.ChartSweepView.OnSweepListener;
-
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Objects;
-
-/**
- * Specific {@link ChartView} that displays {@link ChartNetworkSeriesView} along
- * with {@link ChartSweepView} for inspection ranges and warning/limits.
- */
-public class ChartDataUsageView extends ChartView {
-
- private static final int MSG_UPDATE_AXIS = 100;
- private static final long DELAY_MILLIS = 250;
-
- private ChartGridView mGrid;
- private ChartNetworkSeriesView mSeries;
- private ChartNetworkSeriesView mDetailSeries;
-
- private NetworkStatsHistory mHistory;
-
- private ChartSweepView mSweepWarning;
- private ChartSweepView mSweepLimit;
-
- private long mInspectStart;
- private long mInspectEnd;
-
- private Handler mHandler;
-
- /** Current maximum value of {@link #mVert}. */
- private long mVertMax;
-
- public interface DataUsageChartListener {
- public void onWarningChanged();
- public void onLimitChanged();
- public void requestWarningEdit();
- public void requestLimitEdit();
- }
-
- private DataUsageChartListener mListener;
-
- public ChartDataUsageView(Context context) {
- this(context, null, 0);
- }
-
- public ChartDataUsageView(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public ChartDataUsageView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- init(new TimeAxis(), new InvertedChartAxis(new DataAxis()));
-
- mHandler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- final ChartSweepView sweep = (ChartSweepView) msg.obj;
- updateVertAxisBounds(sweep);
- updateEstimateVisible();
-
- // we keep dispatching repeating updates until sweep is dropped
- sendUpdateAxisDelayed(sweep, true);
- }
- };
- }
-
- @Override
- protected void onFinishInflate() {
- super.onFinishInflate();
-
- mGrid = (ChartGridView) findViewById(R.id.grid);
- mSeries = (ChartNetworkSeriesView) findViewById(R.id.series);
- mDetailSeries = (ChartNetworkSeriesView) findViewById(R.id.detail_series);
- mDetailSeries.setVisibility(View.GONE);
-
- mSweepLimit = (ChartSweepView) findViewById(R.id.sweep_limit);
- mSweepWarning = (ChartSweepView) findViewById(R.id.sweep_warning);
-
- // prevent sweeps from crossing each other
- mSweepWarning.setValidRangeDynamic(null, mSweepLimit);
- mSweepLimit.setValidRangeDynamic(mSweepWarning, null);
-
- // mark neighbors for checking touch events against
- mSweepLimit.setNeighbors(mSweepWarning);
- mSweepWarning.setNeighbors(mSweepLimit);
-
- mSweepWarning.addOnSweepListener(mVertListener);
- mSweepLimit.addOnSweepListener(mVertListener);
-
- mSweepWarning.setDragInterval(5 * MB_IN_BYTES);
- mSweepLimit.setDragInterval(5 * MB_IN_BYTES);
-
- // tell everyone about our axis
- mGrid.init(mHoriz, mVert);
- mSeries.init(mHoriz, mVert);
- mDetailSeries.init(mHoriz, mVert);
- mSweepWarning.init(mVert);
- mSweepLimit.init(mVert);
-
- setActivated(false);
- }
-
- public void setListener(DataUsageChartListener listener) {
- mListener = listener;
- }
-
- public void bindNetworkStats(NetworkStatsHistory stats) {
- mSeries.bindNetworkStats(stats);
- mHistory = stats;
- updateVertAxisBounds(null);
- updateEstimateVisible();
- updatePrimaryRange();
- requestLayout();
- }
-
- public void bindDetailNetworkStats(NetworkStatsHistory stats) {
- mDetailSeries.bindNetworkStats(stats);
- mDetailSeries.setVisibility(stats != null ? View.VISIBLE : View.GONE);
- if (mHistory != null) {
- mDetailSeries.setEndTime(mHistory.getEnd());
- }
- updateVertAxisBounds(null);
- updateEstimateVisible();
- updatePrimaryRange();
- requestLayout();
- }
-
- public void bindNetworkPolicy(NetworkPolicy policy) {
- if (policy == null) {
- mSweepLimit.setVisibility(View.INVISIBLE);
- mSweepLimit.setValue(-1);
- mSweepWarning.setVisibility(View.INVISIBLE);
- mSweepWarning.setValue(-1);
- return;
- }
-
- if (policy.limitBytes != NetworkPolicy.LIMIT_DISABLED) {
- mSweepLimit.setVisibility(View.VISIBLE);
- mSweepLimit.setEnabled(true);
- mSweepLimit.setValue(policy.limitBytes);
- } else {
- mSweepLimit.setVisibility(View.INVISIBLE);
- mSweepLimit.setEnabled(false);
- mSweepLimit.setValue(-1);
- }
-
- if (policy.warningBytes != NetworkPolicy.WARNING_DISABLED) {
- mSweepWarning.setVisibility(View.VISIBLE);
- mSweepWarning.setValue(policy.warningBytes);
- } else {
- mSweepWarning.setVisibility(View.INVISIBLE);
- mSweepWarning.setValue(-1);
- }
-
- updateVertAxisBounds(null);
- requestLayout();
- invalidate();
- }
-
- /**
- * Update {@link #mVert} to both show data from {@link NetworkStatsHistory}
- * and controls from {@link NetworkPolicy}.
- */
- private void updateVertAxisBounds(ChartSweepView activeSweep) {
- final long max = mVertMax;
-
- long newMax = 0;
- if (activeSweep != null) {
- final int adjustAxis = activeSweep.shouldAdjustAxis();
- if (adjustAxis > 0) {
- // hovering around upper edge, grow axis
- newMax = max * 11 / 10;
- } else if (adjustAxis < 0) {
- // hovering around lower edge, shrink axis
- newMax = max * 9 / 10;
- } else {
- newMax = max;
- }
- }
-
- // always show known data and policy lines
- final long maxSweep = Math.max(mSweepWarning.getValue(), mSweepLimit.getValue());
- final long maxSeries = Math.max(mSeries.getMaxVisible(), mDetailSeries.getMaxVisible());
- final long maxVisible = Math.max(maxSeries, maxSweep) * 12 / 10;
- final long maxDefault = Math.max(maxVisible, 50 * MB_IN_BYTES);
- newMax = Math.max(maxDefault, newMax);
-
- // only invalidate when vertMax actually changed
- if (newMax != mVertMax) {
- mVertMax = newMax;
-
- final boolean changed = mVert.setBounds(0L, newMax);
- mSweepWarning.setValidRange(0L, newMax);
- mSweepLimit.setValidRange(0L, newMax);
-
- if (changed) {
- mSeries.invalidatePath();
- mDetailSeries.invalidatePath();
- }
-
- mGrid.invalidate();
-
- // since we just changed axis, make sweep recalculate its value
- if (activeSweep != null) {
- activeSweep.updateValueFromPosition();
- }
-
- // layout other sweeps to match changed axis
- // TODO: find cleaner way of doing this, such as requesting full
- // layout and making activeSweep discard its tracking MotionEvent.
- if (mSweepLimit != activeSweep) {
- layoutSweep(mSweepLimit);
- }
- if (mSweepWarning != activeSweep) {
- layoutSweep(mSweepWarning);
- }
- }
- }
-
- /**
- * Control {@link ChartNetworkSeriesView#setEstimateVisible(boolean)} based
- * on how close estimate comes to {@link #mSweepWarning}.
- */
- private void updateEstimateVisible() {
- final long maxEstimate = mSeries.getMaxEstimate();
-
- // show estimate when near warning/limit
- long interestLine = Long.MAX_VALUE;
- if (mSweepWarning.isEnabled()) {
- interestLine = mSweepWarning.getValue();
- } else if (mSweepLimit.isEnabled()) {
- interestLine = mSweepLimit.getValue();
- }
-
- if (interestLine < 0) {
- interestLine = Long.MAX_VALUE;
- }
-
- final boolean estimateVisible = (maxEstimate >= interestLine * 7 / 10);
- mSeries.setEstimateVisible(estimateVisible);
- }
-
- private void sendUpdateAxisDelayed(ChartSweepView sweep, boolean force) {
- if (force || !mHandler.hasMessages(MSG_UPDATE_AXIS, sweep)) {
- mHandler.sendMessageDelayed(
- mHandler.obtainMessage(MSG_UPDATE_AXIS, sweep), DELAY_MILLIS);
- }
- }
-
- private void clearUpdateAxisDelayed(ChartSweepView sweep) {
- mHandler.removeMessages(MSG_UPDATE_AXIS, sweep);
- }
-
- private OnSweepListener mVertListener = new OnSweepListener() {
- @Override
- public void onSweep(ChartSweepView sweep, boolean sweepDone) {
- if (sweepDone) {
- clearUpdateAxisDelayed(sweep);
- updateEstimateVisible();
-
- if (sweep == mSweepWarning && mListener != null) {
- mListener.onWarningChanged();
- } else if (sweep == mSweepLimit && mListener != null) {
- mListener.onLimitChanged();
- }
- } else {
- // while moving, kick off delayed grow/shrink axis updates
- sendUpdateAxisDelayed(sweep, false);
- }
- }
-
- @Override
- public void requestEdit(ChartSweepView sweep) {
- if (sweep == mSweepWarning && mListener != null) {
- mListener.requestWarningEdit();
- } else if (sweep == mSweepLimit && mListener != null) {
- mListener.requestLimitEdit();
- }
- }
- };
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- if (isActivated()) return false;
- switch (event.getAction()) {
- case MotionEvent.ACTION_DOWN: {
- return true;
- }
- case MotionEvent.ACTION_UP: {
- setActivated(true);
- return true;
- }
- default: {
- return false;
- }
- }
- }
-
- public long getInspectStart() {
- return mInspectStart;
- }
-
- public long getInspectEnd() {
- return mInspectEnd;
- }
-
- public long getWarningBytes() {
- return mSweepWarning.getLabelValue();
- }
-
- public long getLimitBytes() {
- return mSweepLimit.getLabelValue();
- }
-
- /**
- * Set the exact time range that should be displayed, updating how
- * {@link ChartNetworkSeriesView} paints. Moves inspection ranges to be the
- * last "week" of available data, without triggering listener events.
- */
- public void setVisibleRange(long visibleStart, long visibleEnd) {
- final boolean changed = mHoriz.setBounds(visibleStart, visibleEnd);
- mGrid.setBounds(visibleStart, visibleEnd);
- mSeries.setBounds(visibleStart, visibleEnd);
- mDetailSeries.setBounds(visibleStart, visibleEnd);
-
- mInspectStart = visibleStart;
- mInspectEnd = visibleEnd;
-
- requestLayout();
- if (changed) {
- mSeries.invalidatePath();
- mDetailSeries.invalidatePath();
- }
-
- updateVertAxisBounds(null);
- updateEstimateVisible();
- updatePrimaryRange();
- }
-
- private void updatePrimaryRange() {
- // prefer showing primary range on detail series, when available
- if (mDetailSeries.getVisibility() == View.VISIBLE) {
- mSeries.setSecondary(true);
- } else {
- mSeries.setSecondary(false);
- }
- }
-
- public static class TimeAxis implements ChartAxis {
- private static final int FIRST_DAY_OF_WEEK = Calendar.getInstance().getFirstDayOfWeek() - 1;
-
- private long mMin;
- private long mMax;
- private float mSize;
-
- public TimeAxis() {
- final long currentTime = System.currentTimeMillis();
- setBounds(currentTime - DateUtils.DAY_IN_MILLIS * 30, currentTime);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(mMin, mMax, mSize);
- }
-
- @Override
- public boolean setBounds(long min, long max) {
- if (mMin != min || mMax != max) {
- mMin = min;
- mMax = max;
- return true;
- } else {
- return false;
- }
- }
-
- @Override
- public boolean setSize(float size) {
- if (mSize != size) {
- mSize = size;
- return true;
- } else {
- return false;
- }
- }
-
- @Override
- public float convertToPoint(long value) {
- return (mSize * (value - mMin)) / (mMax - mMin);
- }
-
- @Override
- public long convertToValue(float point) {
- return (long) (mMin + ((point * (mMax - mMin)) / mSize));
- }
-
- @Override
- public long buildLabel(Resources res, SpannableStringBuilder builder, long value) {
- // TODO: convert to better string
- builder.replace(0, builder.length(), Long.toString(value));
- return value;
- }
-
- @Override
- public float[] getTickPoints() {
- final float[] ticks = new float[32];
- int i = 0;
-
- // tick mark for first day of each week
- final Time time = new Time();
- time.set(mMax);
- time.monthDay -= time.weekDay - FIRST_DAY_OF_WEEK;
- time.hour = time.minute = time.second = 0;
-
- time.normalize(true);
- long timeMillis = time.toMillis(true);
- while (timeMillis > mMin) {
- if (timeMillis <= mMax) {
- ticks[i++] = convertToPoint(timeMillis);
- }
- time.monthDay -= 7;
- time.normalize(true);
- timeMillis = time.toMillis(true);
- }
-
- return Arrays.copyOf(ticks, i);
- }
-
- @Override
- public int shouldAdjustAxis(long value) {
- // time axis never adjusts
- return 0;
- }
- }
-
- public static class DataAxis implements ChartAxis {
- private long mMin;
- private long mMax;
- private float mSize;
-
- private static final boolean LOG_SCALE = false;
-
- @Override
- public int hashCode() {
- return Objects.hash(mMin, mMax, mSize);
- }
-
- @Override
- public boolean setBounds(long min, long max) {
- if (mMin != min || mMax != max) {
- mMin = min;
- mMax = max;
- return true;
- } else {
- return false;
- }
- }
-
- @Override
- public boolean setSize(float size) {
- if (mSize != size) {
- mSize = size;
- return true;
- } else {
- return false;
- }
- }
-
- @Override
- public float convertToPoint(long value) {
- if (LOG_SCALE) {
- // derived polynomial fit to make lower values more visible
- final double normalized = ((double) value - mMin) / (mMax - mMin);
- final double fraction = Math.pow(10,
- 0.36884343106175121463 * Math.log10(normalized) + -0.04328199452018252624);
- return (float) (fraction * mSize);
- } else {
- return (mSize * (value - mMin)) / (mMax - mMin);
- }
- }
-
- @Override
- public long convertToValue(float point) {
- if (LOG_SCALE) {
- final double normalized = point / mSize;
- final double fraction = 1.3102228476089056629
- * Math.pow(normalized, 2.7111774693164631640);
- return (long) (mMin + (fraction * (mMax - mMin)));
- } else {
- return (long) (mMin + ((point * (mMax - mMin)) / mSize));
- }
- }
-
- private static final Object sSpanSize = new Object();
- private static final Object sSpanUnit = new Object();
-
- @Override
- public long buildLabel(Resources res, SpannableStringBuilder builder, long value) {
- value = MathUtils.constrain(value, 0, TrafficStats.TB_IN_BYTES);
- final BytesResult result = Formatter.formatBytes(res, value,
- Formatter.FLAG_SHORTER | Formatter.FLAG_CALCULATE_ROUNDED);
- setText(builder, sSpanSize, result.value, "^1");
- setText(builder, sSpanUnit, result.units, "^2");
- return result.roundedBytes;
- }
-
- @Override
- public float[] getTickPoints() {
- final long range = mMax - mMin;
-
- // target about 16 ticks on screen, rounded to nearest power of 2
- final long tickJump = roundUpToPowerOfTwo(range / 16);
- final int tickCount = (int) (range / tickJump);
- final float[] tickPoints = new float[tickCount];
- long value = mMin;
- for (int i = 0; i < tickPoints.length; i++) {
- tickPoints[i] = convertToPoint(value);
- value += tickJump;
- }
-
- return tickPoints;
- }
-
- @Override
- public int shouldAdjustAxis(long value) {
- final float point = convertToPoint(value);
- if (point < mSize * 0.1) {
- return -1;
- } else if (point > mSize * 0.85) {
- return 1;
- } else {
- return 0;
- }
- }
- }
-
- private static void setText(
- SpannableStringBuilder builder, Object key, CharSequence text, String bootstrap) {
- int start = builder.getSpanStart(key);
- int end = builder.getSpanEnd(key);
- if (start == -1) {
- start = TextUtils.indexOf(builder, bootstrap);
- end = start + bootstrap.length();
- builder.setSpan(key, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
- }
- builder.replace(start, end, text);
- }
-
- private static long roundUpToPowerOfTwo(long i) {
- // NOTE: borrowed from Hashtable.roundUpToPowerOfTwo()
-
- i--; // If input is a power of two, shift its high-order bit right
-
- // "Smear" the high-order bit all the way to the right
- i |= i >>> 1;
- i |= i >>> 2;
- i |= i >>> 4;
- i |= i >>> 8;
- i |= i >>> 16;
- i |= i >>> 32;
-
- i++;
-
- return i > 0 ? i : Long.MAX_VALUE;
- }
-}
diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java
deleted file mode 100644
index 7aaba66..0000000
--- a/src/com/android/settings/widget/ChartNetworkSeriesView.java
+++ /dev/null
@@ -1,340 +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.widget;
-
-import static android.text.format.DateUtils.DAY_IN_MILLIS;
-import static android.text.format.DateUtils.WEEK_IN_MILLIS;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.DashPathEffect;
-import android.graphics.Paint;
-import android.graphics.Paint.Style;
-import android.graphics.Path;
-import android.graphics.RectF;
-import android.net.NetworkStatsHistory;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-
-import com.android.internal.util.Preconditions;
-import com.android.settings.R;
-
-/**
- * {@link NetworkStatsHistory} series to render inside a {@link ChartView},
- * using {@link ChartAxis} to map into screen coordinates.
- */
-public class ChartNetworkSeriesView extends View {
- private static final String TAG = "ChartNetworkSeriesView";
- private static final boolean LOGD = false;
-
- private static final boolean ESTIMATE_ENABLED = false;
-
- private ChartAxis mHoriz;
- private ChartAxis mVert;
-
- private Paint mPaintStroke;
- private Paint mPaintFill;
- private Paint mPaintFillSecondary;
- private Paint mPaintEstimate;
-
- private NetworkStatsHistory mStats;
-
- private Path mPathStroke;
- private Path mPathFill;
- private Path mPathEstimate;
-
- private int mSafeRegion;
-
- private long mStart;
- private long mEnd;
-
- /** Series will be extended to reach this end time. */
- private long mEndTime = Long.MIN_VALUE;
-
- private boolean mPathValid = false;
- private boolean mEstimateVisible = false;
- private boolean mSecondary = false;
-
- private long mMax;
- private long mMaxEstimate;
-
- public ChartNetworkSeriesView(Context context) {
- this(context, null, 0);
- }
-
- public ChartNetworkSeriesView(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
- }
-
- public ChartNetworkSeriesView(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
-
- final TypedArray a = context.obtainStyledAttributes(
- attrs, R.styleable.ChartNetworkSeriesView, defStyle, 0);
-
- final int stroke = a.getColor(R.styleable.ChartNetworkSeriesView_strokeColor, Color.RED);
- final int fill = a.getColor(R.styleable.ChartNetworkSeriesView_fillColor, Color.RED);
- final int fillSecondary = a.getColor(
- R.styleable.ChartNetworkSeriesView_fillColorSecondary, Color.RED);
- final int safeRegion = a.getDimensionPixelSize(
- R.styleable.ChartNetworkSeriesView_safeRegion, 0);
-
- setChartColor(stroke, fill, fillSecondary);
- setSafeRegion(safeRegion);
- setWillNotDraw(false);
-
- a.recycle();
-
- mPathStroke = new Path();
- mPathFill = new Path();
- mPathEstimate = new Path();
- }
-
- void init(ChartAxis horiz, ChartAxis vert) {
- mHoriz = Preconditions.checkNotNull(horiz, "missing horiz");
- mVert = Preconditions.checkNotNull(vert, "missing vert");
- }
-
- public void setChartColor(int stroke, int fill, int fillSecondary) {
- mPaintStroke = new Paint();
- mPaintStroke.setStrokeWidth(4.0f * getResources().getDisplayMetrics().density);
- mPaintStroke.setColor(stroke);
- mPaintStroke.setStyle(Style.STROKE);
- mPaintStroke.setAntiAlias(true);
-
- mPaintFill = new Paint();
- mPaintFill.setColor(fill);
- mPaintFill.setStyle(Style.FILL);
- mPaintFill.setAntiAlias(true);
-
- mPaintFillSecondary = new Paint();
- mPaintFillSecondary.setColor(fillSecondary);
- mPaintFillSecondary.setStyle(Style.FILL);
- mPaintFillSecondary.setAntiAlias(true);
-
- mPaintEstimate = new Paint();
- mPaintEstimate.setStrokeWidth(3.0f);
- mPaintEstimate.setColor(fillSecondary);
- mPaintEstimate.setStyle(Style.STROKE);
- mPaintEstimate.setAntiAlias(true);
- mPaintEstimate.setPathEffect(new DashPathEffect(new float[] { 10, 10 }, 1));
- }
-
- public void setSafeRegion(int safeRegion) {
- mSafeRegion = safeRegion;
- }
-
- public void bindNetworkStats(NetworkStatsHistory stats) {
- mStats = stats;
- invalidatePath();
- invalidate();
- }
-
- public void setBounds(long start, long end) {
- mStart = start;
- mEnd = end;
- }
-
- public void setSecondary(boolean secondary) {
- mSecondary = secondary;
- }
-
- public void invalidatePath() {
- mPathValid = false;
- mMax = 0;
- invalidate();
- }
-
- /**
- * Erase any existing {@link Path} and generate series outline based on
- * currently bound {@link NetworkStatsHistory} data.
- */
- private void generatePath() {
- if (LOGD) Log.d(TAG, "generatePath()");
-
- mMax = 0;
- mPathStroke.reset();
- mPathFill.reset();
- mPathEstimate.reset();
- mPathValid = true;
-
- // bail when not enough stats to render
- if (mStats == null || mStats.size() < 2) {
- return;
- }
-
- final int width = getWidth();
- final int height = getHeight();
-
- boolean started = false;
- float lastX = 0;
- float lastY = height;
- long lastTime = mHoriz.convertToValue(lastX);
-
- // move into starting position
- mPathStroke.moveTo(lastX, lastY);
- mPathFill.moveTo(lastX, lastY);
-
- // TODO: count fractional data from first bucket crossing start;
- // currently it only accepts first full bucket.
-
- long totalData = 0;
-
- NetworkStatsHistory.Entry entry = null;
-
- final int start = mStats.getIndexBefore(mStart);
- final int end = mStats.getIndexAfter(mEnd);
- for (int i = start; i <= end; i++) {
- entry = mStats.getValues(i, entry);
-
- final long startTime = entry.bucketStart;
- final long endTime = startTime + entry.bucketDuration;
-
- final float startX = mHoriz.convertToPoint(startTime);
- final float endX = mHoriz.convertToPoint(endTime);
-
- // skip until we find first stats on screen
- if (endX < 0) continue;
-
- // increment by current bucket total
- totalData += entry.rxBytes + entry.txBytes;
-
- final float startY = lastY;
- final float endY = mVert.convertToPoint(totalData);
-
- if (lastTime != startTime) {
- // gap in buckets; line to start of current bucket
- mPathStroke.lineTo(startX, startY);
- mPathFill.lineTo(startX, startY);
- }
-
- // always draw to end of current bucket
- mPathStroke.lineTo(endX, endY);
- mPathFill.lineTo(endX, endY);
-
- lastX = endX;
- lastY = endY;
- lastTime = endTime;
- }
-
- // when data falls short, extend to requested end time
- if (lastTime < mEndTime) {
- lastX = mHoriz.convertToPoint(mEndTime);
-
- mPathStroke.lineTo(lastX, lastY);
- mPathFill.lineTo(lastX, lastY);
- }
-
- if (LOGD) {
- final RectF bounds = new RectF();
- mPathFill.computeBounds(bounds, true);
- Log.d(TAG, "onLayout() rendered with bounds=" + bounds.toString() + " and totalData="
- + totalData);
- }
-
- // drop to bottom of graph from current location
- mPathFill.lineTo(lastX, height);
- mPathFill.lineTo(0, height);
-
- mMax = totalData;
-
- if (ESTIMATE_ENABLED) {
- // build estimated data
- mPathEstimate.moveTo(lastX, lastY);
-
- final long now = System.currentTimeMillis();
- final long bucketDuration = mStats.getBucketDuration();
-
- // long window is average over two weeks
- entry = mStats.getValues(lastTime - WEEK_IN_MILLIS * 2, lastTime, now, entry);
- final long longWindow = (entry.rxBytes + entry.txBytes) * bucketDuration
- / entry.bucketDuration;
-
- long futureTime = 0;
- while (lastX < width) {
- futureTime += bucketDuration;
-
- // short window is day average last week
- final long lastWeekTime = lastTime - WEEK_IN_MILLIS + (futureTime % WEEK_IN_MILLIS);
- entry = mStats.getValues(lastWeekTime - DAY_IN_MILLIS, lastWeekTime, now, entry);
- final long shortWindow = (entry.rxBytes + entry.txBytes) * bucketDuration
- / entry.bucketDuration;
-
- totalData += (longWindow * 7 + shortWindow * 3) / 10;
-
- lastX = mHoriz.convertToPoint(lastTime + futureTime);
- lastY = mVert.convertToPoint(totalData);
-
- mPathEstimate.lineTo(lastX, lastY);
- }
-
- mMaxEstimate = totalData;
- }
-
- invalidate();
- }
-
- public void setEndTime(long endTime) {
- mEndTime = endTime;
- }
-
- public void setEstimateVisible(boolean estimateVisible) {
- mEstimateVisible = ESTIMATE_ENABLED ? estimateVisible : false;
- invalidate();
- }
-
- public long getMaxEstimate() {
- return mMaxEstimate;
- }
-
- public long getMaxVisible() {
- final long maxVisible = mEstimateVisible ? mMaxEstimate : mMax;
- if (maxVisible <= 0 && mStats != null) {
- // haven't generated path yet; fall back to raw data
- final NetworkStatsHistory.Entry entry = mStats.getValues(mStart, mEnd, null);
- return entry.rxBytes + entry.txBytes;
- } else {
- return maxVisible;
- }
- }
-
- @Override
- protected void onDraw(Canvas canvas) {
- int save;
-
- if (!mPathValid) {
- generatePath();
- }
-
- if (mEstimateVisible) {
- save = canvas.save();
- canvas.clipRect(0, 0, getWidth(), getHeight());
- canvas.drawPath(mPathEstimate, mPaintEstimate);
- canvas.restoreToCount(save);
- }
-
- final Paint paintFill = mSecondary ? mPaintFillSecondary : mPaintFill;
-
- save = canvas.save();
- canvas.clipRect(mSafeRegion, 0, getWidth(), getHeight() - mSafeRegion);
- canvas.drawPath(mPathFill, paintFill);
- canvas.restoreToCount(save);
- }
-}
diff --git a/src/com/android/settings/widget/ChartView.java b/src/com/android/settings/widget/ChartView.java
index 30284bc..768a717 100644
--- a/src/com/android/settings/widget/ChartView.java
+++ b/src/com/android/settings/widget/ChartView.java
@@ -30,8 +30,8 @@
/**
* Container for two-dimensional chart, drawn with a combination of
- * {@link ChartGridView}, {@link ChartNetworkSeriesView} and {@link ChartSweepView}
- * children. The entire chart uses {@link ChartAxis} to map between raw values
+ * {@link ChartGridView} and {@link ChartSweepView} children. The entire chart uses
+ * {@link ChartAxis} to map between raw values
* and screen coordinates.
*/
public class ChartView extends FrameLayout {
@@ -112,13 +112,7 @@
parentRect.set(mContent);
- if (child instanceof ChartNetworkSeriesView) {
- // series are always laid out to fill entire graph area
- // TODO: handle scrolling for series larger than content area
- Gravity.apply(params.gravity, width, height, parentRect, childRect);
- child.layout(childRect.left, childRect.top, childRect.right, childRect.bottom);
-
- } else if (child instanceof ChartGridView) {
+ if (child instanceof ChartGridView) {
// Grid uses some extra room for labels
Gravity.apply(params.gravity, width, height, parentRect, childRect);
child.layout(childRect.left, childRect.top, childRect.right,
diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index 458b75c..1371663 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -36,14 +36,14 @@
import android.util.AttributeSet;
import android.view.View;
+import androidx.annotation.ColorRes;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.Utils;
import java.util.Locale;
-import androidx.annotation.ColorRes;
-import androidx.annotation.VisibleForTesting;
-
/**
* DonutView represents a donut graph. It visualizes a certain percentage of fullness with a
* corresponding label with the fullness on the inside (i.e. "50%" inside of the donut).
diff --git a/src/com/android/settings/widget/DotsPageIndicator.java b/src/com/android/settings/widget/DotsPageIndicator.java
index 633658e..88e6951 100644
--- a/src/com/android/settings/widget/DotsPageIndicator.java
+++ b/src/com/android/settings/widget/DotsPageIndicator.java
@@ -34,12 +34,12 @@
import android.view.View;
import android.view.animation.Interpolator;
+import androidx.viewpager.widget.ViewPager;
+
import com.android.settings.R;
import java.util.Arrays;
-import androidx.viewpager.widget.ViewPager;
-
/**
* Custom pager indicator for use with a {@code ViewPager}.
*/
diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java
index 6eaa9b2..b24a75b 100644
--- a/src/com/android/settings/widget/EntityHeaderController.java
+++ b/src/com/android/settings/widget/EntityHeaderController.java
@@ -39,6 +39,11 @@
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.applications.AppInfoBase;
@@ -51,11 +56,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
-import androidx.annotation.IntDef;
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.RecyclerView;
-
public class EntityHeaderController {
@IntDef({ActionType.ACTION_NONE,
diff --git a/src/com/android/settings/widget/FixedLineSummaryPreference.java b/src/com/android/settings/widget/FixedLineSummaryPreference.java
index d7d8329..534ab08 100644
--- a/src/com/android/settings/widget/FixedLineSummaryPreference.java
+++ b/src/com/android/settings/widget/FixedLineSummaryPreference.java
@@ -20,11 +20,11 @@
import android.util.AttributeSet;
import android.widget.TextView;
-import com.android.settings.R;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
/**
* A preference whose summary text will only span one single line.
*/
diff --git a/src/com/android/settings/widget/GearPreference.java b/src/com/android/settings/widget/GearPreference.java
index c473d41..0a30100 100644
--- a/src/com/android/settings/widget/GearPreference.java
+++ b/src/com/android/settings/widget/GearPreference.java
@@ -20,11 +20,11 @@
import android.util.AttributeSet;
import android.view.View;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settingslib.RestrictedPreference;
-import androidx.preference.PreferenceViewHolder;
-
/**
* A preference with a Gear on the side
*/
diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
index 0292db9..313a204 100644
--- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
+++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
@@ -30,9 +30,6 @@
import android.util.TypedValue;
import android.view.View;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceGroupAdapter;
@@ -40,6 +37,9 @@
import androidx.preference.PreferenceViewHolder;
import androidx.recyclerview.widget.RecyclerView;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter {
private static final String TAG = "HighlightableAdapter";
diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java
index 904a98c..14c3d7d 100644
--- a/src/com/android/settings/widget/LabeledSeekBar.java
+++ b/src/com/android/settings/widget/LabeledSeekBar.java
@@ -27,12 +27,12 @@
import android.widget.RadioGroup;
import android.widget.SeekBar;
-import java.util.List;
-
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import androidx.customview.widget.ExploreByTouchHelper;
+import java.util.List;
+
/**
* LabeledSeekBar represent a seek bar assigned with labeled, discrete values.
* It pretends to be a group of radio button for AccessibilityServices, in order to adjust the
diff --git a/src/com/android/settings/widget/MasterCheckBoxPreference.java b/src/com/android/settings/widget/MasterCheckBoxPreference.java
index 0e3d8f9..48e09c9 100644
--- a/src/com/android/settings/widget/MasterCheckBoxPreference.java
+++ b/src/com/android/settings/widget/MasterCheckBoxPreference.java
@@ -22,11 +22,11 @@
import android.view.View.OnClickListener;
import android.widget.CheckBox;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settingslib.TwoTargetPreference;
-import androidx.preference.PreferenceViewHolder;
-
/**
* A custom preference that provides inline checkbox. It has a mandatory field for title, and
* optional fields for icon and sub-text.
diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/MasterSwitchController.java
index a009292..9159584 100644
--- a/src/com/android/settings/widget/MasterSwitchController.java
+++ b/src/com/android/settings/widget/MasterSwitchController.java
@@ -16,10 +16,10 @@
package com.android.settings.widget;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
import androidx.preference.Preference;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
/*
* The switch controller that is used to update the switch widget in the MasterSwitchPreference
* layout.
diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java
index d4197db..42529cf 100644
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ b/src/com/android/settings/widget/MasterSwitchPreference.java
@@ -22,12 +22,12 @@
import android.view.View.OnClickListener;
import android.widget.Switch;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.TwoTargetPreference;
-import androidx.preference.PreferenceViewHolder;
-
/**
* A custom preference that provides inline switch toggle. It has a mandatory field for title, and
* optional fields for icon and sub-text.
diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java
index 7735bb4..89df487 100644
--- a/src/com/android/settings/widget/RadioButtonPickerFragment.java
+++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java
@@ -26,6 +26,11 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.InstrumentedPreferenceFragment;
@@ -34,11 +39,6 @@
import java.util.List;
import java.util.Map;
-import androidx.annotation.LayoutRes;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFragment implements
RadioButtonPreference.OnClickListener {
diff --git a/src/com/android/settings/widget/RadioButtonPreference.java b/src/com/android/settings/widget/RadioButtonPreference.java
index 8ebbb8a..ed7f905 100644
--- a/src/com/android/settings/widget/RadioButtonPreference.java
+++ b/src/com/android/settings/widget/RadioButtonPreference.java
@@ -22,12 +22,12 @@
import android.view.View;
import android.widget.TextView;
-import com.android.settings.R;
-
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.
*
diff --git a/src/com/android/settings/widget/RestrictedAppPreference.java b/src/com/android/settings/widget/RestrictedAppPreference.java
index 72625e0..8a2cc91 100644
--- a/src/com/android/settings/widget/RestrictedAppPreference.java
+++ b/src/com/android/settings/widget/RestrictedAppPreference.java
@@ -22,12 +22,13 @@
import android.util.AttributeSet;
import android.view.View;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreferenceHelper;
-
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.widget.apppreference.AppPreference;
/**
* {@link AppPreference} that implements user restriction utilities using
diff --git a/src/com/android/settings/widget/RoundedHomepageIcon.java b/src/com/android/settings/widget/RoundedHomepageIcon.java
new file mode 100644
index 0000000..f7927e7
--- /dev/null
+++ b/src/com/android/settings/widget/RoundedHomepageIcon.java
@@ -0,0 +1,86 @@
+/*
+ * 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 androidx.annotation.VisibleForTesting.NONE;
+
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON_BACKGROUND_ARGB;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON_BACKGROUND_HINT;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settingslib.drawer.Tile;
+
+public class RoundedHomepageIcon extends LayerDrawable {
+
+ private static final String TAG = "RoundedHomepageIcon";
+
+ @VisibleForTesting(otherwise = NONE)
+ int mBackgroundColor = -1;
+
+ public RoundedHomepageIcon(Context context, Drawable foreground) {
+ super(new Drawable[]{
+ context.getDrawable(R.drawable.ic_homepage_generic_background),
+ foreground
+ });
+ final int insetPx = context.getResources()
+ .getDimensionPixelSize(R.dimen.dashboard_tile_foreground_image_inset);
+ setLayerInset(1 /* index */, insetPx, insetPx, insetPx, insetPx);
+ }
+
+ public void setBackgroundColor(Context context, Tile tile) {
+ final Bundle metaData = tile.getMetaData();
+ try {
+ if (metaData != null) {
+ // Load from bg.argb first
+ int bgColor = metaData.getInt(META_DATA_PREFERENCE_ICON_BACKGROUND_ARGB,
+ 0 /* default */);
+ // Not found, load from bg.hint
+ if (bgColor == 0) {
+ final int colorRes = metaData.getInt(META_DATA_PREFERENCE_ICON_BACKGROUND_HINT,
+ 0 /* default */);
+ if (colorRes != 0) {
+ bgColor = context.getPackageManager()
+ .getResourcesForApplication(tile.getPackageName())
+ .getColor(colorRes, null /* theme */);
+ }
+ }
+ // If found anything, use it.
+ if (bgColor != 0) {
+ setBackgroundColor(bgColor);
+ }
+ }
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.e(TAG, "Failed to set background color for " + tile.getPackageName());
+ }
+ }
+
+ public void setBackgroundColor(int color) {
+ mBackgroundColor = color;
+ getDrawable(0).setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+ Log.d(TAG, "Setting background color " + mBackgroundColor);
+ }
+}
diff --git a/src/com/android/settings/widget/RtlCompatibleViewPager.java b/src/com/android/settings/widget/RtlCompatibleViewPager.java
index be40586..68caaa7 100644
--- a/src/com/android/settings/widget/RtlCompatibleViewPager.java
+++ b/src/com/android/settings/widget/RtlCompatibleViewPager.java
@@ -23,10 +23,10 @@
import android.util.AttributeSet;
import android.view.View;
-import java.util.Locale;
-
import androidx.viewpager.widget.ViewPager;
+import java.util.Locale;
+
/**
* A {@link ViewPager} that's aware of RTL changes when used with FragmentPagerAdapter.
*/
diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java
index da251fa..2c57bb3 100644
--- a/src/com/android/settings/widget/SeekBarPreference.java
+++ b/src/com/android/settings/widget/SeekBarPreference.java
@@ -28,11 +28,11 @@
import android.widget.SeekBar;
import android.widget.SeekBar.OnSeekBarChangeListener;
-import com.android.settingslib.RestrictedPreference;
-
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.RestrictedPreference;
+
/**
* Based on android.preference.SeekBarPreference, but uses support preference as base.
*/
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
deleted file mode 100644
index b8730b9..0000000
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ /dev/null
@@ -1,946 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT 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.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.bluetooth.BluetoothAdapter;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.ContentObserver;
-import android.hardware.display.DisplayManager;
-import android.location.LocationManager;
-import android.net.ConnectivityManager;
-import android.net.Uri;
-import android.net.wifi.WifiManager;
-import android.os.AsyncTask;
-import android.os.Handler;
-import android.os.PowerManager;
-import android.os.Process;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.util.Log;
-import android.widget.RemoteViews;
-
-import com.android.settings.R;
-
-/**
- * Provides control of power-related settings from a widget.
- */
-public class SettingsAppWidgetProvider extends AppWidgetProvider {
- static final String TAG = "SettingsAppWidgetProvider";
-
- static final ComponentName THIS_APPWIDGET =
- new ComponentName("com.android.settings",
- "com.android.settings.widget.SettingsAppWidgetProvider");
-
- private static BluetoothAdapter sBluetoothAdapter = null;
-
- private static final int BUTTON_WIFI = 0;
- private static final int BUTTON_BRIGHTNESS = 1;
- private static final int BUTTON_SYNC = 2;
- private static final int BUTTON_LOCATION = 3;
- private static final int BUTTON_BLUETOOTH = 4;
-
- // This widget keeps track of two sets of states:
- // "3-state": STATE_DISABLED, STATE_ENABLED, STATE_INTERMEDIATE
- // "5-state": STATE_DISABLED, STATE_ENABLED, STATE_TURNING_ON, STATE_TURNING_OFF, STATE_UNKNOWN
- private static final int STATE_DISABLED = 0;
- private static final int STATE_ENABLED = 1;
- private static final int STATE_TURNING_ON = 2;
- private static final int STATE_TURNING_OFF = 3;
- private static final int STATE_UNKNOWN = 4;
- private static final int STATE_INTERMEDIATE = 5;
-
- // Position in the widget bar, to enable different graphics for left, center and right buttons
- private static final int POS_LEFT = 0;
- private static final int POS_CENTER = 1;
- private static final int POS_RIGHT = 2;
-
- private static final int[] IND_DRAWABLE_OFF = {
- R.drawable.appwidget_settings_ind_off_l_holo,
- R.drawable.appwidget_settings_ind_off_c_holo,
- R.drawable.appwidget_settings_ind_off_r_holo
- };
-
- private static final int[] IND_DRAWABLE_MID = {
- R.drawable.appwidget_settings_ind_mid_l_holo,
- R.drawable.appwidget_settings_ind_mid_c_holo,
- R.drawable.appwidget_settings_ind_mid_r_holo
- };
-
- private static final int[] IND_DRAWABLE_ON = {
- R.drawable.appwidget_settings_ind_on_l_holo,
- R.drawable.appwidget_settings_ind_on_c_holo,
- R.drawable.appwidget_settings_ind_on_r_holo
- };
-
- /** Minimum brightness at which the indicator is shown at half-full and ON */
- private static final float HALF_BRIGHTNESS_THRESHOLD = 0.3f;
- /** Minimum brightness at which the indicator is shown at full */
- private static final float FULL_BRIGHTNESS_THRESHOLD = 0.8f;
-
- private static final StateTracker sWifiState = new WifiStateTracker();
- private static final StateTracker sBluetoothState = new BluetoothStateTracker();
- private static final StateTracker sLocationState = new LocationStateTracker();
- private static final StateTracker sSyncState = new SyncStateTracker();
- private static SettingsObserver sSettingsObserver;
-
- /**
- * The state machine for a setting's toggling, tracking reality
- * versus the user's intent.
- *
- * This is necessary because reality moves relatively slowly
- * (turning on & off radio drivers), compared to user's
- * expectations.
- */
- private abstract static class StateTracker {
- // Is the state in the process of changing?
- private boolean mInTransition = false;
- private Boolean mActualState = null; // initially not set
- private Boolean mIntendedState = null; // initially not set
-
- // Did a toggle request arrive while a state update was
- // already in-flight? If so, the mIntendedState needs to be
- // requested when the other one is done, unless we happened to
- // arrive at that state already.
- private boolean mDeferredStateChangeRequestNeeded = false;
-
- /**
- * User pressed a button to change the state. Something
- * should immediately appear to the user afterwards, even if
- * we effectively do nothing. Their press must be heard.
- */
- public final void toggleState(Context context) {
- int currentState = getTriState(context);
- boolean newState = false;
- switch (currentState) {
- case STATE_ENABLED:
- newState = false;
- break;
- case STATE_DISABLED:
- newState = true;
- break;
- case STATE_INTERMEDIATE:
- if (mIntendedState != null) {
- newState = !mIntendedState;
- }
- break;
- }
- mIntendedState = newState;
- if (mInTransition) {
- // We don't send off a transition request if we're
- // already transitioning. Makes our state tracking
- // easier, and is probably nicer on lower levels.
- // (even though they should be able to take it...)
- mDeferredStateChangeRequestNeeded = true;
- } else {
- mInTransition = true;
- requestStateChange(context, newState);
- }
- }
-
- /**
- * Return the ID of the clickable container for the setting.
- */
- public abstract int getContainerId();
-
- /**
- * Return the ID of the main large image button for the setting.
- */
- public abstract int getButtonId();
-
- /**
- * Returns the small indicator image ID underneath the setting.
- */
- public abstract int getIndicatorId();
-
- /**
- * Returns the resource ID of the setting's content description.
- */
- public abstract int getButtonDescription();
-
- /**
- * Returns the resource ID of the image to show as a function of
- * the on-vs-off state.
- */
- public abstract int getButtonImageId(boolean on);
-
- /**
- * Returns the position in the button bar - either POS_LEFT, POS_RIGHT or POS_CENTER.
- */
- public int getPosition() { return POS_CENTER; }
-
- /**
- * Updates the remote views depending on the state (off, on,
- * turning off, turning on) of the setting.
- */
- public final void setImageViewResources(Context context, RemoteViews views) {
- int containerId = getContainerId();
- int buttonId = getButtonId();
- int indicatorId = getIndicatorId();
- int pos = getPosition();
- switch (getTriState(context)) {
- case STATE_DISABLED:
- views.setContentDescription(containerId,
- getContentDescription(context, R.string.gadget_state_off));
- views.setImageViewResource(buttonId, getButtonImageId(false));
- views.setImageViewResource(
- indicatorId, IND_DRAWABLE_OFF[pos]);
- break;
- case STATE_ENABLED:
- views.setContentDescription(containerId,
- getContentDescription(context, R.string.gadget_state_on));
- views.setImageViewResource(buttonId, getButtonImageId(true));
- views.setImageViewResource(
- indicatorId, IND_DRAWABLE_ON[pos]);
- break;
- case STATE_INTERMEDIATE:
- // In the transitional state, the bottom green bar
- // shows the tri-state (on, off, transitioning), but
- // the top dark-gray-or-bright-white logo shows the
- // user's intent. This is much easier to see in
- // sunlight.
- if (isTurningOn()) {
- views.setContentDescription(containerId,
- getContentDescription(context, R.string.gadget_state_turning_on));
- views.setImageViewResource(buttonId, getButtonImageId(true));
- views.setImageViewResource(
- indicatorId, IND_DRAWABLE_MID[pos]);
- } else {
- views.setContentDescription(containerId,
- getContentDescription(context, R.string.gadget_state_turning_off));
- views.setImageViewResource(buttonId, getButtonImageId(false));
- views.setImageViewResource(
- indicatorId, IND_DRAWABLE_OFF[pos]);
- }
- break;
- }
- }
-
- /**
- * Returns the gadget state template populated with the gadget
- * description and state.
- */
- private final String getContentDescription(Context context, int stateResId) {
- final String gadget = context.getString(getButtonDescription());
- final String state = context.getString(stateResId);
- return context.getString(R.string.gadget_state_template, gadget, state);
- }
-
- /**
- * Update internal state from a broadcast state change.
- */
- public abstract void onActualStateChange(Context context, Intent intent);
-
- /**
- * Sets the value that we're now in. To be called from onActualStateChange.
- *
- * @param newState one of STATE_DISABLED, STATE_ENABLED, STATE_TURNING_ON,
- * STATE_TURNING_OFF, STATE_UNKNOWN
- */
- protected final void setCurrentState(Context context, int newState) {
- final boolean wasInTransition = mInTransition;
- switch (newState) {
- case STATE_DISABLED:
- mInTransition = false;
- mActualState = false;
- break;
- case STATE_ENABLED:
- mInTransition = false;
- mActualState = true;
- break;
- case STATE_TURNING_ON:
- mInTransition = true;
- mActualState = false;
- break;
- case STATE_TURNING_OFF:
- mInTransition = true;
- mActualState = true;
- break;
- }
-
- if (wasInTransition && !mInTransition) {
- if (mDeferredStateChangeRequestNeeded) {
- Log.v(TAG, "processing deferred state change");
- if (mActualState != null && mIntendedState != null &&
- mIntendedState.equals(mActualState)) {
- Log.v(TAG, "... but intended state matches, so no changes.");
- } else if (mIntendedState != null) {
- mInTransition = true;
- requestStateChange(context, mIntendedState);
- }
- mDeferredStateChangeRequestNeeded = false;
- }
- }
- }
-
-
- /**
- * If we're in a transition mode, this returns true if we're
- * transitioning towards being enabled.
- */
- public final boolean isTurningOn() {
- return mIntendedState != null && mIntendedState;
- }
-
- /**
- * Returns simplified 3-state value from underlying 5-state.
- *
- * @param context
- * @return STATE_ENABLED, STATE_DISABLED, or STATE_INTERMEDIATE
- */
- public final int getTriState(Context context) {
- if (mInTransition) {
- // If we know we just got a toggle request recently
- // (which set mInTransition), don't even ask the
- // underlying interface for its state. We know we're
- // changing. This avoids blocking the UI thread
- // during UI refresh post-toggle if the underlying
- // service state accessor has coarse locking on its
- // state (to be fixed separately).
- return STATE_INTERMEDIATE;
- }
- switch (getActualState(context)) {
- case STATE_DISABLED:
- return STATE_DISABLED;
- case STATE_ENABLED:
- return STATE_ENABLED;
- default:
- return STATE_INTERMEDIATE;
- }
- }
-
- /**
- * Gets underlying actual state.
- *
- * @param context
- * @return STATE_ENABLED, STATE_DISABLED, STATE_ENABLING, STATE_DISABLING,
- * or or STATE_UNKNOWN.
- */
- public abstract int getActualState(Context context);
-
- /**
- * Actually make the desired change to the underlying radio
- * API.
- */
- protected abstract void requestStateChange(Context context, boolean desiredState);
- }
-
- /**
- * Subclass of StateTracker to get/set Wifi state.
- */
- private static final class WifiStateTracker extends StateTracker {
- public int getContainerId() { return R.id.btn_wifi; }
- public int getButtonId() { return R.id.img_wifi; }
- public int getIndicatorId() { return R.id.ind_wifi; }
- public int getButtonDescription() { return R.string.gadget_wifi; }
- public int getButtonImageId(boolean on) {
- return on ? R.drawable.ic_appwidget_settings_wifi_on_holo
- : R.drawable.ic_appwidget_settings_wifi_off_holo;
- }
-
- @Override
- public int getPosition() { return POS_LEFT; }
-
- @Override
- public int getActualState(Context context) {
- WifiManager wifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- if (wifiManager != null) {
- return wifiStateToFiveState(wifiManager.getWifiState());
- }
- return STATE_UNKNOWN;
- }
-
- @Override
- protected void requestStateChange(Context context, final boolean desiredState) {
- final WifiManager wifiManager =
- (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
- if (wifiManager == null) {
- Log.d(TAG, "No wifiManager.");
- return;
- }
-
- // Actually request the wifi change and persistent
- // settings write off the UI thread, as it can take a
- // user-noticeable amount of time, especially if there's
- // disk contention.
- new AsyncTask<Void, Void, Void>() {
- @Override
- protected Void doInBackground(Void... args) {
- /**
- * Disable tethering if enabling Wifi
- */
- int wifiApState = wifiManager.getWifiApState();
- if (desiredState && ((wifiApState == WifiManager.WIFI_AP_STATE_ENABLING) ||
- (wifiApState == WifiManager.WIFI_AP_STATE_ENABLED))) {
- final ConnectivityManager connectivityManager =
- (ConnectivityManager) context.getSystemService(
- Context.CONNECTIVITY_SERVICE);
- connectivityManager.stopTethering(ConnectivityManager.TETHERING_WIFI);
- }
-
- wifiManager.setWifiEnabled(desiredState);
- return null;
- }
- }.execute();
- }
-
- @Override
- public void onActualStateChange(Context context, Intent intent) {
- if (!WifiManager.WIFI_STATE_CHANGED_ACTION.equals(intent.getAction())) {
- return;
- }
- int wifiState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, -1);
- setCurrentState(context, wifiStateToFiveState(wifiState));
- }
-
- /**
- * Converts WifiManager's state values into our
- * Wifi/Bluetooth-common state values.
- */
- private static int wifiStateToFiveState(int wifiState) {
- switch (wifiState) {
- case WifiManager.WIFI_STATE_DISABLED:
- return STATE_DISABLED;
- case WifiManager.WIFI_STATE_ENABLED:
- return STATE_ENABLED;
- case WifiManager.WIFI_STATE_DISABLING:
- return STATE_TURNING_OFF;
- case WifiManager.WIFI_STATE_ENABLING:
- return STATE_TURNING_ON;
- default:
- return STATE_UNKNOWN;
- }
- }
- }
-
- /**
- * Subclass of StateTracker to get/set Bluetooth state.
- */
- private static final class BluetoothStateTracker extends StateTracker {
- public int getContainerId() { return R.id.btn_bluetooth; }
- public int getButtonId() { return R.id.img_bluetooth; }
- public int getIndicatorId() { return R.id.ind_bluetooth; }
- public int getButtonDescription() { return R.string.gadget_bluetooth; }
- public int getButtonImageId(boolean on) {
- return on ? R.drawable.ic_appwidget_settings_bluetooth_on_holo
- : R.drawable.ic_appwidget_settings_bluetooth_off_holo;
- }
-
- @Override
- public int getActualState(Context context) {
- if (sBluetoothAdapter == null) {
- sBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
- if (sBluetoothAdapter == null) {
- return STATE_UNKNOWN; // On emulator?
- }
- }
- return bluetoothStateToFiveState(sBluetoothAdapter.getState());
- }
-
- @Override
- protected void requestStateChange(Context context, final boolean desiredState) {
- if (sBluetoothAdapter == null) {
- Log.d(TAG, "No BluetoothAdapter");
- return;
- }
- // Actually request the Bluetooth change and persistent
- // settings write off the UI thread, as it can take a
- // user-noticeable amount of time, especially if there's
- // disk contention.
- new AsyncTask<Void, Void, Void>() {
- @Override
- protected Void doInBackground(Void... args) {
- if (desiredState) {
- sBluetoothAdapter.enable();
- } else {
- sBluetoothAdapter.disable();
- }
- return null;
- }
- }.execute();
- }
-
- @Override
- public void onActualStateChange(Context context, Intent intent) {
- if (!BluetoothAdapter.ACTION_STATE_CHANGED.equals(intent.getAction())) {
- return;
- }
- int bluetoothState = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1);
- setCurrentState(context, bluetoothStateToFiveState(bluetoothState));
- }
-
- /**
- * Converts BluetoothAdapter's state values into our
- * Wifi/Bluetooth-common state values.
- */
- private static int bluetoothStateToFiveState(int bluetoothState) {
- switch (bluetoothState) {
- case BluetoothAdapter.STATE_OFF:
- return STATE_DISABLED;
- case BluetoothAdapter.STATE_ON:
- return STATE_ENABLED;
- case BluetoothAdapter.STATE_TURNING_ON:
- return STATE_TURNING_ON;
- case BluetoothAdapter.STATE_TURNING_OFF:
- return STATE_TURNING_OFF;
- default:
- return STATE_UNKNOWN;
- }
- }
- }
-
- /**
- * Subclass of StateTracker for location state.
- */
- private static final class LocationStateTracker extends StateTracker {
- private int mCurrentLocationMode = Settings.Secure.LOCATION_MODE_OFF;
-
- public int getContainerId() { return R.id.btn_location; }
- public int getButtonId() { return R.id.img_location; }
- public int getIndicatorId() { return R.id.ind_location; }
- public int getButtonDescription() { return R.string.gadget_location; }
- public int getButtonImageId(boolean on) {
- if (on) {
- switch (mCurrentLocationMode) {
- case Settings.Secure.LOCATION_MODE_HIGH_ACCURACY:
- case Settings.Secure.LOCATION_MODE_SENSORS_ONLY:
- return R.drawable.ic_appwidget_settings_location_on_holo;
- default:
- return R.drawable.ic_appwidget_settings_location_saving_holo;
- }
- }
-
- return R.drawable.ic_appwidget_settings_location_off_holo;
- }
-
- @Override
- public int getActualState(Context context) {
- ContentResolver resolver = context.getContentResolver();
- mCurrentLocationMode = Settings.Secure.getInt(resolver,
- Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
- return (mCurrentLocationMode == Settings.Secure.LOCATION_MODE_OFF)
- ? STATE_DISABLED : STATE_ENABLED;
- }
-
- @Override
- public void onActualStateChange(Context context, Intent unused) {
- // Note: the broadcast location providers changed intent
- // doesn't include an extras bundles saying what the new value is.
- setCurrentState(context, getActualState(context));
- }
-
- @Override
- public void requestStateChange(final Context context, final boolean desiredState) {
- final ContentResolver resolver = context.getContentResolver();
- new AsyncTask<Void, Void, Boolean>() {
- @Override
- protected Boolean doInBackground(Void... args) {
- final UserManager um =
- (UserManager) context.getSystemService(Context.USER_SERVICE);
- if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
- LocationManager lm =
- (LocationManager) context.getSystemService(
- Context.LOCATION_SERVICE);
- boolean currentLocationEnabled = lm.isLocationEnabled();
- lm.setLocationEnabledForUser(
- !currentLocationEnabled, Process.myUserHandle());
- return lm.isLocationEnabled();
- }
- return getActualState(context) == STATE_ENABLED;
- }
-
- @Override
- protected void onPostExecute(Boolean result) {
- setCurrentState(
- context,
- result ? STATE_ENABLED : STATE_DISABLED);
- updateWidget(context);
- }
- }.execute();
- }
- }
-
- /**
- * Subclass of StateTracker for sync state.
- */
- private static final class SyncStateTracker extends StateTracker {
- public int getContainerId() { return R.id.btn_sync; }
- public int getButtonId() { return R.id.img_sync; }
- public int getIndicatorId() { return R.id.ind_sync; }
- public int getButtonDescription() { return R.string.gadget_sync; }
- public int getButtonImageId(boolean on) {
- return on ? R.drawable.ic_appwidget_settings_sync_on_holo
- : R.drawable.ic_appwidget_settings_sync_off_holo;
- }
-
- @Override
- public int getActualState(Context context) {
- boolean on = ContentResolver.getMasterSyncAutomatically();
- return on ? STATE_ENABLED : STATE_DISABLED;
- }
-
- @Override
- public void onActualStateChange(Context context, Intent unused) {
- setCurrentState(context, getActualState(context));
- }
-
- @Override
- public void requestStateChange(final Context context, final boolean desiredState) {
- final ConnectivityManager connManager =
- (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
- final boolean sync = ContentResolver.getMasterSyncAutomatically();
-
- new AsyncTask<Void, Void, Boolean>() {
- @Override
- protected Boolean doInBackground(Void... args) {
- // Turning sync on.
- if (desiredState) {
- if (!sync) {
- ContentResolver.setMasterSyncAutomatically(true);
- }
- return true;
- }
-
- // Turning sync off
- if (sync) {
- ContentResolver.setMasterSyncAutomatically(false);
- }
- return false;
- }
-
- @Override
- protected void onPostExecute(Boolean result) {
- setCurrentState(
- context,
- result ? STATE_ENABLED : STATE_DISABLED);
- updateWidget(context);
- }
- }.execute();
- }
- }
-
- private static void checkObserver(Context context) {
- if (sSettingsObserver == null) {
- sSettingsObserver = new SettingsObserver(new Handler(),
- context.getApplicationContext());
- sSettingsObserver.startObserving();
- }
- }
-
- @Override
- public void onUpdate(Context context, AppWidgetManager appWidgetManager,
- int[] appWidgetIds) {
- // Update each requested appWidgetId
- RemoteViews view = buildUpdate(context);
-
- for (int i = 0; i < appWidgetIds.length; i++) {
- appWidgetManager.updateAppWidget(appWidgetIds[i], view);
- }
- }
-
- @Override
- public void onEnabled(Context context) {
- checkObserver(context);
- }
-
- @Override
- public void onDisabled(Context context) {
- if (sSettingsObserver != null) {
- sSettingsObserver.stopObserving();
- sSettingsObserver = null;
- }
- }
-
- /**
- * Load image for given widget and build {@link RemoteViews} for it.
- */
- static RemoteViews buildUpdate(Context context) {
- RemoteViews views = new RemoteViews(context.getPackageName(),
- R.layout.widget);
- views.setOnClickPendingIntent(R.id.btn_wifi, getLaunchPendingIntent(context,
- BUTTON_WIFI));
- views.setOnClickPendingIntent(R.id.btn_brightness,
- getLaunchPendingIntent(context,
- BUTTON_BRIGHTNESS));
- views.setOnClickPendingIntent(R.id.btn_sync,
- getLaunchPendingIntent(context,
- BUTTON_SYNC));
- views.setOnClickPendingIntent(R.id.btn_location,
- getLaunchPendingIntent(context, BUTTON_LOCATION));
- views.setOnClickPendingIntent(R.id.btn_bluetooth,
- getLaunchPendingIntent(context,
- BUTTON_BLUETOOTH));
-
- updateButtons(views, context);
- return views;
- }
-
- /**
- * Updates the widget when something changes, or when a button is pushed.
- *
- * @param context
- */
- public static void updateWidget(Context context) {
- RemoteViews views = buildUpdate(context);
- // Update specific list of appWidgetIds if given, otherwise default to all
- final AppWidgetManager gm = AppWidgetManager.getInstance(context);
- gm.updateAppWidget(THIS_APPWIDGET, views);
- checkObserver(context);
- }
-
- /**
- * Updates the buttons based on the underlying states of wifi, etc.
- *
- * @param views The RemoteViews to update.
- * @param context
- */
- private static void updateButtons(RemoteViews views, Context context) {
- sWifiState.setImageViewResources(context, views);
- sBluetoothState.setImageViewResources(context, views);
- sLocationState.setImageViewResources(context, views);
- sSyncState.setImageViewResources(context, views);
-
- if (getBrightnessMode(context)) {
- views.setContentDescription(R.id.btn_brightness,
- context.getString(R.string.gadget_brightness_template,
- context.getString(R.string.gadget_brightness_state_auto)));
- views.setImageViewResource(R.id.img_brightness,
- R.drawable.ic_appwidget_settings_brightness_auto_holo);
- views.setImageViewResource(R.id.ind_brightness,
- R.drawable.appwidget_settings_ind_on_r_holo);
- } else {
- final int brightness = getBrightness(context);
- final PowerManager pm = context.getSystemService(PowerManager.class);
- // Set the icon
- final int full = (int)(pm.getMaximumScreenBrightnessSetting()
- * FULL_BRIGHTNESS_THRESHOLD);
- final int half = (int)(pm.getMaximumScreenBrightnessSetting()
- * HALF_BRIGHTNESS_THRESHOLD);
- if (brightness > full) {
- views.setContentDescription(R.id.btn_brightness,
- context.getString(R.string.gadget_brightness_template,
- context.getString(R.string.gadget_brightness_state_full)));
- views.setImageViewResource(R.id.img_brightness,
- R.drawable.ic_appwidget_settings_brightness_full_holo);
- } else if (brightness > half) {
- views.setContentDescription(R.id.btn_brightness,
- context.getString(R.string.gadget_brightness_template,
- context.getString(R.string.gadget_brightness_state_half)));
- views.setImageViewResource(R.id.img_brightness,
- R.drawable.ic_appwidget_settings_brightness_half_holo);
- } else {
- views.setContentDescription(R.id.btn_brightness,
- context.getString(R.string.gadget_brightness_template,
- context.getString(R.string.gadget_brightness_state_off)));
- views.setImageViewResource(R.id.img_brightness,
- R.drawable.ic_appwidget_settings_brightness_off_holo);
- }
- // Set the ON state
- if (brightness > half) {
- views.setImageViewResource(R.id.ind_brightness,
- R.drawable.appwidget_settings_ind_on_r_holo);
- } else {
- views.setImageViewResource(R.id.ind_brightness,
- R.drawable.appwidget_settings_ind_off_r_holo);
- }
- }
- }
-
- /**
- * Creates PendingIntent to notify the widget of a button click.
- *
- * @param context
- * @return
- */
- private static PendingIntent getLaunchPendingIntent(Context context,
- int buttonId) {
- Intent launchIntent = new Intent();
- launchIntent.setClass(context, SettingsAppWidgetProvider.class);
- launchIntent.addCategory(Intent.CATEGORY_ALTERNATIVE);
- launchIntent.setData(Uri.parse("custom:" + buttonId));
- PendingIntent pi = PendingIntent.getBroadcast(context, 0 /* no requestCode */,
- launchIntent, 0 /* no flags */);
- return pi;
- }
-
- /**
- * Receives and processes a button pressed intent or state change.
- *
- * @param context
- * @param intent Indicates the pressed button.
- */
- @Override
- public void onReceive(Context context, Intent intent) {
- super.onReceive(context, intent);
- String action = intent.getAction();
- if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(action)) {
- sWifiState.onActualStateChange(context, intent);
- } else if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {
- sBluetoothState.onActualStateChange(context, intent);
- } else if (LocationManager.MODE_CHANGED_ACTION.equals(action)) {
- sLocationState.onActualStateChange(context, intent);
- } else if (ContentResolver.ACTION_SYNC_CONN_STATUS_CHANGED.equals(action)) {
- sSyncState.onActualStateChange(context, intent);
- } else if (intent.hasCategory(Intent.CATEGORY_ALTERNATIVE)) {
- Uri data = intent.getData();
- int buttonId = Integer.parseInt(data.getSchemeSpecificPart());
- if (buttonId == BUTTON_WIFI) {
- sWifiState.toggleState(context);
- } else if (buttonId == BUTTON_BRIGHTNESS) {
- toggleBrightness(context);
- } else if (buttonId == BUTTON_SYNC) {
- sSyncState.toggleState(context);
- } else if (buttonId == BUTTON_LOCATION) {
- sLocationState.toggleState(context);
- } else if (buttonId == BUTTON_BLUETOOTH) {
- sBluetoothState.toggleState(context);
- }
- } else {
- // Don't fall-through to updating the widget. The Intent
- // was something unrelated or that our super class took
- // care of.
- return;
- }
-
- // State changes fall through
- updateWidget(context);
- }
-
- /**
- * Gets brightness level.
- *
- * @param context
- * @return brightness level between 0 and 255.
- */
- private static int getBrightness(Context context) {
- try {
- int brightness = Settings.System.getInt(context.getContentResolver(),
- Settings.System.SCREEN_BRIGHTNESS);
- return brightness;
- } catch (Exception e) {
- }
- return 0;
- }
-
- /**
- * Gets state of brightness mode.
- *
- * @param context
- * @return true if auto brightness is on.
- */
- private static boolean getBrightnessMode(Context context) {
- try {
- int brightnessMode = Settings.System.getInt(context.getContentResolver(),
- Settings.System.SCREEN_BRIGHTNESS_MODE);
- return brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
- } catch (Exception e) {
- Log.d(TAG, "getBrightnessMode: " + e);
- }
- return false;
- }
-
- /**
- * Increases or decreases the brightness.
- *
- * @param context
- */
- private void toggleBrightness(Context context) {
- try {
- DisplayManager dm = context.getSystemService(DisplayManager.class);
- PowerManager pm = context.getSystemService(PowerManager.class);
-
- ContentResolver cr = context.getContentResolver();
- int brightness = Settings.System.getInt(cr,
- Settings.System.SCREEN_BRIGHTNESS);
- int brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
- //Only get brightness setting if available
- if (context.getResources().getBoolean(
- com.android.internal.R.bool.config_automatic_brightness_available)) {
- brightnessMode = Settings.System.getInt(cr,
- Settings.System.SCREEN_BRIGHTNESS_MODE);
- }
-
- // Rotate AUTO -> MINIMUM -> DEFAULT -> MAXIMUM
- // Technically, not a toggle...
- if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
- brightness = pm.getMinimumScreenBrightnessSetting();
- brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
- } else if (brightness < pm.getDefaultScreenBrightnessSetting()) {
- brightness = pm.getDefaultScreenBrightnessSetting();
- } else if (brightness < pm.getMaximumScreenBrightnessSetting()) {
- brightness = pm.getMaximumScreenBrightnessSetting();
- } else {
- brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
- brightness = pm.getMinimumScreenBrightnessSetting();
- }
-
- if (context.getResources().getBoolean(
- com.android.internal.R.bool.config_automatic_brightness_available)) {
- // Set screen brightness mode (automatic or manual)
- Settings.System.putInt(context.getContentResolver(),
- Settings.System.SCREEN_BRIGHTNESS_MODE,
- brightnessMode);
- } else {
- // Make sure we set the brightness if automatic mode isn't available
- brightnessMode = Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
- }
- if (brightnessMode == Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL) {
- dm.setTemporaryBrightness(brightness);
- Settings.System.putInt(cr, Settings.System.SCREEN_BRIGHTNESS, brightness);
- }
- } catch (Settings.SettingNotFoundException e) {
- Log.d(TAG, "toggleBrightness: " + e);
- }
- }
-
- /** Observer to watch for changes to the BRIGHTNESS setting */
- private static class SettingsObserver extends ContentObserver {
-
- private Context mContext;
-
- SettingsObserver(Handler handler, Context context) {
- super(handler);
- mContext = context;
- }
-
- void startObserving() {
- ContentResolver resolver = mContext.getContentResolver();
- // Listen to brightness and brightness mode
- resolver.registerContentObserver(Settings.System
- .getUriFor(Settings.System.SCREEN_BRIGHTNESS), false, this);
- resolver.registerContentObserver(Settings.System
- .getUriFor(Settings.System.SCREEN_BRIGHTNESS_MODE), false, this);
- resolver.registerContentObserver(Settings.System
- .getUriFor(Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ), false, this);
- }
-
- void stopObserving() {
- mContext.getContentResolver().unregisterContentObserver(this);
- }
-
- @Override
- public void onChange(boolean selfChange) {
- updateWidget(mContext);
- }
- }
-
-}
diff --git a/src/com/android/settings/widget/SingleTargetGearPreference.java b/src/com/android/settings/widget/SingleTargetGearPreference.java
index b770b6d..48876fa 100644
--- a/src/com/android/settings/widget/SingleTargetGearPreference.java
+++ b/src/com/android/settings/widget/SingleTargetGearPreference.java
@@ -19,11 +19,11 @@
import android.content.Context;
import android.util.AttributeSet;
-import com.android.settings.R;
-
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
+import com.android.settings.R;
+
/**
* A preference with single target and a gear icon on the side.
*/
diff --git a/src/com/android/settings/widget/SlidingTabLayout.java b/src/com/android/settings/widget/SlidingTabLayout.java
index f8adde8..3ae4e3c 100644
--- a/src/com/android/settings/widget/SlidingTabLayout.java
+++ b/src/com/android/settings/widget/SlidingTabLayout.java
@@ -25,10 +25,10 @@
import android.widget.LinearLayout;
import android.widget.TextView;
-import com.android.settings.R;
-
import androidx.viewpager.widget.PagerAdapter;
+import com.android.settings.R;
+
/**
* To be used with ViewPager to provide a tab indicator component which give constant feedback as
* to the user's scroll progress.
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index 3450648..8afba40 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -21,6 +21,7 @@
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.SpannableStringBuilder;
@@ -32,10 +33,15 @@
import android.view.View;
import android.view.ViewGroup;
import android.widget.CompoundButton;
+import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.Switch;
import android.widget.TextView;
+import androidx.annotation.ColorInt;
+import androidx.annotation.StringRes;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils;
@@ -44,10 +50,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.ColorInt;
-import androidx.annotation.StringRes;
-import androidx.annotation.VisibleForTesting;
-
public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener {
public interface OnSwitchChangeListener {
@@ -64,14 +66,15 @@
R.attr.switchBarMarginStart,
R.attr.switchBarMarginEnd,
R.attr.switchBarBackgroundColor,
- R.attr.switchBarBackgroundActivatedColor};
+ R.attr.switchBarBackgroundActivatedColor,
+ R.attr.switchBarRestrictionIcon};
private final List<OnSwitchChangeListener> mSwitchChangeListeners = new ArrayList<>();
private final MetricsFeatureProvider mMetricsFeatureProvider;
private final TextAppearanceSpan mSummarySpan;
private ToggleSwitch mSwitch;
- private View mRestrictedIcon;
+ private ImageView mRestrictedIcon;
private TextView mTextView;
private String mLabel;
private String mSummary;
@@ -108,10 +111,11 @@
LayoutInflater.from(context).inflate(R.layout.switch_bar, this);
final TypedArray a = context.obtainStyledAttributes(attrs, XML_ATTRIBUTES);
- int switchBarMarginStart = (int) a.getDimension(0, 0);
- int switchBarMarginEnd = (int) a.getDimension(1, 0);
+ final int switchBarMarginStart = (int) a.getDimension(0, 0);
+ final int switchBarMarginEnd = (int) a.getDimension(1, 0);
mBackgroundColor = a.getColor(2, 0);
mBackgroundActivatedColor = a.getColor(3, 0);
+ final Drawable restrictedIconDrawable = a.getDrawable(4);
a.recycle();
mTextView = findViewById(R.id.switch_text);
@@ -134,14 +138,15 @@
(switchView, isChecked) -> setTextViewLabelAndBackground(isChecked));
mRestrictedIcon = findViewById(R.id.restricted_icon);
+ mRestrictedIcon.setImageDrawable(restrictedIconDrawable);
mRestrictedIcon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (mDisabledByAdmin) {
mMetricsFeatureProvider.count(mContext,
- mMetricsTag + "/switch_bar|restricted", 1);
+ mMetricsTag + "/switch_bar|restricted", 1);
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(context,
- mEnforcedAdmin);
+ mEnforcedAdmin);
}
}
});
@@ -235,7 +240,7 @@
setEnabled(true);
}
setTouchDelegate(new TouchDelegate(new Rect(0, 0, getWidth(), getHeight()),
- getDelegatingView()));
+ getDelegatingView()));
}
public final ToggleSwitch getSwitch() {
@@ -249,7 +254,7 @@
// Make the entire bar work as a switch
post(() -> setTouchDelegate(
new TouchDelegate(new Rect(0, 0, getWidth(), getHeight()),
- getDelegatingView())));
+ getDelegatingView())));
}
}
@@ -264,7 +269,7 @@
protected void onSizeChanged(int w, int h, int oldw, int oldh) {
if ((w > 0) && (h > 0)) {
setTouchDelegate(new TouchDelegate(new Rect(0, 0, w, h),
- getDelegatingView()));
+ getDelegatingView()));
}
}
diff --git a/src/com/android/settings/widget/TwoStateButtonPreference.java b/src/com/android/settings/widget/TwoStateButtonPreference.java
index ae3e495..b154fb4 100644
--- a/src/com/android/settings/widget/TwoStateButtonPreference.java
+++ b/src/com/android/settings/widget/TwoStateButtonPreference.java
@@ -22,12 +22,12 @@
import android.view.View;
import android.widget.Button;
-import com.android.settings.R;
-import com.android.settings.applications.LayoutPreference;
-
import androidx.annotation.VisibleForTesting;
import androidx.core.content.res.TypedArrayUtils;
+import com.android.settings.R;
+import com.android.settings.applications.LayoutPreference;
+
/**
* Preference that presents a button with two states(On vs Off)
*/
diff --git a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java
index 4d54192..998434e 100644
--- a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java
+++ b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java
@@ -19,15 +19,15 @@
import android.os.Bundle;
import android.widget.ArrayAdapter;
-import com.android.settingslib.core.instrumentation.Instrumentable;
-
-import java.util.ArrayList;
-
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceDialogFragmentCompat;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+
+import java.util.ArrayList;
+
/**
* {@link PreferenceDialogFragmentCompat} that updates the available options
* when {@code onListPreferenceUpdated} is called."
diff --git a/src/com/android/settings/widget/UsageGraph.java b/src/com/android/settings/widget/UsageGraph.java
index e56fd435..7cef66f 100644
--- a/src/com/android/settings/widget/UsageGraph.java
+++ b/src/com/android/settings/widget/UsageGraph.java
@@ -35,11 +35,11 @@
import android.util.TypedValue;
import android.view.View;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settingslib.R;
-import androidx.annotation.VisibleForTesting;
-
public class UsageGraph extends View {
private static final int PATH_DELIM = -1;
diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java
index 76d8bcc..cc344ac 100644
--- a/src/com/android/settings/widget/ValidatedEditTextPreference.java
+++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java
@@ -26,12 +26,12 @@
import android.widget.EditText;
import android.widget.TextView;
-import com.android.settingslib.CustomEditTextPreferenceCompat;
-
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.CustomEditTextPreferenceCompat;
+
/**
* {@code EditTextPreference} that supports input validation.
*/
@@ -93,7 +93,8 @@
textView.setInputType(
InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
} else {
- textView.setInputType(InputType.TYPE_CLASS_TEXT);
+ textView.setInputType(
+ InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
}
}
diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java
index ad08ebe..d5d4f5e 100644
--- a/src/com/android/settings/widget/VideoPreference.java
+++ b/src/com/android/settings/widget/VideoPreference.java
@@ -29,12 +29,12 @@
import android.view.View;
import android.widget.ImageView;
-import com.android.settings.R;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
/**
* A full width preference that hosts a MP4 video.
*/
diff --git a/src/com/android/settings/widget/VideoPreferenceController.java b/src/com/android/settings/widget/VideoPreferenceController.java
index 457c6df..a7bb754 100644
--- a/src/com/android/settings/widget/VideoPreferenceController.java
+++ b/src/com/android/settings/widget/VideoPreferenceController.java
@@ -18,13 +18,13 @@
import android.content.Context;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.preference.PreferenceScreen;
-
public class VideoPreferenceController extends BasePreferenceController implements
LifecycleObserver, OnResume, OnPause {
diff --git a/src/com/android/settings/widget/WorkOnlyCategory.java b/src/com/android/settings/widget/WorkOnlyCategory.java
index 87d0684..063b105 100644
--- a/src/com/android/settings/widget/WorkOnlyCategory.java
+++ b/src/com/android/settings/widget/WorkOnlyCategory.java
@@ -18,11 +18,11 @@
import android.os.UserManager;
import android.util.AttributeSet;
+import androidx.preference.PreferenceCategory;
+
import com.android.settings.SelfAvailablePreference;
import com.android.settings.Utils;
-import androidx.preference.PreferenceCategory;
-
/**
* A PreferenceCategory that is only visible when the device has a work profile.
*/
diff --git a/src/com/android/settings/wifi/AddNetworkFragment.java b/src/com/android/settings/wifi/AddNetworkFragment.java
new file mode 100644
index 0000000..814b358
--- /dev/null
+++ b/src/com/android/settings/wifi/AddNetworkFragment.java
@@ -0,0 +1,159 @@
+/*
+ * 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.wifi;
+
+import android.app.Activity;
+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 androidx.annotation.VisibleForTesting;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.InstrumentedFragment;
+
+public class AddNetworkFragment extends InstrumentedFragment implements WifiConfigUiBase,
+ View.OnClickListener {
+
+ final static String WIFI_CONFIG_KEY = "wifi_config_key";
+ @VisibleForTesting
+ final static int SUBMIT_BUTTON_ID = android.R.id.button1;
+ @VisibleForTesting
+ final static int CANCEL_BUTTON_ID = android.R.id.button2;
+
+ private WifiConfigController mUIController;
+ private Button mSubmitBtn;
+ private Button mCancelBtn;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsEvent.SETTINGS_WIFI_ADD_NETWORK;
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ final View rootView = inflater.inflate(R.layout.wifi_add_network_view, container, false);
+
+ mSubmitBtn = rootView.findViewById(SUBMIT_BUTTON_ID);
+ mCancelBtn = rootView.findViewById(CANCEL_BUTTON_ID);
+ mSubmitBtn.setOnClickListener(this);
+ mCancelBtn.setOnClickListener(this);
+ mUIController = new WifiConfigController(this, rootView, null, getMode());
+
+ return rootView;
+ }
+
+ @Override
+ public void onViewStateRestored(Bundle savedInstanceState) {
+ super.onViewStateRestored(savedInstanceState);
+ mUIController.updatePassword();
+ }
+
+ @Override
+ public void onClick(View view) {
+ switch (view.getId()) {
+ case SUBMIT_BUTTON_ID:
+ handleSubmitAction();
+ break;
+ case CANCEL_BUTTON_ID:
+ handleCancelAction();
+ break;
+ }
+ }
+
+ @Override
+ public int getMode() {
+ return WifiConfigUiBase.MODE_CONNECT;
+ }
+
+ @Override
+ public WifiConfigController getController() {
+ return mUIController;
+ }
+
+ @Override
+ public void dispatchSubmit() {
+ handleSubmitAction();
+ }
+
+ @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(WIFI_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/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
index aed5e10..a883826 100644
--- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
+++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java
@@ -20,12 +20,12 @@
import android.provider.Settings;
import android.text.TextUtils;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
/**
* {@link AbstractPreferenceController} that controls whether we should fall back to celluar when
* wifi is bad.
diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java
index 899b35d..63d1745 100644
--- a/src/com/android/settings/wifi/ChangeWifiStateDetails.java
+++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java
@@ -20,6 +20,11 @@
import android.content.Context;
import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.AppInfoWithHeader;
@@ -28,11 +33,6 @@
import com.android.settings.wifi.AppStateChangeWifiStateBridge.WifiSettingsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.SwitchPreference;
-
public class ChangeWifiStateDetails extends AppInfoWithHeader
implements OnPreferenceChangeListener {
diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
index bbb76c7..3efbbff 100644
--- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
+++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.view.View;
+import androidx.annotation.DrawableRes;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.AccessPointPreference;
-import androidx.annotation.DrawableRes;
-import androidx.preference.PreferenceViewHolder;
-
/**
* An AP preference for the currently connected AP
*/
diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java
index 85fd800..c3c08f0 100644
--- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java
+++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java
@@ -17,12 +17,12 @@
import android.content.Context;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPointPreference;
-
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceViewHolder;
+import com.android.settingslib.wifi.AccessPoint;
+import com.android.settingslib.wifi.AccessPointPreference;
+
public class LongPressAccessPointPreference extends AccessPointPreference {
private final Fragment mFragment;
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
new file mode 100644
index 0000000..9aac509
--- /dev/null
+++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -0,0 +1,117 @@
+/*
+ * 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.wifi;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import androidx.appcompat.app.AlertDialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settingslib.wifi.AccessPoint;
+import java.util.ArrayList;
+import java.util.List;
+
+public class NetworkRequestDialogFragment extends InstrumentedDialogFragment implements
+ DialogInterface.OnClickListener {
+
+ private List<AccessPoint> mAccessPointList;
+
+ public static NetworkRequestDialogFragment newInstance(int uid, String packageName) {
+ Bundle args = new Bundle();
+ args.putInt("uid", uid);
+ args.putString("packageName", packageName);
+ NetworkRequestDialogFragment dialogFragment = new NetworkRequestDialogFragment();
+ dialogFragment.setArguments(args);
+ return dialogFragment;
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ Context context = getContext();
+
+ // Prepares title.
+ LayoutInflater inflater = LayoutInflater.from(context);
+ View customTitle = inflater.inflate(R.layout.network_request_dialog_title, null);
+
+ TextView title = customTitle.findViewById(R.id.network_request_title_text);
+ title.setText(R.string.network_connection_request_dialog_title);
+ ProgressBar progressBar = customTitle.findViewById(R.id.network_request_title_progress);
+ progressBar.setVisibility(View.VISIBLE);
+
+ // Prepares adapter.
+ AccessPointAdapter adapter = new AccessPointAdapter(context,
+ R.layout.preference_access_point, getAccessPointList());
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(context)
+ .setCustomTitle(customTitle)
+ .setAdapter(adapter, this)
+ .setPositiveButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+ return builder.create();
+ }
+
+ List<AccessPoint> getAccessPointList() {
+ // Initials list for adapter, in case of display crashing.
+ if (mAccessPointList == null) {
+ mAccessPointList = new ArrayList<>();
+ }
+ return mAccessPointList;
+ }
+
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return MetricsProto.MetricsEvent.WIFI_SCANNING_NEEDED_DIALOG;
+ }
+
+ private class AccessPointAdapter extends ArrayAdapter<AccessPoint> {
+
+ private final int mResourceId;
+ private final LayoutInflater mInflater;
+
+ public AccessPointAdapter(Context context, int resourceId, List<AccessPoint> objects) {
+ super(context, resourceId, objects);
+ mResourceId = resourceId;
+ mInflater = LayoutInflater.from(context);
+ }
+
+ @Override
+ public View getView(int position, View view, ViewGroup parent) {
+ if (view == null) {
+ view = mInflater.inflate(mResourceId, parent, false);
+ }
+
+ // TODO: Sets correct information to list item.
+ final View divider = view.findViewById(com.android.settingslib.R.id.two_target_divider);
+ divider.setVisibility(View.GONE);
+
+ return view;
+ }
+ }
+}
+
diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
index e5f2912..a46a828 100644
--- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
+++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java
@@ -24,6 +24,10 @@
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;
@@ -31,10 +35,6 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
/**
* {@link AbstractPreferenceController} that controls whether we should notify user when open
* network is available.
diff --git a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java
index a99697a..879a93e 100644
--- a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java
+++ b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java
@@ -31,11 +31,11 @@
import android.util.Log;
import android.widget.Toast;
+import androidx.annotation.NonNull;
+
import com.android.internal.app.AlertActivity;
import com.android.settings.R;
-import androidx.annotation.NonNull;
-
/**
* This activity handles requests to toggle WiFi by collecting user
* consent and waiting until the state change is completed.
diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
index df24c42..eef2216 100644
--- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
+++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java
@@ -14,6 +14,11 @@
import android.provider.Settings;
import android.text.TextUtils;
+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;
@@ -24,11 +29,6 @@
import java.util.List;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
/**
* {@link AbstractPreferenceController} that controls whether a user wants to enable the "use open
* networks automatically" feature provider by the current network recommendation provider.
diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java
index 52a54b7..c0b90f9 100644
--- a/src/com/android/settings/wifi/WifiAPITest.java
+++ b/src/com/android/settings/wifi/WifiAPITest.java
@@ -24,14 +24,14 @@
import android.text.Editable;
import android.widget.EditText;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
/**
* Provide an interface for testing out the Wifi API
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 789c433..4b93fc1 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -41,6 +41,7 @@
import android.text.InputType;
import android.text.TextUtils;
import android.text.TextWatcher;
+import android.util.FeatureFlagUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
@@ -57,6 +58,8 @@
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.settingslib.Utils;
@@ -69,8 +72,6 @@
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.
@@ -123,7 +124,8 @@
private final ArrayAdapter<String> mPhase2FullAdapter;
// e.g. AccessPoint.SECURITY_NONE
- private int mAccessPointSecurity;
+ @VisibleForTesting
+ int mAccessPointSecurity;
private TextView mPasswordView;
private String mUnspecifiedCertString;
@@ -154,6 +156,7 @@
private Spinner mProxySettingsSpinner;
private Spinner mMeteredSettingsSpinner;
private Spinner mHiddenSettingsSpinner;
+ private Spinner mPrivacySettingsSpinner;
private TextView mHiddenWarningView;
private TextView mProxyHostView;
private TextView mProxyPortView;
@@ -219,6 +222,12 @@
mSharedCheckBox = (CheckBox) mView.findViewById(R.id.shared);
mMeteredSettingsSpinner = mView.findViewById(R.id.metered_settings);
mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
+ mPrivacySettingsSpinner = mView.findViewById(R.id.privacy_settings);
+ if (FeatureFlagUtils.isEnabled(mContext,
+ com.android.settings.core.FeatureFlags.WIFI_MAC_RANDOMIZATION)) {
+ View privacySettingsLayout = mView.findViewById(R.id.privacy_settings_fields);
+ privacySettingsLayout.setVisibility(View.VISIBLE);
+ }
mHiddenSettingsSpinner.setOnItemSelectedListener(this);
mHiddenWarningView = mView.findViewById(R.id.hidden_settings_warning);
mHiddenWarningView.setVisibility(
@@ -260,6 +269,7 @@
mHiddenSettingsSpinner.setSelection(config.hiddenSSID
? HIDDEN_NETWORK
: NOT_HIDDEN_NETWORK);
+ //TODO(b/117957974): set MAC randomization value to mPrivacySettingsSpinner
if (config.getIpAssignment() == IpAssignment.STATIC) {
mIpSettingsSpinner.setSelection(STATIC_IP);
showAdvancedFields = true;
@@ -465,7 +475,7 @@
} else {
enabled = ipAndProxyFieldsAreValid();
}
- if (mEapCaCertSpinner != null
+ if (mAccessPointSecurity == AccessPoint.SECURITY_EAP && mEapCaCertSpinner != null
&& mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
if (caCertSelection.equals(mUnspecifiedCertString)) {
@@ -482,10 +492,9 @@
enabled = false;
}
}
- if (mEapUserCertSpinner != null
+ if (mAccessPointSecurity == AccessPoint.SECURITY_EAP && mEapUserCertSpinner != null
&& mView.findViewById(R.id.l_user_cert).getVisibility() != View.GONE
- && ((String) mEapUserCertSpinner.getSelectedItem())
- .equals(mUnspecifiedCertString)) {
+ && mEapUserCertSpinner.getSelectedItem().equals(mUnspecifiedCertString)) {
// Disallow submit if the user has not selected a user certificate for an EAP network
// configuration.
enabled = false;
@@ -702,6 +711,10 @@
config.meteredOverride = mMeteredSettingsSpinner.getSelectedItemPosition();
}
+ if (mPrivacySettingsSpinner != null) {
+ //TODO(b/117957974): set MAC randomization value to WifiConfiguration
+ }
+
return config;
}
diff --git a/src/com/android/settings/wifi/WifiDetailPreference.java b/src/com/android/settings/wifi/WifiDetailPreference.java
index 449522a..2567a42 100644
--- a/src/com/android/settings/wifi/WifiDetailPreference.java
+++ b/src/com/android/settings/wifi/WifiDetailPreference.java
@@ -21,11 +21,11 @@
import android.util.AttributeSet;
import android.widget.TextView;
-import com.android.settings.R;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
/**
* A Preference to be used with the Wifi Network Detail Fragment that allows a summary text to be
* set inside the widget resource
diff --git a/src/com/android/settings/wifi/WifiDialog.java b/src/com/android/settings/wifi/WifiDialog.java
index 6e94a06..2b8fb2d 100644
--- a/src/com/android/settings/wifi/WifiDialog.java
+++ b/src/com/android/settings/wifi/WifiDialog.java
@@ -22,12 +22,13 @@
import android.view.View;
import android.widget.Button;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.wifi.AccessPoint;
-import androidx.appcompat.app.AlertDialog;
-
public class WifiDialog extends AlertDialog implements WifiConfigUiBase,
DialogInterface.OnClickListener {
@@ -50,14 +51,6 @@
private WifiConfigController mController;
private boolean mHideSubmitButton;
- // TODO(b/111875856) WifiDialog should not mimic full screen UI.
- /** Creates a WifiDialog with fullscreen style. It displays in fullscreen mode. */
- public static WifiDialog createFullscreen(Context context, WifiDialogListener listener,
- AccessPoint accessPoint, int mode) {
- return new WifiDialog(context, listener, accessPoint, mode,
- R.style.Theme_Settings_WifiDialogFullScreen, false /* hideSubmitButton */);
- }
-
/**
* Creates a WifiDialog with no additional style. It displays as a dialog above the current
* view.
@@ -125,7 +118,7 @@
case BUTTON_FORGET:
if (WifiUtils.isNetworkLockedDown(getContext(), mAccessPoint.getConfig())) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
- RestrictedLockUtils.getDeviceOwner(getContext()));
+ RestrictedLockUtilsInternal.getDeviceOwner(getContext()));
return;
}
mListener.onForget(this);
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index d864855..e3a03ad 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -26,23 +26,17 @@
import android.os.Bundle;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.SetupWizardUtils;
import com.android.settingslib.wifi.AccessPoint;
import com.android.setupwizardlib.util.WizardManagerHelper;
-import androidx.annotation.VisibleForTesting;
-
public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener,
DialogInterface.OnDismissListener {
private static final String TAG = "WifiDialogActivity";
- private static final int RESULT_CONNECTED = RESULT_FIRST_USER;
- private static final int RESULT_FORGET = RESULT_FIRST_USER + 1;
-
- private static final String KEY_ACCESS_POINT_STATE = "access_point_state";
- private static final String KEY_WIFI_CONFIGURATION = "wifi_configuration";
-
/**
* Boolean extra indicating whether this activity should connect to an access point on the
* caller's behalf. If this is set to false, the caller should check
@@ -51,6 +45,11 @@
*/
@VisibleForTesting
static final String KEY_CONNECT_FOR_CALLER = "connect_for_caller";
+ static final String KEY_ACCESS_POINT_STATE = "access_point_state";
+ private static final String KEY_WIFI_CONFIGURATION = "wifi_configuration";
+
+ private static final int RESULT_CONNECTED = RESULT_FIRST_USER;
+ private static final int RESULT_FORGET = RESULT_FIRST_USER + 1;
private WifiDialog mDialog;
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index b769665..60480c2 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -30,18 +30,18 @@
import android.provider.Settings;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.widget.SwitchWidgetController;
-import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.WirelessUtils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import java.util.concurrent.atomic.AtomicBoolean;
-import androidx.annotation.VisibleForTesting;
-
public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListener {
private final SwitchWidgetController mSwitchWidget;
@@ -162,12 +162,12 @@
mSwitchWidget.setEnabled(true);
}
- if (RestrictedLockUtils.hasBaseUserRestriction(mContext,
+ if (RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId())) {
mSwitchWidget.setEnabled(false);
} else {
- final EnforcedAdmin admin = RestrictedLockUtils.checkIfRestrictionEnforced(mContext,
- UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId());
+ final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+ mContext, UserManager.DISALLOW_CONFIG_TETHERING, UserHandle.myUserId());
mSwitchWidget.setDisabledByAdmin(admin);
}
}
diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java
index d15c508..e847712 100644
--- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java
@@ -25,6 +25,10 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.core.text.BidiFormatter;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
@@ -34,10 +38,6 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.core.text.BidiFormatter;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* {@link PreferenceControllerMixin} that updates MAC/IP address.
*/
diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
index 6f82762..692608c 100644
--- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
@@ -17,6 +17,8 @@
import android.content.Context;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.MasterSwitchController;
@@ -30,8 +32,6 @@
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.preference.PreferenceScreen;
-
public class WifiMasterSwitchPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java
index f7c4f79..a590a0f 100644
--- a/src/com/android/settings/wifi/WifiPickerActivity.java
+++ b/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -17,14 +17,14 @@
import android.content.Intent;
+import androidx.preference.PreferenceFragmentCompat;
+
import com.android.settings.ButtonBarHandler;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.wifi.p2p.WifiP2pSettings;
import com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings;
-import androidx.preference.PreferenceFragmentCompat;
-
public class WifiPickerActivity extends SettingsActivity implements ButtonBarHandler {
@Override
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
index cdd4f5f..a9be6a3 100644
--- a/src/com/android/settings/wifi/WifiScanModeActivity.java
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -25,14 +25,14 @@
import android.os.Bundle;
import android.provider.Settings;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentActivity;
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
/**
* This activity requests users permission to allow scanning even when Wi-Fi is turned off
*/
diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java
index a2e8b0e..fd279cc 100644
--- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java
+++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java
@@ -28,14 +28,14 @@
import android.util.Log;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.HelpUtils;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
public class WifiScanningRequiredFragment extends InstrumentedDialogFragment implements
DialogInterface.OnClickListener {
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 28e10b2..f097d5b 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -24,6 +24,7 @@
import android.app.Dialog;
import android.content.ContentResolver;
import android.content.Context;
+import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
import android.net.ConnectivityManager;
@@ -47,6 +48,10 @@
import android.view.View;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.LinkifyUtils;
import com.android.settings.R;
@@ -62,6 +67,7 @@
import com.android.settings.widget.SwitchBarController;
import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
@@ -72,10 +78,6 @@
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.
*
@@ -87,7 +89,7 @@
@SearchIndexable
public class WifiSettings extends RestrictedSettingsFragment
implements Indexable, WifiTracker.WifiListener, AccessPointListener,
- WifiDialog.WifiDialogListener {
+ WifiDialog.WifiDialogListener, DialogInterface.OnDismissListener {
private static final String TAG = "WifiSettings";
@@ -99,6 +101,9 @@
public static final int WIFI_DIALOG_ID = 1;
private static final int WRITE_NFC_DIALOG_ID = 6;
+ @VisibleForTesting
+ static final int ADD_NETWORK_REQUEST = 2;
+
// Instance state keys
private static final String SAVE_DIALOG_MODE = "dialog_mode";
private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
@@ -107,9 +112,9 @@
private static final String PREF_KEY_EMPTY_WIFI_LIST = "wifi_empty_list";
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_ADDITIONAL_SETTINGS = "additional_settings";
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";
private static boolean isVerboseLoggingEnabled() {
return WifiTracker.sVerboseLogging || Log.isLoggable(TAG, Log.VERBOSE);
@@ -162,17 +167,19 @@
private Bundle mAccessPointSavedState;
private Bundle mWifiNfcDialogSavedState;
- private WifiTracker mWifiTracker;
+ @VisibleForTesting
+ WifiTracker mWifiTracker;
private String mOpenSsid;
private AccessPointPreference.UserBadgeCache mUserBadgeCache;
private PreferenceCategory mConnectedAccessPointPreferenceCategory;
private PreferenceCategory mAccessPointsPreferenceCategory;
- private PreferenceCategory mAdditionalSettingsPreferenceCategory;
private Preference mAddPreference;
- private Preference mConfigureWifiSettingsPreference;
- private Preference mSavedNetworksPreference;
+ @VisibleForTesting
+ Preference mConfigureWifiSettingsPreference;
+ @VisibleForTesting
+ Preference mSavedNetworksPreference;
private LinkablePreference mStatusMessagePreference;
// For Search
@@ -224,8 +231,6 @@
(PreferenceCategory) findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
mAccessPointsPreferenceCategory =
(PreferenceCategory) findPreference(PREF_KEY_ACCESS_POINTS);
- mAdditionalSettingsPreferenceCategory =
- (PreferenceCategory) findPreference(PREF_KEY_ADDITIONAL_SETTINGS);
mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
@@ -233,7 +238,7 @@
mAddPreference = new Preference(prefContext);
mAddPreference.setIcon(R.drawable.ic_menu_add);
mAddPreference.setTitle(R.string.wifi_add_network);
- mStatusMessagePreference = new LinkablePreference(prefContext);
+ mStatusMessagePreference = (LinkablePreference) findPreference(PREF_KEY_STATUS_MESSAGE);
mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager());
}
@@ -252,60 +257,63 @@
}
mConnectListener = 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_connect_message,
- Toast.LENGTH_SHORT).show();
- }
- }
- };
+ @Override
+ public void onSuccess() {
+ }
+
+ @Override
+ public void onFailure(int reason) {
+ Activity activity = getActivity();
+ if (activity != null) {
+ Toast.makeText(activity,
+ R.string.wifi_failed_connect_message,
+ Toast.LENGTH_SHORT).show();
+ }
+ }
+ };
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();
- }
- }
- };
+ @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();
- }
- }
- };
+ @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();
+ }
+ }
+ };
if (savedInstanceState != null) {
mDialogMode = savedInstanceState.getInt(SAVE_DIALOG_MODE);
if (savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
mAccessPointSavedState =
- savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
+ savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
}
if (savedInstanceState.containsKey(SAVED_WIFI_NFC_DIALOG_STATE)) {
mWifiNfcDialogSavedState =
- savedInstanceState.getBundle(SAVED_WIFI_NFC_DIALOG_STATE);
+ savedInstanceState.getBundle(SAVED_WIFI_NFC_DIALOG_STATE);
}
}
@@ -371,7 +379,7 @@
private WifiEnabler createWifiEnabler() {
final SettingsActivity activity = (SettingsActivity) getActivity();
return new WifiEnabler(activity, new SwitchBarController(activity.getSwitchBar()),
- mMetricsFeatureProvider);
+ mMetricsFeatureProvider);
}
@Override
@@ -412,6 +420,12 @@
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
+ // Only handle request comes from AddNetworkFragment
+ if (requestCode == ADD_NETWORK_REQUEST) {
+ handleAddNetworkRequest(resultCode, data);
+ return;
+ }
+
final boolean formerlyRestricted = mIsRestricted;
mIsRestricted = isUiRestricted();
if (formerlyRestricted && !mIsRestricted
@@ -429,9 +443,8 @@
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
-
- // If the dialog is showing, save its state.
- if (mDialog != null && mDialog.isShowing()) {
+ // If dialog has been shown, save its state.
+ if (mDialog != null) {
outState.putInt(SAVE_DIALOG_MODE, mDialogMode);
if (mDlgAccessPoint != null) {
mAccessPointSavedState = new Bundle();
@@ -440,7 +453,7 @@
}
}
- if (mWifiToNfcDialog != null && mWifiToNfcDialog.isShowing()) {
+ if (mWifiToNfcDialog != null) {
Bundle savedState = new Bundle();
mWifiToNfcDialog.saveState(savedState);
outState.putBundle(SAVED_WIFI_NFC_DIALOG_STATE, savedState);
@@ -449,38 +462,38 @@
@Override
public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
- Preference preference = (Preference) view.getTag();
+ Preference preference = (Preference) view.getTag();
- if (preference instanceof LongPressAccessPointPreference) {
- mSelectedAccessPoint =
- ((LongPressAccessPointPreference) preference).getAccessPoint();
- menu.setHeaderTitle(mSelectedAccessPoint.getSsid());
- if (mSelectedAccessPoint.isConnectable()) {
- menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
- }
+ if (preference instanceof LongPressAccessPointPreference) {
+ mSelectedAccessPoint =
+ ((LongPressAccessPointPreference) preference).getAccessPoint();
+ menu.setHeaderTitle(mSelectedAccessPoint.getSsid());
+ if (mSelectedAccessPoint.isConnectable()) {
+ menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
+ }
- WifiConfiguration config = mSelectedAccessPoint.getConfig();
- // Some configs are ineditable
- if (WifiUtils.isNetworkLockedDown(getActivity(), config)) {
- return;
- }
+ WifiConfiguration config = mSelectedAccessPoint.getConfig();
+ // Some configs are ineditable
+ if (WifiUtils.isNetworkLockedDown(getActivity(), config)) {
+ return;
+ }
- if (mSelectedAccessPoint.isSaved() || mSelectedAccessPoint.isEphemeral()) {
- // Allow forgetting a network if either the network is saved or ephemerally
- // connected. (In the latter case, "forget" blacklists the network so it won't
- // be used again, ephemerally).
- menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);
- }
- if (mSelectedAccessPoint.isSaved()) {
- menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);
- NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
- if (nfcAdapter != null && nfcAdapter.isEnabled() &&
- mSelectedAccessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
- // Only allow writing of NFC tags for password-protected networks.
- menu.add(Menu.NONE, MENU_ID_WRITE_NFC, 0, R.string.wifi_menu_write_to_nfc);
- }
+ if (mSelectedAccessPoint.isSaved() || mSelectedAccessPoint.isEphemeral()) {
+ // Allow forgetting a network if either the network is saved or ephemerally
+ // connected. (In the latter case, "forget" blacklists the network so it won't
+ // be used again, ephemerally).
+ menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);
+ }
+ if (mSelectedAccessPoint.isSaved()) {
+ menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);
+ NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(getActivity());
+ if (nfcAdapter != null && nfcAdapter.isEnabled() &&
+ mSelectedAccessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
+ // Only allow writing of NFC tags for password-protected networks.
+ menu.add(Menu.NONE, MENU_ID_WRITE_NFC, 0, R.string.wifi_menu_write_to_nfc);
}
}
+ }
}
@Override
@@ -566,7 +579,7 @@
WifiConfiguration config = accessPoint.getConfig();
if (WifiUtils.isNetworkLockedDown(getActivity(), config) && accessPoint.isActive()) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
- RestrictedLockUtils.getDeviceOwner(getActivity()));
+ RestrictedLockUtilsInternal.getDeviceOwner(getActivity()));
return;
}
}
@@ -587,22 +600,15 @@
public Dialog onCreateDialog(int dialogId) {
switch (dialogId) {
case WIFI_DIALOG_ID:
- if (mDlgAccessPoint == null && mAccessPointSavedState == null) {
- // add new network
- mDialog = WifiDialog
- .createFullscreen(getActivity(), this, mDlgAccessPoint, mDialogMode);
- } else {
- // modify network
- if (mDlgAccessPoint == null) {
- // restore AP from save state
- mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
- // Reset the saved access point data
- mAccessPointSavedState = null;
- }
- mDialog = WifiDialog
- .createModal(getActivity(), this, mDlgAccessPoint, mDialogMode);
+ // modify network
+ if (mDlgAccessPoint == null && mAccessPointSavedState != null) {
+ // restore AP from save state
+ mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
+ // Reset the saved access point data
+ mAccessPointSavedState = null;
}
-
+ mDialog = WifiDialog
+ .createModal(getActivity(), this, mDlgAccessPoint, mDialogMode);
mSelectedAccessPoint = mDlgAccessPoint;
return mDialog;
case WRITE_NFC_DIALOG_ID:
@@ -614,13 +620,25 @@
mWifiToNfcDialog = new WriteWifiConfigToNfcDialog(getActivity(),
mWifiNfcDialogSavedState);
}
-
return mWifiToNfcDialog;
}
return super.onCreateDialog(dialogId);
}
@Override
+ public void onDialogShowing() {
+ super.onDialogShowing();
+ setOnDismissListener(this);
+ }
+
+ @Override
+ public void onDismiss(DialogInterface dialog) {
+ // We don't keep any dialog object when dialog was dismissed.
+ mDialog = null;
+ mWifiToNfcDialog = null;
+ }
+
+ @Override
public int getDialogMetricsCategory(int dialogId) {
switch (dialogId) {
case WIFI_DIALOG_ID:
@@ -674,14 +692,14 @@
case WifiManager.WIFI_STATE_ENABLING:
removeConnectedAccessPointPreference();
- mAccessPointsPreferenceCategory.removeAll();
+ removeAccessPointPreference();
addMessagePreference(R.string.wifi_starting);
setProgressBarVisible(true);
break;
case WifiManager.WIFI_STATE_DISABLING:
removeConnectedAccessPointPreference();
- mAccessPointsPreferenceCategory.removeAll();
+ removeAccessPointPreference();
addMessagePreference(R.string.wifi_stopping);
break;
@@ -728,7 +746,10 @@
}
boolean hasAvailableAccessPoints = false;
- mAccessPointsPreferenceCategory.removePreference(mStatusMessagePreference);
+ mStatusMessagePreference.setVisible(false);
+ mConnectedAccessPointPreferenceCategory.setVisible(true);
+ mAccessPointsPreferenceCategory.setVisible(true);
+
cacheRemoveAllPrefs(mAccessPointsPreferenceCategory);
int index =
@@ -913,6 +934,15 @@
}
}
+ private void launchAddNetworkFragment() {
+ new SubSettingLauncher(getContext())
+ .setTitleRes(R.string.wifi_add_network)
+ .setDestination(AddNetworkFragment.class.getName())
+ .setSourceMetricsCategory(getMetricsCategory())
+ .setResultListener(this, ADD_NETWORK_REQUEST)
+ .launch();
+ }
+
private void launchNetworkDetailsFragment(ConnectedAccessPointPreference pref) {
new SubSettingLauncher(getContext())
.setTitleRes(R.string.pref_title_network_details)
@@ -933,32 +963,34 @@
unregisterCaptivePortalNetworkCallback();
}
- private void setAdditionalSettingsSummaries() {
- mAdditionalSettingsPreferenceCategory.addPreference(mConfigureWifiSettingsPreference);
+ private void removeAccessPointPreference() {
+ mAccessPointsPreferenceCategory.removeAll();
+ mAccessPointsPreferenceCategory.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));
- int numSavedNetworks = mWifiTracker.getNumSavedNetworks();
- if (numSavedNetworks > 0) {
- mAdditionalSettingsPreferenceCategory.addPreference(mSavedNetworksPreference);
- mSavedNetworksPreference.setSummary(
- getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
- numSavedNetworks, numSavedNetworks));
- } else {
- mAdditionalSettingsPreferenceCategory.removePreference(mSavedNetworksPreference);
- }
+ final int numSavedNetworks = mWifiTracker.getNumSavedNetworks();
+ mSavedNetworksPreference.setVisible(numSavedNetworks > 0);
+ mSavedNetworksPreference.setSummary(
+ getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
+ numSavedNetworks, numSavedNetworks));
}
private boolean isWifiWakeupEnabled() {
- PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
- ContentResolver contentResolver = getContentResolver();
+ 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.WIFI_WAKEUP_ENABLED, 0) == 1
&& Settings.Global.getInt(contentResolver,
- Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1
+ Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1
&& Settings.Global.getInt(contentResolver,
- Settings.Global.AIRPLANE_MODE_ON, 0) == 0
+ Settings.Global.AIRPLANE_MODE_ON, 0) == 0
&& !powerManager.isPowerSaveMode();
}
@@ -979,15 +1011,14 @@
.launch();
mStatusMessagePreference.setText(title, description, clickListener);
removeConnectedAccessPointPreference();
- mAccessPointsPreferenceCategory.removeAll();
- mAccessPointsPreferenceCategory.addPreference(mStatusMessagePreference);
+ removeAccessPointPreference();
+ mStatusMessagePreference.setVisible(true);
}
private void addMessagePreference(int messageId) {
mStatusMessagePreference.setTitle(messageId);
- removeConnectedAccessPointPreference();
- mAccessPointsPreferenceCategory.removeAll();
- mAccessPointsPreferenceCategory.addPreference(mStatusMessagePreference);
+ mStatusMessagePreference.setVisible(true);
+
}
protected void setProgressBarVisible(boolean visible) {
@@ -1068,7 +1099,7 @@
protected void connect(final WifiConfiguration config, boolean isSavedNetwork) {
// Log subtype if configuration is a saved network.
- mMetricsFeatureProvider.action(getVisibilityLogger(), MetricsEvent.ACTION_WIFI_CONNECT,
+ mMetricsFeatureProvider.action(getContext(), MetricsEvent.ACTION_WIFI_CONNECT,
isSavedNetwork);
mWifiManager.connect(config, mConnectListener);
mClickedConnect = true;
@@ -1081,14 +1112,29 @@
mWifiManager.connect(networkId, mConnectListener);
}
+ @VisibleForTesting
+ void handleAddNetworkRequest(int result, Intent data) {
+ if (result == Activity.RESULT_OK) {
+ handleAddNetworkSubmitEvent(data);
+ }
+ mWifiTracker.resumeScanning();
+ }
+
+ 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.
*/
- /* package */ void onAddNetworkPressed() {
- mMetricsFeatureProvider.action(getActivity(), MetricsEvent.ACTION_WIFI_ADD_NETWORK);
+ private void onAddNetworkPressed() {
// No exact access point is selected.
mSelectedAccessPoint = null;
- showDialog(null, WifiConfigUiBase.MODE_CONNECT);
+ launchAddNetworkFragment();
}
@Override
@@ -1119,25 +1165,26 @@
}
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();
+ 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);
+ // 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;
}
-
- return result;
- }
- };
+ };
private static class SummaryProvider
implements SummaryLoader.SummaryProvider, OnSummaryChangeListener {
@@ -1170,7 +1217,7 @@
= new SummaryLoader.SummaryProviderFactory() {
@Override
public SummaryLoader.SummaryProvider createSummaryProvider(Activity activity,
- SummaryLoader summaryLoader) {
+ SummaryLoader summaryLoader) {
return new SummaryProvider(activity, summaryLoader);
}
};
diff --git a/src/com/android/settings/wifi/WifiSlice.java b/src/com/android/settings/wifi/WifiSlice.java
new file mode 100644
index 0000000..d06d830
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiSlice.java
@@ -0,0 +1,329 @@
+/*
+ * 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.wifi;
+
+import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+import static android.provider.SettingsSlicesContract.KEY_WIFI;
+
+import android.annotation.ColorInt;
+import android.app.PendingIntent;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.Uri;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiSsid;
+import android.os.Bundle;
+import android.provider.SettingsSlicesContract;
+import android.text.TextUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.Utils;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SliceBackgroundWorker;
+import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
+import com.android.settingslib.wifi.AccessPoint;
+import com.android.settingslib.wifi.WifiTracker;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utility class to build a Wifi Slice, and handle all associated actions.
+ */
+public class WifiSlice implements CustomSliceable {
+
+ /**
+ * Backing Uri for the Wifi Slice.
+ */
+ public static final Uri WIFI_URI = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSlicesContract.AUTHORITY)
+ .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+ .appendPath(KEY_WIFI)
+ .build();
+
+ @VisibleForTesting
+ static final int DEFAULT_EXPANDED_ROW_COUNT = 3;
+
+ private final Context mContext;
+
+ public WifiSlice(Context context) {
+ mContext = context;
+ }
+
+ @Override
+ public Uri getUri() {
+ return WIFI_URI;
+ }
+
+ @Override
+ public IntentFilter getIntentFilter() {
+ final IntentFilter filter = new IntentFilter();
+ filter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
+ filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+ return filter;
+ }
+
+ /**
+ * Return a Wifi Slice bound to {@link #WIFI_URI}.
+ */
+ @Override
+ public Slice getSlice() {
+ final boolean isWifiEnabled = isWifiEnabled();
+ final IconCompat icon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_settings_wireless);
+ final String title = mContext.getString(R.string.wifi_settings);
+ final CharSequence summary = getSummary();
+ @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
+ final PendingIntent toggleAction = getBroadcastIntent(mContext);
+ final PendingIntent primaryAction = getPrimaryAction();
+ final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title);
+ final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */,
+ isWifiEnabled);
+
+ final ListBuilder listBuilder = new ListBuilder(mContext, WIFI_URI, ListBuilder.INFINITY)
+ .setAccentColor(color)
+ .addRow(new RowBuilder()
+ .setTitle(title)
+ .setSubtitle(summary)
+ .addEndItem(toggleSliceAction)
+ .setPrimaryAction(primarySliceAction));
+
+ if (!isWifiEnabled) {
+ return listBuilder.build();
+ }
+
+ List<AccessPoint> results = SliceBackgroundWorker.getInstance(mContext, this).getResults();
+ if (results == null) {
+ results = new ArrayList<>();
+ }
+ final int apCount = results.size();
+ // Add AP rows
+ final CharSequence placeholder = mContext.getText(R.string.summary_placeholder);
+ for (int i = 0; i < DEFAULT_EXPANDED_ROW_COUNT; i++) {
+ if (i < apCount) {
+ listBuilder.addRow(getAccessPointRow(results.get(i)));
+ } else {
+ listBuilder.addRow(new RowBuilder()
+ .setTitle(placeholder)
+ .setSubtitle(placeholder));
+ }
+ }
+ return listBuilder.build();
+ }
+
+ private RowBuilder getAccessPointRow(AccessPoint accessPoint) {
+ final String title = accessPoint.getConfigName();
+ final IconCompat levelIcon = IconCompat.createWithResource(mContext,
+ com.android.settingslib.Utils.getWifiIconResource(accessPoint.getLevel()));
+ final CharSequence apSummary = accessPoint.getSettingsSummary();
+ final RowBuilder rowBuilder = new RowBuilder()
+ .setTitleItem(levelIcon, ListBuilder.ICON_IMAGE)
+ .setTitle(title)
+ .setSubtitle(!TextUtils.isEmpty(apSummary)
+ ? apSummary
+ : mContext.getText(R.string.summary_placeholder))
+ .setPrimaryAction(new SliceAction(
+ getAccessPointAction(accessPoint), levelIcon, title));
+
+ final IconCompat endIcon = getEndIcon(accessPoint);
+ if (endIcon != null) {
+ rowBuilder.addEndItem(endIcon, ListBuilder.ICON_IMAGE);
+ }
+ return rowBuilder;
+ }
+
+ private IconCompat getEndIcon(AccessPoint accessPoint) {
+ if (accessPoint.isActive()) {
+ return IconCompat.createWithResource(mContext, R.drawable.ic_settings);
+ } else if (accessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
+ return IconCompat.createWithResource(mContext, R.drawable.ic_friction_lock_closed);
+ } else if (accessPoint.isMetered()) {
+ return IconCompat.createWithResource(mContext, R.drawable.ic_friction_money);
+ }
+ return null;
+ }
+
+ private PendingIntent getAccessPointAction(AccessPoint accessPoint) {
+ final Bundle extras = new Bundle();
+ accessPoint.saveWifiState(extras);
+
+ Intent intent;
+ if (accessPoint.isActive()) {
+ intent = new SubSettingLauncher(mContext)
+ .setTitleRes(R.string.pref_title_network_details)
+ .setDestination(WifiNetworkDetailsFragment.class.getName())
+ .setArguments(extras)
+ .setSourceMetricsCategory(MetricsEvent.WIFI)
+ .toIntent();
+ } else {
+ intent = new Intent(mContext, WifiDialogActivity.class);
+ intent.putExtra(WifiDialogActivity.KEY_ACCESS_POINT_STATE, extras);
+ }
+ return PendingIntent.getActivity(mContext, accessPoint.hashCode() /* requestCode */,
+ intent, 0 /* flags */);
+ }
+
+ /**
+ * Update the current wifi status to the boolean value keyed by
+ * {@link android.app.slice.Slice#EXTRA_TOGGLE_STATE} on {@param intent}.
+ */
+ @Override
+ public void onNotifyChange(Intent intent) {
+ final WifiManager wifiManager = mContext.getSystemService(WifiManager.class);
+ final boolean newState = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
+ wifiManager.isWifiEnabled());
+ wifiManager.setWifiEnabled(newState);
+ // Do not notifyChange on Uri. The service takes longer to update the current value than it
+ // does for the Slice to check the current value again. Let {@link SliceBroadcastRelay}
+ // handle it.
+ }
+
+ @Override
+ public Intent getIntent() {
+ final String screenTitle = mContext.getText(R.string.wifi_settings).toString();
+ final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build();
+ final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
+ WifiSettings.class.getName(), KEY_WIFI, screenTitle,
+ MetricsEvent.DIALOG_WIFI_AP_EDIT)
+ .setClassName(mContext.getPackageName(), SubSettings.class.getName())
+ .setData(contentUri);
+
+ return intent;
+ }
+
+ private boolean isWifiEnabled() {
+ final WifiManager wifiManager = mContext.getSystemService(WifiManager.class);
+
+ switch (wifiManager.getWifiState()) {
+ case WifiManager.WIFI_STATE_ENABLED:
+ case WifiManager.WIFI_STATE_ENABLING:
+ return true;
+ case WifiManager.WIFI_STATE_DISABLED:
+ case WifiManager.WIFI_STATE_DISABLING:
+ case WifiManager.WIFI_STATE_UNKNOWN:
+ default:
+ return false;
+ }
+ }
+
+ private CharSequence getSummary() {
+ final WifiManager wifiManager = mContext.getSystemService(WifiManager.class);
+
+ switch (wifiManager.getWifiState()) {
+ case WifiManager.WIFI_STATE_ENABLED:
+ final String ssid = WifiInfo.removeDoubleQuotes(wifiManager.getConnectionInfo()
+ .getSSID());
+ if (TextUtils.equals(ssid, WifiSsid.NONE)) {
+ return mContext.getText(R.string.disconnected);
+ }
+ return ssid;
+ case WifiManager.WIFI_STATE_ENABLING:
+ return mContext.getText(R.string.disconnected);
+ case WifiManager.WIFI_STATE_DISABLED:
+ case WifiManager.WIFI_STATE_DISABLING:
+ return mContext.getText(R.string.switch_off_text);
+ case WifiManager.WIFI_STATE_UNKNOWN:
+ default:
+ return "";
+ }
+ }
+
+ private PendingIntent getPrimaryAction() {
+ final Intent intent = getIntent();
+ return PendingIntent.getActivity(mContext, 0 /* requestCode */,
+ intent, 0 /* flags */);
+ }
+
+ @Override
+ public Class getBackgroundWorkerClass() {
+ return WifiScanWorker.class;
+ }
+
+ public static class WifiScanWorker extends SliceBackgroundWorker<AccessPoint>
+ implements WifiTracker.WifiListener {
+
+ private final Context mContext;
+
+ private WifiTracker mWifiTracker;
+
+ public WifiScanWorker(Context context, Uri uri) {
+ super(context, uri);
+ mContext = context;
+ }
+
+ @Override
+ protected void onSlicePinned() {
+ if (mWifiTracker == null) {
+ mWifiTracker = new WifiTracker(mContext, this /* wifiListener */,
+ true /* includeSaved */, true /* includeScans */);
+ }
+ mWifiTracker.onStart();
+ onAccessPointsChanged();
+ }
+
+ @Override
+ protected void onSliceUnpinned() {
+ mWifiTracker.onStop();
+ }
+
+ @Override
+ public void close() {
+ mWifiTracker.onDestroy();
+ }
+
+ @Override
+ public void onWifiStateChanged(int state) {
+ }
+
+ @Override
+ public void onConnectedChanged() {
+ }
+
+ @Override
+ public void onAccessPointsChanged() {
+ // in case state has changed
+ if (!mWifiTracker.getManager().isWifiEnabled()) {
+ updateResults(null);
+ return;
+ }
+ // AccessPoints are sorted by the WifiTracker
+ final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints();
+ final List<AccessPoint> resultList = new ArrayList<>();
+ for (AccessPoint ap : accessPoints) {
+ if (ap.isReachable()) {
+ resultList.add(ap);
+ }
+ }
+ updateResults(resultList);
+ }
+ }
+}
diff --git a/src/com/android/settings/wifi/WifiSliceBuilder.java b/src/com/android/settings/wifi/WifiSliceBuilder.java
deleted file mode 100644
index a7bf16a..0000000
--- a/src/com/android/settings/wifi/WifiSliceBuilder.java
+++ /dev/null
@@ -1,181 +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.wifi;
-
-import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
-import static android.provider.SettingsSlicesContract.KEY_WIFI;
-
-import android.annotation.ColorInt;
-import android.app.PendingIntent;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Uri;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiSsid;
-import android.provider.SettingsSlicesContract;
-import android.text.TextUtils;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SubSettings;
-import com.android.settings.Utils;
-import com.android.settings.slices.SliceBroadcastReceiver;
-import com.android.settings.slices.SliceBuilderUtils;
-
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
-/**
- * Utility class to build a Wifi Slice, and handle all associated actions.
- */
-public class WifiSliceBuilder {
-
- /**
- * Backing Uri for the Wifi Slice.
- */
- public static final Uri WIFI_URI = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSlicesContract.AUTHORITY)
- .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
- .appendPath(KEY_WIFI)
- .build();
-
- /**
- * Action notifying a change on the Wifi Slice.
- */
- public static final String ACTION_WIFI_SLICE_CHANGED =
- "com.android.settings.wifi.action.WIFI_CHANGED";
-
- public static final IntentFilter INTENT_FILTER = new IntentFilter();
-
- static {
- INTENT_FILTER.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
- INTENT_FILTER.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
- }
-
- private WifiSliceBuilder() {
- }
-
- /**
- * Return a Wifi Slice bound to {@link #WIFI_URI}.
- * <p>
- * Note that you should register a listener for {@link #INTENT_FILTER} to get changes for Wifi.
- */
- public static Slice getSlice(Context context) {
- final boolean isWifiEnabled = isWifiEnabled(context);
- final IconCompat icon = IconCompat.createWithResource(context,
- R.drawable.ic_settings_wireless);
- final String title = context.getString(R.string.wifi_settings);
- final CharSequence summary = getSummary(context);
- @ColorInt final int color = Utils.getColorAccentDefaultColor(context);
- final PendingIntent toggleAction = getBroadcastIntent(context);
- final PendingIntent primaryAction = getPrimaryAction(context);
- final SliceAction primarySliceAction = new SliceAction(primaryAction, icon, title);
- final SliceAction toggleSliceAction = new SliceAction(toggleAction, null /* actionTitle */,
- isWifiEnabled);
-
- return new ListBuilder(context, WIFI_URI, ListBuilder.INFINITY)
- .setAccentColor(color)
- .addRow(b -> b
- .setTitle(title)
- .setSubtitle(summary)
- .addEndItem(toggleSliceAction)
- .setPrimaryAction(primarySliceAction))
- .build();
- }
-
- /**
- * Update the current wifi status to the boolean value keyed by
- * {@link android.app.slice.Slice#EXTRA_TOGGLE_STATE} on {@param intent}.
- */
- public static void handleUriChange(Context context, Intent intent) {
- final WifiManager wifiManager = context.getSystemService(WifiManager.class);
- final boolean newState = intent.getBooleanExtra(EXTRA_TOGGLE_STATE,
- wifiManager.isWifiEnabled());
- wifiManager.setWifiEnabled(newState);
- // Do not notifyChange on Uri. The service takes longer to update the current value than it
- // does for the Slice to check the current value again. Let {@link SliceBroadcastRelay}
- // handle it.
- }
-
- public static Intent getIntent(Context context) {
- final String screenTitle = context.getText(R.string.wifi_settings).toString();
- final Uri contentUri = new Uri.Builder().appendPath(KEY_WIFI).build();
- final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(context,
- WifiSettings.class.getName(), KEY_WIFI, screenTitle,
- MetricsEvent.DIALOG_WIFI_AP_EDIT)
- .setClassName(context.getPackageName(), SubSettings.class.getName())
- .setData(contentUri);
-
- return intent;
- }
-
- private static boolean isWifiEnabled(Context context) {
- final WifiManager wifiManager = context.getSystemService(WifiManager.class);
-
- switch (wifiManager.getWifiState()) {
- case WifiManager.WIFI_STATE_ENABLED:
- case WifiManager.WIFI_STATE_ENABLING:
- return true;
- case WifiManager.WIFI_STATE_DISABLED:
- case WifiManager.WIFI_STATE_DISABLING:
- case WifiManager.WIFI_STATE_UNKNOWN:
- default:
- return false;
- }
- }
-
- private static CharSequence getSummary(Context context) {
- final WifiManager wifiManager = context.getSystemService(WifiManager.class);
-
- switch (wifiManager.getWifiState()) {
- case WifiManager.WIFI_STATE_ENABLED:
- final String ssid = WifiInfo.removeDoubleQuotes(wifiManager.getConnectionInfo()
- .getSSID());
- if (TextUtils.equals(ssid, WifiSsid.NONE)) {
- return context.getText(R.string.disconnected);
- }
- return ssid;
- case WifiManager.WIFI_STATE_ENABLING:
- return context.getText(R.string.disconnected);
- case WifiManager.WIFI_STATE_DISABLED:
- case WifiManager.WIFI_STATE_DISABLING:
- return context.getText(R.string.switch_off_text);
- case WifiManager.WIFI_STATE_UNKNOWN:
- default:
- return "";
- }
- }
-
- private static PendingIntent getPrimaryAction(Context context) {
- final Intent intent = getIntent(context);
- return PendingIntent.getActivity(context, 0 /* requestCode */,
- intent, 0 /* flags */);
- }
-
- private static PendingIntent getBroadcastIntent(Context context) {
- final Intent intent = new Intent(ACTION_WIFI_SLICE_CHANGED);
- intent.setClass(context, SliceBroadcastReceiver.class);
- return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
- PendingIntent.FLAG_CANCEL_CURRENT);
- }
-}
diff --git a/src/com/android/settings/wifi/WifiSummaryUpdater.java b/src/com/android/settings/wifi/WifiSummaryUpdater.java
index f22b1b6..8696113 100644
--- a/src/com/android/settings/wifi/WifiSummaryUpdater.java
+++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java
@@ -26,12 +26,12 @@
import android.net.wifi.WifiManager;
import android.text.TextUtils;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.widget.SummaryUpdater;
import com.android.settingslib.wifi.WifiStatusTracker;
-import androidx.annotation.VisibleForTesting;
-
/**
* Helper class that listeners to wifi callback and notify client when there is update in
* wifi summary info.
diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index 6379caf..435f8f1 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -25,18 +25,18 @@
import android.provider.Settings;
import android.text.TextUtils;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.utils.AnnotationSpan;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.annotation.VisibleForTesting;
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.settings.dashboard.DashboardFragment;
+import com.android.settings.utils.AnnotationSpan;
+import com.android.settingslib.core.AbstractPreferenceController;
+
/**
* {@link PreferenceControllerMixin} that controls whether the Wi-Fi Wakeup feature should be
* enabled.
@@ -68,7 +68,7 @@
@Override
public boolean isAvailable() {
- return true;
+ return true;
}
@Override
@@ -108,8 +108,8 @@
final SwitchPreference enableWifiWakeup = (SwitchPreference) preference;
enableWifiWakeup.setChecked(getWifiWakeupEnabled()
- && getWifiScanningEnabled()
- && mLocationManager.isLocationEnabled());
+ && getWifiScanningEnabled()
+ && mLocationManager.isLocationEnabled());
if (!mLocationManager.isLocationEnabled()) {
preference.setSummary(getNoLocationSummary());
} else {
@@ -117,7 +117,8 @@
}
}
- @VisibleForTesting CharSequence getNoLocationSummary() {
+ @VisibleForTesting
+ CharSequence getNoLocationSummary() {
AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan.LinkInfo("link", null);
CharSequence locationText = mContext.getText(R.string.wifi_wakeup_summary_no_location);
return AnnotationSpan.linkify(locationText, linkInfo);
diff --git a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
index 55ad183..b56eca6 100644
--- a/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
+++ b/src/com/android/settings/wifi/WriteWifiConfigToNfcDialog.java
@@ -40,13 +40,13 @@
import android.widget.ProgressBar;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settingslib.wifi.AccessPoint;
import java.io.IOException;
-import androidx.appcompat.app.AlertDialog;
-
class WriteWifiConfigToNfcDialog extends AlertDialog
implements TextWatcher, View.OnClickListener, CompoundButton.OnCheckedChangeListener {
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java
index 5762b7b..ac84783 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettings.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettings.java
@@ -24,6 +24,10 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
import com.android.ims.ImsManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
@@ -36,10 +40,6 @@
import java.util.List;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-
/**
* "Wi-Fi Calling settings" screen. This is the container fragment which holds
* {@link WifiCallingSettingsForSub} fragments.
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index 6d34029..6b368c5 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -36,6 +36,12 @@
import android.widget.Switch;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceScreen;
+
import com.android.ims.ImsConfig;
import com.android.ims.ImsManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -46,12 +52,6 @@
import com.android.settings.Utils;
import com.android.settings.widget.SwitchBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceScreen;
-
/**
* This is the inner class of {@link WifiCallingSettings} fragment.
* The preference screen lets you enable/disable Wi-Fi Calling and change Wi-Fi Calling mode.
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
index f9014b7..0629ad3 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java
@@ -31,6 +31,13 @@
import android.text.TextUtils;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+
import com.android.ims.ImsConfig;
import com.android.ims.ImsManager;
import com.android.settings.R;
@@ -47,13 +54,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.ListBuilder.RowBuilder;
-import androidx.slice.builders.SliceAction;
-
/**
* Helper class to control slices for wifi calling settings.
@@ -209,7 +209,7 @@
return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
.setAccentColor(Utils.getColorAccentDefaultColor(mContext))
- .addRow(b -> b
+ .addRow(new RowBuilder()
.setTitle(mContext.getText(R.string.wifi_calling_settings_title))
.addEndItem(
new SliceAction(
@@ -298,7 +298,7 @@
// Top row shows information on current preference state
ListBuilder listBuilder = new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
.setAccentColor(Utils.getColorAccentDefaultColor(mContext));
- listBuilder.setHeader(new ListBuilder.HeaderBuilder(listBuilder)
+ listBuilder.setHeader(new ListBuilder.HeaderBuilder()
.setTitle(mContext.getText(R.string.wifi_calling_mode_title))
.setSubtitle(getWifiCallingPreferenceSummary(currentWfcPref))
.setPrimaryAction(new SliceAction(
@@ -338,7 +338,7 @@
int preferenceTitleResId, String action, boolean checked) {
final IconCompat icon =
IconCompat.createWithResource(mContext, R.drawable.radio_button_check);
- return new RowBuilder(listBuilder)
+ return new RowBuilder()
.setTitle(mContext.getText(preferenceTitleResId))
.setTitleItem(new SliceAction(getBroadcastIntent(action),
icon, mContext.getText(preferenceTitleResId), checked));
@@ -488,7 +488,7 @@
final IconCompat icon = IconCompat.createWithResource(mContext, R.drawable.wifi_signal);
return new ListBuilder(mContext, sliceUri, ListBuilder.INFINITY)
.setAccentColor(Utils.getColorAccentDefaultColor(mContext))
- .addRow(b -> b
+ .addRow(new RowBuilder()
.setTitle(title)
.setSubtitle(subtitle)
.setPrimaryAction(new SliceAction(
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index bda3b76..46f485c 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -44,6 +44,13 @@
import android.widget.ImageView;
import android.widget.Toast;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.text.BidiFormatter;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -70,13 +77,6 @@
import java.util.StringJoiner;
import java.util.stream.Collectors;
-import androidx.annotation.VisibleForTesting;
-import androidx.core.text.BidiFormatter;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
/**
* Controller for logic pertaining to displaying Wifi information for the
* {@link WifiNetworkDetailsFragment}.
diff --git a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java
index 6558019..341b227 100644
--- a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java
@@ -21,13 +21,13 @@
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
+
/**
* {@link AbstractPreferenceController} that controls whether the wifi network is metered or not
*/
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index d114e06..7f0e8ee 100644
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -35,6 +35,7 @@
import com.android.settings.wifi.WifiConfigUiBase;
import com.android.settings.wifi.WifiDialog;
import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.wifi.AccessPoint;
@@ -108,7 +109,7 @@
case Menu.FIRST:
if (!mWifiDetailPreferenceController.canModifyNetwork()) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
- RestrictedLockUtils.getDeviceOwner(getContext()));
+ RestrictedLockUtilsInternal.getDeviceOwner(getContext()));
} else {
showDialog(WIFI_DIALOG_ID);
}
@@ -134,6 +135,10 @@
controllers.add(mWifiDetailPreferenceController);
controllers.add(new WifiMeteredPreferenceController(context, mAccessPoint.getConfig()));
+ WifiPrivacyPreferenceController preferenceController = new WifiPrivacyPreferenceController(
+ context);
+ preferenceController.setWifiConfiguration(mAccessPoint.getConfig());
+ controllers.add(preferenceController);
return controllers;
}
diff --git a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java b/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java
new file mode 100644
index 0000000..2afe35b
--- /dev/null
+++ b/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java
@@ -0,0 +1,89 @@
+/*
+ * 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.wifi.details;
+
+import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.util.FeatureFlagUtils;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.DropDownPreference;
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+/**
+ * {@link AbstractPreferenceController} that controls whether the wifi network is mac randomized
+ * or not
+ */
+public class WifiPrivacyPreferenceController extends BasePreferenceController implements
+ Preference.OnPreferenceChangeListener {
+
+ private static final String KEY_WIFI_PRIVACY = "privacy";
+ private WifiConfiguration mWifiConfiguration;
+ private WifiManager mWifiManager;
+
+ public WifiPrivacyPreferenceController(Context context) {
+ super(context, KEY_WIFI_PRIVACY);
+ mWifiConfiguration = null;
+ mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ }
+
+ public void setWifiConfiguration(WifiConfiguration wifiConfiguration) {
+ mWifiConfiguration = wifiConfiguration;
+ }
+
+ @Override
+ public int getAvailabilityStatus() {
+ return FeatureFlagUtils.isEnabled(mContext, FeatureFlags.WIFI_MAC_RANDOMIZATION)
+ ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+ }
+
+ @Override
+ public void updateState(Preference preference) {
+ final DropDownPreference dropDownPreference = (DropDownPreference) preference;
+ final int randomizationLevel = getRandomizationValue();
+ dropDownPreference.setValue(Integer.toString(randomizationLevel));
+ updateSummary((DropDownPreference) preference, randomizationLevel);
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ if (mWifiConfiguration != null) {
+ //TODO(b/117957974): update MAC randomization level to WifiManager
+ mWifiManager.updateNetwork(mWifiConfiguration);
+ }
+ updateSummary((DropDownPreference) preference, Integer.parseInt((String) newValue));
+ return true;
+ }
+
+ @VisibleForTesting
+ int getRandomizationValue() {
+ if (mWifiConfiguration != null) {
+ //TODO(b/117957974): get real MAC randomization level from WifiManager
+ return 0;
+ }
+ return 0;
+ }
+
+ private void updateSummary(DropDownPreference preference, int macRandomized) {
+ preference.setSummary(preference.getEntries()[macRandomized]);
+ }
+}
diff --git a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
index 48e4124..ac8113b 100644
--- a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
+++ b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
@@ -18,13 +18,13 @@
import android.content.Context;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public abstract class P2pCategoryPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
index 3a2b9f5..ade423a 100644
--- a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
+++ b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
@@ -20,12 +20,12 @@
import android.net.wifi.p2p.WifiP2pDevice;
import android.text.TextUtils;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public class P2pThisDevicePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
index d2d65c3..6caef94 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java
@@ -22,11 +22,11 @@
import android.text.TextUtils;
import android.widget.ImageView;
-import com.android.settings.R;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import com.android.settings.R;
+
public class WifiP2pPeer extends Preference {
private static final int[] STATE_SECURED = {R.attr.state_encrypted};
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
index 3a7b670..4f3b7fd 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
@@ -21,6 +21,10 @@
import android.content.IntentFilter;
import android.net.wifi.WifiManager;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -28,10 +32,6 @@
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/**
* {@link PreferenceControllerMixin} to toggle Wifi Direct preference on Wi-Fi state.
*/
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index 3c2fa08..bfdcb21 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -46,6 +46,10 @@
import android.widget.EditText;
import android.widget.Toast;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -54,10 +58,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
/*
* Displays Wi-fi p2p settings UI
*/
@@ -355,11 +355,9 @@
int textId = mWifiP2pSearching ? R.string.wifi_p2p_menu_searching :
R.string.wifi_p2p_menu_search;
menu.add(Menu.NONE, MENU_ID_SEARCH, 0, textId)
- .setEnabled(mWifiP2pEnabled)
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+ .setEnabled(mWifiP2pEnabled);
menu.add(Menu.NONE, MENU_ID_RENAME, 0, R.string.wifi_p2p_menu_rename)
- .setEnabled(mWifiP2pEnabled)
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+ .setEnabled(mWifiP2pEnabled);
super.onCreateOptionsMenu(menu, inflater);
}
diff --git a/src/com/android/settings/wifi/tether/TetherService.java b/src/com/android/settings/wifi/tether/TetherService.java
index 3cfa7a1..4b39f67 100644
--- a/src/com/android/settings/wifi/tether/TetherService.java
+++ b/src/com/android/settings/wifi/tether/TetherService.java
@@ -40,11 +40,11 @@
import android.util.ArrayMap;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
public class TetherService extends Service {
private static final String TAG = "TetherService";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
index 02b5c51..3a85f7b 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java
@@ -21,12 +21,12 @@
import android.net.wifi.WifiConfiguration;
import android.util.Log;
-import com.android.settings.R;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
+import com.android.settings.R;
+
public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferenceController {
private static final String TAG = "WifiTetherApBandPref";
diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java
index d0c2270..01a0b57 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java
@@ -19,11 +19,11 @@
import android.content.Context;
import android.provider.Settings;
-import com.android.settings.core.BasePreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
+import com.android.settings.core.BasePreferenceController;
+
public class WifiTetherAutoOffPreferenceController extends BasePreferenceController implements
Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
index 59fd989..94e9209 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java
@@ -20,12 +20,12 @@
import android.net.ConnectivityManager;
import android.net.wifi.WifiManager;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
-
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+
public abstract class WifiTetherBasePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
index bbba316..8d9e858 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -20,15 +20,15 @@
import android.net.wifi.WifiConfiguration;
import android.text.TextUtils;
+import androidx.preference.EditTextPreference;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.widget.ValidatedEditTextPreference;
import com.android.settings.wifi.WifiUtils;
import java.util.UUID;
-import androidx.preference.EditTextPreference;
-import androidx.preference.Preference;
-
public class WifiTetherPasswordPreferenceController extends WifiTetherBasePreferenceController
implements ValidatedEditTextPreference.Validator {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
index a8b2dbf..2ae6b58 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java
@@ -26,6 +26,10 @@
import android.provider.Settings;
import android.text.BidiFormatter;
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin;
@@ -35,10 +39,6 @@
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
public class WifiTetherPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
index 5044281..fb2ce97 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java
@@ -20,12 +20,12 @@
import android.net.wifi.WifiConfiguration;
import android.util.Log;
-import com.android.settings.widget.ValidatedEditTextPreference;
-
import androidx.annotation.VisibleForTesting;
import androidx.preference.EditTextPreference;
import androidx.preference.Preference;
+import com.android.settings.widget.ValidatedEditTextPreference;
+
public class WifiTetherSSIDPreferenceController extends WifiTetherBasePreferenceController
implements ValidatedEditTextPreference.Validator {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
index 055ce96..f97a209 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java
@@ -3,11 +3,11 @@
import android.content.Context;
import android.net.wifi.WifiConfiguration;
-import com.android.settings.R;
-
import androidx.preference.ListPreference;
import androidx.preference.Preference;
+import com.android.settings.R;
+
public class WifiTetherSecurityPreferenceController extends WifiTetherBasePreferenceController {
private static final String PREF_KEY = "wifi_tether_security";
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 16908d6..647ba5a 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -30,6 +30,8 @@
import android.provider.SearchIndexableResource;
import android.util.Log;
+import androidx.annotation.VisibleForTesting;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -45,8 +47,6 @@
import java.util.Arrays;
import java.util.List;
-import androidx.annotation.VisibleForTesting;
-
@SearchIndexable
public class WifiTetherSettings extends RestrictedDashboardFragment
implements WifiTetherBasePreferenceController.OnTetherConfigUpdateListener {
@@ -99,6 +99,11 @@
super.onAttach(context);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mTetherChangeReceiver = new TetherChangeReceiver();
+
+ mSSIDPreferenceController = use(WifiTetherSSIDPreferenceController.class);
+ mSecurityPreferenceController = use(WifiTetherSecurityPreferenceController.class);
+ mPasswordPreferenceController = use(WifiTetherPasswordPreferenceController.class);
+ mApBandPreferenceController = use(WifiTetherApBandPreferenceController.class);
}
@Override
@@ -140,18 +145,17 @@
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
- final List<AbstractPreferenceController> controllers = new ArrayList<>();
- mSSIDPreferenceController = new WifiTetherSSIDPreferenceController(context, this);
- mSecurityPreferenceController = new WifiTetherSecurityPreferenceController(context, this);
- mPasswordPreferenceController = new WifiTetherPasswordPreferenceController(context, this);
- mApBandPreferenceController = new WifiTetherApBandPreferenceController(context, this);
+ return buildPreferenceControllers(context, this::onTetherConfigUpdated);
+ }
- controllers.add(mSSIDPreferenceController);
- controllers.add(mSecurityPreferenceController);
- controllers.add(mPasswordPreferenceController);
- controllers.add(mApBandPreferenceController);
- controllers.add(
- new WifiTetherAutoOffPreferenceController(context, KEY_WIFI_TETHER_AUTO_OFF));
+ private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
+ WifiTetherBasePreferenceController.OnTetherConfigUpdateListener listener) {
+ final List<AbstractPreferenceController> controllers = new ArrayList<>();
+ controllers.add(new WifiTetherSSIDPreferenceController(context, listener));
+ controllers.add(new WifiTetherSecurityPreferenceController(context, listener));
+ controllers.add(new WifiTetherPasswordPreferenceController(context, listener));
+ controllers.add(new WifiTetherApBandPreferenceController(context, listener));
+
return controllers;
}
@@ -227,6 +231,12 @@
keys.add(KEY_WIFI_TETHER_SCREEN);
return keys;
}
+
+ @Override
+ public List<AbstractPreferenceController> createPreferenceControllers(
+ Context context) {
+ return buildPreferenceControllers(context, null /* listener */);
+ }
};
@VisibleForTesting
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
index 594eec7..8d87b32 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
@@ -28,14 +28,14 @@
import android.os.Looper;
import android.provider.Settings;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.datausage.DataSaverBackend;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
-import androidx.annotation.VisibleForTesting;
-
public class WifiTetherSwitchBarController implements SwitchWidgetController.OnSwitchChangeListener,
LifecycleObserver, OnStart, OnStop, DataSaverBackend.Listener {
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index 37869e9..6f4deca 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -28,7 +28,9 @@
com.android.settings.bluetooth.BluetoothPairingDetail
com.android.settings.bluetooth.DevicePickerFragment
com.android.settings.datausage.AppDataUsage
+com.android.settings.datausage.AppDataUsageV2
com.android.settings.datausage.DataUsageList
+com.android.settings.datausage.DataUsageListV2
com.android.settings.datetime.timezone.TimeZoneSettings
com.android.settings.deviceinfo.PrivateVolumeSettings
com.android.settings.deviceinfo.PublicVolumeSettings
@@ -39,7 +41,6 @@
com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
com.android.settings.fuelgauge.AdvancedPowerUsageDetail
-com.android.settings.fuelgauge.BatteryHistoryDetail
com.android.settings.fuelgauge.InactiveApps
com.android.settings.fuelgauge.RestrictedAppDetails
com.android.settings.IccLockSettings
@@ -49,6 +50,7 @@
com.android.settings.localepicker.LocaleListEditor
com.android.settings.network.ApnEditor
com.android.settings.network.ApnSettings
+com.android.settings.network.telephony.NetworkSelectSettings
com.android.settings.notification.AppNotificationSettings
com.android.settings.notification.ChannelGroupNotificationSettings
com.android.settings.notification.ChannelNotificationSettings
diff --git a/tests/robotests/assets/grandfather_not_implementing_instrumentable b/tests/robotests/assets/grandfather_not_implementing_instrumentable
index 2c8ae5d..625d9ff 100644
--- a/tests/robotests/assets/grandfather_not_implementing_instrumentable
+++ b/tests/robotests/assets/grandfather_not_implementing_instrumentable
@@ -5,4 +5,5 @@
com.android.settings.password.ChooseLockPattern$SaveAndFinishWorker
com.android.settings.RestrictedListPreference$RestrictedListPreferenceDialogFragment
com.android.settings.password.ConfirmDeviceCredentialBaseFragment$LastTryDialog
-com.android.settings.password.CredentialCheckResultTracker
\ No newline at end of file
+com.android.settings.password.CredentialCheckResultTracker
+com.android.settings.dashboard.profileselector.ProfileSelectDialog
\ No newline at end of file
diff --git a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
index af663f4..64e0a01 100644
--- a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
+++ b/tests/robotests/assets/grandfather_not_in_search_index_provider_registry
@@ -1,3 +1,3 @@
-com.android.settings.accessibility.FontSizePreferenceFragmentForSetupWizard
+com.android.settings.display.FontSizePreferenceFragmentForSetupWizard
com.android.settings.display.ScreenZoomPreferenceFragmentForSetupWizard
com.android.settings.search.FakeSettingsFragment
diff --git a/tests/robotests/config/robolectric.properties b/tests/robotests/config/robolectric.properties
index d213eec..aae2779 100644
--- a/tests/robotests/config/robolectric.properties
+++ b/tests/robotests/config/robolectric.properties
@@ -1,3 +1,6 @@
manifest=packages/apps/Settings/AndroidManifest.xml
sdk=NEWEST_SDK
-shadows=com.android.settings.testutils.shadow.ShadowThreadUtils
\ No newline at end of file
+
+shadows=\
+ com.android.settings.testutils.shadow.ShadowThreadUtils,\
+ com.android.settingslib.testutils.shadow.ShadowXmlUtils
diff --git a/tests/robotests/res/layout/wifi_add_network_view.xml b/tests/robotests/res/layout/wifi_add_network_view.xml
new file mode 100644
index 0000000..b17e19d
--- /dev/null
+++ b/tests/robotests/res/layout/wifi_add_network_view.xml
@@ -0,0 +1,45 @@
+<?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.
+-->
+
+<!-- Since Robolectric can't inflate @*android:layout/alert_dialog_button_bar_material in
+ ../res/layout/wifi_add_network_view.xml, so this Layout overrides button bar part. -->
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <include
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ layout="@layout/wifi_dialog"/>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true">
+ <Button
+ android:id="@android:id/button2"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ <Button
+ android:id="@android:id/button1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"/>
+ </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index 676a8dd..6347d79 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -15,7 +15,6 @@
-->
<resources>
- <bool name="config_tintSettingIcon">false</bool>
<bool name="config_enableColorTemperature">false</bool>
<bool name="config_show_camera_laser_sensor">false</bool>
<bool name="config_show_connectivity_monitor">false</bool>
@@ -64,8 +63,16 @@
<bool name="config_disable_uninstall_update">true</bool>
<bool name="config_show_device_name">false</bool>
+ <!-- Whether or not extra preview panels should be used for screen zoom setting. -->
+ <bool name="config_enable_extra_screen_zoom_preview">false</bool>
+
<!-- List of a11y components on the device allowed to be enabled by Settings Slices -->
<string-array name="config_settings_slices_accessibility_components" translatable="false">
<item>fake_package/fake_service</item>
</string-array>
+
+ <!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
+ <string-array name="slice_whitelist_package_names" translatable="false">
+ <item>com.android.settings.slice_whitelist_package</item>
+ </string-array>
</resources>
diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml
index bbf2520..1252ece 100644
--- a/tests/robotests/res/values/config.xml
+++ b/tests/robotests/res/values/config.xml
@@ -21,4 +21,8 @@
<bool name="config_show_connectivity_monitor">true</bool>
<bool name="config_display_recent_apps">true</bool>
<bool name="config_wifi_support_connected_mac_randomization">true</bool>
+
+ <!-- Fake dimen value for restricted icon size - needed to get around Robolectric
+ issue loading framework hidden resources -->
+ <dimen name="restricted_icon_size">24dp</dimen>
</resources>
\ No newline at end of file
diff --git a/tests/robotests/res/values/themes.xml b/tests/robotests/res/values/themes.xml
index 9a247f6..7bfbe10 100644
--- a/tests/robotests/res/values/themes.xml
+++ b/tests/robotests/res/values/themes.xml
@@ -6,5 +6,24 @@
<!-- Override the main app's style for ActionPrimaryButton to get around lack of new style
support in robolectric -->
- <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button" />
+ <style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button"/>
+
+ <!-- Test version of Theme.Settings.Home. Needed to build homepage activity in Robolectric -->
+ <style name="Theme.Settings.Home" parent="Theme.AppCompat.DayNight.NoActionBar">
+ <item name="colorPrimary">#ffffff</item>
+ <item name="colorPrimaryDark">#ffffff</item>
+ <item name="colorAccent">#ffffff</item>
+ <item name="preferenceTheme">@style/PreferenceTheme</item>
+ <item name="android:windowLightStatusBar">true</item>
+ </style>
+
+ <style name="ThemeOverlay.SwitchBar.Settings" parent="@android:style/ThemeOverlay.Material.ActionBar">
+ <item name="android:textColorPrimary">@android:color/white</item>
+ <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>
+ <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>
+ <item name="switchBarBackgroundColor">@color/switch_bar_background</item>
+ <item name="switchBarBackgroundActivatedColor">?android:attr/colorAccent</item>
+ <item name="switchBarRestrictionIcon">@drawable/ic_help</item>
+ </style>
+
</resources>
diff --git a/tests/robotests/res/xml-mcc998/location_settings.xml b/tests/robotests/res/xml-mcc998/location_settings.xml
index f61ca63..16f0d82 100644
--- a/tests/robotests/res/xml-mcc998/location_settings.xml
+++ b/tests/robotests/res/xml-mcc998/location_settings.xml
@@ -25,13 +25,15 @@
android:title="title"
android:icon="@drawable/ic_android"
android:summary="summary1"
- settings:controller="com.android.settings.core.BadPreferenceController"/>
+ settings:controller="com.android.settings.core.BadPreferenceController"
+ settings:allowDynamicSummaryInSlice="true"/>
<Preference
android:key="key2"
android:title="title"
android:icon="@drawable/ic_android"
android:summary="summary2"
- settings:controller="com.android.settings.slices.FakePreferenceController"/>
+ settings:controller="com.android.settings.slices.FakePreferenceController"
+ settings:allowDynamicSummaryInSlice="true"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/tests/robotests/res/xml-mcc999/display_settings.xml b/tests/robotests/res/xml-mcc999/display_settings.xml
index 8c5d47a..fccad7f 100644
--- a/tests/robotests/res/xml-mcc999/display_settings.xml
+++ b/tests/robotests/res/xml-mcc999/display_settings.xml
@@ -59,5 +59,6 @@
android:title="pref_title_5"
android:summaryOn="summary_on"
android:summaryOff="summary_off"
+ settings:searchable="false"
settings:keywords="keywords1, keywords2, keywords3" />
</PreferenceScreen>
\ No newline at end of file
diff --git a/tests/robotests/res/xml-mcc999/location_settings.xml b/tests/robotests/res/xml-mcc999/location_settings.xml
index da71a1e..91e4c41 100644
--- a/tests/robotests/res/xml-mcc999/location_settings.xml
+++ b/tests/robotests/res/xml-mcc999/location_settings.xml
@@ -26,6 +26,7 @@
android:summary="summary"
settings:controller="com.android.settings.slices.FakePreferenceController"
settings:keywords="a, b, c"
- settings:platform_slice="true"/>
+ settings:platform_slice="true"
+ settings:allowDynamicSummaryInSlice="true"/>
</PreferenceScreen>
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
index c7f366e..174f5ab 100644
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ b/tests/robotests/src/com/android/settings/MasterClearTest.java
@@ -17,7 +17,7 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
+
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -48,7 +48,8 @@
import android.widget.LinearLayout;
import android.widget.ScrollView;
-import com.android.settings.testutils.Robolectric;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -58,12 +59,11 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowActivity;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowUtils.class)
public class MasterClearTest {
@@ -122,8 +122,8 @@
verify(context).startActivity(intent.capture());
assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
- .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
- .isTrue();
+ .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
+ .isTrue();
}
@Test
@@ -139,8 +139,8 @@
verify(context).startActivity(intent.capture());
assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
- .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
- .isFalse();
+ .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
+ .isFalse();
}
@Test
@@ -210,11 +210,10 @@
ShadowUtils.setIsDemoUser(true);
final ComponentName componentName =
- ComponentName.unflattenFromString("com.android.retaildemo/.DeviceAdminReceiver");
+ ComponentName.unflattenFromString("com.android.retaildemo/.DeviceAdminReceiver");
ShadowUtils.setDeviceOwnerComponent(componentName);
- mMasterClear.mInitiateListener
- .onClick(mContentView.findViewById(R.id.initiate_master_clear));
+ mMasterClear.mInitiateListener.onClick(mContentView);
final Intent intent = mShadowActivity.getNextStartedActivity();
assertThat(Intent.ACTION_FACTORY_RESET).isEqualTo(intent.getAction());
assertThat(componentName).isNotNull();
@@ -240,7 +239,8 @@
doNothing().when(mMasterClear).establishInitialState();
mMasterClear
- .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_CANCELED, null);
+ .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_CANCELED,
+ null);
verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
verify(mMasterClear, times(1)).establishInitialState();
@@ -255,7 +255,7 @@
doNothing().when(mMasterClear).showAccountCredentialConfirmation(eq(mMockIntent));
mMasterClear
- .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
+ .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
verify(mMasterClear, times(0)).establishInitialState();
@@ -270,7 +270,7 @@
doNothing().when(mMasterClear).showFinalConfirmation();
mMasterClear
- .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
+ .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
verify(mMasterClear, times(0)).establishInitialState();
@@ -281,14 +281,14 @@
@Test
public void testOnActivityResultInternal_confirmRequestTriggeringShowFinal() {
doReturn(true).when(mMasterClear)
- .isValidRequestCode(eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
+ .isValidRequestCode(eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
doNothing().when(mMasterClear).showFinalConfirmation();
mMasterClear.onActivityResultInternal(
- MasterClear.CREDENTIAL_CONFIRM_REQUEST, Activity.RESULT_OK, null);
+ MasterClear.CREDENTIAL_CONFIRM_REQUEST, Activity.RESULT_OK, null);
verify(mMasterClear, times(1))
- .isValidRequestCode(eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
+ .isValidRequestCode(eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
verify(mMasterClear, times(0)).establishInitialState();
verify(mMasterClear, times(0)).getAccountConfirmationIntent();
verify(mMasterClear, times(1)).showFinalConfirmation();
@@ -306,9 +306,9 @@
when(mMasterClear.getActivity()).thenReturn(mMockActivity);
when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
when(mMockActivity.getString(R.string.account_confirmation_package))
- .thenReturn(TEST_CONFIRMATION_PACKAGE);
+ .thenReturn(TEST_CONFIRMATION_PACKAGE);
when(mMockActivity.getString(R.string.account_confirmation_class))
- .thenReturn(TEST_CONFIRMATION_CLASS);
+ .thenReturn(TEST_CONFIRMATION_CLASS);
Account[] accounts = new Account[0];
when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
@@ -321,10 +321,10 @@
when(mMasterClear.getActivity()).thenReturn(mMockActivity);
when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
when(mMockActivity.getString(R.string.account_confirmation_package))
- .thenReturn(TEST_CONFIRMATION_PACKAGE);
+ .thenReturn(TEST_CONFIRMATION_PACKAGE);
when(mMockActivity.getString(R.string.account_confirmation_class))
- .thenReturn(TEST_CONFIRMATION_CLASS);
- Account[] accounts = new Account[] { new Account(TEST_ACCOUNT_NAME, TEST_ACCOUNT_TYPE) };
+ .thenReturn(TEST_CONFIRMATION_CLASS);
+ Account[] accounts = new Account[]{new Account(TEST_ACCOUNT_NAME, TEST_ACCOUNT_TYPE)};
when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts);
// The package manager should not resolve the confirmation intent targeting the non-existent
@@ -339,11 +339,11 @@
// Only try to show account confirmation if the appropriate resource overlays are available.
when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
when(mMockActivity.getString(R.string.account_confirmation_package))
- .thenReturn(TEST_CONFIRMATION_PACKAGE);
+ .thenReturn(TEST_CONFIRMATION_PACKAGE);
when(mMockActivity.getString(R.string.account_confirmation_class))
- .thenReturn(TEST_CONFIRMATION_CLASS);
+ .thenReturn(TEST_CONFIRMATION_CLASS);
// Add accounts to trigger the search for a resolving intent.
- Account[] accounts = new Account[] { new Account(TEST_ACCOUNT_NAME, TEST_ACCOUNT_TYPE) };
+ Account[] accounts = new Account[]{new Account(TEST_ACCOUNT_NAME, TEST_ACCOUNT_TYPE)};
when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts);
// The package manager should not resolve the confirmation intent targeting the non-existent
@@ -357,25 +357,28 @@
when(mPackageManager.resolveActivity(any(), eq(0))).thenReturn(resolveInfo);
Intent actualIntent = mMasterClear.getAccountConfirmationIntent();
- assertEquals(TEST_CONFIRMATION_PACKAGE, actualIntent.getComponent().getPackageName());
- assertEquals(TEST_CONFIRMATION_CLASS, actualIntent.getComponent().getClassName());
+ assertThat(TEST_CONFIRMATION_PACKAGE).isEqualTo(
+ actualIntent.getComponent().getPackageName());
+ assertThat(TEST_CONFIRMATION_CLASS).isEqualTo(actualIntent.getComponent().getClassName());
}
@Test
public void testShowAccountCredentialConfirmation() {
// Finally mock out the startActivityForResultCall
doNothing().when(mMasterClear)
- .startActivityForResult(eq(mMockIntent), eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
+ .startActivityForResult(eq(mMockIntent),
+ eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
mMasterClear.showAccountCredentialConfirmation(mMockIntent);
verify(mMasterClear, times(1))
- .startActivityForResult(eq(mMockIntent), eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
+ .startActivityForResult(eq(mMockIntent),
+ eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
}
@Test
public void testIsValidRequestCode() {
assertThat(mMasterClear.isValidRequestCode(MasterClear.KEYGUARD_REQUEST)).isTrue();
assertThat(mMasterClear.isValidRequestCode(MasterClear.CREDENTIAL_CONFIRM_REQUEST))
- .isTrue();
+ .isTrue();
assertThat(mMasterClear.isValidRequestCode(0)).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java
index 8753b1d..a10a4a4 100644
--- a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java
+++ b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java
@@ -17,6 +17,7 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.app.Activity;
diff --git a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java
index e4e9710..42fa79f 100644
--- a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java
@@ -16,12 +16,14 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.RuntimeEnvironment.application;
+import android.app.Activity;
import android.app.KeyguardManager;
import android.content.Intent;
import android.os.Bundle;
@@ -34,6 +36,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowKeyguardManager;
@@ -42,8 +45,8 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(
shadows = {
- ShadowUserManager.class,
- ShadowKeyguardManager.class,
+ ShadowUserManager.class,
+ ShadowKeyguardManager.class,
})
public class RestrictedListPreferenceTest {
private static final int PROFILE_USER_ID = 11;
@@ -51,6 +54,7 @@
private static final int UNLAUNCHABLE_REASON_QUIET_MODE = 1;
private static final String EXTRA_UNLAUNCHABLE_REASON = "unlaunchable_reason";
+ private Activity mActivity;
private ShadowUserManager mShadowUserManager;
private ShadowKeyguardManager mShadowKeyguardManager;
private RestrictedListPreference mPreference;
@@ -58,11 +62,12 @@
@Before
public void setUp() {
+ mActivity = Robolectric.setupActivity(Activity.class);
mShadowKeyguardManager =
Shadows.shadowOf(application.getSystemService(KeyguardManager.class));
mMockHelper = mock(RestrictedPreferenceHelper.class);
mShadowUserManager = ShadowUserManager.getShadow();
- mPreference = new RestrictedListPreference(application, mock(AttributeSet.class));
+ mPreference = new RestrictedListPreference(mActivity, mock(AttributeSet.class));
mPreference.setProfileUserId(PROFILE_USER_ID);
ReflectionHelpers.setField(mPreference, "mHelper", mMockHelper);
}
@@ -79,7 +84,7 @@
// Make sure that the performClick method on the helper is never reached.
verify(mMockHelper, never()).performClick();
// Assert that a CONFIRM_DEVICE_CREDENTIAL intent has been started.
- Intent started = Shadows.shadowOf(application).getNextStartedActivity();
+ Intent started = Shadows.shadowOf(mActivity).getNextStartedActivity();
assertThat(started.getExtras().getInt(Intent.EXTRA_USER_ID)).isEqualTo(PROFILE_USER_ID);
assertThat(started.getAction())
.isEqualTo(KeyguardManager.ACTION_CONFIRM_DEVICE_CREDENTIAL_WITH_USER);
@@ -94,7 +99,7 @@
// Make sure that the performClick method on the helper is never reached.
verify(mMockHelper, never()).performClick();
// Assert that a new intent for enabling the work profile is started.
- Intent started = Shadows.shadowOf(application).getNextStartedActivity();
+ Intent started = Shadows.shadowOf(mActivity).getNextStartedActivity();
Bundle extras = started.getExtras();
int reason = extras.getInt(EXTRA_UNLAUNCHABLE_REASON);
assertThat(reason).isEqualTo(UNLAUNCHABLE_REASON_QUIET_MODE);
diff --git a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java
index 73be107..761b3f1 100644
--- a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java
@@ -22,6 +22,8 @@
import android.app.Activity;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -30,8 +32,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.appcompat.app.AlertDialog;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RestrictedSettingsFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/SettingsActivityTest.java b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
index 3d529e4..af25f48 100644
--- a/tests/robotests/src/com/android/settings/SettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsActivityTest.java
@@ -17,6 +17,7 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -30,6 +31,11 @@
import android.os.Bundle;
import android.provider.Settings.Global;
import android.view.View;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.android.settings.core.OnActivityResultListener;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -44,10 +50,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SettingsActivityTest {
@@ -69,20 +71,20 @@
@Test
public void onCreate_deviceNotProvisioned_shouldDisableSearch() {
Global.putInt(mContext.getContentResolver(), Global.DEVICE_PROVISIONED, 0);
- final Intent intent = new Intent(mContext, Settings.class);
- final SettingsActivity activity =
- Robolectric.buildActivity(SettingsActivity.class, intent).create(Bundle.EMPTY).get();
+ final SettingsActivity activity = Robolectric.buildActivity(SettingsActivity.class)
+ .create(Bundle.EMPTY)
+ .get();
assertThat(activity.findViewById(R.id.search_bar).getVisibility())
- .isEqualTo(View.INVISIBLE);
+ .isEqualTo(View.INVISIBLE);
}
@Test
public void onCreate_deviceProvisioned_shouldEnableSearch() {
Global.putInt(mContext.getContentResolver(), Global.DEVICE_PROVISIONED, 1);
- final Intent intent = new Intent(mContext, Settings.class);
- final SettingsActivity activity =
- Robolectric.buildActivity(SettingsActivity.class, intent).create(Bundle.EMPTY).get();
+ final SettingsActivity activity = Robolectric.buildActivity(SettingsActivity.class)
+ .create(Bundle.EMPTY)
+ .get();
assertThat(activity.findViewById(R.id.search_bar).getVisibility()).isEqualTo(View.VISIBLE);
}
@@ -90,6 +92,7 @@
@Test
public void launchSettingFragment_nullExtraShowFragment_shouldNotCrash() {
when(mActivity.getSupportFragmentManager()).thenReturn(mFragmentManager);
+ doReturn(mContext.getContentResolver()).when(mActivity).getContentResolver();
when(mFragmentManager.beginTransaction()).thenReturn(mock(FragmentTransaction.class));
doReturn(RuntimeEnvironment.application.getClassLoader()).when(mActivity).getClassLoader();
diff --git a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
index f9409f4..ed0e5a0 100644
--- a/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDialogFragmentTest.java
@@ -22,6 +22,8 @@
import android.app.Dialog;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -31,8 +33,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.Fragment;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SettingsDialogFragmentTest {
@@ -51,8 +51,8 @@
public void testGetMetrics_shouldGetMetricFromDialogCreatable() {
when(mDialogCreatable.getDialogMetricsCategory(DIALOG_ID)).thenReturn(1);
- mDialogFragment =
- new SettingsPreferenceFragment.SettingsDialogFragment(mDialogCreatable, DIALOG_ID);
+ mDialogFragment = SettingsPreferenceFragment.SettingsDialogFragment.newInstance(
+ mDialogCreatable, DIALOG_ID);
mDialogFragment.onAttach(RuntimeEnvironment.application);
mDialogFragment.getMetricsCategory();
@@ -65,8 +65,8 @@
when(mDialogCreatable.getDialogMetricsCategory(DIALOG_ID)).thenReturn(-1);
try {
- mDialogFragment =
- new SettingsPreferenceFragment.SettingsDialogFragment(mDialogCreatable, DIALOG_ID);
+ mDialogFragment = SettingsPreferenceFragment.SettingsDialogFragment.newInstance(
+ mDialogCreatable, DIALOG_ID);
mDialogFragment.onAttach(RuntimeEnvironment.application);
fail("Should fail with IllegalStateException");
} catch (IllegalStateException e) {
diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
index 2538080..6015e27 100644
--- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java
@@ -16,6 +16,7 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
@@ -28,6 +29,8 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import androidx.annotation.NonNull;
+
import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -43,8 +46,6 @@
import java.io.OutputStream;
import java.io.PrintWriter;
-import androidx.annotation.NonNull;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SettingsDumpServiceTest {
diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
index 281a6c9..8989317 100644
--- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
@@ -17,6 +17,7 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
index 1316545..6848793 100644
--- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java
@@ -17,17 +17,23 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
+
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.Context;
import android.os.Bundle;
import android.view.View;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -41,12 +47,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SettingsPreferenceFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
index f2bd79c..beabd15 100644
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
@@ -16,7 +16,6 @@
package com.android.settings;
-import static com.android.settings.testutils.ResIdSubject.assertResId;
import static com.google.common.truth.Truth.assertThat;
import android.content.Intent;
@@ -32,7 +31,7 @@
public class SetupWizardUtilsTest {
@Test
- public void testCopySetupExtras() throws Throwable {
+ public void testCopySetupExtras() {
Intent fromIntent = new Intent();
final String theme = "TEST_THEME";
fromIntent.putExtra(WizardManagerHelper.EXTRA_THEME, theme);
@@ -52,7 +51,7 @@
Intent intent = new Intent();
intent.putExtra(WizardManagerHelper.EXTRA_THEME, WizardManagerHelper.THEME_GLIF_V2);
- assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
+ assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
}
@Test
@@ -61,7 +60,7 @@
WizardManagerHelper.THEME_GLIF_V2_LIGHT);
Intent intent = new Intent();
- assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
+ assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
}
@Test
@@ -70,8 +69,8 @@
WizardManagerHelper.THEME_GLIF_V3_LIGHT);
Intent intent = new Intent();
- assertResId(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light);
- assertResId(SetupWizardUtils.getTransparentTheme(intent))
+ assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light);
+ assertThat(SetupWizardUtils.getTransparentTheme(intent))
.isEqualTo(R.style.GlifV3Theme_Light_Transparent);
}
}
diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
index 36736ce..3cb9c4c 100644
--- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java
@@ -23,6 +23,8 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -32,8 +34,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResourcesImpl.class)
public class SummaryPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
index 7ccb219..269e52d 100644
--- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java
index 92aedcf..5f2abba 100644
--- a/tests/robotests/src/com/android/settings/UtilsTest.java
+++ b/tests/robotests/src/com/android/settings/UtilsTest.java
@@ -17,6 +17,7 @@
package com.android.settings;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Matchers.anyString;
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
index 8957f85..06fd1fc 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityHearingAidPreferenceControllerTest.java
@@ -25,13 +25,13 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.Activity;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothHearingAid;
import android.bluetooth.BluetoothManager;
import android.bluetooth.BluetoothProfile;
import android.content.BroadcastReceiver;
-import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
@@ -39,11 +39,11 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.HearingAidProfile;
-import com.android.settingslib.bluetooth.LocalBluetoothAdapter;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
@@ -53,25 +53,26 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {ShadowBluetoothUtils.class})
+@Config(shadows = {ShadowBluetoothAdapter.class, ShadowBluetoothUtils.class})
public class AccessibilityHearingAidPreferenceControllerTest {
private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1";
private static final String TEST_DEVICE_NAME = "TEST_HEARING_AID_BT_DEVICE_NAME";
private static final String HEARING_AID_PREFERENCE = "hearing_aid_preference";
private BluetoothAdapter mBluetoothAdapter;
+ private ShadowBluetoothAdapter mShadowBluetoothAdapter;
private BluetoothManager mBluetoothManager;
private BluetoothDevice mBluetoothDevice;
- private Context mContext;
+ private Activity mContext;
private Preference mHearingAidPreference;
- private List<Integer> mProfileSupportedList;
private AccessibilityHearingAidPreferenceController mPreferenceController;
@Mock
@@ -79,8 +80,6 @@
@Mock
private CachedBluetoothDeviceManager mCachedDeviceManager;
@Mock
- private LocalBluetoothAdapter mLocalBluetoothAdapter;
- @Mock
private LocalBluetoothManager mLocalBluetoothManager;
@Mock
private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
@@ -90,7 +89,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = spy(Robolectric.setupActivity(Activity.class));
setupBluetoothEnvironment();
setupHearingAidEnvironment();
mHearingAidPreference = new Preference(mContext);
@@ -146,8 +145,8 @@
}
@Test
- public void handleHearingAidPreferenceClick_withHearingAid_launchBluetoothDeviceDetailSetting()
- {
+ public void handleHearingAidPreferenceClick_withHearingAid_launchBluetoothDeviceDetailSetting
+ () {
mPreferenceController = spy(new AccessibilityHearingAidPreferenceController(mContext,
HEARING_AID_PREFERENCE));
mPreferenceController.setPreference(mHearingAidPreference);
@@ -161,8 +160,9 @@
@Test
public void onNotSupportHearingAidProfile_doNotDoReceiverOperation() {
//clear bluetooth supported profile
- mProfileSupportedList.clear();
- mPreferenceController = new AccessibilityHearingAidPreferenceController(mContext, HEARING_AID_PREFERENCE);
+ mShadowBluetoothAdapter.clearSupportedProfiles();
+ mPreferenceController = new AccessibilityHearingAidPreferenceController(mContext,
+ HEARING_AID_PREFERENCE);
mPreferenceController.setPreference(mHearingAidPreference);
//not call registerReceiver()
mPreferenceController.onResume();
@@ -178,18 +178,17 @@
mLocalBluetoothManager = ShadowBluetoothUtils.getLocalBtManager(mContext);
mBluetoothManager = new BluetoothManager(mContext);
mBluetoothAdapter = mBluetoothManager.getAdapter();
- when(mLocalBluetoothManager.getBluetoothAdapter()).thenReturn(mLocalBluetoothAdapter);
- when(mLocalBluetoothAdapter.isEnabled()).thenReturn(true);
when(mLocalBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
when(mLocalBluetoothManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
when(mLocalBluetoothProfileManager.getHearingAidProfile()).thenReturn(mHearingAidProfile);
}
private void setupHearingAidEnvironment() {
+ mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+ mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
mBluetoothDevice = mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS);
- mProfileSupportedList = new ArrayList<Integer>();
- mProfileSupportedList.add(BluetoothProfile.HEARING_AID);
- when(mLocalBluetoothAdapter.getSupportedProfiles()).thenReturn(mProfileSupportedList);
+ mShadowBluetoothAdapter.enable();
+ mShadowBluetoothAdapter.addSupportedProfiles(BluetoothProfile.HEARING_AID);
when(mCachedDeviceManager.findDevice(mBluetoothDevice)).thenReturn(mCachedBluetoothDevice);
when(mCachedBluetoothDevice.getName()).thenReturn(TEST_DEVICE_NAME);
when(mCachedBluetoothDevice.isConnectedHearingAidDevice()).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index db03833..cb2aa8b 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -25,6 +26,8 @@
import android.os.Vibrator;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
@@ -37,8 +40,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AccessibilitySettingsTest {
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java
index afdeed4..b00d64d 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
import android.accessibilityservice.AccessibilityServiceInfo;
diff --git a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java
index ef67f65..2648a50 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceControllerTest.java
@@ -18,11 +18,14 @@
import static com.android.settings.accessibility.ColorInversionPreferenceController.OFF;
import static com.android.settings.accessibility.ColorInversionPreferenceController.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 com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,8 +35,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ColorInversionPreferenceControllerTest {
private static final int UNKNOWN = -1;
@@ -58,7 +59,7 @@
@Test
public void isChecked_enabled() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, ON);
mController.updateState(mPreference);
@@ -69,7 +70,7 @@
@Test
public void isChecked_disabled() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, OFF);
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java
index 30cf139..96b0323 100644
--- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java
@@ -20,6 +20,8 @@
import android.content.Context;
+import androidx.lifecycle.LifecycleOwner;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -30,8 +32,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class HapticFeedbackIntensityPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java
index b4b76d8..a143d25 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java
@@ -18,11 +18,14 @@
import static com.android.settings.accessibility.MagnificationPreferenceFragment.OFF;
import static com.android.settings.accessibility.MagnificationPreferenceFragment.ON;
+
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,8 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class MagnificationGesturesPreferenceControllerTest {
@@ -59,13 +60,13 @@
@Test
public void updateState_shouldRefreshSummary() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, ON);
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.accessibility_feature_state_on));
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF);
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
@@ -83,7 +84,7 @@
@Test
public void isChecked_enabled() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, ON);
assertThat(mController.isChecked()).isTrue();
@@ -91,7 +92,7 @@
@Test
public void isChecked_disabled() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF);
assertThat(mController.isChecked()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java
index 4362759..89a7884 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java
@@ -19,13 +19,17 @@
import static com.android.settings.accessibility.MagnificationPreferenceFragment.OFF;
import static com.android.settings.accessibility.MagnificationPreferenceFragment.ON;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.content.res.Resources;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -40,8 +44,6 @@
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.Resetter;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class MagnificationNavbarPreferenceControllerTest {
@@ -83,13 +85,13 @@
@Test
public void updateState_shouldRefreshSummary() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, ON);
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getText(R.string.accessibility_feature_state_on));
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, OFF);
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
@@ -107,7 +109,7 @@
@Test
public void isChecked_enabled() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, ON);
assertThat(mController.isChecked()).isTrue();
@@ -115,7 +117,7 @@
@Test
public void isChecked_disabled() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED, OFF);
assertThat(mController.isChecked()).isFalse();
@@ -149,7 +151,7 @@
}
@Implementation
- static boolean isApplicable(Resources res) {
+ protected static boolean isApplicable(Resources res) {
return sIsApplicable;
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java
index f344f5a..3a7fd56 100644
--- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.accessibility;
import static android.provider.Settings.System.NOTIFICATION_VIBRATION_INTENSITY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -26,6 +28,10 @@
import android.os.Vibrator;
import android.provider.Settings;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,10 +44,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NotificationVibrationIntensityPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
index 1fe64c7..26b3a6c 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.accessibility;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index eb63d9c..bfc176f 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -25,17 +25,18 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.XmlRes;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
-
-import androidx.annotation.XmlRes;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
@@ -46,7 +47,8 @@
@Test
public void createFragment_shouldOnlyAddPreferencesOnce() {
mFragment = spy(new ToggleFeaturePreferenceFragmentTestable());
- FragmentTestUtils.startFragment(mFragment);
+ FragmentController.setupFragment(mFragment, FragmentActivity.class, 0 /* containerViewId*/,
+ null /* bundle */);
// execute exactly once
verify(mFragment).addPreferencesFromResource(R.xml.placeholder_prefs);
diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java
index 44b1bc8..a44b62b 100644
--- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java
@@ -21,7 +21,9 @@
import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_MEDIUM;
import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_OFF;
import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
index 40dcf7a..41ac450 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
@@ -15,40 +15,20 @@
*/
package com.android.settings.accounts;
-import static com.android.settings.accounts.AccountDashboardFragmentTest
- .ShadowAuthenticationHelper.LABELS;
-import static com.android.settings.accounts.AccountDashboardFragmentTest
- .ShadowAuthenticationHelper.TYPES;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import android.content.Context;
-import android.os.UserHandle;
import android.provider.SearchIndexableResource;
-import android.text.TextUtils;
-import com.android.settings.R;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.accounts.AuthenticatorHelper;
import com.android.settingslib.drawer.CategoryKey;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
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 java.util.List;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AccountDashboardFragmentTest {
@@ -59,67 +39,12 @@
mFragment = new AccountDashboardFragment();
}
- @After
- public void tearDown() {
- ShadowAuthenticationHelper.reset();
- }
-
@Test
public void testCategory_isAccount() {
assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_ACCOUNT);
}
@Test
- @Config(shadows = {
- ShadowAuthenticationHelper.class
- })
- public void updateSummary_hasAccount_shouldDisplayUpTo3AccountTypes() {
- final SummaryLoader loader = mock(SummaryLoader.class);
- final FragmentActivity activity = Robolectric.buildActivity(
- FragmentActivity.class).setup().get();
-
- final SummaryLoader.SummaryProvider provider =
- AccountDashboardFragment.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(activity,
- loader);
- provider.setListening(true);
-
- verify(loader).setSummary(provider, LABELS[0] + ", " + LABELS[1] + ", and " + LABELS[2]);
- }
-
- @Test
- @Config(shadows = ShadowAuthenticationHelper.class)
- public void updateSummary_noAccount_shouldDisplayDefaultSummary() {
- ShadowAuthenticationHelper.setEnabledAccount(null);
- final SummaryLoader loader = mock(SummaryLoader.class);
- final FragmentActivity activity = Robolectric.buildActivity(FragmentActivity.class).setup().get();
-
- final SummaryLoader.SummaryProvider provider =
- AccountDashboardFragment.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(activity,
- loader);
- provider.setListening(true);
-
- verify(loader).setSummary(provider,
- activity.getString(R.string.account_dashboard_default_summary));
- }
-
- @Test
- @Config(shadows = ShadowAuthenticationHelper.class)
- public void updateSummary_noAccountTypeLabel_shouldNotDisplayNullEntry() {
- final SummaryLoader loader = mock(SummaryLoader.class);
- final FragmentActivity activity = Robolectric.buildActivity(FragmentActivity.class).setup().get();
- final String[] enabledAccounts = {TYPES[0], "unlabeled_account_type", TYPES[1]};
- ShadowAuthenticationHelper.setEnabledAccount(enabledAccounts);
-
- final SummaryLoader.SummaryProvider provider =
- AccountDashboardFragment.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(activity,
- loader);
- provider.setListening(true);
-
- // should only show the 2 accounts with labels
- verify(loader).setSummary(provider, LABELS[0] + " and " + LABELS[1]);
- }
-
- @Test
public void testSearchIndexProvider_shouldIndexResource() {
final List<SearchIndexableResource> indexRes =
AccountDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
@@ -129,43 +54,5 @@
assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
}
- @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;
-
- public 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
- public String[] getEnabledAccountTypes() {
- return sEnabledAccount;
- }
-
- @Implementation
- public 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/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
index 88ed112..2648916 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java
@@ -15,40 +15,55 @@
*/
package com.android.settings.accounts;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_KEYHINT;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_TITLE;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.accounts.Account;
-import android.app.Activity;
+import android.accounts.AccountManager;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
import android.os.Bundle;
import android.os.UserHandle;
+import android.os.UserManager;
+import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.dashboard.DashboardFeatureProviderImpl;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowAccountManager;
+import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.drawer.CategoryKey;
import com.android.settingslib.drawer.Tile;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowAccountManager.class, ShadowUserManager.class})
public class AccountDetailDashboardFragmentTest {
private static final String METADATA_CATEGORY = "com.android.settings.category";
@@ -63,15 +78,23 @@
public void setUp() {
mContext = RuntimeEnvironment.application;
mActivityInfo = new ActivityInfo();
+ mActivityInfo.packageName = mContext.getPackageName();
+ mActivityInfo.name = "clazz";
mActivityInfo.metaData = new Bundle();
final Bundle args = new Bundle();
args.putParcelable(METADATA_USER_HANDLE, UserHandle.CURRENT);
- mFragment = new AccountDetailDashboardFragment();
+ mFragment = spy(new AccountDetailDashboardFragment());
mFragment.setArguments(args);
mFragment.mAccountType = "com.abc";
mFragment.mAccount = new Account("name1@abc.com", "com.abc");
+ when(mFragment.getContext()).thenReturn(mContext);
+ }
+
+ @After
+ public void tearDown() {
+ ShadowAccountManager.reset();
}
@Test
@@ -116,25 +139,70 @@
.thenReturn(mock(ResolveInfo.class));
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_ACCOUNT_DETAIL);
- tile.key = "key";
+ mActivityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "key");
mActivityInfo.metaData.putString(METADATA_CATEGORY, CategoryKey.CATEGORY_ACCOUNT);
mActivityInfo.metaData.putString(METADATA_ACCOUNT_TYPE, "com.abc");
+ mActivityInfo.metaData.putString(META_DATA_PREFERENCE_TITLE, "summary");
mActivityInfo.metaData.putString("com.android.settings.intent.action",
Intent.ACTION_ASSIST);
- tile.intent = new Intent();
tile.userHandle = null;
mFragment.displayTile(tile);
- final Activity activity = Robolectric.setupActivity(Activity.class);
+ final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
final Preference preference = new Preference(mContext);
- dashboardFeatureProvider.bindPreferenceToTile(activity,
- MetricsProto.MetricsEvent.DASHBOARD_SUMMARY, preference, tile, "key",
+ dashboardFeatureProvider.bindPreferenceToTile(activity, false /* forceRoundedIcon */,
+ MetricsProto.MetricsEvent.DASHBOARD_SUMMARY, preference, tile, null /* key */,
Preference.DEFAULT_ORDER);
+ assertThat(preference.getKey()).isEqualTo(tile.getKey(mContext));
preference.performClick();
final Intent intent = Shadows.shadowOf(activity).getNextStartedActivityForResult().intent;
assertThat(intent.getStringExtra("extra.accountName")).isEqualTo("name1@abc.com");
}
+
+ @Test
+ public void onResume_accountMissing_shouldFinish() {
+ ShadowUserManager userManager = Shadow.extract(
+ mContext.getSystemService(UserManager.class));
+ ShadowAccountManager acctMgr = Shadow.extract(
+ mContext.getSystemService(AccountManager.class));
+
+ userManager.addProfile(new UserInfo(1, null, 0));
+ acctMgr.addAccountForUser(1, new Account("test@test.com", "com.test"));
+
+ mFragment.finishIfAccountMissing();
+ verify(mFragment).finish();
+ }
+
+ @Test
+ public void onResume_accountPresentOneProfile_shouldNotFinish() {
+ ShadowUserManager userManager = Shadow.extract(
+ mContext.getSystemService(UserManager.class));
+ ShadowAccountManager acctMgr = Shadow.extract(
+ mContext.getSystemService(AccountManager.class));
+
+ userManager.addProfile(new UserInfo(1, null, 0));
+ acctMgr.addAccountForUser(1, mFragment.mAccount);
+
+ mFragment.finishIfAccountMissing();
+ verify(mFragment, never()).finish();
+ }
+
+ @Test
+ public void onResume_accountPresentTwoProfiles_shouldNotFinish() {
+ ShadowUserManager userManager = Shadow.extract(
+ mContext.getSystemService(UserManager.class));
+ ShadowAccountManager acctMgr = Shadow.extract(
+ mContext.getSystemService(AccountManager.class));
+
+ userManager.addProfile(new UserInfo(1, null, 0));
+ userManager.addProfile(new UserInfo(2, null, 0));
+ acctMgr.addAccountForUser(1, new Account("test@test.com", "com.test"));
+ acctMgr.addAccountForUser(2, mFragment.mAccount);
+
+ mFragment.finishIfAccountMissing();
+ verify(mFragment, never()).finish();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
index feb2b56..19a140c 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.accounts;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
@@ -28,6 +30,10 @@
import android.os.UserHandle;
import android.widget.TextView;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -45,10 +51,6 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class)
public class AccountHeaderPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
index e7902182..5ab0982 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.accounts;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -39,6 +40,11 @@
import android.os.UserManager;
import android.text.TextUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.AccessiblePreferenceCategory;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
@@ -63,11 +69,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
public class AccountPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
index bd79360..0681c82 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.accounts;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
@@ -23,11 +24,14 @@
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
+import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.SyncAdapterType;
import android.os.UserHandle;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -40,12 +44,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
public class AccountSyncPreferenceControllerTest {
@@ -53,24 +55,24 @@
@Mock(answer = RETURNS_DEEP_STUBS)
private AccountManager mAccountManager;
- private Context mContext;
+ private Activity mActivity;
private AccountSyncPreferenceController mController;
private Preference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mActivity = Robolectric.setupActivity(Activity.class);
ShadowApplication.getInstance().setSystemService(Context.ACCOUNT_SERVICE, mAccountManager);
when(mAccountManager.getAuthenticatorTypesAsUser(anyInt())).thenReturn(
new AuthenticatorDescription[0]);
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
- mPreference = new Preference(mContext);
+ mPreference = new Preference(mActivity);
mPreference.setKey("account_sync");
- mController = new AccountSyncPreferenceController(mContext);
+ mController = new AccountSyncPreferenceController(mActivity);
mController.init(new Account("acct1", "type1"), new UserHandle(3));
}
@@ -101,7 +103,7 @@
mController.updateSummary(mPreference);
assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
+ .isEqualTo(mActivity.getString(R.string.account_sync_summary_all_off));
}
@Test
@@ -114,7 +116,7 @@
mController.updateSummary(mPreference);
assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
+ .isEqualTo(mActivity.getString(R.string.account_sync_summary_all_off));
}
@Test
@@ -128,7 +130,7 @@
mController.updateSummary(mPreference);
assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
+ .isEqualTo(mActivity.getString(R.string.account_sync_summary_all_off));
}
@Test
@@ -143,7 +145,7 @@
mController.updateSummary(mPreference);
assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getString(R.string.account_sync_summary_all_off));
+ .isEqualTo(mActivity.getString(R.string.account_sync_summary_all_off));
}
@Test
@@ -156,7 +158,7 @@
mController.updateSummary(mPreference);
assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getString(R.string.account_sync_summary_all_on));
+ .isEqualTo(mActivity.getString(R.string.account_sync_summary_all_on));
}
@Test
@@ -178,6 +180,6 @@
mController.updateSummary(mPreference);
assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getString(R.string.account_sync_summary_some_on, 3, 4));
+ .isEqualTo(mActivity.getString(R.string.account_sync_summary_some_on, 3, 4));
}
}
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java
index ea646e3..7171a6b 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java
@@ -23,6 +23,8 @@
import android.content.Context;
import android.os.UserHandle;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowContentResolver;
@@ -33,8 +35,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowContentResolver.class})
public class AccountSyncSettingsTest {
diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
index f5a0127..c944c30 100644
--- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java
@@ -30,6 +30,12 @@
import android.content.pm.PackageManager;
import android.os.UserHandle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
@@ -44,12 +50,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AccountTypePreferenceLoaderTest {
diff --git a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
new file mode 100644
index 0000000..c72561e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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.accounts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.widget.ImageView;
+
+import com.android.settings.homepage.SettingsHomepageActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class AvatarViewMixinTest {
+ private static final String DUMMY_ACCOUNT = "test@domain.com";
+ private static final String DUMMY_DOMAIN = "domain.com";
+
+ private Context mContext;
+ private ImageView mImageView;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mImageView = new ImageView(mContext);
+ }
+
+ @Test
+ public void hasAccount_useDefaultAccountData_returnFalse() {
+ final AvatarViewMixin avatarViewMixin = new AvatarViewMixin(mContext, mImageView);
+ assertThat(avatarViewMixin.hasAccount()).isFalse();
+ }
+
+ @Test
+ @Config(shadows = ShadowAccountFeatureProviderImpl.class)
+ public void hasAccount_useShadowAccountData_returnTrue() {
+ final AvatarViewMixin avatarViewMixin = new AvatarViewMixin(mContext, mImageView);
+ assertThat(avatarViewMixin.hasAccount()).isTrue();
+ }
+
+ @Test
+ public void onStart_useMockAvatarViewMixin_shouldBeExecuted() {
+ final AvatarViewMixin mockAvatar = spy(new AvatarViewMixin(mContext, mImageView));
+
+ final ActivityController controller = Robolectric.buildActivity(
+ SettingsHomepageActivity.class).create();
+ final SettingsHomepageActivity settingsHomepageActivity =
+ (SettingsHomepageActivity) controller.get();
+ settingsHomepageActivity.getLifecycle().addObserver(mockAvatar);
+ controller.start();
+
+ verify(mockAvatar).onStart();
+ }
+
+ @Implements(AccountFeatureProviderImpl.class)
+ public static class ShadowAccountFeatureProviderImpl {
+
+ @Implementation
+ public Account[] getAccounts(Context context) {
+ Account[] accounts = {new Account(DUMMY_ACCOUNT, DUMMY_DOMAIN)};
+ return accounts;
+ }
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java
index a8227ec..241765e 100644
--- a/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/ChooseAccountPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.accounts;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -30,12 +31,17 @@
import android.graphics.drawable.ColorDrawable;
import android.os.UserHandle;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAccountManager;
import com.android.settings.testutils.shadow.ShadowContentResolver;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import org.junit.After;
import org.junit.Before;
@@ -46,14 +52,9 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class,
- ShadowRestrictedLockUtils.class})
+ ShadowRestrictedLockUtilsInternal.class})
public class ChooseAccountPreferenceControllerTest {
private Context mContext;
@@ -75,8 +76,8 @@
@After
public void tearDown() {
ShadowContentResolver.reset();
- ShadowAccountManager.resetAuthenticator();
- ShadowRestrictedLockUtils.clearDisabledTypes();
+ ShadowAccountManager.reset();
+ ShadowRestrictedLockUtilsInternal.clearDisabledTypes();
}
@Test
@@ -114,9 +115,9 @@
true /* supportsUploading */)};
ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
- ShadowRestrictedLockUtils.setHasSystemFeature(true);
- ShadowRestrictedLockUtils.setDevicePolicyManager(mock(DevicePolicyManager.class));
- ShadowRestrictedLockUtils.setDisabledTypes(new String[] {"test_type"});
+ ShadowRestrictedLockUtilsInternal.setHasSystemFeature(true);
+ ShadowRestrictedLockUtilsInternal.setDevicePolicyManager(mock(DevicePolicyManager.class));
+ ShadowRestrictedLockUtilsInternal.setDisabledTypes(new String[] {"test_type"});
doReturn("label").when(mController).getLabelForType(anyString());
@@ -139,9 +140,9 @@
true /* supportsUploading */)};
ShadowContentResolver.setSyncAdapterTypes(syncAdapters);
- ShadowRestrictedLockUtils.setHasSystemFeature(true);
- ShadowRestrictedLockUtils.setDevicePolicyManager(mock(DevicePolicyManager.class));
- ShadowRestrictedLockUtils.setDisabledTypes(new String[] {"com.acct1"});
+ ShadowRestrictedLockUtilsInternal.setHasSystemFeature(true);
+ ShadowRestrictedLockUtilsInternal.setDevicePolicyManager(mock(DevicePolicyManager.class));
+ ShadowRestrictedLockUtilsInternal.setDisabledTypes(new String[] {"com.acct1"});
doReturn("label").when(mController).getLabelForType(anyString());
diff --git a/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java
index ebd3beb..21b9302 100644
--- a/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java
@@ -16,7 +16,9 @@
package com.android.settings.accounts;
import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH;
+
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;
diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
index f5e415b..9e476bd 100644
--- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.accounts;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -24,12 +25,16 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,6 +46,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@@ -48,9 +54,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EmergencyInfoPreferenceControllerTest {
@@ -68,7 +71,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mController = new EmergencyInfoPreferenceController(mContext);
- mPreference = new Preference(RuntimeEnvironment.application);
+ mPreference = new Preference(Robolectric.setupActivity(Activity.class));
mPreference.setKey(mController.getPreferenceKey());
when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
}
@@ -135,16 +138,16 @@
mController.updateState(preference);
verify(preference).setSummary(
- mContext.getString(R.string.emergency_info_summary, "user 1"));
+ mContext.getString(R.string.emergency_info_summary, "user 1"));
}
@Test
public void handlePreferenceTreeClick_shouldStartActivity() {
final ShadowApplication application = ShadowApplication.getInstance();
- final Context context = RuntimeEnvironment.application;
- final Preference preference = new Preference(context);
+ final Activity activity = Robolectric.setupActivity(Activity.class);
+ final Preference preference = new Preference(activity);
preference.setKey("emergency_info");
- mController = new EmergencyInfoPreferenceController(context);
+ mController = new EmergencyInfoPreferenceController(activity);
mController.handlePreferenceTreeClick(preference);
diff --git a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java
index 3147625..6b80625 100644
--- a/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/EnterpriseDisclosurePreferenceControllerTest.java
@@ -17,11 +17,15 @@
package com.android.settings.accounts;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.content.Context;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EnterpriseDisclosurePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
index ce1dcb2..0803d78 100644
--- a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.accounts;
import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
+
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
index decac8a..3bebd66 100644
--- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java
@@ -15,6 +15,8 @@
*/
package com.android.settings.accounts;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
@@ -28,7 +30,10 @@
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
import android.accounts.AuthenticatorDescription;
+import android.accounts.AuthenticatorException;
+import android.accounts.OperationCanceledException;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Context;
@@ -38,6 +43,13 @@
import android.os.UserManager;
import android.widget.Button;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -49,22 +61,17 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
ShadowUserManager.class,
@@ -157,7 +164,8 @@
@Test
@Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class})
- public void confirmRemove_shouldRemoveAccount() {
+ public void confirmRemove_shouldRemoveAccount()
+ throws AuthenticatorException, OperationCanceledException, IOException {
when(mFragment.isAdded()).thenReturn(true);
FragmentActivity activity = mock(FragmentActivity.class);
when(activity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
@@ -170,7 +178,18 @@
mFragment, account, userHandle);
dialog.onCreate(new Bundle());
dialog.onClick(null, 0);
+ ArgumentCaptor<AccountManagerCallback<Bundle>> callbackCaptor = ArgumentCaptor.forClass(
+ AccountManagerCallback.class);
verify(mAccountManager).removeAccountAsUser(eq(account), nullable(Activity.class),
- nullable(AccountManagerCallback.class), nullable(Handler.class), eq(userHandle));
+ callbackCaptor.capture(), nullable(Handler.class), eq(userHandle));
+
+ AccountManagerCallback<Bundle> callback = callbackCaptor.getValue();
+ assertThat(callback).isNotNull();
+ AccountManagerFuture<Bundle> future = mock(AccountManagerFuture.class);
+ Bundle resultBundle = new Bundle();
+ resultBundle.putBoolean(AccountManager.KEY_BOOLEAN_RESULT, true);
+ when(future.getResult()).thenReturn(resultBundle);
+ callback.run(future);
+ verify(activity).finish();
}
}
diff --git a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
new file mode 100644
index 0000000..79e292d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
@@ -0,0 +1,126 @@
+/*
+ * 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.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.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.accounts.AuthenticatorHelper;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+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(SettingsRobolectricTestRunner.class)
+@Config(shadows = {TopLevelAccountEntryPreferenceControllerTest.ShadowAuthenticationHelper.class})
+public class TopLevelAccountEntryPreferenceControllerTest {
+
+ private TopLevelAccountEntryPreferenceController mController;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new TopLevelAccountEntryPreferenceController(mContext, "test_key");
+ }
+
+ @After
+ public void tearDown() {
+ ShadowAuthenticationHelper.reset();
+ }
+
+ @Test
+
+ public void updateSummary_hasAccount_shouldDisplayUpTo3AccountTypes() {
+ assertThat(mController.getSummary())
+ .isEqualTo(LABELS[0] + ", " + LABELS[1] + ", and " + LABELS[2]);
+ }
+
+ @Test
+ public void updateSummary_noAccount_shouldDisplayDefaultSummary() {
+ ShadowAuthenticationHelper.setEnabledAccount(null);
+
+ assertThat(mController.getSummary()).isEqualTo(
+ mContext.getText(R.string.account_dashboard_default_summary));
+ }
+
+ @Test
+ public void updateSummary_noAccountTypeLabel_shouldNotDisplayNullEntry() {
+ final String[] enabledAccounts = {TYPES[0], "unlabeled_account_type", TYPES[1]};
+ ShadowAuthenticationHelper.setEnabledAccount(enabledAccounts);
+
+
+ // 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;
+
+ public 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
+ public String[] getEnabledAccountTypes() {
+ return sEnabledAccount;
+ }
+
+ @Implementation
+ public 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/accounts/WorkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java
index f9ac3a6..1223d55 100644
--- a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.accounts;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.spy;
@@ -26,6 +27,8 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,8 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WorkModePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
deleted file mode 100644
index 97210b3..0000000
--- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java
+++ /dev/null
@@ -1,68 +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.applications;
-
-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.os.UserManager;
-
-import com.android.settings.notification.EmergencyBroadcastPreferenceController;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.XmlTestUtils;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class AppAndNotificationDashboardFragmentTest {
-
- @Test
- @Config(shadows = {ShadowEmergencyBroadcastPreferenceController.class})
- public void testNonIndexableKeys_existInXmlLayout() {
- final Context context = spy(RuntimeEnvironment.application);
- UserManager manager = mock(UserManager.class);
- when(manager.isAdminUser()).thenReturn(true);
- when(context.getSystemService(Context.USER_SERVICE)).thenReturn(manager);
- final List<String> niks = AppAndNotificationDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
- .getNonIndexableKeys(context);
- AppAndNotificationDashboardFragment fragment = new AppAndNotificationDashboardFragment();
- final int xmlId = fragment.getPreferenceScreenResId();
-
- final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
-
- assertThat(keys).containsAllIn(niks);
- }
-
- @Implements(EmergencyBroadcastPreferenceController.class)
- public static class ShadowEmergencyBroadcastPreferenceController {
-
- @Implementation
- public boolean isAvailable() {
- return true;
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
index 0d905aa..ddcbf85 100644
--- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -31,6 +32,10 @@
import android.net.Uri;
import android.os.UserHandle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -51,10 +56,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowEntityHeaderController.class)
public class AppInfoWithHeaderTest {
diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
index 5bebe5a..cb3d3ad 100644
--- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
@@ -32,6 +33,8 @@
import android.content.pm.PermissionGroupInfo;
import android.content.pm.PermissionInfo;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -44,8 +47,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppPermissionsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
index 327a499..cb50486 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
@@ -17,6 +17,9 @@
package com.android.settings.applications;
import static android.text.format.DateUtils.DAY_IN_MILLIS;
+
+import static com.android.settings.applications.AppStateNotificationBridge
+ .FILTER_APP_NOTIFICATION_BLOCKED;
import static com.android.settings.applications.AppStateNotificationBridge
.FILTER_APP_NOTIFICATION_FREQUENCY;
import static com.android.settings.applications.AppStateNotificationBridge
@@ -25,9 +28,12 @@
.FREQUENCY_NOTIFICATION_COMPARATOR;
import static com.android.settings.applications.AppStateNotificationBridge
.RECENT_NOTIFICATION_COMPARATOR;
+
import static com.google.common.truth.Truth.assertThat;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
@@ -375,10 +381,11 @@
NotificationsSentState sent = new NotificationsSentState();
sent.lastSent = System.currentTimeMillis() - (2 * DAY_IN_MILLIS);
- assertThat(AppStateNotificationBridge.getSummary(mContext, neverSent, true)).isEqualTo(
- mContext.getString(R.string.notifications_sent_never));
- assertThat(AppStateNotificationBridge.getSummary(mContext, sent, true).toString())
- .contains("2");
+ assertThat(AppStateNotificationBridge.getSummary(
+ mContext, neverSent, R.id.sort_order_recent_notification)).isEqualTo(
+ mContext.getString(R.string.notifications_sent_never));
+ assertThat(AppStateNotificationBridge.getSummary(
+ mContext, sent, R.id.sort_order_recent_notification).toString()).contains("2");
}
@Test
@@ -388,13 +395,24 @@
NotificationsSentState sentOften = new NotificationsSentState();
sentOften.avgSentDaily = 8;
- assertThat(AppStateNotificationBridge.getSummary(mContext, sentRarely, false).toString())
+ assertThat(AppStateNotificationBridge.getSummary(
+ mContext, sentRarely, R.id.sort_order_frequent_notification).toString())
.contains("1");
- assertThat(AppStateNotificationBridge.getSummary(mContext, sentOften, false).toString())
+ assertThat(AppStateNotificationBridge.getSummary(
+ mContext, sentOften, R.id.sort_order_frequent_notification).toString())
.contains("8");
}
@Test
+ public void testSummary_alpha() {
+ NotificationsSentState sentRarely = new NotificationsSentState();
+ sentRarely.avgSentWeekly = 1;
+ assertThat(AppStateNotificationBridge.getSummary(
+ mContext, sentRarely, R.id.sort_order_alpha).toString())
+ .isEqualTo("");
+ }
+
+ @Test
public void testFilterRecency() {
NotificationsSentState allowState = new NotificationsSentState();
allowState.lastSent = 1;
@@ -429,6 +447,23 @@
}
@Test
+ public void testFilterBlocked() {
+ NotificationsSentState allowState = new NotificationsSentState();
+ allowState.blocked = true;
+ AppEntry allow = mock(AppEntry.class);
+ allow.extraInfo = allowState;
+
+ assertTrue(FILTER_APP_NOTIFICATION_BLOCKED.filterApp(allow));
+
+ NotificationsSentState denyState = new NotificationsSentState();
+ denyState.blocked = false;
+ AppEntry deny = mock(AppEntry.class);
+ deny.extraInfo = denyState;
+
+ assertFalse(FILTER_APP_NOTIFICATION_BLOCKED.filterApp(deny));
+ }
+
+ @Test
public void testComparators_nullsNoCrash() {
List<AppEntry> entries = new ArrayList<>();
AppEntry a = mock(AppEntry.class);
diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
index a465ff3..04a1237 100644
--- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java
@@ -1,11 +1,14 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@@ -16,8 +19,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppStorageSizesControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
index d8c8c38..43f855d 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications;
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq;
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
index 4f74371..96836ae 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications;
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq;
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 89cf6a0..ba07dc5 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.app.admin.DevicePolicyManager;
diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
index fef8eef..8098e5c 100644
--- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
@@ -165,7 +166,7 @@
final List<String> niks = DefaultAppSettings.SEARCH_INDEX_DATA_PROVIDER
.getNonIndexableKeys(context);
- final int xmlId = (new DefaultAppSettings()).getPreferenceScreenResId();
+ final int xmlId = new DefaultAppSettings().getPreferenceScreenResId();
final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
index 4fa30eb..3378492 100644
--- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
index aab4fb4..a68a00b 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications;
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.argThat;
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
index a2eb07e..3cb5a57 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications;
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.argThat;
diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
index f925a75..da65165 100644
--- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java
@@ -17,12 +17,16 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.view.LayoutInflater;
+import androidx.preference.Preference.OnPreferenceClickListener;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,9 +35,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LayoutPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
index 1bee628..6ff0dba 100644
--- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
@@ -39,12 +40,18 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.os.PowerManager;
import android.os.UserHandle;
import android.os.UserManager;
import android.text.TextUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowPowerManager;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
@@ -63,10 +70,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RecentAppsPreferenceControllerTest {
@@ -195,6 +198,35 @@
}
@Test
+ public void display_powerSaverMode_showNoRecents() {
+ mContext.getSystemService(PowerManager.class).setPowerSaveMode(true);
+
+ final List<UsageStats> stats = new ArrayList<>();
+ final UsageStats stat1 = new UsageStats();
+
+ stat1.mLastTimeUsed = System.currentTimeMillis();
+ stat1.mPackageName = "pkg.class";
+ stats.add(stat1);
+
+ // stat1, stat2 are valid apps. stat3 is invalid.
+ when(mAppState.getEntry(stat1.mPackageName, UserHandle.myUserId()))
+ .thenReturn(mAppEntry);
+ when(mPackageManager.resolveActivity(any(Intent.class), anyInt()))
+ .thenReturn(new ResolveInfo());
+ when(mUsageStatsManager.queryUsageStats(anyInt(), anyLong(), anyLong()))
+ .thenReturn(stats);
+ mAppEntry.info = mApplicationInfo;
+
+ mController.displayPreference(mScreen);
+
+ verify(mCategory, never()).addPreference(any(Preference.class));
+ verify(mCategory).setTitle(null);
+ verify(mSeeAllPref).setTitle(R.string.applications_settings);
+ verify(mSeeAllPref).setIcon(null);
+ verify(mDivider).setVisible(false);
+ }
+
+ @Test
public void display_showRecentsWithInstantApp() {
// Regular app.
final List<UsageStats> stats = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
index 224a8f9..694625e 100644
--- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
@@ -16,15 +16,25 @@
package com.android.settings.applications;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
+
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.content.pm.ApplicationInfo;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
-import com.android.settings.datausage.DataSaverBackend;
+import com.android.settings.datausage.AppStateDataUsageBridge;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowApplicationsState;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settingslib.applications.ApplicationsState;
import org.junit.Before;
import org.junit.Test;
@@ -32,48 +42,74 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
+import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
+import java.util.ArrayList;
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowUserManager.class, ShadowApplicationsState.class})
public class SpecialAppAccessPreferenceControllerTest {
private Context mContext;
@Mock
- private DataSaverBackend mBackend;
+ private ApplicationsState.Session mSession;
@Mock
- private Preference mPreference;
+ private PreferenceScreen mScreen;
private SpecialAppAccessPreferenceController mController;
+ private Preference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- mController = new SpecialAppAccessPreferenceController(mContext);
- ReflectionHelpers.setField(mController, "mDataSaverBackend", mBackend);
+ ShadowUserManager.getShadow().setProfileIdsWithDisabled(new int[]{0});
+ mController = new SpecialAppAccessPreferenceController(mContext, "test_key");
+ mPreference = new Preference(mContext);
+ when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+
+ mController.mSession = mSession;
}
@Test
- public void isAvailable_shouldAlwaysReturnTrue() {
- assertThat(mController.isAvailable()).isTrue();
+ public void getAvailabilityState_unsearchable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
@Test
public void updateState_shouldSetSummary() {
- when(mBackend.getWhitelistedCount()).thenReturn(0);
+ final ArrayList<ApplicationsState.AppEntry> apps = new ArrayList<>();
+ final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);
+ entry.hasLauncherEntry = true;
+ entry.info = new ApplicationInfo();
+ entry.extraInfo = new AppStateDataUsageBridge.DataUsageState(
+ true /* whitelisted */, false /* blacklisted */);
+ apps.add(entry);
+ when(mSession.getAllApps()).thenReturn(apps);
- mController.updateState(mPreference);
+ mController.displayPreference(mScreen);
+ mController.onExtraInfoUpdated();
- verify(mPreference).setSummary(mContext.getResources()
- .getQuantityString(R.plurals.special_access_summary, 0, 0));
+ assertThat(mPreference.getSummary())
+ .isEqualTo(mContext.getResources().getQuantityString(
+ R.plurals.special_access_summary, 1, 1));
+ }
- when(mBackend.getWhitelistedCount()).thenReturn(1);
+ @Test
+ public void updateState_wrongExtraInfo_shouldNotIncludeInSummary() {
+ final ArrayList<ApplicationsState.AppEntry> apps = new ArrayList<>();
+ final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class);
+ entry.hasLauncherEntry = true;
+ entry.info = new ApplicationInfo();
+ entry.extraInfo = new AppStateNotificationBridge.NotificationsSentState();
+ apps.add(entry);
+ when(mSession.getAllApps()).thenReturn(apps);
- mController.updateState(mPreference);
+ mController.displayPreference(mScreen);
+ mController.onExtraInfoUpdated();
- verify(mPreference).setSummary(mContext.getResources()
- .getQuantityString(R.plurals.special_access_summary, 1, 1));
+ assertThat(mPreference.getSummary())
+ .isEqualTo(mContext.getResources().getQuantityString(
+ R.plurals.special_access_summary, 0, 0));
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
index 79ada89..f9cb01b 100644
--- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
index d9465bd..284ce06 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyDouble;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -32,6 +33,10 @@
import android.os.BatteryStats;
import android.os.Bundle;
+import androidx.loader.app.LoaderManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.SettingsActivity;
@@ -50,10 +55,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.loader.app.LoaderManager;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppBatteryPreferenceControllerTest {
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 dac9409..44ace78 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
@@ -42,6 +42,8 @@
import android.content.pm.PackageManager;
import android.os.UserManager;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -63,8 +65,6 @@
import org.mockito.stubbing.Answer;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.Fragment;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppButtonsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
index ae9e429..e77106d 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
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;
@@ -33,6 +34,9 @@
import android.net.INetworkStatsSession;
import android.os.Bundle;
+import androidx.loader.app.LoaderManager;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.datausage.AppDataUsage;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -46,9 +50,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.loader.app.LoaderManager;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppDataUsagePreferenceControllerTest {
@@ -114,6 +115,7 @@
@Test
public void onPause_shouldDestroyDataLoader() {
+ ReflectionHelpers.setField(mController, "mStatsSession", mock(INetworkStatsSession.class));
doReturn(mLoaderManager).when(mFragment).getLoaderManager();
mController.onPause();
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerV2Test.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerV2Test.java
new file mode 100644
index 0000000..708222e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerV2Test.java
@@ -0,0 +1,143 @@
+/*
+ * 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.applications.appinfo;
+
+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.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+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.pm.ApplicationInfo;
+import android.net.ConnectivityManager;
+import android.os.Bundle;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.datausage.AppDataUsageV2;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import android.util.FeatureFlagUtils;
+
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import androidx.loader.app.LoaderManager;
+import androidx.preference.Preference;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class AppDataUsagePreferenceControllerV2Test {
+
+ @Mock
+ private LoaderManager mLoaderManager;
+ @Mock
+ private AppInfoDashboardFragment mFragment;
+
+ private Context mContext;
+ private AppDataUsagePreferenceControllerV2 mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+ mController = spy(new AppDataUsagePreferenceControllerV2(mContext, "test_key"));
+ mController.setParentFragment(mFragment);
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.DATA_USAGE_V2, true);
+ }
+
+ @Test
+ public void getAvailabilityStatus_bandwidthControlEnabled_shouldReturnAvailable() {
+ doReturn(true).when(mController).isBandwidthControlEnabled();
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_bandwidthControlDisabled_shouldReturnDisabled() {
+ doReturn(false).when(mController).isBandwidthControlEnabled();
+
+ assertThat(mController.getAvailabilityStatus())
+ .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void onResume_notAvailable_shouldNotRestartDataLoader() {
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.DATA_USAGE_V2, false);
+ doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+
+ mController.onResume();
+
+ verify(mLoaderManager, never()).restartLoader(
+ AppInfoDashboardFragment.LOADER_CHART_DATA, Bundle.EMPTY, mController);
+ }
+
+ @Test
+ public void onResume_isAvailable_shouldRestartDataLoader() {
+ final ConnectivityManager connectivityManager = mock(ConnectivityManager.class);
+ when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
+ .thenReturn(connectivityManager);
+ when(connectivityManager.isNetworkSupported(anyInt())).thenReturn(true);
+ doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+ doReturn(BasePreferenceController.AVAILABLE).when(mController).getAvailabilityStatus();
+ final AppEntry appEntry = mock(AppEntry.class);
+ appEntry.info = new ApplicationInfo();
+ when(mFragment.getAppEntry()).thenReturn(appEntry);
+
+ mController.onResume();
+
+ verify(mLoaderManager).restartLoader(eq(AppInfoDashboardFragment.LOADER_CHART_DATA),
+ nullable(Bundle.class), eq(mController));
+ }
+
+ @Test
+ public void onPause_shouldDestroyDataLoader() {
+ doReturn(BasePreferenceController.AVAILABLE).when(mController).getAvailabilityStatus();
+ doReturn(mLoaderManager).when(mFragment).getLoaderManager();
+
+ mController.onPause();
+
+ verify(mLoaderManager).destroyLoader(AppInfoDashboardFragment.LOADER_CHART_DATA);
+ }
+
+ @Test
+ public void getDetailFragmentClass_shouldReturnAppDataUsage() {
+ assertThat(mController.getDetailFragmentClass()).isEqualTo(AppDataUsageV2.class);
+ }
+
+ @Test
+ public void updateState_shouldUpdatePreferenceSummary() {
+ final Preference preference = mock(Preference.class);
+
+ mController.updateState(preference);
+
+ verify(preference).setSummary(any());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
index 944b4b1..a342e10 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications.appinfo;
import static androidx.lifecycle.Lifecycle.Event.ON_START;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
@@ -35,6 +37,10 @@
import android.view.View;
import android.widget.TextView;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -49,10 +55,6 @@
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppHeaderViewPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
index 36bdeb7..539e75f 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
@@ -20,7 +20,9 @@
import static com.android.settings.applications.appinfo.AppInfoDashboardFragment
.UNINSTALL_ALL_USERS_MENU;
import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.UNINSTALL_UPDATES;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doNothing;
@@ -168,7 +170,7 @@
}
@Test
- public void launchFragment_hasNoPackageInfo_shouldFinish() {
+ public void ensurePackageInfoAvailable_hasNoPackageInfo_shouldFinish() {
ReflectionHelpers.setField(mFragment, "mPackageInfo", null);
assertThat(mFragment.ensurePackageInfoAvailable(mActivity)).isFalse();
@@ -176,7 +178,7 @@
}
@Test
- public void launchFragment_hasPackageInfo_shouldReturnTrue() {
+ public void ensurePackageInfoAvailable_hasPackageInfo_shouldReturnTrue() {
final PackageInfo packageInfo = mock(PackageInfo.class);
ReflectionHelpers.setField(mFragment, "mPackageInfo", packageInfo);
@@ -185,6 +187,16 @@
}
@Test
+ public void createPreference_hasNoPackageInfo_shouldSkip() {
+ ReflectionHelpers.setField(mFragment, "mPackageInfo", null);
+
+ mFragment.onCreatePreferences(new Bundle(), "root_key");
+
+ verify(mActivity).finishAndRemoveTask();
+ verify(mFragment, never()).getPreferenceScreen();
+ }
+
+ @Test
public void packageSizeChange_isOtherPackage_shouldNotRefreshUi() {
ReflectionHelpers.setField(mFragment, "mPackageName", PACKAGE_NAME);
mFragment.onPackageSizeChanged("Not_" + PACKAGE_NAME);
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
index 6796605..e68f8d3 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications.appinfo;
import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.SUB_INFO_FRAGMENT;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -27,6 +29,9 @@
import android.content.pm.ApplicationInfo;
import android.os.Bundle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.core.BasePreferenceController;
@@ -42,9 +47,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppInfoPreferenceControllerBaseTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java
index 2e988d8..30152a4 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.any;
@@ -36,6 +37,8 @@
import android.content.pm.ResolveInfo;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -46,8 +49,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppInstallerInfoPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
index 77e1eca..733e22e 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
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;
@@ -24,15 +25,19 @@
import android.content.Context;
import android.content.Intent;
-import android.os.UserManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.SettingsActivity;
import com.android.settings.applications.ProcStatsData;
import com.android.settings.applications.ProcessStatsDetail;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,14 +45,11 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowUserManager.class})
public class AppMemoryPreferenceControllerTest {
@Mock
@@ -66,8 +68,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- Shadows.shadowOf(userManager).setIsAdminUser(true);
+ ShadowUserManager.getShadow().setIsAdminUser(true);
mController =
spy(new AppMemoryPreferenceController(mContext, mFragment, null /* lifecycle */));
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
@@ -76,6 +77,11 @@
when(mFragment.getActivity()).thenReturn(mActivity);
}
+ @After
+ public void tearDown() {
+ ShadowUserManager.getShadow().reset();
+ }
+
@Test
@Config(qualifiers = "mcc999")
public void getAvailabilityStatus_developmentSettingsEnabled_shouldReturnAvailable() {
@@ -83,7 +89,7 @@
Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.AVAILABLE);
+ .isEqualTo(BasePreferenceController.AVAILABLE);
}
@Test
@@ -92,7 +98,7 @@
Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
@Test
@@ -101,7 +107,7 @@
Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0);
assertThat(mController.getAvailabilityStatus())
- .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+ .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
index cd335ea..a3e7ca6 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications.appinfo;
import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
+
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;
@@ -29,6 +31,10 @@
import android.content.Intent;
import android.content.pm.ApplicationInfo;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.notification.AppNotificationSettings;
import com.android.settings.notification.NotificationBackend;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,10 +48,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppNotificationPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java
index a18a041..b3d0a0d 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
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.never;
@@ -28,6 +29,9 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.applications.AppLaunchSettings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.AppUtils;
@@ -42,9 +46,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppOpenByDefaultPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
index 73459c4..e6ae618 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
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.argThat;
@@ -28,6 +29,9 @@
import android.content.Intent;
import android.content.pm.ApplicationInfo;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,9 +46,6 @@
import java.util.ArrayList;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppPermissionPreferenceControllerTest {
@@ -83,8 +84,7 @@
public void onPermissionSummaryResult_noRequestedPermission_shouldDisablePreference() {
mController.displayPreference(mScreen);
- mController.mPermissionCallback.onPermissionSummaryResult(
- 1, 0, 1, new ArrayList<CharSequence>());
+ mController.mPermissionCallback.onPermissionSummaryResult(1, 0, 1, new ArrayList<>());
verify(mPreference).setEnabled(false);
verify(mPreference).setSummary(mContext.getString(
@@ -95,8 +95,7 @@
public void onPermissionSummaryResult_noGrantedPermission_shouldSetNoPermissionSummary() {
mController.displayPreference(mScreen);
- mController.mPermissionCallback.onPermissionSummaryResult(
- 1, 5, 0, new ArrayList<CharSequence>());
+ mController.mPermissionCallback.onPermissionSummaryResult(1, 5, 0, new ArrayList<>());
verify(mPreference).setEnabled(true);
verify(mPreference).setSummary(mContext.getString(
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java
index 99bfe32..9f0fd31 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java
@@ -18,11 +18,13 @@
import static com.google.common.truth.Truth.assertThat;
-import android.app.Application;
+import android.app.Activity;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ResolveInfo;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -30,12 +32,11 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.shadows.ShadowPackageManager;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppSettingPreferenceControllerTest {
@@ -50,19 +51,19 @@
@Mock
private AppInfoDashboardFragment mParent;
- private Application mApplication;
private ShadowPackageManager mPackageManager;
private AppSettingPreferenceController mController;
private Preference mPreference;
+ private Activity mActivity;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mApplication = RuntimeEnvironment.application;
- mPackageManager = Shadows.shadowOf(mApplication.getPackageManager());
- mController = new AppSettingPreferenceController(mApplication, "test_key");
+ mActivity = Robolectric.setupActivity(Activity.class);
+ mPackageManager = Shadows.shadowOf(RuntimeEnvironment.application.getPackageManager());
+ mController = new AppSettingPreferenceController(mActivity, "test_key");
mController.setPackageName(TEST_PKG_NAME).setParentFragment(mParent);
- mPreference = new Preference(mApplication);
+ mPreference = new Preference(mActivity);
mPreference.setKey(mController.getPreferenceKey());
}
@@ -108,7 +109,7 @@
mPackageManager.addResolveInfoForIntent(RESOLVED_INTENT, info);
assertThat(mController.handlePreferenceTreeClick(mPreference)).isTrue();
- assertThat(Shadows.shadowOf(mApplication).getNextStartedActivity().getComponent())
+ assertThat(Shadows.shadowOf(mActivity).getNextStartedActivity().getComponent())
.isEqualTo(TEST_INTENT.getComponent());
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java
index 3cb48b6..0cf8b08 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
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;
@@ -28,6 +29,9 @@
import android.content.pm.ApplicationInfo;
import android.os.Bundle;
+import androidx.loader.app.LoaderManager;
+import androidx.preference.Preference;
+
import com.android.settings.applications.AppStorageSettings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -40,9 +44,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.loader.app.LoaderManager;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppStoragePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
index 0b7ad04..e07f66e 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java
@@ -23,6 +23,8 @@
import android.content.Context;
import android.content.pm.PackageInfo;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,8 +34,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppVersionPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java
index 80a696a..e9ff8fb 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ButtonActionDialogFragmentTest.java
@@ -16,6 +16,7 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -24,11 +25,14 @@
import android.content.Context;
import android.content.DialogInterface;
+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.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.Before;
import org.junit.Test;
@@ -37,9 +41,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class})
@@ -74,7 +76,8 @@
@Test
public void testOnCreateDialog_forceStopDialog() {
ButtonActionDialogFragment fragment = ButtonActionDialogFragment.newInstance(FORCE_STOP_ID);
- FragmentTestUtils.startFragment(fragment);
+ FragmentController.setupFragment(fragment, FragmentActivity.class, 0 /* containerViewId */,
+ null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog).isNotNull();
@@ -94,7 +97,8 @@
@Test
public void testOnCreateDialog_disableDialog() {
ButtonActionDialogFragment fragment = ButtonActionDialogFragment.newInstance(DISABLE_ID);
- FragmentTestUtils.startFragment(fragment);
+ FragmentController.setupFragment(fragment, FragmentActivity.class, 0 /* containerViewId */,
+ null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog).isNotNull();
@@ -113,7 +117,8 @@
public void testOnCreateDialog_specialDisableDialog() {
ButtonActionDialogFragment fragment =
ButtonActionDialogFragment.newInstance(SPECIAL_DISABLE_ID);
- FragmentTestUtils.startFragment(fragment);
+ FragmentController.setupFragment(fragment, FragmentActivity.class, 0 /* containerViewId */,
+ null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog).isNotNull();
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 794d5e5..da1c6b4 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java
@@ -17,14 +17,18 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.argThat;
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.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.applications.DefaultAppSettings;
@@ -35,10 +39,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
+import org.robolectric.Robolectric;
@RunWith(SettingsRobolectricTestRunner.class)
public class DefaultAppShortcutPreferenceControllerBaseTest {
@@ -48,19 +49,17 @@
@Mock
private AppInfoDashboardFragment mFragment;
@Mock
- private PreferenceScreen mScreen;
- @Mock
private Preference mPreference;
- private Context mContext;
+ private Activity mActivity;
private TestPreferenceController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- mController = new TestPreferenceController(mContext, mFragment);
+ mActivity = spy(Robolectric.setupActivity(Activity.class));
+ when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+ mController = new TestPreferenceController(mActivity, mFragment);
final String key = mController.getPreferenceKey();
when(mPreference.getKey()).thenReturn(key);
}
@@ -94,7 +93,7 @@
mController.isDefault = true;
mController.updateState(mPreference);
- String yesString = mContext.getString(R.string.yes);
+ String yesString = mActivity.getString(R.string.yes);
verify(mPreference).setSummary(yesString);
}
@@ -104,7 +103,7 @@
mController.updateState(mPreference);
- String noString = mContext.getString(R.string.no);
+ String noString = mActivity.getString(R.string.no);
verify(mPreference).setSummary(noString);
}
@@ -112,7 +111,7 @@
public void handlePreferenceTreeClick_shouldStartDefaultAppSettings() {
mController.handlePreferenceTreeClick(mPreference);
- verify(mContext).startActivity(argThat(intent -> intent != null
+ verify(mActivity).startActivity(argThat(intent -> intent != null
&& intent.getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT).equals(
DefaultAppSettings.class.getName())
&& intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java
index 34a9e2e..f4571ce 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java
@@ -17,8 +17,9 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.argThat;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -65,8 +66,8 @@
public void hasAppCapability_hasBrowserCapability_shouldReturnTrue() {
List<ResolveInfo> resolveInfos = new ArrayList<>();
resolveInfos.add(new ResolveInfo());
- when(mPackageManager.queryIntentActivities(argThat(intent-> intent != null
- && intent.getCategories().contains(Intent.CATEGORY_BROWSABLE)), anyInt()))
+ when(mPackageManager.queryIntentActivitiesAsUser(argThat(intent-> intent != null
+ && intent.getCategories().contains(Intent.CATEGORY_BROWSABLE)), anyInt(), anyInt()))
.thenReturn(resolveInfos);
assertThat(mController.hasAppCapability()).isTrue();
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java
index 999e802..e630a4c 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java
index 5536cff..a0b802e 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java
index cd6a3ae..ac79a4f 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
index 35f3d61..3b9ce3d 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java
index 20f29bf..3cc4cfe 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static android.Manifest.permission.SYSTEM_ALERT_WINDOW;
import static android.Manifest.permission.WRITE_SETTINGS;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -28,6 +30,8 @@
import android.content.pm.PackageInfo;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,8 +42,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DrawOverlayDetailPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java
index cbc4d00..1b25286 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java
@@ -16,18 +16,20 @@
package com.android.settings.applications.appinfo;
-import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.app.Activity;
import android.content.Context;
import android.view.Window;
import android.view.WindowManager.LayoutParams;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -44,8 +46,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DrawOverlayDetailsTest {
@@ -91,7 +91,7 @@
when(mWindow.getAttributes()).thenReturn(layoutParams);
mFragment.onResume();
- verify(mWindow).addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+ verify(mWindow).addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
mFragment.onPause();
@@ -99,6 +99,6 @@
ArgumentCaptor<LayoutParams> paramCaptor = ArgumentCaptor.forClass(LayoutParams.class);
verify(mWindow).setAttributes(paramCaptor.capture());
assertEquals(0,
- paramCaptor.getValue().privateFlags & PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
+ paramCaptor.getValue().privateFlags & SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java
index b857308..a81035f 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -25,6 +26,8 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,8 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ExternalSourceDetailPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
index 4f89615..d3a90da 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
@@ -17,18 +17,25 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import android.content.Context;
+import android.content.ContextWrapper;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
+import android.os.UserHandle;
import android.os.UserManager;
import com.android.settings.applications.AppStateInstallAppsBridge;
import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsState;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settingslib.RestrictedPreferenceHelper;
import com.android.settingslib.RestrictedSwitchPreference;
import org.junit.Before;
@@ -36,9 +43,13 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowUserManager.class})
public class ExternalSourcesDetailsTest {
@Mock
@@ -46,6 +57,8 @@
@Mock
private RestrictedSwitchPreference mSwitchPref;
@Mock
+ private RestrictedPreferenceHelper mHelper;
+ @Mock
private PackageInfo mPackageInfo;
private ExternalSourcesDetails mFragment;
@@ -89,5 +102,128 @@
mFragment.refreshUi();
assertThat(mFragment.refreshUi()).isTrue();
+ assertThat(mSwitchPref.isDisabledByAdmin()).isFalse();
+ }
+
+ @Test
+ public void refreshUi_userRestrictionsUnknownSources_disablesSwitchPreference() {
+ // Mocks set up
+ final ExternalSourcesDetails fragment = new ExternalSourcesDetails();
+ final ContextWrapper context = RuntimeEnvironment.application;
+ final UserManager userManager = (UserManager) context.getSystemService(
+ Context.USER_SERVICE);
+ final ShadowUserManager shadowUserManager = Shadow.extract(userManager);
+
+ ReflectionHelpers.setField(fragment, "mSwitchPref", mSwitchPref);
+ ReflectionHelpers.setField(fragment, "mPackageInfo", mPackageInfo);
+ mPackageInfo.applicationInfo = new ApplicationInfo();
+ ReflectionHelpers.setField(fragment, "mUserManager", userManager);
+ ReflectionHelpers.setField(mSwitchPref, "mHelper", mHelper);
+
+ final AppStateInstallAppsBridge appBridge = mock(AppStateInstallAppsBridge.class);
+ ReflectionHelpers.setField(fragment, "mAppBridge", appBridge);
+ when(appBridge.createInstallAppsStateFor(nullable(String.class), anyInt()))
+ .thenReturn(mock(InstallAppsState.class));
+
+ // Test restriction set up
+ shadowUserManager.setUserRestriction(UserHandle.of(UserHandle.myUserId()),
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true);
+ doAnswer((answer) -> {
+ when(mSwitchPref.isDisabledByAdmin()).thenReturn(true);
+ return null;
+ }).when(mSwitchPref).checkRestrictionAndSetDisabled(
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES);
+
+ // Code execution
+ assertThat(fragment.refreshUi()).isTrue();
+
+ // Assertions
+ assertThat(userManager.hasUserRestriction(
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,
+ UserHandle.of(UserHandle.myUserId()))).isTrue();
+ assertThat(mSwitchPref.isDisabledByAdmin()).isTrue();
+ }
+
+ @Test
+ public void refreshUi_userRestrictionsUnknownSourcesGlobally_disablesSwitchPreference() {
+ // Mocks set up
+ final ExternalSourcesDetails fragment = new ExternalSourcesDetails();
+ final ContextWrapper context = RuntimeEnvironment.application;
+ final UserManager userManager = (UserManager) context.getSystemService(
+ Context.USER_SERVICE);
+ final ShadowUserManager shadowUserManager = Shadow.extract(userManager);
+
+ ReflectionHelpers.setField(fragment, "mSwitchPref", mSwitchPref);
+ ReflectionHelpers.setField(fragment, "mPackageInfo", mPackageInfo);
+ mPackageInfo.applicationInfo = new ApplicationInfo();
+ ReflectionHelpers.setField(fragment, "mUserManager", userManager);
+ ReflectionHelpers.setField(mSwitchPref, "mHelper", mHelper);
+
+ final AppStateInstallAppsBridge appBridge = mock(AppStateInstallAppsBridge.class);
+ ReflectionHelpers.setField(fragment, "mAppBridge", appBridge);
+ when(appBridge.createInstallAppsStateFor(nullable(String.class), anyInt()))
+ .thenReturn(mock(InstallAppsState.class));
+
+ // Test restriction set up
+ shadowUserManager.setUserRestriction(UserHandle.of(UserHandle.myUserId()),
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY, true);
+ doAnswer((answer) -> {
+ when(mSwitchPref.isDisabledByAdmin()).thenReturn(true);
+ return null;
+ }).when(mSwitchPref).checkRestrictionAndSetDisabled(
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY);
+
+ // Code execution
+ assertThat(fragment.refreshUi()).isTrue();
+
+ // Assertions
+ assertThat(userManager.hasUserRestriction(
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
+ UserHandle.of(UserHandle.myUserId()))).isTrue();
+ assertThat(mSwitchPref.isDisabledByAdmin()).isTrue();
+ }
+
+ @Test
+ public void refreshUi_bothUnknownSourcesUserRestrictions_disableSwitchPreference() {
+ // Mocks set up
+ final ExternalSourcesDetails fragment = new ExternalSourcesDetails();
+ final ContextWrapper context = RuntimeEnvironment.application;
+ final UserManager userManager = (UserManager) context.getSystemService(
+ Context.USER_SERVICE);
+ final ShadowUserManager shadowUserManager = Shadow.extract(userManager);
+
+ ReflectionHelpers.setField(fragment, "mSwitchPref", mSwitchPref);
+ ReflectionHelpers.setField(fragment, "mPackageInfo", mPackageInfo);
+ mPackageInfo.applicationInfo = new ApplicationInfo();
+ ReflectionHelpers.setField(fragment, "mUserManager", userManager);
+ ReflectionHelpers.setField(mSwitchPref, "mHelper", mHelper);
+
+ final AppStateInstallAppsBridge appBridge = mock(AppStateInstallAppsBridge.class);
+ ReflectionHelpers.setField(fragment, "mAppBridge", appBridge);
+ when(appBridge.createInstallAppsStateFor(nullable(String.class), anyInt()))
+ .thenReturn(mock(InstallAppsState.class));
+
+ // Test restriction set up
+ shadowUserManager.setUserRestriction(UserHandle.of(UserHandle.myUserId()),
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY, true);
+ shadowUserManager.setUserRestriction(UserHandle.of(UserHandle.myUserId()),
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true);
+ doAnswer((answer) -> {
+ when(mSwitchPref.isDisabledByAdmin()).thenReturn(true);
+ return null;
+ }).when(mSwitchPref).checkRestrictionAndSetDisabled(
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY);
+
+ // Code execution
+ assertThat(fragment.refreshUi()).isTrue();
+
+ // Assertions
+ assertThat(userManager.hasUserRestriction(
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY,
+ UserHandle.of(UserHandle.myUserId()))).isTrue();
+ assertThat(userManager.hasUserRestriction(
+ UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES,
+ UserHandle.of(UserHandle.myUserId()))).isTrue();
+ assertThat(mSwitchPref.isDisabledByAdmin()).isTrue();
}
}
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java
index 6b4a641..29c783c 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java
@@ -16,6 +16,7 @@
package com.android.settings.applications.appinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -29,6 +30,9 @@
import android.content.DialogInterface;
import android.content.pm.PackageManager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -41,9 +45,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class})
public class InstantAppButtonDialogFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java
index 45fee32..5d8c842 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
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.argThat;
@@ -41,6 +42,11 @@
import android.view.View;
import android.widget.Button;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.BasePreferenceController;
@@ -56,11 +62,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class InstantAppButtonsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java
index 7e15848..af38db3 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.appinfo;
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;
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java
index 2473881..358bd30 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications.appinfo;
import static android.content.Intent.EXTRA_PACKAGE_NAME;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -26,6 +28,9 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.ResolveInfo;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,9 +43,6 @@
import org.robolectric.Shadows;
import org.robolectric.shadows.ShadowPackageManager;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TimeSpentInAppPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java
index 605da60..00ecece 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static android.Manifest.permission.SYSTEM_ALERT_WINDOW;
import static android.Manifest.permission.WRITE_SETTINGS;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -28,6 +30,8 @@
import android.content.pm.PackageInfo;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,8 +42,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WriteSystemSettingsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
index 1e4de78..74a3851 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications.assist;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
@@ -28,6 +30,10 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -39,10 +45,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AssistContextPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
index 2cb21db..10197ae 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications.assist;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
@@ -31,6 +33,10 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,10 +51,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AssistFlashScreenPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
index 8fcb316..e445dc6 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.assist;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
index 320471c..02c1b8b 100644
--- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.assist;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
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 57d2bcd..541954b 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java
@@ -23,11 +23,13 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.app.Activity;
import android.content.Context;
import android.os.UserManager;
import android.util.Pair;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -45,9 +47,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DefaultAppPickerFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
index f42c2ab..b9a1316 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -25,6 +26,8 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.TwoTargetPreference;
@@ -37,8 +40,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DefaultAppPreferenceControllerTest {
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 ed823c1..f2d14ac 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
@@ -17,18 +17,33 @@
package com.android.settings.applications.defaultapps;
import static com.google.common.truth.Truth.assertThat;
+
+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.when;
+import static org.robolectric.RuntimeEnvironment.application;
-import android.app.Activity;
+import android.app.AppOpsManager;
import android.content.Context;
+import android.content.Intent;
import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.UserHandle;
import android.os.UserManager;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowProcess;
+import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.applications.DefaultAppInfo;
import org.junit.Before;
@@ -37,45 +52,165 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
+import java.util.Arrays;
+
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {
+ SettingsShadowResources.SettingsShadowTheme.class,
+ ShadowProcess.class,
+ ShadowSecureSettings.class
+ })
public class DefaultAutofillPickerTest {
- private static final String TEST_APP_KEY = "foo.bar/foo.bar.Baz";
+ private static final String MAIN_APP_KEY = "main.foo.bar/foo.bar.Baz";
+ private static final String MANAGED_APP_KEY = "managed.foo.bar/foo.bar.Baz";
+ private static final int MANAGED_PROFILE_UID = 10;
+ private static final int MAIN_PROFILE_UID = 0;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Activity mActivity;
+ private FragmentActivity mActivity;
@Mock
private UserManager mUserManager;
@Mock
+ private AppOpsManager mAppOpsManager;
+ @Mock
private PackageManager mPackageManager;
+ @Mock
+ private PreferenceScreen mScreen;
+
private DefaultAutofillPicker mPicker;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest();
+
+ Resources res = application.getResources();
+
+ when(mActivity.getApplicationContext()).thenReturn(mActivity);
+ when(mActivity.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+ when(mActivity.getTheme()).thenReturn(res.newTheme());
+ when(mActivity.getResources()).thenReturn(res);
+
mPicker = spy(new DefaultAutofillPicker());
- mPicker.onAttach((Context) mActivity);
+
+ doReturn(application.getApplicationContext()).when(mPicker).getContext();
+ doReturn(mActivity).when(mPicker).getActivity();
+ doReturn(res).when(mPicker).getResources();
+ doReturn(mScreen).when(mPicker).getPreferenceScreen();
+
+ doNothing().when(mPicker).onCreatePreferences(any(), any());
+ doNothing().when(mPicker).updateCandidates();
ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
-
- doReturn(RuntimeEnvironment.application).when(mPicker).getContext();
}
@Test
public void setAndGetDefaultAppKey_shouldUpdateDefaultAutoFill() {
- assertThat(mPicker.setDefaultKey(TEST_APP_KEY)).isTrue();
- assertThat(mPicker.getDefaultKey()).isEqualTo(TEST_APP_KEY);
+ mPicker.onAttach((Context) mActivity);
+
+ ReflectionHelpers.setField(
+ mPicker, "mUserId", MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE);
+ assertThat(mPicker.setDefaultKey(MAIN_APP_KEY)).isTrue();
+ ReflectionHelpers.setField(
+ mPicker, "mUserId", MANAGED_PROFILE_UID * UserHandle.PER_USER_RANGE);
+ assertThat(mPicker.setDefaultKey(MANAGED_APP_KEY)).isTrue();
+
+ ReflectionHelpers.setField(
+ mPicker, "mUserId", MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE);
+ assertThat(mPicker.getDefaultKey()).isEqualTo(MAIN_APP_KEY);
+ ReflectionHelpers.setField(
+ mPicker, "mUserId", MANAGED_PROFILE_UID * UserHandle.PER_USER_RANGE);
+ assertThat(mPicker.getDefaultKey()).isEqualTo(MANAGED_APP_KEY);
}
@Test
public void getConfirmationMessage_shouldNotBeNull() {
+ mPicker.onAttach((Context) mActivity);
+
final DefaultAppInfo info = mock(DefaultAppInfo.class);
when(info.loadLabel()).thenReturn("test_app_name");
assertThat(mPicker.getConfirmationMessage(info)).isNotNull();
}
+
+ @Test
+ public void mUserId_shouldDeriveUidFromManagedCaller() {
+ setupUserManager();
+ setupCaller();
+ ShadowProcess.setMyUid(MANAGED_PROFILE_UID * UserHandle.PER_USER_RANGE);
+
+ mPicker.onAttach((Context) mActivity);
+ mPicker.onCreate(null);
+
+ assertUserId(MANAGED_PROFILE_UID);
+ }
+
+ @Test
+ public void mUserId_shouldDeriveUidFromMainCaller() {
+ setupUserManager();
+ setupCaller();
+ ShadowProcess.setMyUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE);
+
+ mPicker.onAttach((Context) mActivity);
+ mPicker.onCreate(null);
+
+ assertUserId(MAIN_PROFILE_UID);
+ }
+
+ @Test
+ public void mUserId_shouldDeriveUidFromManagedClick() {
+ setupUserManager();
+ setupClick(/* forWork= */ true);
+ ShadowProcess.setMyUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE);
+
+ mPicker.onAttach((Context) mActivity);
+ mPicker.onCreate(null);
+
+ assertUserId(MANAGED_PROFILE_UID);
+ }
+
+ @Test
+ public void mUserId_shouldDeriveUidFromMainClick() {
+ setupUserManager();
+ setupClick(/* forWork= */ false);
+ ShadowProcess.setMyUid(MAIN_PROFILE_UID * UserHandle.PER_USER_RANGE);
+
+ mPicker.onAttach((Context) mActivity);
+ mPicker.onCreate(null);
+
+ assertUserId(MAIN_PROFILE_UID);
+ }
+
+ private void setupUserManager() {
+ UserHandle mainUserHandle = new UserHandle(MAIN_PROFILE_UID);
+ UserHandle managedUserHandle = new UserHandle(MANAGED_PROFILE_UID);
+ UserInfo managedUserInfo = new UserInfo(
+ MANAGED_PROFILE_UID, "managed", UserInfo.FLAG_MANAGED_PROFILE);
+ when(mUserManager.getUserProfiles())
+ .thenReturn(Arrays.asList(mainUserHandle, managedUserHandle));
+ when(mUserManager.getUserInfo(MANAGED_PROFILE_UID))
+ .thenReturn(managedUserInfo);
+ when(mUserManager.getUserHandle()).thenReturn(MAIN_PROFILE_UID);
+ }
+
+ private void setupCaller() {
+ Intent intent = new Intent();
+ intent.putExtra("package_name", "any package name");
+ when(mActivity.getIntent()).thenReturn(intent);
+ }
+
+ private void setupClick(boolean forWork) {
+ Bundle bundle = new Bundle();
+ bundle.putBoolean("for_work", forWork);
+ doReturn(bundle).when(mPicker).getArguments();
+ }
+
+ private void assertUserId(int userId) {
+ assertThat((Integer) ReflectionHelpers.getField(mPicker, "mUserId"))
+ .isEqualTo(userId);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
index 4e08bad..6146671 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.defaultapps;
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;
@@ -28,6 +29,8 @@
import android.provider.Settings;
import android.view.autofill.AutofillManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -40,8 +43,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DefaultAutofillPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
index de6d5cf..cd3a426 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
@@ -17,9 +17,10 @@
package com.android.settings.applications.defaultapps;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -33,8 +34,11 @@
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -50,8 +54,6 @@
import java.util.Collections;
import java.util.List;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DefaultBrowserPreferenceControllerTest {
@@ -130,10 +132,23 @@
}
@Test
+ public void getDefaultApp_shouldGetApplicationInfoAsUser() throws NameNotFoundException {
+ final String PACKAGE_NAME = "com.test.package";
+ when(mPackageManager.getDefaultBrowserPackageNameAsUser(anyInt())).thenReturn(PACKAGE_NAME);
+
+ mController.getDefaultAppInfo();
+
+ verify(mPackageManager).getApplicationInfoAsUser(eq(PACKAGE_NAME), anyInt(), anyInt());
+ }
+
+ @Test
public void isBrowserDefault_onlyApp_shouldReturnTrue() {
when(mPackageManager.getDefaultBrowserPackageNameAsUser(anyInt())).thenReturn(null);
+ final List<ResolveInfo> resolveInfos = new ArrayList<>();
+ final String PACKAGE_ONE = "pkg";
+ resolveInfos.add(createResolveInfo(PACKAGE_ONE));
when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
- .thenReturn(Collections.singletonList(new ResolveInfo()));
+ .thenReturn(resolveInfos);
assertThat(mController.isBrowserDefault("pkg", 0)).isTrue();
}
@@ -160,6 +175,42 @@
assertThat(defaultBrowserInfo.size()).isEqualTo(2);
}
+ @Test
+ public void getCandidates_shouldQueryActivityWithFlagsEquals0() {
+
+ mController.getCandidates(mPackageManager, 0 /* userId */);
+
+ verify(mPackageManager).queryIntentActivitiesAsUser(
+ any(Intent.class), eq(0) /* flags */, eq(0) /* userId */);
+ }
+
+ @Test
+ public void getOnlyAppIcon_shouldGetApplicationInfoAsUser() throws NameNotFoundException {
+ final List<ResolveInfo> resolveInfos = new ArrayList<>();
+ final String PACKAGE_NAME = "com.test.package";
+ resolveInfos.add(createResolveInfo(PACKAGE_NAME));
+ when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))
+ .thenReturn(resolveInfos);
+ when(mContext.getPackageManager()).thenReturn(mPackageManager);
+ when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
+ when(mContext.getResources()).thenReturn(mock(Resources.class));
+
+ mController.getOnlyAppIcon();
+
+ verify(mPackageManager).getApplicationInfoAsUser(
+ eq(PACKAGE_NAME), eq(0) /* flags */, eq(0) /* userId */);
+ }
+
+ @Test
+ public void hasBrowserPreference_shouldQueryIntentActivitiesAsUser() {
+ when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+ mController.hasBrowserPreference("com.test.package", mContext, 0 /* userId */);
+
+ verify(mPackageManager).queryIntentActivitiesAsUser(
+ any(Intent.class), eq(0) /* flags */, eq(0) /* userId */);
+ }
+
private ResolveInfo createResolveInfo(String packageName) {
final ResolveInfo info = new ResolveInfo();
info.handleAllWebDataURI = true;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
index 91ffb80..e17b556 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.defaultapps;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
index 80e968a..4cf79df 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.defaultapps;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyList;
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
index ce9fe2a..1083a99 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
@@ -17,8 +17,9 @@
package com.android.settings.applications.defaultapps;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyList;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
@@ -29,10 +30,14 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -45,14 +50,12 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import java.util.Arrays;
-import java.util.Collections;
-
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DefaultHomePreferenceControllerTest {
+ private static final String TEST_PACKAGE = "test.pkg";
+ private static final String TEST_CLASS = "class";
+
@Mock
private UserManager mUserManager;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -107,14 +110,14 @@
@Test
public void testIsHomeDefault_noDefaultSet_shouldReturnTrue() {
when(mPackageManager.getHomeActivities(anyList())).thenReturn(null);
- assertThat(DefaultHomePreferenceController.isHomeDefault("test.pkg", mPackageManager))
+ assertThat(DefaultHomePreferenceController.isHomeDefault(TEST_PACKAGE, mPackageManager))
.isTrue();
}
@Test
public void testIsHomeDefault_defaultSetToPkg_shouldReturnTrue() {
- final String pkgName = "test.pkg";
- final ComponentName defaultHome = new ComponentName(pkgName, "class");
+ final String pkgName = TEST_PACKAGE;
+ final ComponentName defaultHome = new ComponentName(pkgName, TEST_CLASS);
when(mPackageManager.getHomeActivities(anyList())).thenReturn(defaultHome);
@@ -124,8 +127,8 @@
@Test
public void testIsHomeDefault_defaultSetToOtherPkg_shouldReturnFalse() {
- final String pkgName = "test.pkg";
- final ComponentName defaultHome = new ComponentName("not" + pkgName, "class");
+ final String pkgName = TEST_PACKAGE;
+ final ComponentName defaultHome = new ComponentName("not" + pkgName, TEST_CLASS);
when(mPackageManager.getHomeActivities(anyList())).thenReturn(defaultHome);
@@ -136,29 +139,28 @@
@Test
public void testGetSettingIntent_homeHasNoSetting_shouldNotReturnSettingIntent() {
when(mPackageManager.getHomeActivities(anyList()))
- .thenReturn(new ComponentName("test.pkg", "class"));
+ .thenReturn(new ComponentName(TEST_PACKAGE, TEST_CLASS));
+ when(mPackageManager.resolveActivity(any(Intent.class), anyInt()))
+ .thenReturn(null);
+
assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull();
}
@Test
public void testGetSettingIntent_homeHasOneSetting_shouldReturnSettingIntent() {
when(mPackageManager.getHomeActivities(anyList()))
- .thenReturn(new ComponentName("test.pkg", "class"));
- when(mPackageManager.queryIntentActivities(any(), eq(0)))
- .thenReturn(Collections.singletonList(mock(ResolveInfo.class)));
+ .thenReturn(new ComponentName(TEST_PACKAGE, TEST_CLASS));
+ final ResolveInfo info = mock(ResolveInfo.class);
+ info.activityInfo = mock(ActivityInfo.class);
+ info.activityInfo.name = TEST_CLASS;
+ info.activityInfo.applicationInfo = mock(ApplicationInfo.class);
+ info.activityInfo.applicationInfo.packageName = TEST_PACKAGE;
+ when(mPackageManager.resolveActivity(any(Intent.class), anyInt()))
+ .thenReturn(info);
Intent intent = mController.getSettingIntent(mController.getDefaultAppInfo());
assertThat(intent).isNotNull();
- assertThat(intent.getPackage()).isEqualTo("test.pkg");
- }
-
- @Test
- public void testGetSettingIntent_homeHasMultipleSettings_shouldNotReturnSettingIntent() {
- when(mPackageManager.getHomeActivities(anyList()))
- .thenReturn(new ComponentName("test.pkg", "class"));
- when(mPackageManager.queryIntentActivities(any(), eq(0)))
- .thenReturn(Arrays.asList(mock(ResolveInfo.class), mock(ResolveInfo.class)));
- assertThat(mController.getSettingIntent(mController.getDefaultAppInfo())).isNull();
+ assertThat(intent.getPackage()).isEqualTo(TEST_PACKAGE);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
index cfe30cb..1d4b5c0 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.defaultapps;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -27,6 +28,8 @@
import android.nfc.NfcAdapter;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.nfc.PaymentBackend;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,8 +41,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DefaultPaymentSettingsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
index 9b088cf..1378930 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java
@@ -16,8 +16,11 @@
package com.android.settings.applications.manageapplications;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ENABLED;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+ .FILTER_APPS_ENABLED;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry
+ .FILTER_APPS_USAGE_ACCESS;
+
import static com.google.common.truth.Truth.assertThat;
import com.android.settings.R;
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
index 51b6116..7409136 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
@@ -52,6 +52,7 @@
.LIST_TYPE_USAGE_ACCESS;
import static com.android.settings.applications.manageapplications.ManageApplications
.LIST_TYPE_WRITE_SETTINGS;
+
import static com.google.common.truth.Truth.assertThat;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java
index 5b0b275..2ae9561 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.manageapplications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import android.content.Context;
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 cc0308c..b3f5b5e 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
@@ -18,13 +18,16 @@
import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING;
import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+
import static com.android.settings.applications.manageapplications.AppFilterRegistry
.FILTER_APPS_ALL;
import static com.android.settings.applications.manageapplications.ManageApplications
.LIST_TYPE_MAIN;
import static com.android.settings.applications.manageapplications.ManageApplications
.LIST_TYPE_NOTIFICATION;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -49,6 +52,9 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.LoadingViewController;
@@ -65,9 +71,6 @@
import java.util.ArrayList;
-import androidx.fragment.app.FragmentActivity;
-import androidx.recyclerview.widget.RecyclerView;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ManageApplicationsTest {
@@ -197,13 +200,13 @@
}
@Test
- public void shouldUseStableItemHeight_mainType_yes() {
+ public void shouldUseStableItemHeight() {
assertThat(ManageApplications.ApplicationsAdapter.shouldUseStableItemHeight(
LIST_TYPE_MAIN))
.isTrue();
assertThat(ManageApplications.ApplicationsAdapter.shouldUseStableItemHeight(
LIST_TYPE_NOTIFICATION))
- .isFalse();
+ .isTrue();
}
@Test
@@ -279,6 +282,28 @@
}
@Test
+ public void applicationsAdapter_onBindViewHolder_notifications_wrongExtraInfo() {
+ when(mUserManager.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[]{});
+ ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
+ mFragment.mListType = LIST_TYPE_NOTIFICATION;
+ ApplicationViewHolder holder = mock(ApplicationViewHolder.class);
+ ReflectionHelpers.setField(holder, "itemView", mock(View.class));
+ ManageApplications.ApplicationsAdapter adapter =
+ new ManageApplications.ApplicationsAdapter(mState,
+ mFragment, mock(AppFilterItem.class),
+ mock(Bundle.class));
+ final ArrayList<ApplicationsState.AppEntry> appList = new ArrayList<>();
+ final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+ appEntry.info = mock(ApplicationInfo.class);
+ appEntry.extraInfo = mock(AppFilterItem.class);
+ appList.add(appEntry);
+ ReflectionHelpers.setField(adapter, "mEntries", appList);
+
+ adapter.onBindViewHolder(holder, 0);
+ // no crash? yay!
+ }
+
+ @Test
public void applicationsAdapter_onBindViewHolder_updateSwitch_notifications() {
when(mUserManager.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[]{});
ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
index 13295e3..d2b6d8a 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.manageapplications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -30,6 +31,8 @@
import android.view.View;
import android.widget.FrameLayout;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.StorageStatsSource;
@@ -42,8 +45,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.Fragment;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class MusicViewHolderControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
index 8f2fb65e..64cc1cc 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.manageapplications;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.nullable;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,6 +30,8 @@
import android.view.View;
import android.widget.FrameLayout;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.StorageStatsSource;
@@ -41,8 +44,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.Fragment;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PhotosViewHolderControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java
index 2baacda..be3d554 100644
--- a/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/DomainAppPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.managedomainurls;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -27,6 +28,8 @@
import android.view.View;
import android.widget.ProgressBar;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.ApplicationsState;
@@ -38,8 +41,6 @@
import java.util.UUID;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DomainAppPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java
index fc789bf..f09e400 100644
--- a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppAccountPreferenceControllerTest.java
@@ -16,9 +16,12 @@
package com.android.settings.applications.managedomainurls;
import static android.provider.Settings.Global.ENABLE_EPHEMERAL_FEATURE;
+
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -59,13 +62,13 @@
mContext = spy(RuntimeEnvironment.application);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
mContentResolver = mContext.getContentResolver();
- mEnableEphemeralFeature = Settings.Secure.getInt(mContentResolver,
+ mEnableEphemeralFeature = Settings.Global.getInt(mContentResolver,
ENABLE_EPHEMERAL_FEATURE, 1);
}
@After
public void tearDown() {
- Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE,
+ Settings.Global.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE,
mEnableEphemeralFeature);
}
@@ -78,10 +81,10 @@
}
@Test
- public void testGetAvailabilityStatus_enableWebActiions() {
+ public void testGetAvailabilityStatus_enableWebActions() {
when(mPackageManager.getInstantAppResolverSettingsComponent()).thenReturn(mComponentName);
mController = new InstantAppAccountPreferenceController(mContext, PREF_KEY);
- Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 1);
+ Settings.Global.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 1);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@@ -90,7 +93,7 @@
public void testGetAvailabilityStatus_disableWebActions() {
when(mPackageManager.getInstantAppResolverSettingsComponent()).thenReturn(mComponentName);
mController = new InstantAppAccountPreferenceController(mContext, PREF_KEY);
- Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 0);
+ Settings.Global.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 0);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
diff --git a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java
index 8d1b584..b4ff2fa 100644
--- a/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/managedomainurls/InstantAppWebActionPreferenceControllerTest.java
@@ -16,15 +16,20 @@
package com.android.settings.applications.managedomainurls;
import static android.provider.Settings.Global.ENABLE_EPHEMERAL_FEATURE;
+
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.After;
@@ -34,8 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class InstantAppWebActionPreferenceControllerTest {
private static final String PREF_KEY = "instant_app_web_action_toggle";
@@ -54,26 +57,26 @@
mContentResolver = mContext.getContentResolver();
mController = new InstantAppWebActionPreferenceController(mContext, PREF_KEY);
mSwitchPreference = new SwitchPreference(mContext);
- mEnableEphemeralFeature = Settings.Secure.getInt(mContentResolver,
+ mEnableEphemeralFeature = Settings.Global.getInt(mContentResolver,
ENABLE_EPHEMERAL_FEATURE, 1);
}
@After
public void tearDown() {
- Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE,
+ Settings.Global.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE,
mEnableEphemeralFeature);
}
@Test
public void testGetAvailabilityStatus_enableWebActions() {
- Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 1);
+ Settings.Global.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 1);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
@Test
public void testGetAvailabilityStatus_disableWebActions() {
- Settings.Secure.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 0);
+ Settings.Global.putInt(mContentResolver, ENABLE_EPHEMERAL_FEATURE, 0);
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java
index c632d08..ed72cf9 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/DataSaverControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.specialaccess;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java
index 4713be2..27fb24e 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/HighPowerAppsControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.specialaccess;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java
index e19d9e6..0873a18 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListItemTest.java
@@ -18,6 +18,7 @@
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
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 7507e07..18ecf7d 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
@@ -18,6 +18,7 @@
import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -29,6 +30,8 @@
import android.content.IntentFilter;
import android.os.UserHandle;
+import androidx.lifecycle.LifecycleOwner;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
@@ -40,8 +43,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DeviceAdminListPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java
index 8355d78..bba2b8b 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.specialaccess.pictureinpicture;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -24,6 +25,8 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.core.BasePreferenceController;
@@ -36,8 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PictureInPictureDetailPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java
index eb96d94..9d53f95 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.specialaccess.pictureinpicture;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java
index 1d1be50..deb66c8 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.applications.specialaccess.pictureinpicture;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java
index ff4ac9f..3978825 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsAccessTest.java
@@ -24,7 +24,6 @@
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.telephony.SmsUsageMonitor;
-import com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java
index 35a93c1..4244cd7 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications.specialaccess.premiumsms;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java
index 29ab15b..0dc7da3 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/premiumsms/PremiumSmsScreenPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.applications.specialaccess.premiumsms;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java
index 3fb9045..6239774 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/EnabledVrListenersControllerTest.java
@@ -18,6 +18,7 @@
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 android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java
index c5734f9..7a8dc5f 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java
index c5dfc21..43b707c 100644
--- a/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/AutoRestorePreferenceControllerTest.java
@@ -20,6 +20,8 @@
import android.content.Context;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,8 +33,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowPrivacySettingsUtils.class})
public class AutoRestorePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java
index 4a0f85d..f23bc93 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupDataPreferenceControllerTest.java
@@ -20,6 +20,8 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,8 +34,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowPrivacySettingsUtils.class})
public class BackupDataPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java
index 95d68d9..bcd432a 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java
@@ -20,6 +20,8 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,8 +33,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowPrivacySettingsUtils.class})
public class BackupInactivePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
index 3f8c0ef..f6276d0 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.backup;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -25,6 +26,8 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,8 +41,6 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class)
public class BackupSettingsActivityPreferenceControllerTest {
@@ -63,7 +64,7 @@
mContext = spy(RuntimeEnvironment.application.getApplicationContext());
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
- mController = new BackupSettingsActivityPreferenceController(mContext);
+ mController = new BackupSettingsActivityPreferenceController(mContext, KEY_BACKUP_SETTINGS);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
index 602ae21..51a6016 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java
@@ -17,6 +17,7 @@
package com.android.settings.backup;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.isA;
@@ -30,6 +31,10 @@
import android.content.pm.PackageManager;
import android.os.UserHandle;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -51,10 +56,6 @@
import java.util.List;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class,
BackupSettingsActivityTest.ShadowUserHandle.class})
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
index d156a2d..f3cb850 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
@@ -17,6 +17,7 @@
package com.android.settings.backup;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.mock;
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
index 3d3fec6..fb3f947 100644
--- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.backup;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,9 @@
import android.content.Context;
import android.content.Intent;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,9 +40,6 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class)
public class BackupSettingsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java
index 2e0ae5d..5609f35 100644
--- a/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/ConfigureAccountPreferenceControllerTest.java
@@ -21,6 +21,8 @@
import android.content.Context;
import android.content.Intent;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,8 +36,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowPrivacySettingsUtils.class})
public class ConfigureAccountPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java
index 2f1f119..caf20c8 100644
--- a/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/backup/DataManagementPreferenceControllerTest.java
@@ -21,6 +21,8 @@
import android.content.Context;
import android.content.Intent;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,8 +35,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowPrivacySettingsUtils.class})
public class DataManagementPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
index bde1c3e..9907da0 100644
--- a/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceStatusPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -30,6 +32,8 @@
import android.hardware.face.FaceManager;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -45,8 +49,6 @@
import java.util.Collections;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FaceStatusPreferenceControllerTest {
@Mock
@@ -119,7 +121,7 @@
when(mFaceManager.isHardwareDetected()).thenReturn(true);
when(mFaceManager.getEnrolledFaces(anyInt()))
.thenReturn(Collections.singletonList(mock(Face.class)));
- when(mFaceManager.hasEnrolledFaces(anyInt()))
+ when(mFaceManager.hasEnrolledTemplates(anyInt()))
.thenReturn(true);
mController.updateState(mPreference);
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 9479771..1d3d9ea 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,14 @@
import android.app.Dialog;
import android.hardware.fingerprint.Fingerprint;
+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.biometrics.fingerprint.FingerprintSettings
+ .FingerprintSettingsFragment.DeleteFingerprintDialog;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowFragment;
-import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.Before;
import org.junit.Test;
@@ -36,6 +38,7 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowFragment.class, SettingsShadowResourcesImpl.class})
@@ -56,7 +59,8 @@
@Test
public void launchDialog_clickPositive_shouldDeleteFingerprint() {
- FragmentTestUtils.startFragment(mFragment);
+ FragmentController.setupFragment(mFragment, FragmentActivity.class, 0 /* containerViewId */,
+ null /* bundle */);
mFragment.onClick(mFragment.getDialog(), Dialog.BUTTON_POSITIVE);
@@ -65,7 +69,8 @@
@Test
public void launchDialog_clickNegative_shouldDoNothing() {
- FragmentTestUtils.startFragment(mFragment);
+ FragmentController.setupFragment(mFragment, FragmentActivity.class, 0 /* containerViewId */,
+ null /* bundle */);
mFragment.onClick(mFragment.getDialog(), Dialog.BUTTON_NEGATIVE);
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index bee208f..fb50b3c 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -17,19 +17,15 @@
package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.verify;
-import static org.robolectric.RuntimeEnvironment.application;
import android.content.Intent;
import android.hardware.fingerprint.FingerprintManager;
import android.hardware.fingerprint.FingerprintManager.EnrollmentCallback;
-import android.media.AudioAttributes;
import android.os.CancellationSignal;
-import android.os.VibrationEffect;
-import android.os.Vibrator;
import android.widget.TextView;
import com.android.settings.R;
@@ -38,7 +34,7 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settings.testutils.shadow.ShadowVibrator;
+
import org.junit.After;
import org.junit.Before;
@@ -49,15 +45,11 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
-import org.robolectric.shadow.api.Shadow;
-
-import java.util.concurrent.TimeUnit;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
SettingsShadowResourcesImpl.class,
- ShadowUtils.class,
- ShadowVibrator.class})
+ ShadowUtils.class})
public class FingerprintEnrollEnrollingTest {
@Mock
@@ -69,7 +61,6 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowUtils.setFingerprintManager(mFingerprintManager);
- ShadowVibrator.addToServiceMap();
FakeFeatureFactory.setupForTest();
mActivity = Robolectric.buildActivity(
@@ -83,11 +74,10 @@
@After
public void tearDown() {
ShadowUtils.reset();
- ShadowVibrator.reset();
}
@Test
- public void fingerprintEnrollHelp_shouldShowHelpTextAndVibrate() {
+ public void fingerprintEnrollHelp_shouldShowHelpText() {
EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
enrollmentCallback.onEnrollmentProgress(123);
@@ -97,16 +87,6 @@
TextView errorText = mActivity.findViewById(R.id.error_text);
assertThat(errorText.getText()).isEqualTo("test enrollment help");
-
- Robolectric.getForegroundThreadScheduler().advanceBy(2, TimeUnit.MILLISECONDS);
-
- ShadowVibrator shadowVibrator =
- Shadow.extract(application.getSystemService(Vibrator.class));
- verify(shadowVibrator.delegate).vibrate(
- anyInt(),
- nullable(String.class),
- any(VibrationEffect.class),
- nullable(AudioAttributes.class));
}
private EnrollmentCallback verifyAndCaptureEnrollmentCallback() {
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index 147ed1d..d51c6a5 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java
index 888b061..834aea5 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSuggestionActivityTest.java
@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
index 8c90cb7..03b96ed 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import android.content.Context;
@@ -24,6 +25,8 @@
import android.view.View;
import android.widget.FrameLayout;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.biometrics.fingerprint.FingerprintSettings.FingerprintPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,8 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FingerprintPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
index fe3f5b0..7606202 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.biometrics.fingerprint;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
index cb22837..b47fd08 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintStatusPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -30,6 +32,8 @@
import android.hardware.fingerprint.FingerprintManager;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -45,8 +49,6 @@
import java.util.Collections;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FingerprintStatusPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
index 310674e..393d86e 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
+
import static org.robolectric.RuntimeEnvironment.application;
import android.app.Activity;
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
index 797a202..86a5f71 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensorTest.java
@@ -17,12 +17,15 @@
package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
+
import static org.robolectric.RuntimeEnvironment.application;
import android.content.Intent;
import android.hardware.fingerprint.FingerprintManager;
import android.widget.Button;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -41,8 +44,6 @@
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
-import androidx.appcompat.app.AlertDialog;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
SettingsShadowResources.SettingsShadowTheme.class,
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 36ccc68..aed1ea9 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -17,6 +17,7 @@
package com.android.settings.biometrics.fingerprint;
import static com.google.common.truth.Truth.assertThat;
+
import static org.robolectric.RuntimeEnvironment.application;
import android.app.KeyguardManager;
@@ -29,14 +30,13 @@
import com.android.settings.R;
import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.biometrics.BiometricEnrollIntroduction;
-import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper;
import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment;
import com.android.settings.password.SetupSkipDialog;
-import com.android.settings.password.StorageManagerWrapper;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowFingerprintManager;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowStorageManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.After;
@@ -49,8 +49,6 @@
import org.robolectric.Shadows;
import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowActivity;
import org.robolectric.shadows.ShadowActivity.IntentForResult;
import org.robolectric.shadows.ShadowKeyguardManager;
@@ -59,7 +57,7 @@
@Config(shadows = {
ShadowFingerprintManager.class,
ShadowLockPatternUtils.class,
- ShadowStorageManagerWrapper.class,
+ ShadowStorageManager.class,
ShadowUserManager.class
})
public class SetupFingerprintEnrollIntroductionTest {
@@ -75,7 +73,6 @@
Shadows.shadowOf(application.getPackageManager())
.setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
- ShadowFingerprintManager.addToServiceMap();
FakeFeatureFactory.setupForTest();
@@ -87,8 +84,7 @@
@After
public void tearDown() {
- ShadowStorageManagerWrapper.reset();
- ShadowFingerprintManager.reset();
+ ShadowStorageManager.reset();
}
@Test
@@ -207,7 +203,7 @@
@Test
public void testLockPattern() {
- ShadowStorageManagerWrapper.sIsFileEncrypted = false;
+ ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
mController.create().postCreate(null).resume();
@@ -226,19 +222,4 @@
private ShadowKeyguardManager getShadowKeyguardManager() {
return Shadows.shadowOf(application.getSystemService(KeyguardManager.class));
}
-
- @Implements(StorageManagerWrapper.class)
- public static class ShadowStorageManagerWrapper {
-
- private static boolean sIsFileEncrypted = true;
-
- public static void reset() {
- sIsFileEncrypted = true;
- }
-
- @Implementation
- public static boolean isFileEncryptedNativeOrEmulated() {
- return sIsFileEncrypted;
- }
- }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
index 1e323ef..0083478 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java
@@ -16,6 +16,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
@@ -25,18 +26,14 @@
import android.content.Intent;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadow.api.Shadow;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {ShadowBluetoothAdapter.class})
public class AlwaysDiscoverableTest {
@Mock
@@ -44,14 +41,12 @@
private AlwaysDiscoverable mAlwaysDiscoverable;
private BluetoothAdapter mBluetoothAdapter;
- private ShadowBluetoothAdapter mShadowBluetoothAdapter;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mAlwaysDiscoverable = new AlwaysDiscoverable(mContext);
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
- mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
}
@Test
@@ -81,7 +76,7 @@
@Test
public void startSetsModeAndRegistersReceiver() {
- mShadowBluetoothAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_NONE);
+ mBluetoothAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_NONE);
mAlwaysDiscoverable.start();
assertThat(mBluetoothAdapter.getScanMode())
.isEqualTo(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
@@ -109,7 +104,7 @@
}
private void sendScanModeChangedIntent(int newMode, int previousMode) {
- mShadowBluetoothAdapter.setScanMode(newMode);
+ mBluetoothAdapter.setScanMode(newMode);
Intent intent = new Intent(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED);
intent.putExtra(BluetoothAdapter.EXTRA_SCAN_MODE, newMode);
intent.putExtra(BluetoothAdapter.EXTRA_PREVIOUS_SCAN_MODE, previousMode);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
index cf73d41e..0b7853c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java
@@ -22,6 +22,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
@@ -31,11 +32,9 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAudioManager;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowCachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
-import com.android.settingslib.bluetooth.HeadsetProfile;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
import org.junit.Before;
import org.junit.Test;
@@ -44,12 +43,14 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
import java.util.ArrayList;
import java.util.Collection;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {ShadowAudioManager.class})
+@Config(shadows = {ShadowAudioManager.class, ShadowBluetoothAdapter.class,
+ ShadowCachedBluetoothDeviceManager.class})
public class AvailableMediaBluetoothDeviceUpdaterTest {
@Mock
private DashboardFragment mDashboardFragment;
@@ -59,39 +60,34 @@
private CachedBluetoothDevice mCachedBluetoothDevice;
@Mock
private BluetoothDevice mBluetoothDevice;
- @Mock
- private LocalBluetoothManager mLocalManager;
- @Mock
- private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
- @Mock
- private HeadsetProfile mHeadsetProfile;
- @Mock
- private CachedBluetoothDeviceManager mCachedDeviceManager;
private Context mContext;
private AvailableMediaBluetoothDeviceUpdater mBluetoothDeviceUpdater;
- private Collection<CachedBluetoothDevice> cachedDevices;
+ private Collection<CachedBluetoothDevice> mCachedDevices;
private ShadowAudioManager mShadowAudioManager;
private BluetoothDevicePreference mPreference;
+ private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+ private ShadowCachedBluetoothDeviceManager mShadowCachedBluetoothDeviceManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mShadowAudioManager = ShadowAudioManager.getShadow();
+ mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+ mShadowBluetoothAdapter.setEnabled(true);
mContext = RuntimeEnvironment.application;
- doReturn(mContext).when(mDashboardFragment).getContext();
- cachedDevices =
+ mShadowCachedBluetoothDeviceManager = Shadow.extract(
+ Utils.getLocalBtManager(mContext).getCachedDeviceManager());
+ mCachedDevices =
new ArrayList<CachedBluetoothDevice>(new ArrayList<CachedBluetoothDevice>());
+ mShadowCachedBluetoothDeviceManager.setCachedDevicesCopy(mCachedDevices);
+ doReturn(mContext).when(mDashboardFragment).getContext();
when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
- when(mLocalManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
- when(mLocalBluetoothProfileManager.getHeadsetProfile()).thenReturn(mHeadsetProfile);
- when(mLocalManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
- when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(cachedDevices);
- mBluetoothDeviceUpdater = spy(new AvailableMediaBluetoothDeviceUpdater(mDashboardFragment,
- mDevicePreferenceCallback, mLocalManager));
+ mBluetoothDeviceUpdater = spy(new AvailableMediaBluetoothDeviceUpdater(mContext,
+ mDashboardFragment, mDevicePreferenceCallback));
mBluetoothDeviceUpdater.setPrefContext(mContext);
mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
@@ -103,8 +99,8 @@
mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
- cachedDevices.add(mCachedBluetoothDevice);
+ when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);
+ mCachedDevices.add(mCachedBluetoothDevice);
mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -116,8 +112,8 @@
mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
- cachedDevices.add(mCachedBluetoothDevice);
+ when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);
+ mCachedDevices.add(mCachedBluetoothDevice);
mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -129,8 +125,8 @@
mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
- cachedDevices.add(mCachedBluetoothDevice);
+ when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);
+ mCachedDevices.add(mCachedBluetoothDevice);
mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -142,8 +138,8 @@
mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
- cachedDevices.add(mCachedBluetoothDevice);
+ when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);
+ mCachedDevices.add(mCachedBluetoothDevice);
mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -155,7 +151,7 @@
mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
+ when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);
mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
@@ -168,7 +164,7 @@
mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
+ when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);
mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
@@ -181,7 +177,7 @@
mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
+ when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);
mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
@@ -194,7 +190,7 @@
mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
+ when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);
mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
index 78af1d1..d17fd96 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
@@ -27,6 +28,9 @@
import android.view.View;
import android.widget.Button;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
@@ -39,9 +43,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowBluetoothDevice.class)
public class BluetoothDetailsButtonsControllerTest extends BluetoothDetailsControllerTestBase {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
index ba9fe12..aa3985a 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java
@@ -23,6 +23,9 @@
import android.content.Context;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -32,9 +35,6 @@
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowBluetoothDevice.class)
public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
index 95508bc..509ebc8 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
@@ -24,6 +24,11 @@
import android.bluetooth.BluetoothManager;
import android.content.Context;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
@@ -35,11 +40,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothDetailsControllerTestBase {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
index 3860617..0430e0f 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.inOrder;
@@ -27,6 +28,10 @@
import android.graphics.drawable.Drawable;
import android.view.View;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -46,10 +51,6 @@
import org.mockito.Mock;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {SettingsShadowBluetoothDevice.class, ShadowEntityHeaderController.class})
@@ -71,7 +72,7 @@
FakeFeatureFactory.setupForTest();
ShadowEntityHeaderController.setUseMock(mHeaderController);
when(mBluetoothManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
- when(mCachedDeviceManager.getHearingAidPairDeviceSummary(mCachedDevice)).thenReturn("abc");
+ when(mCachedDeviceManager.getSubDeviceSummary(mCachedDevice)).thenReturn("abc");
mController =
new BluetoothDetailsHeaderController(mContext, mFragment, mCachedDevice, mLifecycle,
mBluetoothManager);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
index 62414e4..5c4289c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -28,11 +29,14 @@
import android.bluetooth.BluetoothProfile;
import android.content.Context;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice;
+import com.android.settings.testutils.shadow.ShadowBluetoothDevice;
import com.android.settingslib.bluetooth.A2dpProfile;
-import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfile;
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
@@ -51,11 +55,8 @@
import java.util.Map;
import java.util.Set;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = SettingsShadowBluetoothDevice.class)
+@Config(shadows = {SettingsShadowBluetoothDevice.class, ShadowBluetoothDevice.class})
public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase {
private BluetoothDetailsProfilesController mController;
@@ -105,7 +106,7 @@
}
@Override
- public boolean isConnectable() {
+ public boolean accessProfileEnabled() {
return true;
}
@@ -290,8 +291,7 @@
@Test
public void pbapProfileStartsEnabled() {
setupDevice(makeDefaultDeviceConfig());
- when(mCachedDevice.getPhonebookPermissionChoice())
- .thenReturn(CachedBluetoothDevice.ACCESS_ALLOWED);
+ mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
PbapServerProfile psp = mock(PbapServerProfile.class);
when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap);
when(psp.toString()).thenReturn(PbapServerProfile.NAME);
@@ -306,14 +306,14 @@
pref.performClick();
assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
- verify(mCachedDevice).setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_REJECTED);
+ assertThat(mDevice.getPhonebookAccessPermission())
+ .isEqualTo(BluetoothDevice.ACCESS_REJECTED);
}
@Test
public void pbapProfileStartsDisabled() {
setupDevice(makeDefaultDeviceConfig());
- when(mCachedDevice.getPhonebookPermissionChoice())
- .thenReturn(CachedBluetoothDevice.ACCESS_REJECTED);
+ mDevice.setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
PbapServerProfile psp = mock(PbapServerProfile.class);
when(psp.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_pbap);
when(psp.toString()).thenReturn(PbapServerProfile.NAME);
@@ -328,7 +328,8 @@
pref.performClick();
assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
- verify(mCachedDevice).setPhonebookPermissionChoice(CachedBluetoothDevice.ACCESS_ALLOWED);
+ assertThat(mDevice.getPhonebookAccessPermission())
+ .isEqualTo(BluetoothDevice.ACCESS_ALLOWED);
}
@Test
@@ -338,8 +339,7 @@
when(mapProfile.getNameResource(mDevice)).thenReturn(R.string.bluetooth_profile_map);
when(mProfileManager.getMapProfile()).thenReturn(mapProfile);
when(mProfileManager.getProfileByName(eq(mapProfile.toString()))).thenReturn(mapProfile);
- when(mCachedDevice.getMessagePermissionChoice())
- .thenReturn(CachedBluetoothDevice.ACCESS_REJECTED);
+ mDevice.setMessageAccessPermission(BluetoothDevice.ACCESS_REJECTED);
showScreen(mController);
List<SwitchPreference> switches = getProfileSwitches(false);
assertThat(switches.size()).isEqualTo(1);
@@ -349,7 +349,7 @@
pref.performClick();
assertThat(mProfiles.getPreferenceCount()).isEqualTo(1);
- verify(mCachedDevice).setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
+ assertThat(mDevice.getMessageAccessPermission()).isEqualTo(BluetoothDevice.ACCESS_ALLOWED);
}
private A2dpProfile addMockA2dpProfile(boolean preferred, boolean supportsHighQualityAudio,
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
index 9a35345..9651a89 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
index afce68e..5d2718c 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
@@ -24,12 +25,14 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.bluetooth.BluetoothAdapter;
import android.content.Context;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,9 +41,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowBluetoothAdapter.class})
public class BluetoothDeviceNamePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
index 6256a3d..12c7193 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -16,6 +16,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -37,6 +38,7 @@
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.testutils.DrawableTestHelper;
import org.junit.Before;
import org.junit.Test;
@@ -78,7 +80,7 @@
mPreference.onClicked();
verify(mMetricsFeatureProvider)
- .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT);
+ .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_DISCONNECT);
}
@Test
@@ -89,7 +91,7 @@
mPreference.onClicked();
verify(mMetricsFeatureProvider)
- .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT);
+ .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_CONNECT);
}
@Test
@@ -102,9 +104,10 @@
mPreference.onClicked();
verify(mMetricsFeatureProvider)
- .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
+ .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
verify(mMetricsFeatureProvider, never())
- .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
+ .action(mContext,
+ MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
}
@Test
@@ -117,9 +120,10 @@
mPreference.onClicked();
verify(mMetricsFeatureProvider)
- .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
+ .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR);
verify(mMetricsFeatureProvider)
- .action(mContext, MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
+ .action(mContext,
+ MetricsEvent.ACTION_SETTINGS_BLUETOOTH_PAIR_DEVICES_WITHOUT_NAMES);
}
@Test
@@ -163,13 +167,12 @@
@Test
public void imagingDeviceIcon_isICSettingsPrint() {
when(mCachedBluetoothDevice.getBatteryLevel())
- .thenReturn(BluetoothDevice.BATTERY_LEVEL_UNKNOWN);
+ .thenReturn(BluetoothDevice.BATTERY_LEVEL_UNKNOWN);
when(mCachedBluetoothDevice.getBtClass())
- .thenReturn(new BluetoothClass(BluetoothClass.Device.Major.IMAGING));
+ .thenReturn(new BluetoothClass(BluetoothClass.Device.Major.IMAGING));
mPreference.onDeviceAttributesChanged();
- assertThat(mPreference.getIcon()).isEqualTo(
- mContext.getDrawable(R.drawable.ic_settings_print));
+ DrawableTestHelper.assertDrawableResId(mPreference.getIcon(), R.drawable.ic_settings_print);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
index 0fdfc52..9de46dd 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
@@ -27,8 +28,14 @@
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -36,11 +43,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
index 9f81711..c93d965 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java
@@ -16,21 +16,27 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.content.Intent;
+import androidx.preference.Preference;
+
import com.android.settings.SettingsActivity;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import org.junit.Before;
@@ -40,10 +46,14 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
-import androidx.preference.Preference;
+import java.util.ArrayList;
+import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothAdapter.class})
public class BluetoothDeviceUpdaterTest {
@Mock
@@ -53,23 +63,36 @@
@Mock
private CachedBluetoothDevice mCachedBluetoothDevice;
@Mock
+ private CachedBluetoothDevice mSubCachedBluetoothDevice;
+ @Mock
private BluetoothDevice mBluetoothDevice;
@Mock
+ private BluetoothDevice mSubBluetoothDevice;
+ @Mock
private SettingsActivity mSettingsActivity;
@Mock
private LocalBluetoothManager mLocalManager;
+ @Mock
+ private CachedBluetoothDeviceManager mCachedDeviceManager;
private Context mContext;
private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
private BluetoothDevicePreference mPreference;
+ private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+ private List<CachedBluetoothDevice> mCachedDevices = new ArrayList<CachedBluetoothDevice>();
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
+ mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+ mCachedDevices.add(mCachedBluetoothDevice);
doReturn(mContext).when(mDashboardFragment).getContext();
when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
+ when(mSubCachedBluetoothDevice.getDevice()).thenReturn(mSubBluetoothDevice);
+ when(mLocalManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
+ when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(mCachedDevices);
mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
mBluetoothDeviceUpdater =
@@ -129,6 +152,20 @@
}
@Test
+ public void testRemovePreference_subDeviceExist_removePreference() {
+ when(mCachedBluetoothDevice.getSubDevice()).thenReturn(mSubCachedBluetoothDevice);
+ mBluetoothDeviceUpdater.mPreferenceMap.put(mSubBluetoothDevice, mPreference);
+
+ assertThat(mBluetoothDeviceUpdater.mPreferenceMap.
+ containsKey(mSubBluetoothDevice)).isTrue();
+ mBluetoothDeviceUpdater.removePreference(mCachedBluetoothDevice);
+
+ verify(mDevicePreferenceCallback).onDeviceRemoved(mPreference);
+ assertThat(mBluetoothDeviceUpdater.mPreferenceMap.
+ containsKey(mSubBluetoothDevice)).isFalse();
+ }
+
+ @Test
public void testDeviceProfilesListener_click_startBluetoothDeviceDetailPage() {
doReturn(mSettingsActivity).when(mDashboardFragment).getContext();
@@ -171,4 +208,38 @@
// Shouldn't crash
mBluetoothDeviceUpdater.unregisterCallback();
}
+
+ @Test
+ public void forceUpdate_bluetoothDisabled_doNothing() {
+ mShadowBluetoothAdapter.setEnabled(false);
+ mBluetoothDeviceUpdater.forceUpdate();
+
+ verify(mDevicePreferenceCallback, never()).onDeviceAdded(any(Preference.class));
+ }
+
+ @Test
+ public void forceUpdate_bluetoothEnabled_addPreference() {
+ mShadowBluetoothAdapter.setEnabled(true);
+ mBluetoothDeviceUpdater.forceUpdate();
+
+ verify(mDevicePreferenceCallback).onDeviceAdded(any(Preference.class));
+ }
+
+ @Test
+ public void onBluetoothStateChanged_bluetoothStateIsOn_forceUpdate() {
+ mShadowBluetoothAdapter.setEnabled(true);
+ mBluetoothDeviceUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_ON);
+
+ verify(mDevicePreferenceCallback).onDeviceAdded(any(Preference.class));
+ }
+
+ @Test
+ public void onBluetoothStateChanged_bluetoothStateIsOff_removeAllDevicesFromPreference() {
+ mBluetoothDeviceUpdater.mPreferenceMap.put(mBluetoothDevice, mPreference);
+
+ mBluetoothDeviceUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_OFF);
+
+ verify(mDevicePreferenceCallback).onDeviceRemoved(mPreference);
+ assertThat(mBluetoothDeviceUpdater.mPreferenceMap.containsKey(mBluetoothDevice)).isFalse();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
index 927f622..fe10d3e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Mockito.mock;
@@ -30,9 +31,12 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.os.UserHandle;
import android.os.UserManager;
import android.view.View;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
@@ -54,8 +58,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowBluetoothAdapter.class})
public class BluetoothEnablerTest {
@@ -66,7 +68,8 @@
@BeforeClass
public static void beforeClass() {
- sFakeEnforcedAdmin = new EnforcedAdmin(new ComponentName("test.package", "test.Class"), 10);
+ sFakeEnforcedAdmin = new EnforcedAdmin(new ComponentName("test.package", "test.Class"),
+ UserHandle.of(10));
}
@Mock
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
index c3bc9a1..f912975 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -25,6 +26,8 @@
import android.content.pm.PackageManager;
import android.os.Bundle;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,8 +38,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothFilesPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java
new file mode 100644
index 0000000..350ec9e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothNameDialogFragmentTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.view.inputmethod.EditorInfo;
+import android.widget.TextView;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class BluetoothNameDialogFragmentTest {
+
+ private TestBluetoothNameDialogFragment mBluetoothNameDialogFragment;
+ private TextView mTextView;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mBluetoothNameDialogFragment = new TestBluetoothNameDialogFragment();
+ mTextView = new TextView(RuntimeEnvironment.application);
+ }
+
+ @Test
+ public void onEditorAction_dialogNull_shouldNotCrash() {
+ mBluetoothNameDialogFragment.mAlertDialog = null;
+
+ // Should not crash
+ assertThat(
+ mBluetoothNameDialogFragment.onEditorAction(mTextView, EditorInfo.IME_ACTION_DONE,
+ null)).isTrue();
+ }
+
+
+ /**
+ * Test fragment for {@link BluetoothNameDialogFragment} to test common methods
+ */
+ public static class TestBluetoothNameDialogFragment extends BluetoothNameDialogFragment {
+
+ @Override
+ protected int getDialogTitle() {
+ return 0;
+ }
+
+ @Override
+ protected String getDeviceName() {
+ return null;
+ }
+
+ @Override
+ protected void setDeviceName(String deviceName) {
+
+ }
+
+ @Override
+ public int getMetricsCategory() {
+ return 0;
+ }
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
index 8da659e..5233d84 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingControllerTest.java
@@ -16,9 +16,11 @@
package com.android.settings.bluetooth;
import static android.bluetooth.BluetoothDevice.PAIRING_VARIANT_CONSENT;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
+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.content.Intent;
@@ -38,6 +40,8 @@
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class})
public class BluetoothPairingControllerTest {
+ private final BluetoothClass mBluetoothClass =
+ new BluetoothClass(BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE);
@Mock
private BluetoothDevice mBluetoothDevice;
private Context mContext;
@@ -50,7 +54,7 @@
mContext = RuntimeEnvironment.application;
final Intent intent = new Intent();
intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mBluetoothDevice);
- mBluetoothPairingController = spy(new BluetoothPairingController(intent, mContext));
+ mBluetoothPairingController = new BluetoothPairingController(intent, mContext);
}
@Test
@@ -62,4 +66,36 @@
verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
}
+
+ @Test
+ public void onSetContactSharingState_permissionAllowed_setPBAPAllowed() {
+ when(mBluetoothDevice.getPhonebookAccessPermission()).thenReturn(
+ BluetoothDevice.ACCESS_ALLOWED);
+ mBluetoothPairingController.setContactSharingState();
+ mBluetoothPairingController.onDialogPositiveClick(null);
+
+ verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+ }
+
+ @Test
+ public void onSetContactSharingState_permissionUnknown_audioVideoHandsfree_setPBAPAllowed() {
+ when(mBluetoothDevice.getPhonebookAccessPermission()).thenReturn(
+ BluetoothDevice.ACCESS_UNKNOWN);
+ when(mBluetoothDevice.getBluetoothClass()).thenReturn(mBluetoothClass);
+ mBluetoothPairingController.setContactSharingState();
+ mBluetoothPairingController.onDialogPositiveClick(null);
+
+ verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_ALLOWED);
+ }
+
+ @Test
+ public void onSetContactSharingState_permissionRejected_setPBAPRejected() {
+ when(mBluetoothDevice.getPhonebookAccessPermission()).thenReturn(
+ BluetoothDevice.ACCESS_REJECTED);
+ when(mBluetoothDevice.getBluetoothClass()).thenReturn(mBluetoothClass);
+ mBluetoothPairingController.setContactSharingState();
+ mBluetoothPairingController.onDialogPositiveClick(null);
+
+ verify(mBluetoothDevice).setPhonebookAccessPermission(BluetoothDevice.ACCESS_REJECTED);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
index 6491843..a967566 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
@@ -28,13 +29,17 @@
import static org.mockito.Mockito.verify;
import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.content.res.Resources;
+import androidx.preference.PreferenceGroup;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.widget.FooterPreference;
@@ -48,11 +53,10 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
-import androidx.preference.PreferenceGroup;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowBluetoothAdapter.class})
public class BluetoothPairingDetailTest {
+ private static final String TEST_DEVICE_ADDRESS = "00:A1:A1:A1:A1:A1";
@Mock
private Resources mResource;
@@ -60,12 +64,15 @@
private LocalBluetoothManager mLocalManager;
@Mock
private PreferenceGroup mPreferenceGroup;
+ @Mock
+ private CachedBluetoothDevice mCachedBluetoothDevice;
private BluetoothPairingDetail mFragment;
private Context mContext;
private BluetoothProgressCategory mAvailableDevicesCategory;
private FooterPreference mFooterPreference;
private BluetoothAdapter mBluetoothAdapter;
private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+ private BluetoothDevice mBluetoothDevice;
@Before
public void setUp() {
@@ -80,6 +87,7 @@
mFooterPreference = new FooterPreference(mContext);
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+ mBluetoothDevice = mBluetoothAdapter.getRemoteDevice(TEST_DEVICE_ADDRESS);
mFragment.mBluetoothAdapter = mBluetoothAdapter;
mFragment.mLocalManager = mLocalManager;
@@ -88,7 +96,7 @@
}
@Test
- public void testInitPreferencesFromPreferenceScreen_findPreferences() {
+ public void initPreferencesFromPreferenceScreen_findPreferences() {
doReturn(mAvailableDevicesCategory).when(mFragment)
.findPreference(BluetoothPairingDetail.KEY_AVAIL_DEVICES);
doReturn(mFooterPreference).when(mFragment)
@@ -101,7 +109,7 @@
}
@Test
- public void testStartScanning_startScanAndRemoveDevices() {
+ public void startScanning_startScanAndRemoveDevices() {
mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
mFragment.mDeviceListGroup = mAvailableDevicesCategory;
@@ -112,7 +120,7 @@
}
@Test
- public void testUpdateContent_stateOn_addDevices() {
+ public void updateContent_stateOn_addDevices() {
mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
mFragment.mFooterPreference = mFooterPreference;
doNothing().when(mFragment).addDeviceCategory(any(), anyInt(), any(), anyBoolean());
@@ -121,20 +129,20 @@
verify(mFragment).addDeviceCategory(mAvailableDevicesCategory,
R.string.bluetooth_preference_found_media_devices,
- BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER, false);
+ BluetoothDeviceFilter.ALL_FILTER, false);
assertThat(mBluetoothAdapter.getScanMode())
.isEqualTo(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
}
@Test
- public void testUpdateContent_stateOff_finish() {
+ public void updateContent_stateOff_finish() {
mFragment.updateContent(BluetoothAdapter.STATE_OFF);
verify(mFragment).finish();
}
@Test
- public void testUpdateBluetooth_bluetoothOff_turnOnBluetooth() {
+ public void updateBluetooth_bluetoothOff_turnOnBluetooth() {
mShadowBluetoothAdapter.setEnabled(false);
mFragment.updateBluetooth();
@@ -143,7 +151,7 @@
}
@Test
- public void testUpdateBluetooth_bluetoothOn_updateState() {
+ public void updateBluetooth_bluetoothOn_updateState() {
mShadowBluetoothAdapter.setEnabled(true);
doNothing().when(mFragment).updateContent(anyInt());
@@ -153,7 +161,7 @@
}
@Test
- public void testOnScanningStateChanged_restartScanAfterInitialScanning() {
+ public void onScanningStateChanged_restartScanAfterInitialScanning() {
mFragment.mAvailableDevicesCategory = mAvailableDevicesCategory;
mFragment.mFooterPreference = mFooterPreference;
mFragment.mDeviceListGroup = mAvailableDevicesCategory;
@@ -208,4 +216,15 @@
verify(mFragment).showBluetoothTurnedOnToast();
}
-}
+
+ @Test
+ public void onConnectionStateChanged_connected_finish() {
+ mFragment.mSelectedDevice = mBluetoothDevice;
+ doReturn(mBluetoothDevice).when(mCachedBluetoothDevice).getDevice();
+
+ mFragment.onConnectionStateChanged(mCachedBluetoothDevice,
+ BluetoothAdapter.STATE_CONNECTED);
+
+ verify(mFragment).finish();
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
index 6cd924a..7b50e21 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -16,6 +16,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doNothing;
@@ -35,11 +36,13 @@
import android.widget.CheckBox;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.Before;
import org.junit.Test;
@@ -48,8 +51,7 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-
-import androidx.appcompat.app.AlertDialog;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class})
@@ -189,7 +191,8 @@
BluetoothPairingDialogFragment frag = new BluetoothPairingDialogFragment();
// this should throw an error
- FragmentTestUtils.startFragment(frag);
+ FragmentController.setupFragment(frag, FragmentActivity.class, 0 /* containerViewId */,
+ null /* bundle */);
fail("Starting the fragment with no controller set should have thrown an exception.");
}
@@ -285,7 +288,7 @@
// verify that the checkbox is visible and that the device name is correct
CheckBox sharingCheckbox =
- frag.getmDialog().findViewById(R.id.phonebook_sharing_message_confirm_pin);
+ frag.getmDialog().findViewById(R.id.phonebook_sharing_message_confirm_pin);
assertThat(sharingCheckbox.getVisibility()).isEqualTo(View.VISIBLE);
}
@@ -303,7 +306,7 @@
// verify that the checkbox is gone
CheckBox sharingCheckbox =
- frag.getmDialog().findViewById(R.id.phonebook_sharing_message_confirm_pin);
+ frag.getmDialog().findViewById(R.id.phonebook_sharing_message_confirm_pin);
assertThat(sharingCheckbox.getVisibility()).isEqualTo(View.GONE);
}
@@ -449,7 +452,8 @@
frag.setPairingController(controller);
assertThat(frag.isPairingDialogActivitySet()).isFalse();
frag.setPairingDialogActivity(dialogActivity);
- FragmentTestUtils.startFragment(frag);
+ FragmentController.setupFragment(frag, FragmentActivity.class, 0 /* containerViewId */,
+ null /* bundle */);
assertThat(frag.getmDialog()).isNotNull();
assertThat(frag.isPairingControllerSet()).isTrue();
assertThat(frag.isPairingDialogActivitySet()).isTrue();
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
index f53a2f5..27ea6be 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.spy;
@@ -26,9 +27,12 @@
import android.content.Context;
import android.content.Intent;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.testutils.DrawableTestHelper;
import org.junit.Before;
import org.junit.Test;
@@ -38,8 +42,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothPairingPreferenceControllerTest {
@@ -71,10 +73,10 @@
Preference pref = mController.createBluetoothPairingPreference(ORDER);
assertThat(pref.getKey()).isEqualTo(BluetoothPairingPreferenceController.KEY_PAIRING);
- assertThat(pref.getIcon()).isEqualTo(mContext.getDrawable(R.drawable.ic_menu_add));
+ DrawableTestHelper.assertDrawableResId(pref.getIcon(), R.drawable.ic_menu_add);
assertThat(pref.getOrder()).isEqualTo(ORDER);
assertThat(pref.getTitle())
- .isEqualTo(mContext.getString(R.string.bluetooth_pairing_pref_title));
+ .isEqualTo(mContext.getString(R.string.bluetooth_pairing_pref_title));
}
@Test
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
index 75361d7..369d222 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java
@@ -18,14 +18,18 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
import android.bluetooth.BluetoothAdapter;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,14 +45,6 @@
import java.util.List;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.widget.SliceLiveData;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowLocalBluetoothProfileManager.class})
public class BluetoothSliceBuilderTest {
@@ -58,12 +54,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
-
- // Prevent crash in SliceMetadata.
- Resources resources = spy(mContext.getResources());
- doReturn(60).when(resources).getDimensionPixelSize(anyInt());
- doReturn(resources).when(mContext).getResources();
+ mContext = RuntimeEnvironment.application;
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
@@ -97,4 +88,4 @@
assertThat(adapter.isEnabled()).isTrue();
}
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
index 2cab95b..d3c195f 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doCallRealMethod;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
index cca9ff0..e53c86e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.Context;
@@ -27,13 +28,11 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.utils.AnnotationSpan;
import com.android.settings.widget.SwitchWidgetController;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.widget.FooterPreference;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
index d94a8a7..f4364b7 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java
@@ -16,6 +16,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -23,6 +24,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
@@ -32,9 +34,9 @@
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAudioManager;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowCachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
import org.junit.Before;
import org.junit.Test;
@@ -43,12 +45,14 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
import java.util.ArrayList;
import java.util.Collection;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {ShadowAudioManager.class})
+@Config(shadows = {ShadowAudioManager.class, ShadowBluetoothAdapter.class,
+ ShadowCachedBluetoothDeviceManager.class})
public class ConnectedBluetoothDeviceUpdaterTest {
@Mock
private DashboardFragment mDashboardFragment;
@@ -58,32 +62,32 @@
private CachedBluetoothDevice mCachedBluetoothDevice;
@Mock
private BluetoothDevice mBluetoothDevice;
- @Mock
- private LocalBluetoothManager mLocalManager;
- @Mock
- private CachedBluetoothDeviceManager mCachedDeviceManager;
private Context mContext;
private ConnectedBluetoothDeviceUpdater mBluetoothDeviceUpdater;
- private Collection<CachedBluetoothDevice> cachedDevices;
+ private Collection<CachedBluetoothDevice> mCachedDevices;
private ShadowAudioManager mShadowAudioManager;
+ private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+ private ShadowCachedBluetoothDeviceManager mShadowCachedBluetoothDeviceManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mShadowAudioManager = ShadowAudioManager.getShadow();
+ mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+ mShadowBluetoothAdapter.setEnabled(true);
mContext = RuntimeEnvironment.application;
+ mShadowCachedBluetoothDeviceManager = Shadow.extract(
+ Utils.getLocalBtManager(mContext).getCachedDeviceManager());
doReturn(mContext).when(mDashboardFragment).getContext();
- cachedDevices =
+ mCachedDevices =
new ArrayList<CachedBluetoothDevice>(new ArrayList<CachedBluetoothDevice>());
when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
- when(mLocalManager.getCachedDeviceManager()).thenReturn(mCachedDeviceManager);
- when(mCachedDeviceManager.getCachedDevicesCopy()).thenReturn(cachedDevices);
-
- mBluetoothDeviceUpdater = spy(new ConnectedBluetoothDeviceUpdater(mDashboardFragment,
- mDevicePreferenceCallback, mLocalManager));
+ mShadowCachedBluetoothDeviceManager.setCachedDevicesCopy(mCachedDevices);
+ mBluetoothDeviceUpdater = spy(new ConnectedBluetoothDeviceUpdater(mContext,
+ mDashboardFragment, mDevicePreferenceCallback));
mBluetoothDeviceUpdater.setPrefContext(mContext);
doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
doNothing().when(mBluetoothDeviceUpdater).removePreference(any());
@@ -94,8 +98,8 @@
mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
- cachedDevices.add(mCachedBluetoothDevice);
+ when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);
+ mCachedDevices.add(mCachedBluetoothDevice);
mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -107,8 +111,8 @@
mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
- cachedDevices.add(mCachedBluetoothDevice);
+ when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);
+ mCachedDevices.add(mCachedBluetoothDevice);
mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -120,8 +124,8 @@
mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
- cachedDevices.add(mCachedBluetoothDevice);
+ when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);
+ mCachedDevices.add(mCachedBluetoothDevice);
mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -133,8 +137,8 @@
mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
- cachedDevices.add(mCachedBluetoothDevice);
+ when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);
+ mCachedDevices.add(mCachedBluetoothDevice);
mBluetoothDeviceUpdater.onAudioModeChanged();
@@ -146,7 +150,7 @@
mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
+ when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);
mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
@@ -159,7 +163,7 @@
mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isA2dpDevice()).thenReturn(true);
+ when(mCachedBluetoothDevice.isConnectedA2dpDevice()).thenReturn(true);
mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
@@ -172,7 +176,7 @@
mShadowAudioManager.setMode(AudioManager.MODE_IN_CALL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
+ when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);
mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
@@ -185,7 +189,7 @@
mShadowAudioManager.setMode(AudioManager.MODE_NORMAL);
when(mBluetoothDeviceUpdater.
isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);
- when(mCachedBluetoothDevice.isHfpDevice()).thenReturn(true);
+ when(mCachedBluetoothDevice.isConnectedHfpDevice()).thenReturn(true);
mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,
BluetoothProfile.STATE_CONNECTED, BluetoothProfile.A2DP);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
index c64b904..649728e 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doReturn;
@@ -28,6 +29,8 @@
import android.content.Context;
import android.content.res.Resources;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
@@ -44,8 +47,6 @@
import java.util.List;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowBluetoothAdapter.class})
public class DeviceListPreferenceFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
index 8532cc1..d6d31ea 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
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;
@@ -24,6 +25,9 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -39,9 +43,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowDialog;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResourcesImpl.class)
public class ForgetDeviceDialogFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java
index 49d72fb..b455fa2 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -26,12 +27,14 @@
import android.view.View;
import android.view.inputmethod.InputMethodManager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.After;
import org.junit.Before;
@@ -41,10 +44,9 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
import org.robolectric.util.ReflectionHelpers;
-import androidx.appcompat.app.AlertDialog;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class})
public class LocalDeviceNameDialogFragmentTest {
@@ -72,7 +74,8 @@
@Test
public void diaglogTriggersShowSoftInput() {
- FragmentTestUtils.startFragment(mFragment);
+ FragmentController.setupFragment(mFragment, FragmentActivity.class, 0 /* containerViewId */,
+ null /* bundle */);
AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
assertThat(dialog).isNotNull();
View view = dialog.findViewById(R.id.edittext);
diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
index c9edc00..31dec3f 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.bluetooth;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
@@ -29,15 +30,17 @@
import android.widget.Button;
import android.widget.EditText;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
+import com.android.settings.testutils.shadow.ShadowDynamicLayout;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
@@ -45,11 +48,10 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowDialog;
-
-import androidx.appcompat.app.AlertDialog;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResourcesImpl.class)
+@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowDynamicLayout.class})
public class RemoteDeviceNameDialogFragmentTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -76,12 +78,12 @@
*/
AlertDialog startDialog(String deviceName) {
when(mCachedDevice.getName()).thenReturn(deviceName);
- FragmentTestUtils.startFragment(mFragment);
+ FragmentController.setupFragment(mFragment, FragmentActivity.class, 0 /* containerViewId */,
+ null /* bundle */);
return (AlertDialog) ShadowDialog.getLatestDialog();
}
@Test
- @Ignore
public void deviceNameDisplayIsCorrect() {
String deviceName = "ABC Corp Headphones";
AlertDialog dialog = startDialog(deviceName);
@@ -97,7 +99,6 @@
}
@Test
- @Ignore
public void deviceNameEditSucceeds() {
String deviceNameInitial = "ABC Corp Headphones";
String deviceNameModified = "My Headphones";
@@ -120,7 +121,6 @@
}
@Test
- @Ignore
public void deviceNameEditThenCancelDoesntRename() {
String deviceNameInitial = "ABC Corp Headphones";
String deviceNameModified = "My Headphones";
diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
index def8c4d..e25e4b2 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
@@ -29,9 +29,8 @@
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
-import com.android.settingslib.bluetooth.LocalBluetoothManager;
-import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
import org.junit.Before;
import org.junit.Test;
@@ -39,8 +38,10 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowBluetoothAdapter.class})
public class SavedBluetoothDeviceUpdaterTest {
@Mock
@@ -51,10 +52,6 @@
private CachedBluetoothDevice mCachedBluetoothDevice;
@Mock
private BluetoothDevice mBluetoothDevice;
- @Mock
- private LocalBluetoothManager mLocalManager;
- @Mock
- private LocalBluetoothProfileManager mLocalBluetoothProfileManager;
private Context mContext;
private SavedBluetoothDeviceUpdater mBluetoothDeviceUpdater;
@@ -67,11 +64,10 @@
mContext = RuntimeEnvironment.application;
doReturn(mContext).when(mDashboardFragment).getContext();
when(mCachedBluetoothDevice.getDevice()).thenReturn(mBluetoothDevice);
- when(mLocalManager.getProfileManager()).thenReturn(mLocalBluetoothProfileManager);
when(mBluetoothDevice.getBondState()).thenReturn(BluetoothDevice.BOND_BONDED);
- mBluetoothDeviceUpdater = spy(new SavedBluetoothDeviceUpdater(mDashboardFragment,
- mDevicePreferenceCallback, mLocalManager));
+ mBluetoothDeviceUpdater = spy(new SavedBluetoothDeviceUpdater(mContext, mDashboardFragment,
+ mDevicePreferenceCallback));
mBluetoothDeviceUpdater.setPrefContext(mContext);
mPreference = new BluetoothDevicePreference(mContext, mCachedBluetoothDevice, false);
doNothing().when(mBluetoothDeviceUpdater).addPreference(any());
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
index c3ba7d1..4f02062 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
@@ -17,8 +17,11 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static junit.framework.Assert.assertTrue;
+
import static org.mockito.Mockito.when;
import android.bluetooth.BluetoothAdapter;
@@ -28,6 +31,8 @@
import android.content.pm.PackageManager;
import android.text.TextUtils;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedPreference;
@@ -43,8 +48,6 @@
import org.robolectric.shadows.ShadowApplicationPackageManager;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowApplicationPackageManager.class)
public class AddDevicePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
index e3e3fc5..f0be229 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
@@ -16,7 +16,9 @@
package com.android.settings.connecteddevice;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.ContentResolver;
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
index 7814b18..7d99550 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
@@ -15,9 +15,11 @@
*/
package com.android.settings.connecteddevice;
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+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 static org.mockito.ArgumentMatchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
@@ -29,6 +31,11 @@
import android.content.pm.PackageManager;
import android.media.AudioManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater;
import com.android.settings.dashboard.DashboardFragment;
@@ -48,11 +55,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
ShadowAudioManager.class,
@@ -177,7 +179,7 @@
doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
assertThat(mAvailableMediaDeviceGroupController.getAvailabilityStatus()).isEqualTo(
- AVAILABLE);
+ AVAILABLE_UNSEARCHABLE);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index 4529f03..eecbca5 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -19,7 +19,9 @@
.KEY_AVAILABLE_DEVICES;
import static com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment
.KEY_CONNECTED_DEVICES;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
index bd47f8b..a752a6c 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java
@@ -15,9 +15,11 @@
*/
package com.android.settings.connecteddevice;
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+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 static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -27,6 +29,11 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
@@ -44,11 +51,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplicationPackageManager;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowApplicationPackageManager.class)
public class ConnectedDeviceGroupControllerTest {
@@ -94,7 +96,7 @@
}
@Test
- public void testOnDeviceAdded_firstAdd_becomeVisibleAndPreferenceAdded() {
+ public void onDeviceAdded_firstAdd_becomeVisibleAndPreferenceAdded() {
mConnectedDeviceGroupController.onDeviceAdded(mPreference);
assertThat(mPreferenceGroup.isVisible()).isTrue();
@@ -102,7 +104,7 @@
}
@Test
- public void testOnDeviceRemoved_lastRemove_becomeInvisibleAndPreferenceRemoved() {
+ public void onDeviceRemoved_lastRemove_becomeInvisibleAndPreferenceRemoved() {
mPreferenceGroup.addPreference(mPreference);
mConnectedDeviceGroupController.onDeviceRemoved(mPreference);
@@ -112,7 +114,7 @@
}
@Test
- public void testOnDeviceRemoved_notLastRemove_stillVisible() {
+ public void onDeviceRemoved_notLastRemove_stillVisible() {
mPreferenceGroup.setVisible(true);
mPreferenceGroup.addPreference(mPreference);
mPreferenceGroup.addPreference(new Preference(mContext));
@@ -123,7 +125,7 @@
}
@Test
- public void testDisplayPreference_becomeInvisible() {
+ public void displayPreference_becomeInvisible() {
doReturn(mPreferenceGroup).when(mPreferenceScreen).findPreference(anyString());
mConnectedDeviceGroupController.displayPreference(mPreferenceScreen);
@@ -132,7 +134,7 @@
}
@Test
- public void testRegister() {
+ public void onStart_shouldRegisterUpdaters() {
// register the callback in onStart()
mConnectedDeviceGroupController.onStart();
verify(mConnectedBluetoothDeviceUpdater).registerCallback();
@@ -141,7 +143,7 @@
}
@Test
- public void testUnregister() {
+ public void onStop_shouldUnregisterUpdaters() {
// unregister the callback in onStop()
mConnectedDeviceGroupController.onStop();
verify(mConnectedBluetoothDeviceUpdater).unregisterCallback();
@@ -150,7 +152,7 @@
}
@Test
- public void testGetAvailabilityStatus_noBluetoothFeature_returnUnSupported() {
+ public void getAvailabilityStatus_noBluetoothFeature_returnUnSupported() {
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
@@ -158,10 +160,10 @@
}
@Test
- public void testGetAvailabilityStatus_BluetoothFeature_returnSupported() {
+ public void getAvailabilityStatus_BluetoothFeature_returnSupported() {
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
assertThat(mConnectedDeviceGroupController.getAvailabilityStatus()).isEqualTo(
- AVAILABLE);
+ AVAILABLE_UNSEARCHABLE);
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
index e6ef2d9..913e7d9 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -29,6 +30,8 @@
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;
@@ -46,14 +49,11 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
-import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class})
public class DiscoverableFooterPreferenceControllerTest {
@@ -74,7 +74,6 @@
private DiscoverableFooterPreferenceController mDiscoverableFooterPreferenceController;
private BroadcastReceiver mBluetoothChangedReceiver;
private ShadowApplication mShadowApplication;
- private ShadowBluetoothAdapter mShadowBluetoothAdapter;
@Before
public void setUp() {
@@ -90,7 +89,6 @@
mAlwaysDiscoverable);
mBluetoothChangedReceiver = mDiscoverableFooterPreferenceController
.mBluetoothChangedReceiver;
- mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
}
@Test
@@ -136,15 +134,15 @@
@Test
public void onBluetoothStateChanged_bluetoothOn_updateTitle() {
- mShadowBluetoothAdapter.setName(DEVICE_NAME);
+ BluetoothAdapter.getDefaultAdapter().setName(DEVICE_NAME);
sendBluetoothStateChangedIntent(BluetoothAdapter.STATE_ON);
assertThat(mPreference.getTitle()).isEqualTo(generateTitle(DEVICE_NAME));
}
@Test
- public void onBluetoothStateChanged_bluetoothOff_updateTitle(){
- mShadowBluetoothAdapter.setName(DEVICE_NAME);
+ public void onBluetoothStateChanged_bluetoothOff_updateTitle() {
+ BluetoothAdapter.getDefaultAdapter().setName(DEVICE_NAME);
sendBluetoothStateChangedIntent(BluetoothAdapter.STATE_OFF);
assertThat(mPreference.getTitle()).isEqualTo(generateTitle(null));
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
index f89bcce..52b2e95 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
@@ -17,7 +17,9 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -25,6 +27,11 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
import com.android.settings.dashboard.DashboardFragment;
@@ -37,8 +44,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PreviouslyConnectedDevicePreferenceControllerTest {
@@ -52,10 +57,12 @@
private DockUpdater mDockUpdater;
@Mock
private PackageManager mPackageManager;
+ @Mock
+ private PreferenceManager mPreferenceManager;
private Context mContext;
private PreviouslyConnectedDevicePreferenceController mPreConnectedDeviceController;
- private Preference mPreference;
+ private PreferenceGroup mPreferenceGroup;
@Before
public void setUp() {
@@ -68,8 +75,10 @@
mPreConnectedDeviceController.setBluetoothDeviceUpdater(mBluetoothDeviceUpdater);
mPreConnectedDeviceController.setSavedDockUpdater(mDockUpdater);
- mPreference = new Preference(mContext);
- mPreConnectedDeviceController.setPreference(mPreference);
+ mPreferenceGroup = spy(new PreferenceCategory(mContext));
+ doReturn(mPreferenceManager).when(mPreferenceGroup).getPreferenceManager();
+ mPreferenceGroup.setVisible(false);
+ mPreConnectedDeviceController.setPreferenceGroup(mPreferenceGroup);
}
@Test
@@ -99,20 +108,34 @@
}
@Test
- public void onDeviceAdded_addFirstDevice_preferenceIsEnable() {
- doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
- mPreConnectedDeviceController.setPreferenceSize(0);
- mPreConnectedDeviceController.onDeviceAdded(mPreference);
+ public void onDeviceAdded_addDevicePreference_displayIt() {
+ mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
- assertThat(mPreference.isEnabled()).isTrue();
+ assertThat(mPreferenceGroup.isVisible()).isTrue();
+ assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(1);
}
@Test
- public void onDeviceRemoved_removeLastDevice_preferenceIsDisable() {
- doReturn(true).when(mPackageManager).hasSystemFeature(PackageManager.FEATURE_BLUETOOTH);
- mPreConnectedDeviceController.setPreferenceSize(1);
- mPreConnectedDeviceController.onDeviceRemoved(mPreference);
+ public void onDeviceAdded_addFourDevicePreference_onlyDisplayThree() {
+ mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
+ mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
+ mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
+ mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
- assertThat(mPreference.isEnabled()).isFalse();
+ assertThat(mPreferenceGroup.isVisible()).isTrue();
+ assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(3);
}
+
+ @Test
+ public void onDeviceRemoved_removeLastDevice_setInvisible() {
+ final Preference preference = new Preference(mContext);
+ mPreferenceGroup.addPreference(preference);
+ mPreferenceGroup.setVisible(true);
+
+ mPreConnectedDeviceController.onDeviceRemoved(preference);
+
+ assertThat(mPreferenceGroup.isVisible()).isFalse();
+ assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(0);
+ }
+
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
index a6cac5d..e85626d 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java
@@ -17,7 +17,9 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -25,6 +27,9 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceManager;
+
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
import com.android.settings.dashboard.DashboardFragment;
@@ -39,9 +44,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceManager;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SavedDeviceGroupControllerTest {
private static final String PREFERENCE_KEY_1 = "pref_key_1";
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java
new file mode 100644
index 0000000..8816bec
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java
@@ -0,0 +1,61 @@
+/*
+ * 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.connecteddevice;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class TopLevelConnectedDevicesPreferenceControllerTest {
+
+ private Context mContext;
+ private TopLevelConnectedDevicesPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mController = new TopLevelConnectedDevicesPreferenceController(mContext, "test_key");
+ }
+
+ @Test
+ @Config(shadows = ShadowAdvancedConnectedDeviceController.class)
+ public void getSummary_shouldCallAdvancedConnectedDeviceController() {
+ assertThat(mController.getSummary())
+ .isEqualTo(mContext.getText(R.string.settings_label_launcher));
+ }
+
+ @Implements(AdvancedConnectedDeviceController.class)
+ private static class ShadowAdvancedConnectedDeviceController {
+
+ @Implementation
+ public static int getConnectedDevicesSummaryResourceId(Context context) {
+ return R.string.settings_label_launcher;
+ }
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
index 3068032..643d6b2 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java
@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice.usb;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@
import com.android.settings.connecteddevice.DevicePreferenceCallback;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.testutils.DrawableTestHelper;
import org.junit.Before;
import org.junit.Test;
@@ -67,8 +69,8 @@
mDeviceUpdater.initUsbPreference(mContext);
assertThat(mDeviceUpdater.mUsbPreference.getTitle()).isEqualTo("USB");
- assertThat(mDeviceUpdater.mUsbPreference.getIcon())
- .isEqualTo(mContext.getDrawable(R.drawable.ic_usb));
+ DrawableTestHelper.assertDrawableResId(
+ mDeviceUpdater.mUsbPreference.getIcon(), R.drawable.ic_usb);
assertThat(mDeviceUpdater.mUsbPreference.isSelectable()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
index 567b072..9ad73be 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
@@ -17,6 +17,7 @@
package com.android.settings.connecteddevice.usb;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java
index 06e7522..7317ea9 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiverTest.java
@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice.usb;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
index dca10d7..2c619dc 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
@@ -16,12 +16,21 @@
package com.android.settings.connecteddevice.usb;
+import static android.net.ConnectivityManager.TETHERING_USB;
+
import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Mockito.doNothing;
+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 static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import android.hardware.usb.UsbManager;
+import android.net.ConnectivityManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -31,13 +40,17 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
+import org.robolectric.util.FragmentTestUtil;
@RunWith(SettingsRobolectricTestRunner.class)
public class UsbDefaultFragmentTest {
@Mock
private UsbBackend mUsbBackend;
+ @Mock
+ private ConnectivityManager mConnectivityManager;
private UsbDefaultFragment mFragment;
@@ -46,6 +59,7 @@
MockitoAnnotations.initMocks(this);
mFragment = new UsbDefaultFragment();
mFragment.mUsbBackend = mUsbBackend;
+ mFragment.mConnectivityManager = mConnectivityManager;
}
@Test
@@ -102,12 +116,6 @@
}
@Test
- public void setDefaultKey_isRndis_shouldSetRndis() {
- mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_RNDIS));
- verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_RNDIS);
- }
-
- @Test
public void setDefaultKey_isMidi_shouldSetMidi() {
mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MIDI));
verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_MIDI);
@@ -118,6 +126,39 @@
public void setDefaultKey_isMonkey_shouldDoNothing() {
ShadowUtils.setIsUserAMonkey(true);
mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MTP));
- verifyZeroInteractions(mUsbBackend);
+
+ verify(mUsbBackend, never()).setDefaultUsbFunctions(anyLong());
+ }
+
+ @Test
+ public void setDefaultKey_functionRndis_startTetheringInvoked() {
+ doReturn(UsbManager.FUNCTION_MTP).when(mUsbBackend).getCurrentFunctions();
+
+ mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_RNDIS));
+
+ verify(mConnectivityManager).startTethering(TETHERING_USB, true,
+ mFragment.mOnStartTetheringCallback);
+ assertThat(mFragment.mPreviousFunctions).isEqualTo(
+ UsbManager.FUNCTION_MTP);
+ }
+
+ @Test
+ public void setDefaultKey_functionOther_setCurrentFunctionInvoked() {
+ doReturn(UsbManager.FUNCTION_MTP).when(mUsbBackend).getCurrentFunctions();
+
+ mFragment.setDefaultKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_PTP));
+
+ verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_PTP);
+ assertThat(mFragment.mPreviousFunctions).isEqualTo(
+ UsbManager.FUNCTION_MTP);
+ }
+
+ @Test
+ public void onTetheringStarted_setDefaultUsbFunctions() {
+ mFragment.mPreviousFunctions = UsbManager.FUNCTION_PTP;
+
+ mFragment.mOnStartTetheringCallback.onTetheringStarted();
+
+ verify(mUsbBackend).setDefaultUsbFunctions(UsbManager.FUNCTION_RNDIS);
}
}
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 3771262..dfd4eae 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.connecteddevice.usb;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,6 +27,11 @@
import android.hardware.usb.UsbPort;
import android.os.Handler;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.RadioButtonPreference;
@@ -39,11 +45,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class UsbDetailsDataRoleControllerTest {
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 d41210d..679a2a9 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
@@ -16,14 +16,21 @@
package com.android.settings.connecteddevice.usb;
+import static android.net.ConnectivityManager.TETHERING_USB;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyLong;
+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 static org.mockito.Mockito.when;
import android.content.Context;
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
+import android.net.ConnectivityManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -53,9 +60,10 @@
private UsbDetailsFunctionsController mDetailsFunctionsController;
private Context mContext;
private Lifecycle mLifecycle;
- private PreferenceCategory mPreference;
+ private PreferenceCategory mPreferenceCategory;
private PreferenceManager mPreferenceManager;
private PreferenceScreen mScreen;
+ private RadioButtonPreference mRadioButtonPreference;
@Mock
private UsbBackend mUsbBackend;
@@ -63,12 +71,14 @@
private UsbDetailsFragment mFragment;
@Mock
private FragmentActivity mActivity;
+ @Mock
+ private ConnectivityManager mConnectivityManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = spy(RuntimeEnvironment.application);
mLifecycle = new Lifecycle(() -> mLifecycle);
mPreferenceManager = new PreferenceManager(mContext);
mScreen = mPreferenceManager.createPreferenceScreen(mContext);
@@ -78,12 +88,16 @@
when(mFragment.getContext()).thenReturn(mContext);
when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
+ when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
mDetailsFunctionsController = new UsbDetailsFunctionsController(mContext, mFragment,
mUsbBackend);
- mPreference = new PreferenceCategory(mContext);
- mPreference.setKey(mDetailsFunctionsController.getPreferenceKey());
- mScreen.addPreference(mPreference);
+ mPreferenceCategory = new PreferenceCategory(mContext);
+ mPreferenceCategory.setKey(mDetailsFunctionsController.getPreferenceKey());
+ mScreen.addPreference(mPreferenceCategory);
+ mDetailsFunctionsController.displayPreference(mScreen);
+
+ mRadioButtonPreference = new RadioButtonPreference(mContext);
}
@Test
@@ -105,10 +119,9 @@
public void displayRefresh_disconnected_shouldDisable() {
when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
- mDetailsFunctionsController.displayPreference(mScreen);
mDetailsFunctionsController.refresh(false, UsbManager.FUNCTION_NONE,
UsbPort.POWER_ROLE_SINK, UsbPort.DATA_ROLE_DEVICE);
- assertThat(mPreference.isEnabled()).isFalse();
+ assertThat(mPreferenceCategory.isEnabled()).isFalse();
}
@Test
@@ -118,7 +131,6 @@
when(mUsbBackend.areFunctionsSupported(UsbManager.FUNCTION_PTP)).thenReturn(false);
when(mUsbBackend.areFunctionsSupported(UsbManager.FUNCTION_RNDIS)).thenReturn(false);
- mDetailsFunctionsController.displayPreference(mScreen);
mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_NONE, UsbPort.POWER_ROLE_SINK,
UsbPort.DATA_ROLE_DEVICE);
List<RadioButtonPreference> prefs = getRadioPreferences();
@@ -131,7 +143,6 @@
public void displayRefresh_mtpEnabled_shouldCheckSwitches() {
when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
- mDetailsFunctionsController.displayPreference(mScreen);
mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_MTP, UsbPort.POWER_ROLE_SINK,
UsbPort.DATA_ROLE_DEVICE);
List<RadioButtonPreference> prefs = getRadioPreferences();
@@ -145,7 +156,6 @@
public void onClickMtp_noneEnabled_shouldEnableMtp() {
when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
- mDetailsFunctionsController.displayPreference(mScreen);
mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_NONE, UsbPort.POWER_ROLE_SINK,
UsbPort.DATA_ROLE_DEVICE);
when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_NONE);
@@ -164,7 +174,6 @@
public void onClickMtp_ptpEnabled_shouldEnableMtp() {
when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
- mDetailsFunctionsController.displayPreference(mScreen);
mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_PTP, UsbPort.POWER_ROLE_SINK,
UsbPort.DATA_ROLE_DEVICE);
when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_PTP);
@@ -186,7 +195,6 @@
public void onClickNone_mtpEnabled_shouldDisableMtp() {
when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
- mDetailsFunctionsController.displayPreference(mScreen);
mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_MTP, UsbPort.POWER_ROLE_SINK,
UsbPort.DATA_ROLE_DEVICE);
when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_MTP);
@@ -210,9 +218,55 @@
private List<RadioButtonPreference> getRadioPreferences() {
ArrayList<RadioButtonPreference> result = new ArrayList<>();
- for (int i = 0; i < mPreference.getPreferenceCount(); i++) {
- result.add((RadioButtonPreference) mPreference.getPreference(i));
+ for (int i = 0; i < mPreferenceCategory.getPreferenceCount(); i++) {
+ result.add((RadioButtonPreference) mPreferenceCategory.getPreference(i));
}
return result;
}
+
+ @Test
+ public void onRadioButtonClicked_functionRndis_startTetheringInvoked() {
+ mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_RNDIS));
+ doReturn(UsbManager.FUNCTION_MTP).when(mUsbBackend).getCurrentFunctions();
+
+ mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+ verify(mConnectivityManager).startTethering(TETHERING_USB, true,
+ mDetailsFunctionsController.mOnStartTetheringCallback);
+ assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(
+ UsbManager.FUNCTION_MTP);
+ }
+
+ @Test
+ public void onRadioButtonClicked_functionOther_setCurrentFunctionInvoked() {
+ mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_PTP));
+ doReturn(UsbManager.FUNCTION_MTP).when(mUsbBackend).getCurrentFunctions();
+
+ mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+ verify(mUsbBackend).setCurrentFunctions(UsbManager.FUNCTION_PTP);
+ assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(
+ UsbManager.FUNCTION_MTP);
+ }
+
+ @Test
+ public void onRadioButtonClicked_clickSameButton_doNothing() {
+ mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_PTP));
+ doReturn(UsbManager.FUNCTION_PTP).when(mUsbBackend).getCurrentFunctions();
+
+ mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+ verify(mUsbBackend, never()).setCurrentFunctions(UsbManager.FUNCTION_PTP);
+ verify(mConnectivityManager, never()).startTethering(TETHERING_USB, true,
+ mDetailsFunctionsController.mOnStartTetheringCallback);
+ }
+
+ @Test
+ public void onTetheringFailed_resetPreviousFunctions() {
+ mDetailsFunctionsController.mPreviousFunction = UsbManager.FUNCTION_PTP;
+
+ mDetailsFunctionsController.mOnStartTetheringCallback.onTetheringFailed();
+
+ verify(mUsbBackend).setCurrentFunctions(UsbManager.FUNCTION_PTP);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java
index 321b1b2..ec697ad 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java
@@ -16,35 +16,39 @@
package com.android.settings.connecteddevice.usb;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.graphics.drawable.Drawable;
import android.hardware.usb.UsbManager;
import android.hardware.usb.UsbPort;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.testutils.DrawableTestHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
+import org.mockito.ArgumentMatcher;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowEntityHeaderController.class)
public class UsbDetailsHeaderControllerTest {
@@ -100,7 +104,10 @@
mDetailsHeaderController.refresh(true, UsbManager.FUNCTION_NONE, UsbPort.POWER_ROLE_SINK,
UsbPort.DATA_ROLE_DEVICE);
verify(mHeaderController).setLabel(mContext.getString(R.string.usb_pref));
- verify(mHeaderController).setIcon(mContext.getDrawable(R.drawable.ic_usb));
+ verify(mHeaderController).setIcon(argThat((ArgumentMatcher<Drawable>) t -> {
+ DrawableTestHelper.assertDrawableResId(t, R.drawable.ic_usb);
+ return true;
+ }));
verify(mHeaderController).done(mActivity, true);
}
}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java
index ca3d0cf..856ac19 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.connecteddevice.usb;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -27,6 +28,12 @@
import android.hardware.usb.UsbPort;
import android.os.Handler;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -39,12 +46,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class UsbDetailsPowerRoleControllerTest {
diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
index 237e69a..044ecc9 100644
--- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java
@@ -21,13 +21,18 @@
import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.slices.SliceData;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,9 +44,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BasePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
index 6c3b4af..6f309de 100644
--- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java
@@ -25,6 +25,10 @@
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,10 +40,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class InstrumentedPreferenceFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
index 70cfa21..3b1b5af 100644
--- a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
@@ -16,7 +16,12 @@
package com.android.settings.core;
+import static com.android.settings.core.PreferenceXmlParserUtils
+ .METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE;
+import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEYWORDS;
+import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_SEARCHABLE;
+
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
@@ -247,8 +252,7 @@
@Test
@Config(qualifiers = "mcc999")
- public void extractMetadata_requestIncludesKeywords_shouldContainKeywords()
- throws IOException, XmlPullParserException {
+ public void extractMetadata_requestIncludesKeywords_shouldContainKeywords() throws Exception {
final String expectedKeywords = "a, b, c";
final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
R.xml.location_settings,
@@ -260,6 +264,57 @@
assertThat(keywords).isEqualTo(expectedKeywords);
}
+ @Test
+ @Config(qualifiers = "mcc998")
+ public void extractMetadata_requestSearchable_shouldDefaultToTrue() throws Exception {
+ final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
+ R.xml.location_settings, MetadataFlag.FLAG_NEED_SEARCHABLE);
+ for (Bundle bundle : metadata) {
+ assertThat(bundle.getBoolean(METADATA_SEARCHABLE)).isTrue();
+ }
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void extractMetadata_requestSearchable_shouldReturnAttributeValue() throws Exception {
+ final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
+ R.xml.display_settings,
+ MetadataFlag.FLAG_NEED_KEY | MetadataFlag.FLAG_NEED_SEARCHABLE);
+ boolean foundKey = false;
+ for (Bundle bundle : metadata) {
+ if (TextUtils.equals(bundle.getString(METADATA_KEY), "pref_key_5")) {
+ assertThat(bundle.getBoolean(METADATA_SEARCHABLE)).isFalse();
+ foundKey = true;
+ break;
+ }
+ }
+ assertThat(foundKey).isTrue();
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void extractMetadata_requestIsDynamicSummaryAllowed_shouldDefaultToFalse()
+ throws Exception {
+ final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
+ R.xml.display_settings, MetadataFlag.FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE);
+
+ for (Bundle bundle : metadata) {
+ assertThat(bundle.getBoolean(METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE)).isFalse();
+ }
+ }
+
+ @Test
+ @Config(qualifiers = "mcc998")
+ public void extractMetadata_requestIsDynamicSummaryAllowed_shouldReturnAttributeValue()
+ throws Exception {
+ final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
+ R.xml.location_settings, MetadataFlag.FLAG_ALLOW_DYNAMIC_SUMMARY_IN_SLICE);
+
+ for (Bundle bundle : metadata) {
+ assertThat(bundle.getBoolean(METADATA_ALLOW_DYNAMIC_SUMMARY_IN_SLICE)).isTrue();
+ }
+ }
+
/**
* @param resId the ID for the XML preference
* @return an XML resource parser that points to the start tag
diff --git a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java
index 0347336..c57c384 100644
--- a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java
@@ -18,6 +18,8 @@
import android.content.Context;
+import androidx.preference.SeekBarPreference;
+
import com.android.settings.slices.SliceData;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -26,8 +28,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SeekBarPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SliderPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java
index 2467e57..fd3b4a0 100644
--- a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java
+++ b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java
@@ -17,6 +17,7 @@
package com.android.settings.core;
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;
@@ -29,6 +30,9 @@
import android.content.Intent;
import android.os.UserHandle;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
@@ -41,9 +45,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SubSettingLauncherTest {
diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
index ae5d7aa..53fe9a8 100644
--- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
@@ -19,6 +19,8 @@
import android.content.Context;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.slices.SliceData;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -27,8 +29,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TogglePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
index 36c3ae7..9480e6d 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
@@ -20,6 +20,8 @@
import android.util.ArraySet;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.core.codeinspection.CodeInspector;
import com.android.settingslib.core.instrumentation.Instrumentable;
@@ -27,8 +29,6 @@
import java.util.List;
import java.util.Set;
-import androidx.fragment.app.Fragment;
-
/**
* {@link CodeInspector} that verifies all fragments implements Instrumentable.
*/
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
index c5a6bca..644f249 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentedDialogFragmentTest.java
@@ -24,6 +24,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -56,7 +57,7 @@
// Precondition: no metrics feature
assertThat(fragment.getMetricsFeatureProvider()).isNull();
- fragment.onAttach(ShadowApplication.getInstance().getApplicationContext());
+ fragment.onAttach(RuntimeEnvironment.application);
// Verify: has metrics feature
assertThat(fragment.getMetricsFeatureProvider()).isNotNull();
diff --git a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
index 5b658a9..d8fb65d 100644
--- a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
@@ -17,14 +17,14 @@
package com.android.settings.dashboard;
import static com.android.settingslib.drawer.CategoryKey.CATEGORY_HOMEPAGE;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_KEY_ORDER;
import static com.google.common.truth.Truth.assertThat;
-import android.content.ComponentName;
import android.content.Context;
-import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.ApplicationInfo;
+import android.os.Bundle;
import android.util.Pair;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -54,6 +54,8 @@
public void setUp() {
mContext = RuntimeEnvironment.application;
mActivityInfo = new ActivityInfo();
+ mActivityInfo.packageName = "pkg";
+ mActivityInfo.name = "class";
mActivityInfo.applicationInfo = new ApplicationInfo();
mTileByComponentCache = new HashMap<>();
mCategoryByKeyMap = new HashMap<>();
@@ -130,26 +132,32 @@
// Create some fake tiles that are not sorted.
final String testPackage = "com.android.test";
final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
- final Tile tile1 = new Tile(mActivityInfo, category.key);
- tile1.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class1"));
- tile1.priority = 100;
- final Tile tile2 = new Tile(mActivityInfo, category.key);
- tile2.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class2"));
- tile2.priority = 50;
- final Tile tile3 = new Tile(mActivityInfo, category.key);
- tile3.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class3"));
- tile3.priority = 200;
+ final ActivityInfo activityInfo1 = new ActivityInfo();
+ activityInfo1.metaData = new Bundle();
+ activityInfo1.metaData.putInt(META_DATA_KEY_ORDER, 100);
+ activityInfo1.packageName = testPackage;
+ activityInfo1.name = "class1";
+ final ActivityInfo activityInfo2 = new ActivityInfo();
+ activityInfo2.metaData = new Bundle();
+ activityInfo2.metaData.putInt(META_DATA_KEY_ORDER, 50);
+ activityInfo2.packageName = testPackage;
+ activityInfo2.name = "class2";
+ final ActivityInfo activityInfo3 = new ActivityInfo();
+ activityInfo3.metaData = new Bundle();
+ activityInfo3.metaData.putInt(META_DATA_KEY_ORDER, 200);
+ activityInfo3.packageName = testPackage;
+ activityInfo3.name = "class3";
+ final Tile tile1 = new Tile(activityInfo1, category.key);
+ final Tile tile2 = new Tile(activityInfo2, category.key);
+ final Tile tile3 = new Tile(activityInfo3, category.key);
+
category.addTile(tile1);
category.addTile(tile2);
category.addTile(tile3);
mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
// Sort their priorities
- mCategoryManager.sortCategories(ShadowApplication.getInstance().getApplicationContext(),
- mCategoryByKeyMap);
+ mCategoryManager.sortCategories(RuntimeEnvironment.application, mCategoryByKeyMap);
// Verify they are now sorted.
assertThat(category.getTile(0)).isSameAs(tile3);
@@ -163,18 +171,25 @@
final String testPackage1 = "com.android.test1";
final String testPackage2 = "com.android.test2";
final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
- final Tile tile1 = new Tile(mActivityInfo, category.key);
- tile1.intent =
- new Intent().setComponent(new ComponentName(testPackage2, "class1"));
- tile1.priority = 100;
- final Tile tile2 = new Tile(mActivityInfo, category.key);
- tile2.intent =
- new Intent().setComponent(new ComponentName(testPackage1, "class2"));
- tile2.priority = 100;
- final Tile tile3 = new Tile(mActivityInfo, category.key);
- tile3.intent =
- new Intent().setComponent(new ComponentName(testPackage1, "class3"));
- tile3.priority = 50;
+ final ActivityInfo activityInfo1 = new ActivityInfo();
+ activityInfo1.metaData = new Bundle();
+ activityInfo1.metaData.putInt(META_DATA_KEY_ORDER, 100);
+ activityInfo1.packageName = testPackage2;
+ activityInfo1.name = "class1";
+ final ActivityInfo activityInfo2 = new ActivityInfo();
+ activityInfo2.metaData = new Bundle();
+ activityInfo2.metaData.putInt(META_DATA_KEY_ORDER, 100);
+ activityInfo2.packageName = testPackage1;
+ activityInfo2.name = "class2";
+ final ActivityInfo activityInfo3 = new ActivityInfo();
+ activityInfo3.metaData = new Bundle();
+ activityInfo3.metaData.putInt(META_DATA_KEY_ORDER, 50);
+ activityInfo3.packageName = testPackage1;
+ activityInfo3.name = "class3";
+
+ final Tile tile1 = new Tile(activityInfo1, category.key);
+ final Tile tile2 = new Tile(activityInfo2, category.key);
+ final Tile tile3 = new Tile(activityInfo3, category.key);
category.addTile(tile1);
category.addTile(tile2);
category.addTile(tile3);
@@ -194,18 +209,24 @@
// Create some fake tiles that are not sorted.
final String testPackage = mContext.getPackageName();
final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
- final Tile tile1 = new Tile(mActivityInfo, category.key);
- tile1.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class1"));
- tile1.priority = 100;
- final Tile tile2 = new Tile(mActivityInfo, category.key);
- tile2.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class2"));
- tile2.priority = 100;
- final Tile tile3 = new Tile(mActivityInfo, category.key);
- tile3.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class3"));
- tile3.priority = 50;
+ final ActivityInfo activityInfo1 = new ActivityInfo();
+ activityInfo1.packageName = testPackage;
+ activityInfo1.name = "class1";
+ activityInfo1.metaData = new Bundle();
+ activityInfo1.metaData.putInt(META_DATA_KEY_ORDER, 100);
+ final ActivityInfo activityInfo2 = new ActivityInfo();
+ activityInfo2.packageName = testPackage;
+ activityInfo2.name = "class2";
+ activityInfo2.metaData = new Bundle();
+ activityInfo2.metaData.putInt(META_DATA_KEY_ORDER, 100);
+ final ActivityInfo activityInfo3 = new ActivityInfo();
+ activityInfo3.packageName = testPackage;
+ activityInfo3.name = "class3";
+ activityInfo3.metaData = new Bundle();
+ activityInfo3.metaData.putInt(META_DATA_KEY_ORDER, 50);
+ final Tile tile1 = new Tile(activityInfo1, category.key);
+ final Tile tile2 = new Tile(activityInfo2, category.key);
+ final Tile tile3 = new Tile(activityInfo3, category.key);
category.addTile(tile1);
category.addTile(tile2);
category.addTile(tile3);
@@ -226,18 +247,32 @@
final String testPackage = mContext.getPackageName();
final String testPackage2 = "com.google.test2";
final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
- final Tile tile1 = new Tile(mActivityInfo, category.key);
- tile1.intent = new Intent().setComponent(new ComponentName(testPackage, "class1"));
- tile1.priority = 2;
- final Tile tile2 = new Tile(mActivityInfo, category.key);
- tile2.intent = new Intent().setComponent(new ComponentName(testPackage, "class2"));
- tile2.priority = 1;
- final Tile tile3 = new Tile(mActivityInfo, category.key);
- tile3.intent = new Intent().setComponent(new ComponentName(testPackage2, "class0"));
- tile3.priority = 0;
- final Tile tile4 = new Tile(mActivityInfo, category.key);
- tile4.intent = new Intent().setComponent(new ComponentName(testPackage, "class3"));
- tile4.priority = -1;
+
+ final ActivityInfo activityInfo1 = new ActivityInfo();
+ activityInfo1.packageName = testPackage;
+ activityInfo1.name = "class1";
+ activityInfo1.metaData = new Bundle();
+ activityInfo1.metaData.putInt(META_DATA_KEY_ORDER, 2);
+ final ActivityInfo activityInfo2 = new ActivityInfo();
+ activityInfo2.packageName = testPackage;
+ activityInfo2.name = "class2";
+ activityInfo2.metaData = new Bundle();
+ activityInfo2.metaData.putInt(META_DATA_KEY_ORDER, 1);
+ final ActivityInfo activityInfo3 = new ActivityInfo();
+ activityInfo3.packageName = testPackage2;
+ activityInfo3.name = "class0";
+ activityInfo3.metaData = new Bundle();
+ activityInfo3.metaData.putInt(META_DATA_KEY_ORDER, 0);
+ final ActivityInfo activityInfo4 = new ActivityInfo();
+ activityInfo4.packageName = testPackage;
+ activityInfo4.name = "class3";
+ activityInfo4.metaData = new Bundle();
+ activityInfo4.metaData.putInt(META_DATA_KEY_ORDER, -1);
+
+ final Tile tile1 = new Tile(activityInfo1, category.key);
+ final Tile tile2 = new Tile(activityInfo2, category.key);
+ final Tile tile4 = new Tile(activityInfo4, category.key);
+ final Tile tile3 = new Tile(activityInfo3, category.key);
category.addTile(tile1);
category.addTile(tile2);
category.addTile(tile3);
@@ -261,15 +296,24 @@
final String testPackage2 = "com.google.test2";
final String testPackage3 = "com.abcde.test3";
final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
- final Tile tile1 = new Tile(mActivityInfo, category.key);
- tile1.intent = new Intent().setComponent(new ComponentName(testPackage2, "class1"));
- tile1.priority = 1;
- final Tile tile2 = new Tile(mActivityInfo, category.key);
- tile2.intent = new Intent().setComponent(new ComponentName(testPackage, "class2"));
- tile2.priority = 1;
- final Tile tile3 = new Tile(mActivityInfo, category.key);
- tile3.intent = new Intent().setComponent(new ComponentName(testPackage3, "class3"));
- tile3.priority = 1;
+ final ActivityInfo activityInfo1 = new ActivityInfo();
+ activityInfo1.packageName = testPackage2;
+ activityInfo1.name = "class1";
+ activityInfo1.metaData = new Bundle();
+ activityInfo1.metaData.putInt(META_DATA_KEY_ORDER, 1);
+ final ActivityInfo activityInfo2 = new ActivityInfo();
+ activityInfo2.packageName = testPackage;
+ activityInfo2.name = "class2";
+ activityInfo2.metaData = new Bundle();
+ activityInfo2.metaData.putInt(META_DATA_KEY_ORDER, 1);
+ final ActivityInfo activityInfo3 = new ActivityInfo();
+ activityInfo3.packageName = testPackage3;
+ activityInfo3.name = "class3";
+ activityInfo3.metaData = new Bundle();
+ activityInfo3.metaData.putInt(META_DATA_KEY_ORDER, 1);
+ final Tile tile1 = new Tile(activityInfo1, category.key);
+ final Tile tile2 = new Tile(activityInfo2, category.key);
+ final Tile tile3 = new Tile(activityInfo3, category.key);
category.addTile(tile1);
category.addTile(tile2);
category.addTile(tile3);
@@ -289,18 +333,24 @@
// Create some unique tiles
final String testPackage = mContext.getPackageName();
final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
- final Tile tile1 = new Tile(mActivityInfo, category.key);
- tile1.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class1"));
- tile1.priority = 100;
- final Tile tile2 = new Tile(mActivityInfo, category.key);
- tile2.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class2"));
- tile2.priority = 100;
- final Tile tile3 = new Tile(mActivityInfo, category.key);
- tile3.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class3"));
- tile3.priority = 50;
+ final ActivityInfo activityInfo1 = new ActivityInfo();
+ activityInfo1.packageName = testPackage;
+ activityInfo1.name = "class1";
+ activityInfo1.metaData = new Bundle();
+ activityInfo1.metaData.putInt(META_DATA_KEY_ORDER, 100);
+ final ActivityInfo activityInfo2 = new ActivityInfo();
+ activityInfo2.packageName = testPackage;
+ activityInfo2.name = "class2";
+ activityInfo2.metaData = new Bundle();
+ activityInfo2.metaData.putInt(META_DATA_KEY_ORDER, 100);
+ final ActivityInfo activityInfo3 = new ActivityInfo();
+ activityInfo3.packageName = testPackage;
+ activityInfo3.name = "class3";
+ activityInfo3.metaData = new Bundle();
+ activityInfo3.metaData.putInt(META_DATA_KEY_ORDER, 50);
+ final Tile tile1 = new Tile(activityInfo1, category.key);
+ final Tile tile2 = new Tile(activityInfo2, category.key);
+ final Tile tile3 = new Tile(activityInfo3, category.key);
category.addTile(tile1);
category.addTile(tile2);
category.addTile(tile3);
@@ -316,18 +366,25 @@
// Create tiles pointing to same intent.
final String testPackage = mContext.getPackageName();
final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
- final Tile tile1 = new Tile(mActivityInfo, category.key);
- tile1.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class1"));
- tile1.priority = 100;
- final Tile tile2 = new Tile(mActivityInfo, category.key);
- tile2.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class1"));
- tile2.priority = 100;
- final Tile tile3 = new Tile(mActivityInfo, category.key);
- tile3.intent =
- new Intent().setComponent(new ComponentName(testPackage, "class1"));
- tile3.priority = 50;
+ final ActivityInfo activityInfo1 = new ActivityInfo();
+ activityInfo1.packageName = testPackage;
+ activityInfo1.name = "class1";
+ activityInfo1.metaData = new Bundle();
+ activityInfo1.metaData.putInt(META_DATA_KEY_ORDER, 100);
+ final ActivityInfo activityInfo2 = new ActivityInfo();
+ activityInfo2.packageName = testPackage;
+ activityInfo2.name = "class1";
+ activityInfo2.metaData = new Bundle();
+ activityInfo2.metaData.putInt(META_DATA_KEY_ORDER, 100);
+ final ActivityInfo activityInfo3 = new ActivityInfo();
+ activityInfo3.packageName = testPackage;
+ activityInfo3.name = "class1";
+ activityInfo3.metaData = new Bundle();
+ activityInfo3.metaData.putInt(META_DATA_KEY_ORDER, 50);
+
+ final Tile tile1 = new Tile(activityInfo1, category.key);
+ final Tile tile2 = new Tile(activityInfo2, category.key);
+ final Tile tile3 = new Tile(activityInfo3, category.key);
category.addTile(tile1);
category.addTile(tile2);
category.addTile(tile3);
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
deleted file mode 100644
index d474d72..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
+++ /dev/null
@@ -1,326 +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.dashboard;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
-import android.os.Bundle;
-import android.service.settings.suggestions.Suggestion;
-import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.dashboard.conditional.Condition;
-import com.android.settings.dashboard.suggestions.SuggestionAdapter;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.Tile;
-import com.android.settingslib.drawer.TileUtils;
-import com.android.settingslib.utils.IconCache;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
-public class DashboardAdapterTest {
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private SettingsActivity mContext;
- @Mock
- private View mView;
- @Mock
- private Condition mCondition;
- @Mock
- private Resources mResources;
- @Mock
- private WindowManager mWindowManager;
- private ActivityInfo mActivityInfo;
- private FakeFeatureFactory mFactory;
- private DashboardAdapter mDashboardAdapter;
- private List<Condition> mConditionList;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mFactory = FakeFeatureFactory.setupForTest();
- mActivityInfo = new ActivityInfo();
- mActivityInfo.metaData = new Bundle();
- when(mFactory.dashboardFeatureProvider.shouldTintIcon()).thenReturn(true);
-
- when(mContext.getSystemService(Context.WINDOW_SERVICE)).thenReturn(mWindowManager);
- when(mContext.getResources()).thenReturn(mResources);
- when(mResources.getQuantityString(any(int.class), any(int.class), any())).thenReturn("");
-
- mConditionList = new ArrayList<>();
- mConditionList.add(mCondition);
- when(mCondition.shouldShow()).thenReturn(true);
- mDashboardAdapter = new DashboardAdapter(mContext, null /* savedInstanceState */,
- mConditionList, null /* suggestionControllerMixin */, null /* lifecycle */);
- when(mView.getTag()).thenReturn(mCondition);
- }
-
- @Test
- public void onSuggestionClosed_notOnlySuggestion_updateSuggestionOnly() {
- final DashboardAdapter adapter =
- spy(new DashboardAdapter(mContext, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */,
- null /* lifecycle */));
- final List<Suggestion> suggestions = makeSuggestionsV2("pkg1", "pkg2", "pkg3");
- adapter.setSuggestions(suggestions);
-
- final RecyclerView data = mock(RecyclerView.class);
- when(data.getResources()).thenReturn(mResources);
- when(data.getContext()).thenReturn(mContext);
- when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
- final View itemView = mock(View.class);
- when(itemView.findViewById(R.id.suggestion_list)).thenReturn(data);
- when(itemView.findViewById(android.R.id.summary)).thenReturn(mock(TextView.class));
- when(itemView.findViewById(android.R.id.title)).thenReturn(mock(TextView.class));
- final DashboardAdapter.SuggestionContainerHolder holder =
- new DashboardAdapter.SuggestionContainerHolder(itemView);
-
- adapter.onBindSuggestion(holder, 0);
-
- reset(adapter); // clear interactions tracking
-
- final Suggestion suggestionToRemove = suggestions.get(1);
- adapter.onSuggestionClosed(suggestionToRemove);
-
- assertThat(suggestions.size()).isEqualTo(2);
- assertThat(suggestions.contains(suggestionToRemove)).isFalse();
- verify(adapter).notifyDashboardDataChanged(any());
- }
-
- @Test
- public void onSuggestionClosed_onlySuggestion_updateDashboardData() {
- final DashboardAdapter adapter =
- spy(new DashboardAdapter(mContext, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */,
- null /* lifecycle */));
- final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
- adapter.setSuggestions(suggestions);
- final DashboardData dashboardData = adapter.mDashboardData;
- reset(adapter); // clear interactions tracking
-
- adapter.onSuggestionClosed(suggestions.get(0));
-
- assertThat(adapter.mDashboardData).isNotEqualTo(dashboardData);
- verify(adapter).notifyDashboardDataChanged(any());
- }
-
- @Test
- public void onSuggestionClosed_notInSuggestionList_shouldNotUpdateSuggestionList() {
- final DashboardAdapter adapter =
- spy(new DashboardAdapter(mContext, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */,
- null /* lifecycle */));
- final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
- adapter.setSuggestions(suggestions);
-
- reset(adapter); // clear interactions tracking
-
- adapter.onSuggestionClosed(mock(Suggestion.class));
-
- verify(adapter, never()).setSuggestions(any());
- }
-
- @Test
- public void onBindSuggestion_shouldSetSuggestionAdapterAndNoCrash() {
- mDashboardAdapter = new DashboardAdapter(mContext, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */);
- final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
-
- mDashboardAdapter.setSuggestions(suggestions);
-
- final RecyclerView data = mock(RecyclerView.class);
- when(data.getResources()).thenReturn(mResources);
- when(data.getContext()).thenReturn(mContext);
- when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
- final View itemView = mock(View.class);
- when(itemView.findViewById(R.id.suggestion_list)).thenReturn(data);
- when(itemView.findViewById(android.R.id.summary)).thenReturn(mock(TextView.class));
- when(itemView.findViewById(android.R.id.title)).thenReturn(mock(TextView.class));
- final DashboardAdapter.SuggestionContainerHolder holder =
- new DashboardAdapter.SuggestionContainerHolder(itemView);
-
- mDashboardAdapter.onBindSuggestion(holder, 0);
-
- verify(data).setAdapter(any(SuggestionAdapter.class));
- // should not crash
- }
-
- @Test
- public void onBindTile_internalTile_shouldNotUseGenericBackgroundIcon() {
- final Context context = RuntimeEnvironment.application;
- final View view = LayoutInflater.from(context).inflate(R.layout.dashboard_tile, null);
- final DashboardAdapter.DashboardItemHolder holder =
- new DashboardAdapter.DashboardItemHolder(view);
- final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
- doReturn(Icon.createWithResource(context, R.drawable.ic_settings))
- .when(tile).getIcon(context);
- final IconCache iconCache = mock(IconCache.class);
- when(iconCache.getIcon(tile.getIcon(context)))
- .thenReturn(context.getDrawable(R.drawable.ic_settings));
-
- mDashboardAdapter = new DashboardAdapter(context, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */);
- ReflectionHelpers.setField(mDashboardAdapter, "mCache", iconCache);
- mDashboardAdapter.onBindTile(holder, tile);
-
- verify(iconCache, never()).updateIcon(any(Icon.class), any(Drawable.class));
- }
-
- @Test
- public void onBindTile_externalTile_shouldUpdateIcon() {
- final Context context = spy(RuntimeEnvironment.application);
- final View view = LayoutInflater.from(context).inflate(R.layout.dashboard_tile, null);
- final DashboardAdapter.DashboardItemHolder holder =
- new DashboardAdapter.DashboardItemHolder(view);
- final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
- final Icon icon = Icon.createWithResource(context, R.drawable.ic_settings);
- doReturn(icon).when(tile).getIcon(context);
-
- final IconCache iconCache = new IconCache(context);
-
- mDashboardAdapter = new DashboardAdapter(context, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */);
- ReflectionHelpers.setField(mDashboardAdapter, "mCache", iconCache);
-
- doReturn("another.package").when(context).getPackageName();
- mDashboardAdapter.onBindTile(holder, tile);
-
- assertThat(iconCache.getIcon(tile.getIcon(context)))
- .isInstanceOf(RoundedHomepageIcon.class);
- }
-
- @Test
- public void onBindTile_externalTileWithBackgroundColorRawValue_shouldUpdateIcon() {
- final Context context = spy(RuntimeEnvironment.application);
- final View view = LayoutInflater.from(context).inflate(R.layout.dashboard_tile, null);
- final DashboardAdapter.DashboardItemHolder holder =
- new DashboardAdapter.DashboardItemHolder(view);
- final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
- tile.getMetaData().putInt(DashboardAdapter.META_DATA_PREFERENCE_ICON_BACKGROUND_ARGB,
- 0xff0000);
- doReturn(Icon.createWithResource(context, R.drawable.ic_settings))
- .when(tile).getIcon(context);
- final IconCache iconCache = new IconCache(context);
- mDashboardAdapter = new DashboardAdapter(context, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */);
- ReflectionHelpers.setField(mDashboardAdapter, "mCache", iconCache);
-
- doReturn("another.package").when(context).getPackageName();
- mDashboardAdapter.onBindTile(holder, tile);
-
- final RoundedHomepageIcon homepageIcon = (RoundedHomepageIcon) iconCache.getIcon(
- tile.getIcon(context));
- assertThat(homepageIcon.mBackgroundColor).isEqualTo(0xff0000);
- }
-
- @Test
- public void onBindTile_externalTileWithBackgroundColorHint_shouldUpdateIcon() {
- final Context context = spy(RuntimeEnvironment.application);
- final View view = LayoutInflater.from(context).inflate(R.layout.dashboard_tile, null);
- final DashboardAdapter.DashboardItemHolder holder =
- new DashboardAdapter.DashboardItemHolder(view);
- final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
- tile.getMetaData().putInt(TileUtils.META_DATA_PREFERENCE_ICON_BACKGROUND_HINT,
- R.color.memory_critical);
- doReturn(Icon.createWithResource(context, R.drawable.ic_settings))
- .when(tile).getIcon(context);
- final IconCache iconCache = new IconCache(context);
- mDashboardAdapter = new DashboardAdapter(context, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */);
- ReflectionHelpers.setField(mDashboardAdapter, "mCache", iconCache);
-
- doReturn("another.package").when(context).getPackageName();
- mDashboardAdapter.onBindTile(holder, tile);
-
- final RoundedHomepageIcon homepageIcon = (RoundedHomepageIcon) iconCache.getIcon(
- tile.getIcon(context));
- assertThat(homepageIcon.mBackgroundColor)
- .isEqualTo(RuntimeEnvironment.application.getColor(R.color.memory_critical));
- }
-
- @Test
- public void onBindTile_externalTile_usingRoundedHomepageIcon_shouldNotUpdateIcon() {
- final Context context = RuntimeEnvironment.application;
- final View view = LayoutInflater.from(context).inflate(R.layout.dashboard_tile, null);
- final DashboardAdapter.DashboardItemHolder holder =
- new DashboardAdapter.DashboardItemHolder(view);
- final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
- doReturn(mock(Icon.class)).when(tile).getIcon(context);
- when(tile.getIcon(context).getResPackage()).thenReturn("another.package");
-
- final IconCache iconCache = mock(IconCache.class);
- when(iconCache.getIcon(tile.getIcon(context))).thenReturn(mock(RoundedHomepageIcon.class));
-
- mDashboardAdapter = new DashboardAdapter(context, null /* savedInstanceState */,
- null /* conditions */, null /* suggestionControllerMixin */, null /* lifecycle */);
- ReflectionHelpers.setField(mDashboardAdapter, "mCache", iconCache);
-
- mDashboardAdapter.onBindTile(holder, tile);
-
- verify(iconCache, never()).updateIcon(eq(tile.getIcon(context)),
- any(RoundedHomepageIcon.class));
- }
-
- private List<Suggestion> makeSuggestionsV2(String... pkgNames) {
- final List<Suggestion> suggestions = new ArrayList<>();
- for (String pkgName : pkgNames) {
- final Suggestion suggestion = new Suggestion.Builder(pkgName)
- .setPendingIntent(mock(PendingIntent.class))
- .build();
- suggestions.add(suggestion);
- }
- return suggestions;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
deleted file mode 100644
index dfa0494..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_CONTAINER;
-import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_FOOTER;
-import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONDITION_DIVIDER;
-import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONTAINER;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.app.PendingIntent;
-import android.service.settings.suggestions.Suggestion;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.DiffUtil;
-import androidx.recyclerview.widget.ListUpdateCallback;
-
-import com.android.settings.dashboard.conditional.AirplaneModeCondition;
-import com.android.settings.dashboard.conditional.Condition;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class DashboardDataTest {
-
- private static final String TEST_SUGGESTION_TITLE = "Use fingerprint";
- private static final String TEST_CATEGORY_TILE_TITLE = "Display";
-
- private DashboardData mDashboardDataWithOneConditions;
- private DashboardData mDashboardDataWithTwoConditions;
- private DashboardData mDashboardDataWithNoItems;
- private DashboardCategory mDashboardCategory;
- @Mock
- private Tile mTestCategoryTile;
- @Mock
- private Condition mTestCondition;
- @Mock
- private Condition mSecondCondition; // condition used to test insert in DiffUtil
- private Suggestion mTestSuggestion;
-
- @Before
- public void SetUp() {
- MockitoAnnotations.initMocks(this);
-
- mDashboardCategory = new DashboardCategory(CategoryKey.CATEGORY_HOMEPAGE);
-
- // Build suggestions
- final List<Suggestion> suggestions = new ArrayList<>();
- mTestSuggestion = new Suggestion.Builder("pkg")
- .setTitle(TEST_SUGGESTION_TITLE)
- .setPendingIntent(mock(PendingIntent.class))
- .build();
- suggestions.add(mTestSuggestion);
-
- // Build oneItemConditions
- final List<Condition> oneItemConditions = new ArrayList<>();
- when(mTestCondition.shouldShow()).thenReturn(true);
- oneItemConditions.add(mTestCondition);
-
- // Build twoItemConditions
- final List<Condition> twoItemsConditions = new ArrayList<>();
- when(mSecondCondition.shouldShow()).thenReturn(true);
- twoItemsConditions.add(mTestCondition);
- twoItemsConditions.add(mSecondCondition);
-
- // Build category
- mTestCategoryTile.title = TEST_CATEGORY_TILE_TITLE;
-
- mDashboardCategory.addTile(mTestCategoryTile);
-
- // Build DashboardData
- mDashboardDataWithOneConditions = new DashboardData.Builder()
- .setConditions(oneItemConditions)
- .setCategory(mDashboardCategory)
- .setSuggestions(suggestions)
- .setConditionExpanded(true)
- .build();
-
- mDashboardDataWithTwoConditions = new DashboardData.Builder()
- .setConditions(twoItemsConditions)
- .setCategory(mDashboardCategory)
- .setSuggestions(suggestions)
- .setConditionExpanded(true)
- .build();
-
- mDashboardDataWithNoItems = new DashboardData.Builder()
- .setConditions(null)
- .setCategory(null)
- .setSuggestions(null)
- .build();
- }
-
- @Test
- public void testBuildItemsData_shouldSetstableId() {
- final List<DashboardData.Item> items = mDashboardDataWithOneConditions.getItemList();
-
- // suggestion, separator, condition, footer, 1 tile
- assertThat(items).hasSize(5);
-
- assertThat(items.get(0).id).isEqualTo(STABLE_ID_SUGGESTION_CONTAINER);
- assertThat(items.get(1).id).isEqualTo(STABLE_ID_SUGGESTION_CONDITION_DIVIDER);
- assertThat(items.get(2).id).isEqualTo(STABLE_ID_CONDITION_CONTAINER);
- assertThat(items.get(3).id).isEqualTo(STABLE_ID_CONDITION_FOOTER);
- assertThat(items.get(4).id).isEqualTo(Objects.hash(mTestCategoryTile.title));
- }
-
- @Test
- public void testBuildItemsData_containsAllData() {
- final Object[] expectedObjects = {
- mDashboardDataWithOneConditions.getSuggestions(),
- null /* divider */,
- mDashboardDataWithOneConditions.getConditions(),
- null /* footer */, mTestCategoryTile};
- final int expectedSize = expectedObjects.length;
-
- assertThat(mDashboardDataWithOneConditions.getItemList()).hasSize(expectedSize);
-
- for (int i = 0; i < expectedSize; i++) {
- final Object item = mDashboardDataWithOneConditions.getItemEntityByPosition(i);
- if (item instanceof List) {
- assertThat(item).isEqualTo(expectedObjects[i]);
- } else if (item instanceof DashboardData.ConditionHeaderData) {
- DashboardData.ConditionHeaderData i1 = (DashboardData.ConditionHeaderData) item;
- DashboardData.ConditionHeaderData i2 =
- (DashboardData.ConditionHeaderData) expectedObjects[i];
- assertThat(i1.title).isEqualTo(i2.title);
- assertThat(i1.conditionCount).isEqualTo(i2.conditionCount);
- } else {
- assertThat(item).isSameAs(expectedObjects[i]);
- }
- }
- }
-
- @Test
- public void testGetPositionByEntity_selfInstance_returnPositionFound() {
- final int position = mDashboardDataWithOneConditions
- .getPositionByEntity(mDashboardDataWithOneConditions.getConditions());
- assertThat(position).isNotEqualTo(DashboardData.POSITION_NOT_FOUND);
- }
-
- @Test
- public void testGetPositionByEntity_notExisted_returnNotFound() {
- final Condition condition = mock(AirplaneModeCondition.class);
- final int position = mDashboardDataWithOneConditions.getPositionByEntity(condition);
- assertThat(position).isEqualTo(DashboardData.POSITION_NOT_FOUND);
- }
-
- @Test
- public void testGetPositionByTile_selfInstance_returnPositionFound() {
- final int position = mDashboardDataWithOneConditions.getPositionByTile(mTestCategoryTile);
- assertThat(position).isNotEqualTo(DashboardData.POSITION_NOT_FOUND);
- }
-
- @Test
- public void testGetPositionByTile_equalTitle_returnPositionFound() {
- final Tile tile = mock(Tile.class);
- tile.title = TEST_CATEGORY_TILE_TITLE;
- final int position = mDashboardDataWithOneConditions.getPositionByTile(tile);
- assertThat(position).isNotEqualTo(DashboardData.POSITION_NOT_FOUND);
- }
-
- @Test
- public void testGetPositionByTile_notExisted_returnNotFound() {
- final Tile tile = mock(Tile.class);
- tile.title = "";
- final int position = mDashboardDataWithOneConditions.getPositionByTile(tile);
- assertThat(position).isEqualTo(DashboardData.POSITION_NOT_FOUND);
- }
-
- @Test
- public void testDiffUtil_DataEqual_noResultData() {
- List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
- testDiffUtil(mDashboardDataWithOneConditions,
- mDashboardDataWithOneConditions, testResultData);
- }
-
- @Test
- public void testDiffUtil_InsertOneCondition_ResultDataOneChanged() {
- final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
- // Item in position 3 is the condition container containing the list of conditions, which
- // gets 1 more item
- testResultData.add(new ListUpdateResult.ResultData(
- ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 2, 1));
-
- testDiffUtil(mDashboardDataWithOneConditions,
- mDashboardDataWithTwoConditions, testResultData);
- }
-
- @Test
- public void testDiffUtil_RemoveOneSuggestion_causeItemRemoveAndChange() {
- final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
- // removed suggestion and the divider
- testResultData.add(new ListUpdateResult.ResultData(
- ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 2));
- testResultData.add(new ListUpdateResult.ResultData(
- ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 2, 1));
- // Build DashboardData
- final List<Condition> oneItemConditions = new ArrayList<>();
- when(mTestCondition.shouldShow()).thenReturn(true);
- oneItemConditions.add(mTestCondition);
- final List<Suggestion> suggestions = new ArrayList<>();
- suggestions.add(mTestSuggestion);
-
- final DashboardData oldData = new DashboardData.Builder()
- .setConditions(oneItemConditions)
- .setCategory(mDashboardCategory)
- .setSuggestions(suggestions)
- .setConditionExpanded(false)
- .build();
- final DashboardData newData = new DashboardData.Builder()
- .setConditions(oneItemConditions)
- .setSuggestions(null)
- .setCategory(mDashboardCategory)
- .setConditionExpanded(false)
- .build();
-
- testDiffUtil(oldData, newData, testResultData);
- }
-
- @Test
- public void testDiffUtil_DeleteAllData_ResultDataOneDeleted() {
- final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
- testResultData.add(new ListUpdateResult.ResultData(
- ListUpdateResult.ResultData.TYPE_OPERATION_REMOVE, 0, 5));
-
- testDiffUtil(mDashboardDataWithOneConditions, mDashboardDataWithNoItems, testResultData);
- }
-
- @Test
- public void testDiffUtil_typeSuggestedContainer_ResultDataNothingChanged() {
- final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
-
- DashboardData prevData = new DashboardData.Builder()
- .setConditions(null)
- .setCategory(null)
- .setSuggestions(Collections.singletonList(mTestSuggestion))
- .build();
- DashboardData currentData = new DashboardData.Builder()
- .setConditions(null)
- .setCategory(null)
- .setSuggestions(Collections.singletonList(mTestSuggestion))
- .build();
- testDiffUtil(prevData, currentData, testResultData);
- }
-
- /**
- * Test when using the
- * {@link com.android.settings.dashboard.DashboardData.ItemsDataDiffCallback}
- * to transfer List from {@paramref baseDashboardData} to {@paramref diffDashboardData},
- * whether
- * the transform data result is equals to {@paramref testResultData}
- * <p>
- * The steps are described below:
- * 1. Calculate a {@link androidx.recyclerview.widget.DiffUtil.DiffResult} from
- * {@paramref baseDashboardData} to {@paramref diffDashboardData}
- * <p>
- * 2. Dispatch the {@link androidx.recyclerview.widget.DiffUtil.DiffResult} calculated from step
- * 1
- * into {@link ListUpdateResult}
- * <p>
- * 3. Get result data(a.k.a. baseResultData) from {@link ListUpdateResult} and compare it to
- * {@paramref testResultData}
- * <p>
- * Because baseResultData and {@paramref testResultData} don't have sequence. When do the
- * comparison, we will sort them first and then compare the inside data from them one by one.
- */
- private void testDiffUtil(DashboardData baseDashboardData, DashboardData diffDashboardData,
- List<ListUpdateResult.ResultData> testResultData) {
- final DiffUtil.DiffResult diffUtilResult = DiffUtil.calculateDiff(
- new DashboardData.ItemsDataDiffCallback(
- baseDashboardData.getItemList(), diffDashboardData.getItemList()));
-
- // Dispatch to listUpdateResult, then listUpdateResult will have result data
- final ListUpdateResult listUpdateResult = new ListUpdateResult();
- diffUtilResult.dispatchUpdatesTo(listUpdateResult);
-
- final List<ListUpdateResult.ResultData> baseResultData = listUpdateResult.getResultData();
- assertThat(testResultData.size()).isEqualTo(baseResultData.size());
-
- // Sort them so we can compare them one by one using a for loop
- Collections.sort(baseResultData);
- Collections.sort(testResultData);
- final int size = baseResultData.size();
- for (int i = 0; i < size; i++) {
- // Refer to equals method in ResultData
- assertThat(baseResultData.get(i)).isEqualTo(testResultData.get(i));
- }
- }
-
- /**
- * This class contains the result about how the changes made to convert one
- * list to another list. It implements ListUpdateCallback to record the result data.
- */
- private static class ListUpdateResult implements ListUpdateCallback {
- final private List<ResultData> mResultData;
-
- public ListUpdateResult() {
- mResultData = new ArrayList<>();
- }
-
- private List<ResultData> getResultData() {
- return mResultData;
- }
-
- @Override
- public void onInserted(int position, int count) {
- mResultData.add(new ResultData(ResultData.TYPE_OPERATION_INSERT, position, count));
- }
-
- @Override
- public void onRemoved(int position, int count) {
- mResultData.add(new ResultData(ResultData.TYPE_OPERATION_REMOVE, position, count));
- }
-
- @Override
- public void onMoved(int fromPosition, int toPosition) {
- mResultData.add(
- new ResultData(ResultData.TYPE_OPERATION_MOVE, fromPosition, toPosition));
- }
-
- @Override
- public void onChanged(int position, int count, Object payload) {
- mResultData.add(new ResultData(ResultData.TYPE_OPERATION_CHANGE, position, count));
- }
-
- /**
- * This class contains general type and field to record the operation data generated
- * in {@link ListUpdateCallback}. Please refer to {@link ListUpdateCallback} for more info.
- * <p>
- * The following are examples about the data stored in this class:
- * <p>
- * "The data starts from position(arg1) with count number(arg2) is changed(operation)"
- * or "The data is moved(operation) from position1(arg1) to position2(arg2)"
- */
- private static class ResultData implements Comparable<ResultData> {
-
- private static final int TYPE_OPERATION_INSERT = 0;
- private static final int TYPE_OPERATION_REMOVE = 1;
- private static final int TYPE_OPERATION_MOVE = 2;
- private static final int TYPE_OPERATION_CHANGE = 3;
-
- private final int operation;
- private final int arg1;
- private final int arg2;
-
- private ResultData(int operation, int arg1, int arg2) {
- this.operation = operation;
- this.arg1 = arg1;
- this.arg2 = arg2;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
-
- if (!(obj instanceof ResultData)) {
- return false;
- }
-
- ResultData targetData = (ResultData) obj;
-
- return operation == targetData.operation && arg1 == targetData.arg1
- && arg2 == targetData.arg2;
- }
-
- @Override
- public int compareTo(@NonNull ResultData resultData) {
- if (this.operation != resultData.operation) {
- return operation - resultData.operation;
- }
-
- if (arg1 != resultData.arg1) {
- return arg1 - resultData.arg1;
- }
-
- return arg2 - resultData.arg2;
- }
-
- @Override
- public String toString() {
- return "op:" + operation + ",arg1:" + arg1 + ",arg2:" + arg2;
- }
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index f3601c4..634bdb7 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -16,7 +16,11 @@
package com.android.settings.dashboard;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_KEY_ORDER;
import static com.android.settingslib.drawer.TileUtils.META_DATA_KEY_PROFILE;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_KEYHINT;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_TITLE;
import static com.android.settingslib.drawer.TileUtils.PROFILE_ALL;
import static com.android.settingslib.drawer.TileUtils.PROFILE_PRIMARY;
@@ -33,8 +37,6 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
-import android.app.Activity;
-import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -46,9 +48,10 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
-import com.android.internal.logging.nano.MetricsProto;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -58,7 +61,6 @@
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.drawer.TileUtils;
@@ -73,7 +75,6 @@
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
@@ -83,25 +84,31 @@
public class DashboardFeatureProviderImplTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Activity mActivity;
+ private FragmentActivity mActivity;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private UserManager mUserManager;
@Mock
- private CategoryManager mCategoryManager;
- @Mock
private PackageManager mPackageManager;
private FakeFeatureFactory mFeatureFactory;
private Context mContext;
private ActivityInfo mActivityInfo;
private DashboardFeatureProviderImpl mImpl;
+ private boolean mForceRoundedIcon;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
+ doReturn(RuntimeEnvironment.application).when(mActivity).getApplicationContext();
+ mForceRoundedIcon = false;
mActivityInfo = new ActivityInfo();
+ mActivityInfo.packageName = mContext.getPackageName();
+ mActivityInfo.name = "class";
mActivityInfo.metaData = new Bundle();
+ mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_TITLE, R.string.settings_label);
+ mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_SUMMARY,
+ R.string.about_settings_summary);
doReturn(mPackageManager).when(mContext).getPackageManager();
when(mPackageManager.resolveActivity(any(Intent.class), anyInt()))
.thenReturn(new ResolveInfo());
@@ -118,37 +125,34 @@
public void bindPreference_shouldBindAllData() {
final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
- tile.title = "title";
- tile.summary = "summary";
+ mActivityInfo.metaData.putInt(META_DATA_KEY_ORDER, 10);
doReturn(Icon.createWithBitmap(Bitmap.createBitmap(1, 1, Bitmap.Config.RGB_565)))
.when(tile).getIcon(any(Context.class));
mActivityInfo.metaData.putString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS, "HI");
- tile.priority = 10;
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.SETTINGS_GESTURES,
preference, tile, "123", Preference.DEFAULT_ORDER);
- assertThat(preference.getTitle()).isEqualTo(tile.title);
- assertThat(preference.getSummary()).isEqualTo(tile.summary);
+ assertThat(preference.getTitle()).isEqualTo(mContext.getText(R.string.settings_label));
+ assertThat(preference.getSummary())
+ .isEqualTo(mContext.getText(R.string.about_settings_summary));
assertThat(preference.getIcon()).isNotNull();
assertThat(preference.getFragment()).isEqualTo(
mActivityInfo.metaData.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS));
- assertThat(preference.getOrder()).isEqualTo(-tile.priority);
+ assertThat(preference.getOrder()).isEqualTo(tile.getOrder());
}
@Test
public void bindPreference_noFragmentMetadata_shouldBindIntent() {
final Preference preference = new Preference(RuntimeEnvironment.application);
+ mActivityInfo.metaData.putInt(META_DATA_KEY_ORDER, 10);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.priority = 10;
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.SETTINGS_GESTURES,
preference, tile, "123", Preference.DEFAULT_ORDER);
assertThat(preference.getFragment()).isNull();
assertThat(preference.getOnPreferenceClickListener()).isNotNull();
- assertThat(preference.getOrder()).isEqualTo(-tile.priority);
+ assertThat(preference.getOrder()).isEqualTo(tile.getOrder());
}
@Test
@@ -158,17 +162,12 @@
tile.userHandle = new ArrayList<>();
tile.userHandle.add(mock(UserHandle.class));
tile.userHandle.add(mock(UserHandle.class));
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
- when(mActivity.getApplicationContext().getSystemService(Context.USER_SERVICE))
- .thenReturn(mUserManager);
-
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.SETTINGS_GESTURES,
preference, tile, "123", Preference.DEFAULT_ORDER);
preference.getOnPreferenceClickListener().onPreferenceClick(null);
- verify(mActivity).getFragmentManager();
+ verify(mActivity).getSupportFragmentManager();
}
@Test
@@ -177,20 +176,18 @@
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
tile.userHandle = new ArrayList<>();
tile.userHandle.add(mock(UserHandle.class));
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
when(mActivity.getSystemService(Context.USER_SERVICE))
.thenReturn(mUserManager);
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.SETTINGS_GESTURES,
preference, tile, "123", Preference.DEFAULT_ORDER);
preference.getOnPreferenceClickListener().onPreferenceClick(null);
verify(mFeatureFactory.metricsFeatureProvider).logDashboardStartIntent(
any(Context.class),
any(Intent.class),
- eq(MetricsProto.MetricsEvent.SETTINGS_GESTURES));
+ eq(MetricsEvent.SETTINGS_GESTURES));
verify(mActivity)
.startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
}
@@ -198,19 +195,12 @@
@Test
public void bindPreference_toInternalSettingActivity_shouldBindToDirectLaunchIntentAndNotLog() {
final Preference preference = new Preference(RuntimeEnvironment.application);
+ mActivityInfo.packageName = RuntimeEnvironment.application.getPackageName();
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
tile.userHandle = new ArrayList<>();
tile.userHandle.add(mock(UserHandle.class));
- tile.intent = new Intent();
- tile.intent.setComponent(
- new ComponentName(RuntimeEnvironment.application.getPackageName(), "class"));
- when(mActivity.getSystemService(Context.USER_SERVICE))
- .thenReturn(mUserManager);
- when(mActivity.getApplicationContext().getPackageName())
- .thenReturn(RuntimeEnvironment.application.getPackageName());
-
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.SETTINGS_GESTURES,
preference, tile, "123", Preference.DEFAULT_ORDER);
preference.getOnPreferenceClickListener().onPreferenceClick(null);
verify(mFeatureFactory.metricsFeatureProvider).logDashboardStartIntent(
@@ -224,7 +214,7 @@
@Test
public void bindPreference_nullPreference_shouldIgnore() {
final Tile tile = mock(Tile.class);
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.VIEW_UNKNOWN,
null, tile, "123", Preference.DEFAULT_ORDER);
verifyZeroInteractions(tile);
@@ -234,9 +224,7 @@
public void bindPreference_withNullKeyNullPriority_shouldGenerateKeyAndPriority() {
final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.VIEW_UNKNOWN,
preference, tile, null /*key */, Preference.DEFAULT_ORDER);
assertThat(preference.getKey()).isNotNull();
@@ -246,10 +234,11 @@
@Test
public void bindPreference_noSummary_shouldSetSummaryToPlaceholder() {
final Preference preference = new Preference(RuntimeEnvironment.application);
+ mActivityInfo.metaData.remove(META_DATA_PREFERENCE_SUMMARY);
+
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.VIEW_UNKNOWN,
preference, tile, null /*key */, Preference.DEFAULT_ORDER);
assertThat(preference.getSummary())
@@ -257,29 +246,14 @@
}
@Test
- public void bindPreference_hasSummary_shouldSetSummary() {
- final Preference preference = new Preference(RuntimeEnvironment.application);
- final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.summary = "test";
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
- preference, tile, null /*key */, Preference.DEFAULT_ORDER);
-
- assertThat(preference.getSummary()).isEqualTo(tile.summary);
- }
-
- @Test
@Config(shadows = {ShadowTileUtils.class, ShadowThreadUtils.class})
public void bindPreference_hasSummaryUri_shouldLoadSummaryFromContentProvider() {
final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
mActivityInfo.metaData.putString(TileUtils.META_DATA_PREFERENCE_SUMMARY_URI,
"content://com.android.settings/tile_summary");
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.VIEW_UNKNOWN,
preference, tile, null /*key */, Preference.DEFAULT_ORDER);
assertThat(preference.getSummary()).isEqualTo(ShadowTileUtils.MOCK_SUMMARY);
@@ -288,52 +262,49 @@
@Test
public void bindPreference_withNullKeyTileKey_shouldUseTileKey() {
final Preference preference = new Preference(RuntimeEnvironment.application);
+ mActivityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "key");
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.key = "key";
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.VIEW_UNKNOWN,
preference, tile, null /* key */, Preference.DEFAULT_ORDER);
- assertThat(preference.getKey()).isEqualTo(tile.key);
+ assertThat(preference.getKey()).isEqualTo(tile.getKey(mContext));
}
@Test
@Config(shadows = {ShadowTileUtils.class, ShadowThreadUtils.class})
public void bindPreference_withIconUri_shouldLoadIconFromContentProvider() {
final Preference preference = new Preference(RuntimeEnvironment.application);
+ mActivityInfo.packageName = RuntimeEnvironment.application.getPackageName();
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.key = "key";
- tile.intent = new Intent();
- tile.intent.setComponent(
- new ComponentName(RuntimeEnvironment.application.getPackageName(), "class"));
+ mActivityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "key");
mActivityInfo.metaData.putString(TileUtils.META_DATA_PREFERENCE_ICON_URI,
"content://com.android.settings/tile_icon");
- mImpl.bindIcon(preference, tile);
+ mImpl.bindIcon(preference, tile, false /* forceRoundedIcon */);
assertThat(preference.getIcon()).isNotNull();
}
@Test
- public void bindPreference_withBaseOrder_shouldOffsetPriority() {
+ public void bindPreference_withBaseOrder_shouldOffsetOrder() {
final int baseOrder = 100;
final Preference preference = new Preference(RuntimeEnvironment.application);
+ mActivityInfo.metaData.putInt(META_DATA_KEY_ORDER, 10);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.priority = 10;
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.VIEW_UNKNOWN,
preference, tile, "123", baseOrder);
- assertThat(preference.getOrder()).isEqualTo(-tile.priority + baseOrder);
+ assertThat(preference.getOrder()).isEqualTo(tile.getOrder() + baseOrder);
}
@Test
public void bindPreference_withOrderMetadata_shouldUseOrderInMetadata() {
final Preference preference = new Preference(RuntimeEnvironment.application);
final int testOrder = -30;
+ mActivityInfo.metaData.putInt(META_DATA_KEY_ORDER, 10);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- mActivityInfo.metaData.putInt(mImpl.META_DATA_KEY_ORDER, testOrder);
- tile.priority = 10;
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+ mActivityInfo.metaData.putInt(META_DATA_KEY_ORDER, testOrder);
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.VIEW_UNKNOWN,
preference, tile, "123", Preference.DEFAULT_ORDER);
assertThat(preference.getOrder()).isEqualTo(testOrder);
@@ -343,25 +314,23 @@
public void bindPreference_invalidOrderMetadata_shouldIgnore() {
final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- mActivityInfo.metaData.putString(mImpl.META_DATA_KEY_ORDER, "hello");
- tile.priority = 10;
- mImpl.bindPreferenceToTile(mActivity, MetricsProto.MetricsEvent.VIEW_UNKNOWN,
+ mActivityInfo.metaData.putString(META_DATA_KEY_ORDER, "hello");
+
+ mImpl.bindPreferenceToTile(mActivity, mForceRoundedIcon, MetricsEvent.VIEW_UNKNOWN,
preference, tile, "123", Preference.DEFAULT_ORDER);
- assertThat(preference.getOrder()).isEqualTo(-tile.priority);
+ assertThat(preference.getOrder()).isEqualTo(Preference.DEFAULT_ORDER);
}
@Test
public void bindPreference_withIntentActionMetadata_shouldSetLaunchAction() {
- Activity activity = Robolectric.buildActivity(Activity.class).get();
+ FragmentActivity activity = Robolectric.buildActivity(FragmentActivity.class).get();
final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.key = "key";
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
+ mActivityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "key");
mActivityInfo.metaData.putString("com.android.settings.intent.action", "TestAction");
tile.userHandle = null;
- mImpl.bindPreferenceToTile(activity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
+ mImpl.bindPreferenceToTile(activity, mForceRoundedIcon, MetricsEvent.SETTINGS_GESTURES,
preference, tile, "123", Preference.DEFAULT_ORDER);
preference.performClick();
ShadowActivity shadowActivity = Shadows.shadowOf(activity);
@@ -370,24 +339,21 @@
assertThat(launchIntent.getAction())
.isEqualTo("TestAction");
assertThat(launchIntent.getIntExtra(VisibilityLoggerMixin.EXTRA_SOURCE_METRICS_CATEGORY, 0))
- .isEqualTo(MetricsProto.MetricsEvent.SETTINGS_GESTURES);
+ .isEqualTo(MetricsEvent.SETTINGS_GESTURES);
}
@Test
public void clickPreference_withUnresolvableIntent_shouldNotLaunchAnything() {
ReflectionHelpers.setField(
mImpl, "mPackageManager", RuntimeEnvironment.application.getPackageManager());
- Activity activity = Robolectric.buildActivity(Activity.class).get();
- final ShadowApplication application = ShadowApplication.getInstance();
- final Preference preference = new Preference(application.getApplicationContext());
+ FragmentActivity activity = Robolectric.buildActivity(FragmentActivity.class).get();
+ final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.key = "key";
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
+ mActivityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "key");
mActivityInfo.metaData.putString("com.android.settings.intent.action", "TestAction");
tile.userHandle = null;
- mImpl.bindPreferenceToTile(activity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
+ mImpl.bindPreferenceToTile(activity, mForceRoundedIcon, MetricsEvent.SETTINGS_GESTURES,
preference, tile, "123", Preference.DEFAULT_ORDER);
preference.performClick();
@@ -398,67 +364,8 @@
}
@Test
- public void getPreferences_noCategory_shouldReturnNull() {
- mImpl = new DashboardFeatureProviderImpl(mActivity);
- ReflectionHelpers.setField(mImpl, "mCategoryManager", mCategoryManager);
- when(mCategoryManager.getTilesByCategory(mActivity, CategoryKey.CATEGORY_HOMEPAGE))
- .thenReturn(null);
-
- assertThat(mImpl.getPreferencesForCategory(null, null,
- MetricsProto.MetricsEvent.SETTINGS_GESTURES, CategoryKey.CATEGORY_HOMEPAGE))
- .isNull();
- }
-
- @Test
- public void getPreferences_noTileForCategory_shouldReturnNull() {
- mImpl = new DashboardFeatureProviderImpl(mActivity);
- ReflectionHelpers.setField(mImpl, "mCategoryManager", mCategoryManager);
- when(mCategoryManager.getTilesByCategory(mActivity, CategoryKey.CATEGORY_HOMEPAGE))
- .thenReturn(new DashboardCategory(CategoryKey.CATEGORY_HOMEPAGE));
-
- assertThat(mImpl.getPreferencesForCategory(null, null,
- MetricsProto.MetricsEvent.SETTINGS_GESTURES, CategoryKey.CATEGORY_HOMEPAGE))
- .isNull();
- }
-
- @Test
- public void getPreferences_hasTileForCategory_shouldReturnPrefList() {
- mImpl = new DashboardFeatureProviderImpl(mActivity);
- ReflectionHelpers.setField(mImpl, "mCategoryManager", mCategoryManager);
- final DashboardCategory category = new DashboardCategory(CategoryKey.CATEGORY_HOMEPAGE);
- category.addTile(new Tile(mActivityInfo, category.key));
- when(mCategoryManager
- .getTilesByCategory(any(Context.class), eq(CategoryKey.CATEGORY_HOMEPAGE)))
- .thenReturn(category);
-
- assertThat(mImpl.getPreferencesForCategory(mActivity,
- ShadowApplication.getInstance().getApplicationContext(),
- MetricsProto.MetricsEvent.SETTINGS_GESTURES,
- CategoryKey.CATEGORY_HOMEPAGE).isEmpty())
- .isFalse();
- }
-
- @Test
- public void testGetExtraIntentAction_shouldReturnNull() {
- assertThat(mImpl.getExtraIntentAction()).isNull();
- }
-
- @Test
- public void testShouldTintIcon_enabledInResources_shouldBeTrue() {
- assertThat(mImpl.shouldTintIcon()).isTrue();
- }
-
- @Test
- @Config(qualifiers = "mcc999")
- public void testShouldTintIcon_disabledInResources_shouldBeFalse() {
- assertThat(mImpl.shouldTintIcon()).isFalse();
- }
-
- @Test
public void openTileIntent_profileSelectionDialog_shouldShow() {
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
final ArrayList<UserHandle> handles = new ArrayList<>();
handles.add(new UserHandle(0));
handles.add(new UserHandle(10));
@@ -467,15 +374,13 @@
verify(mActivity, never())
.startActivityForResult(any(Intent.class), eq(0));
- verify(mActivity).getFragmentManager();
+ verify(mActivity).getSupportFragmentManager();
}
@Test
public void openTileIntent_profileSelectionDialog_explicitMetadataShouldShow() {
mActivityInfo.metaData.putString(META_DATA_KEY_PROFILE, PROFILE_ALL);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
final ArrayList<UserHandle> handles = new ArrayList<>();
handles.add(new UserHandle(0));
handles.add(new UserHandle(10));
@@ -484,15 +389,13 @@
verify(mActivity, never())
.startActivityForResult(any(Intent.class), eq(0));
- verify(mActivity).getFragmentManager();
+ verify(mActivity).getSupportFragmentManager();
}
@Test
public void openTileIntent_profileSelectionDialog_shouldNotShow() {
mActivityInfo.metaData.putString(META_DATA_KEY_PROFILE, PROFILE_PRIMARY);
final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
- tile.intent = new Intent();
- tile.intent.setComponent(new ComponentName("pkg", "class"));
final ArrayList<UserHandle> handles = new ArrayList<>();
handles.add(new UserHandle(0));
handles.add(new UserHandle(10));
@@ -501,6 +404,6 @@
verify(mActivity)
.startActivityForResult(any(Intent.class), eq(0));
- verify(mActivity, never()).getFragmentManager();
+ verify(mActivity, never()).getSupportFragmentManager();
}
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java
new file mode 100644
index 0000000..1f68e2f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.dashboard;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class DashboardFragmentRegistryTest {
+ @Test
+ public void pageAndKeyShouldHave1to1Mapping() {
+ assertThat(DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP.size())
+ .isEqualTo(DashboardFragmentRegistry.PARENT_TO_CATEGORY_KEY_MAP.size());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
index 69cb081..7106cf6 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
@@ -18,6 +18,8 @@
import android.content.Context;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerListHelper;
import com.android.settings.search.DatabaseIndexingUtils;
@@ -28,8 +30,6 @@
import java.util.List;
-import androidx.fragment.app.Fragment;
-
public class DashboardFragmentSearchIndexProviderInspector {
public static boolean isSharingPreferenceControllers(Class clazz) {
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index 90bd7db..8e9480d 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -33,10 +33,12 @@
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import com.android.settingslib.drawer.DashboardCategory;
import com.android.settingslib.drawer.Tile;
@@ -67,6 +69,8 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mActivityInfo = new ActivityInfo();
+ mActivityInfo.packageName = "pkg";
+ mActivityInfo.name = "class";
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
mDashboardCategory = new DashboardCategory("key");
mDashboardCategory.addTile(new Tile(mActivityInfo, mDashboardCategory.key));
@@ -175,6 +179,17 @@
verify(mockController2).getPreferenceKey();
}
+ @Test
+ public void onExpandButtonClick_shouldLogAdvancedButtonExpand() {
+ final MetricsFeatureProvider metricsFeatureProvider
+ = mFakeFeatureFactory.getMetricsFeatureProvider();
+ mTestFragment.onExpandButtonClick();
+
+ verify(metricsFeatureProvider).actionWithSource(
+ RuntimeEnvironment.application, MetricsEvent.DASHBOARD_CONTAINER,
+ MetricsEvent.ACTION_SETTINGS_ADVANCED_BUTTON_EXPAND);
+ }
+
public static class TestPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
@@ -228,7 +243,7 @@
@Override
public int getMetricsCategory() {
- return 0;
+ return MetricsEvent.DASHBOARD_CONTAINER;
}
@Override
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
deleted file mode 100644
index 543bfdb..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.pm.ActivityInfo;
-import android.view.View;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class DashboardItemAnimatorTest {
-
- private DashboardItemAnimator mDashboardItemAnimator;
- private ViewHolder mViewHolder;
-
- @Before
- public void SetUp() {
- mDashboardItemAnimator = new DashboardItemAnimator();
- mViewHolder = new ViewHolder(new TextView(RuntimeEnvironment.application));
- mViewHolder.itemView.setTag(new Tile(new ActivityInfo(), CategoryKey.CATEGORY_HOMEPAGE));
- }
-
- @Test
- public void testAnimateChange_NoPositionChange_NoPendingAnimation() {
- final boolean hasPendingAnimation =
- mDashboardItemAnimator.animateChange(mViewHolder, mViewHolder, 0, 1, 0, 1);
- assertThat(hasPendingAnimation).isFalse();
- }
-
- @Test
- public void testAnimateChange_HasPositionChange_HasPendingAnimation() {
- final boolean hasPendingAnimation =
- mDashboardItemAnimator.animateChange(mViewHolder, mViewHolder, 0, 0, 1, 1);
- assertThat(hasPendingAnimation).isTrue();
- }
-
- @Test
- public void testAnimateChange_HasRunningAnimationWhileNoPositionChange_NoPendingAnimation() {
- // Set pending move animations
- mDashboardItemAnimator.animateMove(mViewHolder, 0, 0, 1, 1);
-
- final boolean hasPendingAnimation =
- mDashboardItemAnimator.animateChange(mViewHolder, mViewHolder, 0, 1, 0, 1);
- assertThat(hasPendingAnimation).isFalse();
- }
-
- // Sample viewholder to use for test
- static final class ViewHolder extends RecyclerView.ViewHolder {
-
- ViewHolder(View itemView) {
- super(itemView);
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
deleted file mode 100644
index d93cd81..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java
+++ /dev/null
@@ -1,185 +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.dashboard;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-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.Context;
-
-import com.android.settings.dashboard.conditional.ConditionManager;
-import com.android.settings.dashboard.conditional.FocusRecyclerView;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class DashboardSummaryTest {
-
- @Mock
- private DashboardAdapter mAdapter;
- @Mock
- private DashboardFeatureProvider mDashboardFeatureProvider;
- @Mock
- private FocusRecyclerView mDashboard;
- @Mock
- private LinearLayoutManager mLayoutManager;
- @Mock
- private ConditionManager mConditionManager;
- @Mock
- private SummaryLoader mSummaryLoader;
- @Mock
- private SuggestionControllerMixinCompat mSuggestionControllerMixin;
-
- private Context mContext;
- private DashboardSummary mSummary;
- private FakeFeatureFactory mFeatureFactory;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mFeatureFactory = FakeFeatureFactory.setupForTest();
- mContext = RuntimeEnvironment.application;
- mSummary = spy(new DashboardSummary());
- ReflectionHelpers.setField(mSummary, "mAdapter", mAdapter);
- ReflectionHelpers.setField(mSummary, "mDashboardFeatureProvider",
- mDashboardFeatureProvider);
- ReflectionHelpers.setField(mSummary, "mDashboard", mDashboard);
- ReflectionHelpers.setField(mSummary, "mLayoutManager", mLayoutManager);
- ReflectionHelpers.setField(mSummary, "mConditionManager", mConditionManager);
- ReflectionHelpers.setField(mSummary, "mSummaryLoader", mSummaryLoader);
- }
-
- @Test
- public void onAttach_suggestionDisabled_shouldNotStartSuggestionControllerMixin() {
- when(mFeatureFactory.suggestionsFeatureProvider.isSuggestionEnabled(any(Context.class)))
- .thenReturn(false);
-
- mSummary.onAttach(mContext);
- final SuggestionControllerMixinCompat mixin = ReflectionHelpers
- .getField(mSummary, "mSuggestionControllerMixin");
- assertThat(mixin).isNull();
- }
-
- @Test
- public void onAttach_suggestionEnabled_shouldStartSuggestionControllerMixin() {
- when(mFeatureFactory.suggestionsFeatureProvider.isSuggestionEnabled(any(Context.class)))
- .thenReturn(true);
-
- mSummary.onAttach(mContext);
- final SuggestionControllerMixinCompat mixin = ReflectionHelpers
- .getField(mSummary, "mSuggestionControllerMixin");
- assertThat(mixin).isNotNull();
- }
-
- @Test
- public void updateCategory_shouldGetCategoryFromFeatureProvider() {
- ReflectionHelpers.setField(mSummary, "mSuggestionControllerMixin",
- mSuggestionControllerMixin);
-
- when(mSuggestionControllerMixin.isSuggestionLoaded()).thenReturn(true);
- doReturn(mock(FragmentActivity.class)).when(mSummary).getActivity();
- mSummary.onAttach(mContext);
- mSummary.updateCategory();
-
- verify(mSummaryLoader).updateSummaryToCache(nullable(DashboardCategory.class));
- verify(mDashboardFeatureProvider).getTilesForCategory(CategoryKey.CATEGORY_HOMEPAGE);
- verify(mAdapter).setCategory(any());
- }
-
- @Test
- public void updateCategory_shouldGetCategoryFromFeatureProvider_evenIfSuggestionDisabled() {
- when(mFeatureFactory.suggestionsFeatureProvider.isSuggestionEnabled(any(Context.class)))
- .thenReturn(false);
-
- doReturn(mock(FragmentActivity.class)).when(mSummary).getActivity();
- mSummary.onAttach(mContext);
- mSummary.updateCategory();
-
- verify(mSummaryLoader).updateSummaryToCache(nullable(DashboardCategory.class));
- verify(mDashboardFeatureProvider).getTilesForCategory(CategoryKey.CATEGORY_HOMEPAGE);
- verify(mAdapter).setCategory(any());
- }
-
- @Test
- public void onConditionChanged_PositionAtTop_ScrollToTop() {
- when(mLayoutManager.findFirstCompletelyVisibleItemPosition()).thenReturn(1);
- mSummary.onConditionsChanged();
- mSummary.onConditionsChanged();
- verify(mDashboard).scrollToPosition(0);
- }
-
- @Test
- public void onConditionChanged_PositionNotTop_RemainPosition() {
- when(mLayoutManager.findFirstCompletelyVisibleItemPosition()).thenReturn(2);
- mSummary.onConditionsChanged();
- mSummary.onConditionsChanged();
- verify(mDashboard, never()).scrollToPosition(0);
- }
-
- @Test
- public void onConditionChanged_firstCall_shouldIgnore() {
- mSummary.onConditionsChanged();
- verify(mAdapter, never()).setConditions(any());
- }
-
- @Test
- public void onConditionChanged_secondCall_shouldSetConditionsOnAdapter() {
- mSummary.onConditionsChanged();
- mSummary.onConditionsChanged();
- verify(mAdapter).setConditions(any());
- }
-
- @Test
- public void onCategoryChanged_noRebuildOnFirstCall() {
- doReturn(mock(FragmentActivity.class)).when(mSummary).getActivity();
- doNothing().when(mSummary).rebuildUI();
- mSummary.onCategoriesChanged();
- verify(mSummary, never()).rebuildUI();
- }
-
- @Test
- public void onCategoryChanged_rebuildOnSecondCall() {
- doReturn(mock(FragmentActivity.class)).when(mSummary).getActivity();
- doNothing().when(mSummary).rebuildUI();
- mSummary.onCategoriesChanged();
- mSummary.onCategoriesChanged();
- verify(mSummary).rebuildUI();
- }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
index 77f7fde..d5636a1 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.dashboard;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DashboardTilePlaceholderPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java
deleted file mode 100644
index 0c90660..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java
+++ /dev/null
@@ -1,70 +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.dashboard;
-
-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.content.Context;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.ShapeDrawable;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class RoundedHomepageIconTest {
-
- private Context mContext;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- }
-
- @Test
- public void createIcon_shouldSetBackgroundAndInset() {
- final RoundedHomepageIcon icon =
- new RoundedHomepageIcon(mContext, new ColorDrawable(Color.BLACK));
-
- assertThat(icon.getNumberOfLayers()).isEqualTo(2);
- assertThat(icon.getDrawable(0))
- .isEqualTo(mContext.getDrawable(R.drawable.ic_homepage_generic_background));
- }
-
- @Test
- public void setBackgroundColor_shouldUpdateColorFilter() {
- final RoundedHomepageIcon icon =
- spy(new RoundedHomepageIcon(mContext, new ColorDrawable(Color.BLACK)));
- final ShapeDrawable background = mock(ShapeDrawable.class);
- when(icon.getDrawable(0)).thenReturn(background);
-
- icon.setBackgroundColor(Color.BLUE);
-
- verify(background).setColorFilter(Color.BLUE, PorterDuff.Mode.SRC_ATOP);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
index e207cab..3726fb4 100644
--- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java
@@ -16,14 +16,17 @@
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.Intent;
+import android.content.Context;
import android.content.pm.ActivityInfo;
+import android.os.Bundle;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,6 +39,7 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
public class SummaryLoaderTest {
@@ -43,6 +47,7 @@
private static final String SUMMARY_1 = "summary1";
private static final String SUMMARY_2 = "summary2";
+ private Context mContext;
private SummaryLoader mSummaryLoader;
private boolean mCallbackInvoked;
private Tile mTile;
@@ -51,10 +56,13 @@
@Before
public void SetUp() {
MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
-
- mTile = new Tile(new ActivityInfo(), CategoryKey.CATEGORY_HOMEPAGE);
- mTile.summary = SUMMARY_1;
+ final ActivityInfo activityInfo = new ActivityInfo();
+ activityInfo.packageName = "pkg";
+ activityInfo.name = "class";
+ mTile = new Tile(activityInfo, CategoryKey.CATEGORY_HOMEPAGE);
+ mTile.overrideSummary(SUMMARY_1);
mCallbackInvoked = false;
final Activity activity = Robolectric.buildActivity(Activity.class).get();
@@ -70,14 +78,14 @@
@Test
public void testUpdateSummaryIfNeeded_SummaryIdentical_NoCallback() {
- mSummaryLoader.updateSummaryIfNeeded(mTile, SUMMARY_1);
+ mSummaryLoader.updateSummaryIfNeeded(mContext, mTile, SUMMARY_1);
assertThat(mCallbackInvoked).isFalse();
}
@Test
public void testUpdateSummaryIfNeeded_SummaryChanged_HasCallback() {
- mSummaryLoader.updateSummaryIfNeeded(mTile, SUMMARY_2);
+ mSummaryLoader.updateSummaryIfNeeded(mContext, mTile, SUMMARY_2);
assertThat(mCallbackInvoked).isTrue();
}
@@ -86,17 +94,21 @@
public void testUpdateSummaryToCache_hasCache_shouldUpdate() {
final String testSummary = "test_summary";
final DashboardCategory category = new DashboardCategory(CategoryKey.CATEGORY_HOMEPAGE);
- final Tile tile = new Tile(new ActivityInfo(), category.key);
- tile.key = "123";
- tile.intent = new Intent();
+ 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.key);
+ .thenReturn(tile.getKey(RuntimeEnvironment.application));
- mSummaryLoader.updateSummaryIfNeeded(tile, testSummary);
- tile.summary = null;
+ mSummaryLoader.updateSummaryIfNeeded(mContext, tile, testSummary);
+ tile.overrideSummary(null);
mSummaryLoader.updateSummaryToCache(category);
- assertThat(tile.summary).isEqualTo(testSummary);
+ assertThat(tile.getSummary(mContext)).isEqualTo(testSummary);
}
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java
deleted file mode 100644
index 725be79..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java
+++ /dev/null
@@ -1,63 +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.dashboard.conditional;
-
-import static com.google.common.truth.Truth.assertThat;
-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 com.android.settings.Settings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class BackgroundDataConditionTest {
- @Mock
- private ConditionManager mConditionManager;
-
- private Context mContext;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- when(mConditionManager.getContext()).thenReturn(mContext);
- }
-
- @Test
- public void onPrimaryClick_shouldReturn2SummaryActivity() {
- final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
- BackgroundDataCondition backgroundDataCondition
- = new BackgroundDataCondition(mConditionManager);
- backgroundDataCondition.onPrimaryClick();
- verify(mContext).startActivity(argumentCaptor.capture());
- Intent intent = argumentCaptor.getValue();
-
- assertThat(intent.getComponent().getClassName()).isEqualTo(
- Settings.DataUsageSummaryActivity.class.getName());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
deleted file mode 100644
index 62d1dfa..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java
+++ /dev/null
@@ -1,134 +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.dashboard.conditional;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardAdapter;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class ConditionAdapterTest {
-
- @Mock
- private Condition mCondition1;
- @Mock
- private Condition mCondition2;
-
- private Context mContext;
- private ConditionAdapter mConditionAdapter;
- private List<Condition> mOneCondition;
- private List<Condition> mTwoConditions;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- final CharSequence[] actions = new CharSequence[2];
- when(mCondition1.getActions()).thenReturn(actions);
- when(mCondition1.shouldShow()).thenReturn(true);
- mOneCondition = new ArrayList<>();
- mOneCondition.add(mCondition1);
- mTwoConditions = new ArrayList<>();
- mTwoConditions.add(mCondition1);
- mTwoConditions.add(mCondition2);
- }
-
- @Test
- public void getItemCount_notExpanded_shouldReturn0() {
- mConditionAdapter = new ConditionAdapter(mContext, mOneCondition, false);
- assertThat(mConditionAdapter.getItemCount()).isEqualTo(0);
- }
-
- @Test
- public void getItemCount_expanded_shouldReturnListSize() {
- mConditionAdapter = new ConditionAdapter(mContext, mOneCondition, true);
- assertThat(mConditionAdapter.getItemCount()).isEqualTo(1);
-
- mConditionAdapter = new ConditionAdapter(mContext, mTwoConditions, true);
- assertThat(mConditionAdapter.getItemCount()).isEqualTo(2);
- }
-
- @Test
- public void getItemViewType_shouldReturnConditionTile() {
- mConditionAdapter = new ConditionAdapter(mContext, mTwoConditions, true);
- assertThat(mConditionAdapter.getItemViewType(0)).isEqualTo(R.layout.condition_tile);
- }
-
- @Test
- public void onBindViewHolder_shouldSetListener() {
- final View view = LayoutInflater.from(mContext)
- .inflate(R.layout.condition_tile, new LinearLayout(mContext), true);
- final DashboardAdapter.DashboardItemHolder viewHolder =
- new DashboardAdapter.DashboardItemHolder(view);
- mConditionAdapter = new ConditionAdapter(mContext, mOneCondition, true);
-
- mConditionAdapter.onBindViewHolder(viewHolder, 0);
- final View card = view.findViewById(R.id.content);
- assertThat(card).isNotNull();
- assertThat(card.hasOnClickListeners()).isTrue();
- }
-
- @Test
- public void viewClick_shouldInvokeConditionPrimaryClick() {
- final View view = LayoutInflater.from(mContext)
- .inflate(R.layout.condition_tile, new LinearLayout(mContext), true);
- final DashboardAdapter.DashboardItemHolder viewHolder =
- new DashboardAdapter.DashboardItemHolder(view);
- mConditionAdapter = new ConditionAdapter(mContext, mOneCondition, true);
-
- mConditionAdapter.onBindViewHolder(viewHolder, 0);
- final View card = view.findViewById(R.id.content);
- assertThat(card).isNotNull();
- card.performClick();
- verify(mCondition1).onPrimaryClick();
- }
-
- @Test
- public void onSwiped_nullCondition_shouldNotCrash() {
- final RecyclerView recyclerView = new RecyclerView(mContext);
- final View view = LayoutInflater.from(mContext).inflate(
- R.layout.condition_tile, new LinearLayout(mContext), true);
- final DashboardAdapter.DashboardItemHolder viewHolder =
- new DashboardAdapter.DashboardItemHolder(view);
- mConditionAdapter = new ConditionAdapter(mContext, mOneCondition, true);
- mConditionAdapter.addDismissHandling(recyclerView);
-
- // do not bind viewholder to simulate the null condition scenario
- mConditionAdapter.mSwipeCallback.onSwiped(viewHolder, 0);
- // no crash
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
deleted file mode 100644
index 6d56731..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.dashboard.conditional;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.IntentFilter;
-import android.graphics.drawable.Drawable;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class ConditionTest {
-
- @Mock
- private ConditionManager mConditionManager;
- @Mock
- private MetricsFeatureProvider mMetricsFeatureProvider;
-
- private Context mContext;
- private TestCondition mCondition;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- mCondition = new TestCondition(mConditionManager, mMetricsFeatureProvider);
- when(mConditionManager.getContext()).thenReturn(mContext);
- }
-
- @Test
- public void initialize_shouldNotBeSilenced() {
- assertThat(mCondition.isSilenced()).isFalse();
- }
-
- @Test
- public void silence_shouldNotifyDataChangeAndLog() {
- mCondition.silence();
-
- assertThat(mCondition.isSilenced()).isTrue();
- verify(mConditionManager).notifyChanged(mCondition);
- verify(mMetricsFeatureProvider).action(any(Context.class),
- eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_CONDITION_DISMISS),
- eq(TestCondition.TEST_METRIC_CONSTANT));
- }
-
- @Test
- public void onSilenceChanged_silenced_shouldRegisterReceiver() {
- mCondition.onSilenceChanged(true);
-
- verify(mContext).registerReceiver(
- TestCondition.mReceiver, TestCondition.TESTS_INTENT_FILTER);
- }
-
- @Test
- public void onSilenceChanged_notSilenced_registered_shouldUnregisterReceiver() {
- mCondition.onSilenceChanged(true);
-
- mCondition.onSilenceChanged(false);
-
- verify(mContext).unregisterReceiver(TestCondition.mReceiver);
- }
-
- @Test
- public void onSilenceChanged_notSilenced_notRegistered_shouldNotCrash() {
- mCondition.onSilenceChanged(false);
-
- verify(mContext, never()).unregisterReceiver(TestCondition.mReceiver);
- // no crash
- }
-
- private static final class TestCondition extends Condition {
-
- private static final int TEST_METRIC_CONSTANT = 1234;
- private static final IntentFilter TESTS_INTENT_FILTER = new IntentFilter("TestIntent");
- private static final BroadcastReceiver mReceiver = mock(BroadcastReceiver.class);
-
- TestCondition(ConditionManager manager, MetricsFeatureProvider metricsFeatureProvider) {
- super(manager, metricsFeatureProvider);
- }
-
- @Override
- public void refreshState() {
- }
-
- @Override
- public int getMetricsConstant() {
- return TEST_METRIC_CONSTANT;
- }
-
- @Override
- public Drawable getIcon() {
- return null;
- }
-
- @Override
- public CharSequence getTitle() {
- return null;
- }
-
- @Override
- public CharSequence getSummary() {
- return null;
- }
-
- @Override
- public CharSequence[] getActions() {
- return new CharSequence[0];
- }
-
- @Override
- public void onPrimaryClick() {
- }
-
- @Override
- public void onActionClick(int index) {
- }
-
- @Override
- public BroadcastReceiver getReceiver() {
- return mReceiver;
- }
-
- @Override
- public IntentFilter getIntentFilter() {
- return TESTS_INTENT_FILTER;
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
deleted file mode 100644
index 29ad60f..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java
+++ /dev/null
@@ -1,117 +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.dashboard.conditional;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.reset;
-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.pm.PackageManager;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class DndConditionTest {
-
- @Mock
- private ConditionManager mConditionManager;
- @Mock
- private PackageManager mPackageManager;
- @Mock
- private Context mContext;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- FakeFeatureFactory.setupForTest();
- when(mConditionManager.getContext()).thenReturn(mContext);
- when(mContext.getPackageManager()).thenReturn(mPackageManager);
- }
-
- @Test
- public void constructor_shouldNotDisableReceiver() {
- new DndCondition(mConditionManager);
- verify(mPackageManager, never()).setComponentEnabledSetting(any(ComponentName.class),
- eq(PackageManager.COMPONENT_ENABLED_STATE_DISABLED), eq(PackageManager.DONT_KILL_APP));
- }
-
- @Test
- public void constructor_shouldRegisterReceiver() {
- new DndCondition(mConditionManager);
- verify(mContext).registerReceiver(any(DndCondition.Receiver.class),
- eq(DndCondition.DND_FILTER));
- }
-
- @Test
- public void silence_shouldNotDisableReceiver() {
- new DndCondition(mConditionManager).silence();
-
- verify(mPackageManager, never()).setComponentEnabledSetting(any(ComponentName.class),
- eq(PackageManager.COMPONENT_ENABLED_STATE_DISABLED), eq(PackageManager.DONT_KILL_APP));
- }
-
- @Test
- public void onResume_shouldRegisterReceiver() {
- DndCondition condition = new DndCondition(mConditionManager);
- condition.onPause();
- condition.onResume();
-
- // one from constructor, one from onResume()
- verify(mContext, times(2)).registerReceiver(any(DndCondition.Receiver.class),
- eq(DndCondition.DND_FILTER));
- }
-
- @Test
- public void onPause_shouldUnregisterReceiver() {
- new DndCondition(mConditionManager).onPause();
-
- verify(mContext).unregisterReceiver(any(DndCondition.Receiver.class));
- }
-
- @Test
- public void onPause_noReceiverRegistered_shouldNotUnregisterReceiver() {
- DndCondition condition = new DndCondition(mConditionManager);
- condition.onPause();
- reset(mContext);
-
- condition.onPause();
-
- verify(mContext, never()).unregisterReceiver(any(DndCondition.Receiver.class));
- }
-
- @Test
- public void nullZenConfig_noCrash() {
- DndCondition condition = new DndCondition(mConditionManager);
- assertThat(condition.mConfig).isNull();
-
- // should not crash, instead summary is null
- assertThat(condition.getSummary()).isNull();
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java
deleted file mode 100644
index 66ef5a0..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java
+++ /dev/null
@@ -1,95 +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.dashboard.conditional;
-
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.media.AudioManager;
-import android.provider.Settings;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowAudioManager;
-import com.android.settings.testutils.shadow.ShadowNotificationManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadow.api.Shadow;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {ShadowNotificationManager.class, ShadowAudioManager.class})
-public class RingerMutedConditionTest {
- private static final String TAG = "RingerMutedConditionTest";
- @Mock
- private ConditionManager mConditionManager;
-
- private Context mContext;
- private ShadowNotificationManager mNotificationManager;
- private ShadowAudioManager mAudioManager;
- private RingerMutedCondition mCondition;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mAudioManager = Shadow.extract(mContext.getSystemService(Context.AUDIO_SERVICE));
- mNotificationManager = Shadow.extract(
- mContext.getSystemService(Context.NOTIFICATION_SERVICE));
- when(mConditionManager.getContext()).thenReturn(mContext);
- mCondition = spy(new RingerMutedCondition(mConditionManager));
- }
-
- @Test
- public void verifyText() {
- assertThat(mCondition.getTitle()).isEqualTo(
- mContext.getText(R.string.condition_device_muted_title));
- assertThat(mCondition.getSummary()).isEqualTo(
- mContext.getText(R.string.condition_device_muted_summary));
- assertThat(mCondition.getActions()[0]).isEqualTo(
- mContext.getText(R.string.condition_device_muted_action_turn_on_sound));
- }
-
- @Test
- public void refreshState_zenModeOn_shouldNotActivate() {
- mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_SILENT);
- mNotificationManager.setZenMode(Settings.Global.ZEN_MODE_NO_INTERRUPTIONS, null, TAG);
-
- mCondition.refreshState();
-
- verify(mCondition).setActive(false);
- }
-
- @Test
- public void refreshState_zenModeOff_shouldActivate() {
- mAudioManager.setRingerModeInternal(AudioManager.RINGER_MODE_SILENT);
- mNotificationManager.setZenMode(Settings.Global.ZEN_MODE_OFF, null, TAG);
-
- mCondition.refreshState();
-
- verify(mCondition).setActive(true);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java
deleted file mode 100644
index a134fac..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java
+++ /dev/null
@@ -1,60 +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.dashboard.conditional;
-
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class RingerVibrateConditionTest {
- @Mock
- private ConditionManager mConditionManager;
-
- private Context mContext;
- private RingerVibrateCondition mCondition;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- when(mConditionManager.getContext()).thenReturn(mContext);
- mCondition = new RingerVibrateCondition(mConditionManager);
- }
-
- @Test
- public void verifyText() {
- assertThat(mCondition.getTitle()).isEqualTo(
- mContext.getText(R.string.condition_device_vibrate_title));
- assertThat(mCondition.getSummary()).isEqualTo(
- mContext.getText(R.string.condition_device_vibrate_summary));
- assertThat(mCondition.getActions()[0]).isEqualTo(
- mContext.getText(R.string.condition_device_muted_action_turn_on_sound));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/WorkModeConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/WorkModeConditionTest.java
deleted file mode 100644
index 8ba6ecc..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/WorkModeConditionTest.java
+++ /dev/null
@@ -1,65 +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.dashboard.conditional;
-
-import static org.mockito.ArgumentMatchers.argThat;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-
-import com.android.settings.Settings;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class WorkModeConditionTest {
-
- @Mock
- private ConditionManager mConditionManager;
-
- private Context mContext;
- private WorkModeCondition mCondition;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- FakeFeatureFactory.setupForTest();
- when(mConditionManager.getContext()).thenReturn(mContext);
- mCondition = new WorkModeCondition(mConditionManager);
- }
-
- @Test
- public void onPrimaryClick_shouldLaunchAccountsSetting() {
- final ComponentName componentName =
- new ComponentName(mContext, Settings.AccountDashboardActivity.class);
-
- mCondition.onPrimaryClick();
-
- verify(mContext).startActivity(
- argThat(intent-> intent.getComponent().equals(componentName)));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java
index 4c2ef42..8d7f841 100644
--- a/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java
@@ -24,7 +24,6 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.UserInfo;
import android.os.UserHandle;
@@ -51,6 +50,8 @@
@Mock
private UserManager mUserManager;
+ private ActivityInfo mActivityInfo;
+
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
@@ -58,12 +59,15 @@
final UserInfo userInfo = new UserInfo(
NORMAL_USER.getIdentifier(), "test_user", UserInfo.FLAG_RESTRICTED);
when(mUserManager.getUserInfo(NORMAL_USER.getIdentifier())).thenReturn(userInfo);
+ mActivityInfo = new ActivityInfo();
+ mActivityInfo.packageName = "pkg";
+ mActivityInfo.name = "cls";
+
}
@Test
public void updateUserHandlesIfNeeded_Normal() {
- final Tile tile = new Tile(new ActivityInfo(), CategoryKey.CATEGORY_HOMEPAGE);
- tile.intent = new Intent();
+ final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
tile.userHandle.add(NORMAL_USER);
ProfileSelectDialog.updateUserHandlesIfNeeded(mContext, tile);
@@ -75,8 +79,7 @@
@Test
public void updateUserHandlesIfNeeded_Remove() {
- final Tile tile = new Tile(new ActivityInfo(), CategoryKey.CATEGORY_HOMEPAGE);
- tile.intent = new Intent();
+ final Tile tile = new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
tile.userHandle.add(REMOVED_USER);
tile.userHandle.add(NORMAL_USER);
tile.userHandle.add(REMOVED_USER);
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
deleted file mode 100644
index c5e6b9d..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
+++ /dev/null
@@ -1,344 +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.dashboard.suggestions;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
-import android.service.settings.suggestions.Suggestion;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.dashboard.DashboardAdapter;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowCardView;
-import com.android.settingslib.Utils;
-import com.android.settingslib.suggestions.SuggestionControllerMixinCompat;
-import com.android.settingslib.utils.IconCache;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = ShadowCardView.class)
-public class SuggestionAdapterTest {
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private SettingsActivity mActivity;
- @Mock
- private SuggestionControllerMixinCompat mSuggestionControllerMixin;
- @Mock
- private Resources mResources;
- @Mock
- private WindowManager mWindowManager;
-
- private FakeFeatureFactory mFeatureFactory;
- private Context mContext;
- private SuggestionAdapter mSuggestionAdapter;
- private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
- private List<Suggestion> mOneSuggestion;
- private List<Suggestion> mTwoSuggestions;
- private SuggestionAdapter.CardConfig mConfig;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- when(mActivity.getSystemService(Context.WINDOW_SERVICE)).thenReturn(mWindowManager);
- when(mActivity.getResources()).thenReturn(mResources);
- when(mResources.getDimensionPixelOffset(R.dimen.suggestion_card_inner_margin))
- .thenReturn(10);
- when(mResources.getDimensionPixelOffset(R.dimen.suggestion_card_outer_margin))
- .thenReturn(20);
- mConfig = spy(SuggestionAdapter.CardConfig.get(mActivity));
-
- mFeatureFactory = FakeFeatureFactory.setupForTest();
-
- final Suggestion suggestion1 = new Suggestion.Builder("id1")
- .setTitle("Test suggestion 1")
- .build();
- final Suggestion suggestion2 = new Suggestion.Builder("id2")
- .setTitle("Test suggestion 2")
- .build();
- mOneSuggestion = new ArrayList<>();
- mOneSuggestion.add(suggestion1);
- mTwoSuggestions = new ArrayList<>();
- mTwoSuggestions.add(suggestion1);
- mTwoSuggestions.add(suggestion2);
- }
-
- @Test
- public void getItemCount_shouldReturnListSize() {
- mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
- null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
- mSuggestionAdapter.setSuggestions(mOneSuggestion);
- assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
-
- mSuggestionAdapter.setSuggestions(mTwoSuggestions);
- assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
- }
-
- @Test
- public void getItemViewType_shouldReturnSuggestionTile() {
- mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
- null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
- mSuggestionAdapter.setSuggestions(mOneSuggestion);
- assertThat(mSuggestionAdapter.getItemViewType(0))
- .isEqualTo(R.layout.suggestion_tile);
- }
-
- @Test
- public void getItemType_hasButton_shouldReturnSuggestionWithButton() {
- final List<Suggestion> suggestions = new ArrayList<>();
- suggestions.add(new Suggestion.Builder("id")
- .setFlags(Suggestion.FLAG_HAS_BUTTON)
- .setTitle("123")
- .setSummary("456")
- .build());
- mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
- null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
- mSuggestionAdapter.setSuggestions(suggestions);
-
- assertThat(mSuggestionAdapter.getItemViewType(0))
- .isEqualTo(R.layout.suggestion_tile_with_button);
- }
-
- @Test
- public void onBindViewHolder_shouldLog() {
- final View view = spy(LayoutInflater.from(mContext).inflate(
- R.layout.suggestion_tile, new LinearLayout(mContext), true));
- mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
- mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
- null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
- mSuggestionAdapter.setSuggestions(mOneSuggestion);
- doReturn("sans").when(mContext).getString(anyInt());
-
- // Bind twice
- mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
- mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
-
- // Log once
- verify(mFeatureFactory.metricsFeatureProvider).action(
- mContext, MetricsProto.MetricsEvent.ACTION_SHOW_SETTINGS_SUGGESTION,
- mOneSuggestion.get(0).getId());
- }
-
- @Test
- public void onBindViewHolder_itemViewShouldHandleClick()
- throws PendingIntent.CanceledException {
- final List<Suggestion> suggestions = makeSuggestions("pkg1");
- setupSuggestions(mActivity, suggestions);
-
- mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
- mSuggestionHolder.itemView.performClick();
-
- verify(mSuggestionControllerMixin).launchSuggestion(suggestions.get(0));
- verify(suggestions.get(0).getPendingIntent()).send();
- }
-
- @Test
- public void onBindViewHolder_hasButton_buttonShouldHandleClick()
- throws PendingIntent.CanceledException {
- final List<Suggestion> suggestions = new ArrayList<>();
- final PendingIntent pendingIntent = mock(PendingIntent.class);
- suggestions.add(new Suggestion.Builder("id")
- .setFlags(Suggestion.FLAG_HAS_BUTTON)
- .setTitle("123")
- .setSummary("456")
- .setPendingIntent(pendingIntent)
- .build());
- mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
- null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
- mSuggestionAdapter.setSuggestions(suggestions);
- mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
- new FrameLayout(RuntimeEnvironment.application),
- mSuggestionAdapter.getItemViewType(0));
- doReturn("sans").when(mContext).getString(anyInt());
-
- mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
- mSuggestionHolder.itemView.findViewById(android.R.id.primary).performClick();
-
- verify(mSuggestionControllerMixin).launchSuggestion(suggestions.get(0));
- verify(pendingIntent).send();
- }
-
- @Test
- public void getSuggestions_shouldReturnSuggestionWhenMatch() {
- final List<Suggestion> suggestions = makeSuggestions("pkg1");
- setupSuggestions(mActivity, suggestions);
-
- assertThat(mSuggestionAdapter.getSuggestion(0)).isNotNull();
- }
-
- @Test
- public void onBindViewHolder_closeButtonShouldHandleClick()
- throws PendingIntent.CanceledException {
- final List<Suggestion> suggestions = makeSuggestions("pkg1");
- final SuggestionAdapter.Callback callback = mock(SuggestionAdapter.Callback.class);
- mSuggestionAdapter = new SuggestionAdapter(mActivity, mSuggestionControllerMixin,
- null /* savedInstanceState */, callback, null /* lifecycle */);
- mSuggestionAdapter.setSuggestions(suggestions);
- mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
- new FrameLayout(RuntimeEnvironment.application),
- mSuggestionAdapter.getItemViewType(0));
-
- mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
- mSuggestionHolder.itemView.findViewById(R.id.close_button).performClick();
-
- final Suggestion suggestion = suggestions.get(0);
- verify(mFeatureFactory.suggestionsFeatureProvider).dismissSuggestion(
- mActivity, mSuggestionControllerMixin, suggestion);
- verify(callback).onSuggestionClosed(suggestion);
- }
-
- @Test
- public void onBindViewHolder_iconNotTintable_shouldNotTintIcon()
- throws PendingIntent.CanceledException {
- final Icon icon = mock(Icon.class);
- final Suggestion suggestion = new Suggestion.Builder("pkg1")
- .setPendingIntent(mock(PendingIntent.class))
- .setIcon(icon)
- .build();
- final List<Suggestion> suggestions = new ArrayList<>();
- suggestions.add(suggestion);
- mSuggestionAdapter = new SuggestionAdapter(mActivity, mSuggestionControllerMixin,
- null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
- mSuggestionAdapter.setSuggestions(suggestions);
- mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
- new FrameLayout(RuntimeEnvironment.application),
- mSuggestionAdapter.getItemViewType(0));
- IconCache cache = mock(IconCache.class);
- final Drawable drawable = mock(Drawable.class);
- when(cache.getIcon(icon)).thenReturn(drawable);
- ReflectionHelpers.setField(mSuggestionAdapter, "mCache", cache);
-
- mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
-
- verify(drawable, never()).setTint(anyInt());
- }
-
- @Test
- public void onBindViewHolder_iconTintable_shouldTintIcon()
- throws PendingIntent.CanceledException {
- final Icon icon = mock(Icon.class);
- final int FLAG_ICON_TINTABLE = 1 << 1;
- final Suggestion suggestion = new Suggestion.Builder("pkg1")
- .setPendingIntent(mock(PendingIntent.class))
- .setIcon(icon)
- .setFlags(FLAG_ICON_TINTABLE)
- .build();
- final List<Suggestion> suggestions = new ArrayList<>();
- suggestions.add(suggestion);
- mSuggestionAdapter = new SuggestionAdapter(mActivity, mSuggestionControllerMixin,
- null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
- mSuggestionAdapter.setSuggestions(suggestions);
- mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
- new FrameLayout(RuntimeEnvironment.application),
- mSuggestionAdapter.getItemViewType(0));
- IconCache cache = mock(IconCache.class);
- final Drawable drawable = mock(Drawable.class);
- when(cache.getIcon(icon)).thenReturn(drawable);
- ReflectionHelpers.setField(mSuggestionAdapter, "mCache", cache);
- TypedArray typedArray = mock(TypedArray.class);
- final ColorStateList colorAccentState = Utils.getColorAccent(mContext);
- when(mActivity.obtainStyledAttributes(any())).thenReturn(typedArray);
- when(typedArray.getColorStateList(anyInt())).thenReturn(colorAccentState);
-
- mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
-
- verify(drawable).setTintList(colorAccentState);
- }
-
- @Test
- public void onBindViewHolder_closeButtonShouldHaveContentDescription()
- throws PendingIntent.CanceledException {
- final List<Suggestion> suggestions = makeSuggestions("pkg1");
- setupSuggestions(mActivity, suggestions);
-
- mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
-
- assertThat(
- mSuggestionHolder.itemView.findViewById(R.id.close_button).getContentDescription())
- .isNotNull();
- }
-
- @Test
- public void setCardLayout_twoCards_shouldSetCardWidthToHalfScreenMinusPadding() {
- final List<Suggestion> suggestions = makeSuggestions("pkg1");
- setupSuggestions(mContext, suggestions);
- doReturn(200).when(mConfig).getScreenWidth();
-
- mConfig.setCardLayout(mSuggestionHolder, 0);
-
- /*
- * card width = (screen width - left margin - inner margin - right margin) / 2
- * = (200 - 20 - 10 - 20) / 2
- * = 75
- */
- assertThat(mSuggestionHolder.itemView.getLayoutParams().width).isEqualTo(75);
- }
-
- private void setupSuggestions(Context context, List<Suggestion> suggestions) {
- mSuggestionAdapter = new SuggestionAdapter(context, mSuggestionControllerMixin,
- null /* savedInstanceState */, null /* callback */, null /* lifecycle */);
- mSuggestionAdapter.setSuggestions(suggestions);
- mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
- new FrameLayout(RuntimeEnvironment.application),
- mSuggestionAdapter.getItemViewType(0));
- }
-
- private List<Suggestion> makeSuggestions(String... pkgNames) {
- final List<Suggestion> suggestions = new ArrayList<>();
- for (String pkgName : pkgNames) {
- final Suggestion suggestion = new Suggestion.Builder(pkgName)
- .setPendingIntent(mock(PendingIntent.class))
- .build();
- suggestions.add(suggestion);
- }
- return suggestions;
- }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
index ea1af69..f9a7379 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
@@ -78,6 +78,8 @@
MockitoAnnotations.initMocks(this);
mFactory = FakeFeatureFactory.setupForTest();
mActivityInfo = new ActivityInfo();
+ mActivityInfo.packageName = "pkg";
+ mActivityInfo.name = "class";
when(mContext.getPackageManager()).thenReturn(mPackageManager);
// Explicit casting to object due to MockitoCast bug
when((Object) mContext.getSystemService(FingerprintManager.class))
@@ -141,20 +143,4 @@
anyString());
verify(mSuggestionControllerMixin).dismissSuggestion(mSuggestion);
}
-
- @Test
- public void filterExclusiveSuggestions_shouldOnlyKeepFirst3() {
- final List<Tile> suggestions = new ArrayList<>();
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
- suggestions.add(new Tile(mActivityInfo, CategoryKey.CATEGORY_APPS));
-
- mProvider.filterExclusiveSuggestions(suggestions);
-
- assertThat(suggestions).hasSize(3);
- }
}
diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java
index 5ff88bd..3a82796 100644
--- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java
@@ -17,6 +17,7 @@
package com.android.settings.dashboard.suggestions;
import static android.content.Intent.EXTRA_COMPONENT_NAME;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
index 5de54ea..99a3629 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.graphics.Color;
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
index 230aee9..01fa32f 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java
@@ -34,10 +34,13 @@
import android.util.ArraySet;
import android.view.View;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.AppItem;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -54,11 +57,8 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtils.class})
+@Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtilsInternal.class})
public class AppDataUsageTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -163,7 +163,7 @@
ReflectionHelpers.setField(mFragment, "mDataSaverBackend", dataSaverBackend);
ReflectionHelpers.setField(mFragment.services, "mPolicyManager", networkPolicyManager);
- ShadowRestrictedLockUtils.setRestricted(true);
+ ShadowRestrictedLockUtilsInternal.setRestricted(true);
doReturn(NetworkPolicyManager.POLICY_NONE).when(networkPolicyManager)
.getUidPolicy(testUid);
diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageV2Test.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageV2Test.java
new file mode 100644
index 0000000..8796a39
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageV2Test.java
@@ -0,0 +1,227 @@
+/*
+ * 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.datausage;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+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.content.Context;
+import android.content.pm.PackageManager;
+import android.net.NetworkPolicyManager;
+import android.os.Bundle;
+import android.util.ArraySet;
+import android.view.View;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.AppItem;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.net.NetworkCycleDataForUid;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtilsInternal.class})
+public class AppDataUsageV2Test {
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private EntityHeaderController mHeaderController;
+ @Mock
+ private PackageManager mPackageManager;
+
+ private AppDataUsageV2 mFragment;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ FakeFeatureFactory.setupForTest();
+ }
+
+ @After
+ public void tearDown() {
+ ShadowEntityHeaderController.reset();
+ }
+
+ @Test
+ public void bindAppHeader_allWorkApps_shouldNotShowAppInfoLink() {
+ ShadowEntityHeaderController.setUseMock(mHeaderController);
+ when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
+ when(mHeaderController.setUid(anyInt())).thenReturn(mHeaderController);
+
+ mFragment = spy(new AppDataUsageV2());
+
+ when(mFragment.getPreferenceManager())
+ .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
+ doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
+ ReflectionHelpers.setField(mFragment, "mAppItem", mock(AppItem.class));
+
+ mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
+
+ verify(mHeaderController).setHasAppInfoLink(false);
+ }
+
+ @Test
+ public void bindAppHeader_workApp_shouldSetWorkAppUid() throws
+ PackageManager.NameNotFoundException {
+ final int fakeUserId = 100;
+
+ mFragment = spy(new AppDataUsageV2());
+ final ArraySet<String> packages = new ArraySet<>();
+ packages.add("pkg");
+ final AppItem appItem = new AppItem(123456789);
+
+ ReflectionHelpers.setField(mFragment, "mPackageManager", mPackageManager);
+ ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
+ ReflectionHelpers.setField(mFragment, "mPackages", packages);
+
+ when(mPackageManager.getPackageUidAsUser(anyString(), anyInt()))
+ .thenReturn(fakeUserId);
+
+ ShadowEntityHeaderController.setUseMock(mHeaderController);
+ when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController);
+ when(mHeaderController.setUid(fakeUserId)).thenReturn(mHeaderController);
+ when(mHeaderController.setHasAppInfoLink(anyBoolean())).thenReturn(mHeaderController);
+
+ when(mFragment.getPreferenceManager())
+ .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS));
+ doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
+
+ mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle());
+
+ verify(mHeaderController).setHasAppInfoLink(true);
+ verify(mHeaderController).setUid(fakeUserId);
+ }
+
+ @Test
+ public void changePreference_backgroundData_shouldUpdateUI() {
+ mFragment = spy(new AppDataUsageV2());
+ final AppItem appItem = new AppItem(123456789);
+ final RestrictedSwitchPreference pref = mock(RestrictedSwitchPreference.class);
+ final DataSaverBackend dataSaverBackend = mock(DataSaverBackend.class);
+ ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
+ ReflectionHelpers.setField(mFragment, "mRestrictBackground", pref);
+ ReflectionHelpers.setField(mFragment, "mDataSaverBackend", dataSaverBackend);
+
+ doNothing().when(mFragment).updatePrefs();
+
+ mFragment.onPreferenceChange(pref, true /* value */);
+
+ verify(mFragment).updatePrefs();
+ }
+
+ @Test
+ public void updatePrefs_restrictedByAdmin_shouldDisablePreference() {
+ mFragment = spy(new AppDataUsageV2());
+ final int testUid = 123123;
+ final AppItem appItem = new AppItem(testUid);
+ final RestrictedSwitchPreference restrictBackgroundPref
+ = mock(RestrictedSwitchPreference.class);
+ final RestrictedSwitchPreference unrestrictedDataPref
+ = mock(RestrictedSwitchPreference.class);
+ final DataSaverBackend dataSaverBackend = mock(DataSaverBackend.class);
+ final NetworkPolicyManager networkPolicyManager = mock(NetworkPolicyManager.class);
+ ReflectionHelpers.setField(mFragment, "mAppItem", appItem);
+ ReflectionHelpers.setField(mFragment, "mRestrictBackground", restrictBackgroundPref);
+ ReflectionHelpers.setField(mFragment, "mUnrestrictedData", unrestrictedDataPref);
+ ReflectionHelpers.setField(mFragment, "mDataSaverBackend", dataSaverBackend);
+ ReflectionHelpers.setField(mFragment.services, "mPolicyManager", networkPolicyManager);
+
+ ShadowRestrictedLockUtilsInternal.setRestricted(true);
+ doReturn(NetworkPolicyManager.POLICY_NONE).when(networkPolicyManager)
+ .getUidPolicy(testUid);
+
+ mFragment.updatePrefs();
+
+ verify(restrictBackgroundPref).setDisabledByAdmin(any(EnforcedAdmin.class));
+ verify(unrestrictedDataPref).setDisabledByAdmin(any(EnforcedAdmin.class));
+ }
+
+ @Test
+ public void bindData_noAppUsageData_shouldHideCycleSpinner() {
+ mFragment = spy(new AppDataUsageV2());
+ final SpinnerPreference cycle = mock(SpinnerPreference.class);
+ ReflectionHelpers.setField(mFragment, "mCycle", cycle);
+ final Preference preference = mock(Preference.class);
+ ReflectionHelpers.setField(mFragment, "mBackgroundUsage", preference);
+ ReflectionHelpers.setField(mFragment, "mForegroundUsage", preference);
+ ReflectionHelpers.setField(mFragment, "mTotalUsage", preference);
+ doReturn(RuntimeEnvironment.application).when(mFragment).getContext();
+
+ mFragment.bindData(0 /* position */);
+
+ verify(cycle).setVisible(false);
+ }
+
+ @Test
+ public void bindData_hasAppUsageData_shouldShowCycleSpinnerAndUpdateUsageSummary() {
+ mFragment = spy(new AppDataUsageV2());
+ final Context context = RuntimeEnvironment.application;
+ doReturn(context).when(mFragment).getContext();
+ final long backgroundBytes = 1234L;
+ final long foregroundBytes = 5678L;
+ final List<NetworkCycleDataForUid> appUsage = new ArrayList<>();
+ appUsage.add(new NetworkCycleDataForUid.Builder()
+ .setBackgroundUsage(backgroundBytes).setForegroundUsage(foregroundBytes).build());
+ ReflectionHelpers.setField(mFragment, "mUsageData", appUsage);
+ final Preference backgroundPref = mock(Preference.class);
+ ReflectionHelpers.setField(mFragment, "mBackgroundUsage", backgroundPref);
+ final Preference foregroundPref = mock(Preference.class);
+ ReflectionHelpers.setField(mFragment, "mForegroundUsage", foregroundPref);
+ final Preference totalPref = mock(Preference.class);
+ ReflectionHelpers.setField(mFragment, "mTotalUsage", totalPref);
+ final SpinnerPreference cycle = mock(SpinnerPreference.class);
+ ReflectionHelpers.setField(mFragment, "mCycle", cycle);
+
+ mFragment.bindData(0 /* position */);
+
+ verify(cycle).setVisible(true);
+ verify(totalPref).setSummary(
+ DataUsageUtils.formatDataUsage(context, backgroundBytes + foregroundBytes));
+ verify(backgroundPref).setSummary(DataUsageUtils.formatDataUsage(context, backgroundBytes));
+ verify(foregroundPref).setSummary(DataUsageUtils.formatDataUsage(context, foregroundBytes));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
index 13072d5..e3034f8 100644
--- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
@@ -28,6 +29,8 @@
import android.graphics.drawable.Drawable;
import android.util.ArraySet;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,8 +40,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppPrefLoaderTest {
diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
index 2d44628..1560af3 100644
--- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java
@@ -16,12 +16,17 @@
package com.android.settings.datausage;
import static android.net.NetworkPolicy.CYCLE_NONE;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.nullable;
+import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -30,10 +35,20 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.net.ConnectivityManager;
+import android.net.NetworkPolicyManager;
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
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;
@@ -41,10 +56,7 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.SwitchPreference;
+import org.robolectric.util.ReflectionHelpers;
@RunWith(SettingsRobolectricTestRunner.class)
public class BillingCycleSettingsTest {
@@ -58,6 +70,10 @@
PreferenceManager mMockPreferenceManager;
@Mock
private NetworkPolicyEditor mNetworkPolicyEditor;
+ @Mock
+ private ConnectivityManager mConnectivityManager;
+ @Mock
+ private NetworkPolicyManager mNetworkPolicyManager;
private Context mContext;
@Mock
@@ -94,7 +110,8 @@
public void testDataUsageLimit_shouldNotBeSetOnCancel() {
mConfirmLimitFragment.onClick(null, DialogInterface.BUTTON_NEGATIVE);
- assertFalse(mSharedPreferences.getBoolean(BillingCycleSettings.KEY_SET_DATA_LIMIT, true));
+ assertThat(mSharedPreferences.getBoolean(BillingCycleSettings.KEY_SET_DATA_LIMIT, true))
+ .isFalse();
verify(mMockBillingCycleSettings, never()).setPolicyLimitBytes(anyLong());
}
@@ -102,7 +119,8 @@
public void testDataUsageLimit_shouldBeSetOnConfirmation() {
mConfirmLimitFragment.onClick(null, DialogInterface.BUTTON_POSITIVE);
- assertTrue(mSharedPreferences.getBoolean(BillingCycleSettings.KEY_SET_DATA_LIMIT, false));
+ assertThat(mSharedPreferences.getBoolean(BillingCycleSettings.KEY_SET_DATA_LIMIT, false))
+ .isTrue();
verify(mMockBillingCycleSettings).setPolicyLimitBytes(LIMIT_BYTES);
}
@@ -122,4 +140,32 @@
verify(mBillingCycle).setSummary(null);
}
+
+ @Test
+ public void onCreate_emptyArguments_shouldSetDefaultNetworkTemplate() {
+ final BillingCycleSettings billingCycleSettings = spy(new BillingCycleSettings());
+ when(billingCycleSettings.getContext()).thenReturn(mContext);
+ when(billingCycleSettings.getArguments()).thenReturn(Bundle.EMPTY);
+ final FragmentActivity activity = mock(FragmentActivity.class);
+ when(billingCycleSettings.getActivity()).thenReturn(activity);
+ final Resources.Theme theme = mContext.getTheme();
+ when(activity.getTheme()).thenReturn(theme);
+ doNothing().when(billingCycleSettings)
+ .onCreatePreferences(any(Bundle.class), nullable(String.class));
+ when(mContext.getSystemService(Context.NETWORK_POLICY_SERVICE))
+ .thenReturn(mNetworkPolicyManager);
+ when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
+ .thenReturn(mConnectivityManager);
+ 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);
+
+ assertThat(billingCycleSettings.mNetworkTemplate).isNotNull();
+ }
+
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java
index 62751dd..7440966 100644
--- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java
@@ -16,6 +16,7 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.when;
@@ -26,6 +27,8 @@
import android.view.View;
import android.widget.LinearLayout;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,8 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class CellDataPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
index e053e16..ce58ae2 100644
--- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
@@ -16,6 +16,7 @@
package com.android.settings.datausage;
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;
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
index 206f149..acd00fd 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -29,9 +30,13 @@
import android.os.Bundle;
import android.provider.Settings;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceManager;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.NetworkPolicyEditor;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
import org.junit.Before;
import org.junit.Test;
@@ -40,8 +45,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DataUsageListTest {
@@ -67,7 +70,11 @@
@Test
public void resumePause_shouldListenUnlistenDataStateChange() {
- mDataUsageList.onAttach(mContext);
+ ReflectionHelpers.setField(
+ mDataUsageList, "mVisibilityLoggerMixin", mock(VisibilityLoggerMixin.class));
+ ReflectionHelpers.setField(
+ mDataUsageList, "mPreferenceManager", mock(PreferenceManager.class));
+
mDataUsageList.onResume();
verify(mListener).setListener(true, mDataUsageList.mSubId, mContext);
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListV2Test.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListV2Test.java
new file mode 100644
index 0000000..f561a05
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListV2Test.java
@@ -0,0 +1,127 @@
+/*
+ * 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.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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.net.ConnectivityManager;
+import android.net.NetworkTemplate;
+import android.os.Bundle;
+import android.provider.Settings;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.NetworkPolicyEditor;
+import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.util.ReflectionHelpers;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceManager;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class DataUsageListV2Test {
+
+ @Mock
+ private CellDataPreference.DataStateListener mListener;
+ @Mock
+ private TemplatePreference.NetworkServices mNetworkServices;
+ @Mock
+ private Context mContext;
+ private DataUsageListV2 mDataUsageList;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ FakeFeatureFactory.setupForTest();
+ mNetworkServices.mPolicyEditor = mock(NetworkPolicyEditor.class);
+ mDataUsageList = spy(DataUsageListV2.class);
+
+ doReturn(mContext).when(mDataUsageList).getContext();
+ ReflectionHelpers.setField(mDataUsageList, "mDataStateListener", mListener);
+ ReflectionHelpers.setField(mDataUsageList, "services", mNetworkServices);
+ }
+
+ @Test
+ public void resumePause_shouldListenUnlistenDataStateChange() {
+ ReflectionHelpers.setField(
+ mDataUsageList, "mVisibilityLoggerMixin", mock(VisibilityLoggerMixin.class));
+ ReflectionHelpers.setField(
+ mDataUsageList, "mPreferenceManager", mock(PreferenceManager.class));
+
+ mDataUsageList.onResume();
+
+ verify(mListener).setListener(true, mDataUsageList.mSubId, mContext);
+
+ mDataUsageList.onPause();
+
+ verify(mListener).setListener(false, mDataUsageList.mSubId, mContext);
+ }
+
+ @Test
+ public void processArgument_shouldGetTemplateFromArgument() {
+ final Bundle args = new Bundle();
+ args.putParcelable(DataUsageListV2.EXTRA_NETWORK_TEMPLATE, mock(NetworkTemplate.class));
+ args.putInt(DataUsageListV2.EXTRA_SUB_ID, 3);
+ mDataUsageList.setArguments(args);
+
+ mDataUsageList.processArgument();
+
+ assertThat(mDataUsageList.mTemplate).isNotNull();
+ assertThat(mDataUsageList.mSubId).isEqualTo(3);
+ }
+
+ @Test
+ public void processArgument_shouldGetNetworkTypeFromArgument() {
+ final Bundle args = new Bundle();
+ args.putInt(DataUsageListV2.EXTRA_NETWORK_TYPE, ConnectivityManager.TYPE_WIFI);
+ args.putInt(DataUsageListV2.EXTRA_SUB_ID, 3);
+ mDataUsageList.setArguments(args);
+
+ mDataUsageList.processArgument();
+
+ assertThat(mDataUsageList.mNetworkType).isEqualTo(ConnectivityManager.TYPE_WIFI);
+ }
+
+ @Test
+ public void processArgument_fromIntent_shouldGetTemplateFromIntent() {
+ final FragmentActivity activity = mock(FragmentActivity.class);
+ final Intent intent = new Intent();
+ intent.putExtra(Settings.EXTRA_NETWORK_TEMPLATE, mock(NetworkTemplate.class));
+ intent.putExtra(Settings.EXTRA_SUB_ID, 3);
+ when(activity.getIntent()).thenReturn(intent);
+ doReturn(activity).when(mDataUsageList).getActivity();
+
+ mDataUsageList.processArgument();
+
+ assertThat(mDataUsageList.mTemplate).isNotNull();
+ assertThat(mDataUsageList.mSubId).isEqualTo(3);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java
index 422450a..151bc7d 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsagePreferenceTest.java
@@ -57,7 +57,7 @@
@Test
public void setTemplate_noDataUsage_shouldDisablePreference() {
- doReturn(0L).when(mController).getHistoriclUsageLevel(any(NetworkTemplate.class));
+ doReturn(0L).when(mController).getHistoricalUsageLevel(any(NetworkTemplate.class));
mPreference.setTemplate(
NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */);
@@ -68,7 +68,7 @@
@Test
public void setTemplate_hasDataUsage_shouldNotDisablePreference() {
- doReturn(200L).when(mController).getHistoriclUsageLevel(any(NetworkTemplate.class));
+ doReturn(200L).when(mController).getHistoricalUsageLevel(any(NetworkTemplate.class));
mPreference.setTemplate(
NetworkTemplate.buildTemplateMobileWildcard(), 5 /* subId */, null /* services */);
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
index bd9db3d..5171548 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
@@ -17,9 +17,12 @@
package com.android.settings.datausage;
import static android.net.ConnectivityManager.TYPE_WIFI;
+
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -35,6 +38,9 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import androidx.fragment.app.FragmentActivity;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -59,9 +65,6 @@
import java.util.concurrent.TimeUnit;
-import androidx.fragment.app.FragmentActivity;
-import androidx.recyclerview.widget.RecyclerView;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowEntityHeaderController.class)
public class DataUsageSummaryPreferenceControllerTest {
@@ -118,7 +121,7 @@
mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
when(mActivity.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
- when(mActivity.getSystemService(ConnectivityManager.class))
+ when(mActivity.getSystemService(Context.CONNECTIVITY_SERVICE))
.thenReturn(mConnectivityManager);
when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_READY);
when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(false);
@@ -355,7 +358,7 @@
mActivity, null, null, null);
final SubscriptionInfo subInfo = new SubscriptionInfo(0, "123456", 0, "name", "carrier",
- 0, 0, "number", 0, null, "123", "456", "ZX");
+ 0, 0, "number", 0, null, "123", "456", "ZX", false, null, null);
when(mSubscriptionManager.getDefaultDataSubscriptionInfo()).thenReturn(subInfo);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
}
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
index 94716f9..855e40b 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
@@ -17,13 +17,13 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.ComponentName;
-import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
import android.net.NetworkTemplate;
@@ -36,6 +36,9 @@
import android.widget.ProgressBar;
import android.widget.TextView;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
@@ -48,16 +51,12 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowActivity;
import java.util.concurrent.TimeUnit;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResourcesImpl.class)
public class DataUsageSummaryPreferenceTest {
@@ -66,7 +65,7 @@
private static final long UPDATE_LAG_MILLIS = 10000000L;
private static final String DUMMY_CARRIER = "z-mobile";
- private Context mContext;
+ private Activity mActivity;
private PreferenceViewHolder mHolder;
private DataUsageSummaryPreference mSummaryPreference;
private TextView mUsageTitle;
@@ -87,9 +86,9 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
- mSummaryPreference = new DataUsageSummaryPreference(mContext, null /* attrs */);
- LayoutInflater inflater = LayoutInflater.from(mContext);
+ mActivity = spy(Robolectric.setupActivity(Activity.class));
+ mSummaryPreference = new DataUsageSummaryPreference(mActivity, null /* attrs */);
+ LayoutInflater inflater = LayoutInflater.from(mActivity);
View view = inflater.inflate(mSummaryPreference.getLayoutResource(), null /* root */,
false /* attachToRoot */);
@@ -227,7 +226,7 @@
bindViewHolder();
assertThat(mCarrierInfo.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(mCarrierInfo.getCurrentTextColor()).isEqualTo(
- Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorSecondary));
+ Utils.getColorAttrDefaultColor(mActivity, android.R.attr.textColorSecondary));
assertThat(mCarrierInfo.getTypeface()).isEqualTo(Typeface.SANS_SERIF);
}
@@ -240,7 +239,7 @@
bindViewHolder();
assertThat(mCarrierInfo.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(mCarrierInfo.getCurrentTextColor()).isEqualTo(
- Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorError));
+ Utils.getColorAttrDefaultColor(mActivity, android.R.attr.colorError));
assertThat(mCarrierInfo.getTypeface()).isEqualTo(
DataUsageSummaryPreference.SANS_SERIF_MEDIUM);
}
@@ -273,7 +272,7 @@
bindViewHolder();
assertThat(mCycleTime.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(mCycleTime.getText()).isEqualTo(
- mContext.getString(R.string.billing_cycle_less_than_one_day_left));
+ mActivity.getString(R.string.billing_cycle_less_than_one_day_left));
}
@Test
@@ -285,7 +284,7 @@
bindViewHolder();
assertThat(mCycleTime.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(mCycleTime.getText()).isEqualTo(
- mContext.getString(R.string.billing_cycle_none_left));
+ mActivity.getString(R.string.billing_cycle_none_left));
}
@Test
@@ -384,7 +383,7 @@
assertThat(mDataUsed.getText().toString()).isEqualTo("1.00 MB used");
assertThat(mDataRemaining.getText().toString()).isEqualTo("9.00 MB left");
assertThat(mDataRemaining.getVisibility()).isEqualTo(View.VISIBLE);
- final int colorId = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorAccent);
+ final int colorId = Utils.getColorAttrDefaultColor(mActivity, android.R.attr.colorAccent);
assertThat(mDataRemaining.getCurrentTextColor()).isEqualTo(colorId);
}
@@ -400,7 +399,7 @@
bindViewHolder();
assertThat(mDataUsed.getText().toString()).isEqualTo("11.00 MB used");
assertThat(mDataRemaining.getText().toString()).isEqualTo("1.00 MB over");
- final int colorId = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorError);
+ final int colorId = Utils.getColorAttrDefaultColor(mActivity, android.R.attr.colorError);
assertThat(mDataRemaining.getCurrentTextColor()).isEqualTo(colorId);
}
@@ -429,7 +428,7 @@
bindViewHolder();
assertThat(mLaunchButton.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(mLaunchButton.getText())
- .isEqualTo(mContext.getString(R.string.launch_mdp_app_text));
+ .isEqualTo(mActivity.getString(R.string.launch_mdp_app_text));
mLaunchButton.callOnClick();
ShadowActivity shadowActivity = Shadows.shadowOf(activity);
@@ -443,12 +442,12 @@
@Test
public void testSetUsageInfo_withOverflowStrings_dataRemainingNotShown() {
- LayoutInflater inflater = LayoutInflater.from(mContext);
+ LayoutInflater inflater = LayoutInflater.from(mActivity);
View view = inflater.inflate(mSummaryPreference.getLayoutResource(), null /* root */,
false /* attachToRoot */);
- TextView dataUsed = spy(new TextView(mContext));
- TextView dataRemaining = spy(new TextView(mContext));
+ TextView dataUsed = spy(new TextView(mActivity));
+ TextView dataRemaining = spy(new TextView(mActivity));
doReturn(dataUsed).when(mHolder).findViewById(R.id.data_usage_view);
doReturn(dataRemaining).when(mHolder).findViewById(R.id.data_remaining_view);
@@ -459,10 +458,10 @@
10 * BillingCycleSettings.MIB_IN_BYTES,
true /* hasMobileData */);
- when(mContext.getResources()).thenCallRealMethod();
- when(mContext.getText(R.string.data_used_formatted))
+ when(mActivity.getResources()).thenCallRealMethod();
+ when(mActivity.getText(R.string.data_used_formatted))
.thenReturn("^1 ^2 used with long trailing text");
- when(mContext.getText(R.string.data_remaining)).thenReturn("^1 left");
+ when(mActivity.getText(R.string.data_remaining)).thenReturn("^1 left");
bindViewHolder();
@@ -493,11 +492,11 @@
mSummaryPreference.setUsageNumbers(1000000L, -1L, true);
final String cycleText = "The quick fox";
mSummaryPreference.setWifiMode(true, cycleText);
- doReturn(200L).when(mSummaryPreference).getHistoriclUsageLevel();
+ doReturn(200L).when(mSummaryPreference).getHistoricalUsageLevel();
bindViewHolder();
assertThat(mUsageTitle.getText().toString())
- .isEqualTo(mContext.getString(R.string.data_usage_wifi_title));
+ .isEqualTo(mActivity.getString(R.string.data_usage_wifi_title));
assertThat(mUsageTitle.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(mCycleTime.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(mCycleTime.getText()).isEqualTo(cycleText);
@@ -505,7 +504,7 @@
assertThat(mDataLimits.getVisibility()).isEqualTo(View.GONE);
assertThat(mLaunchButton.getVisibility()).isEqualTo(View.VISIBLE);
assertThat(mLaunchButton.getText())
- .isEqualTo(mContext.getString(R.string.launch_wifi_text));
+ .isEqualTo(mActivity.getString(R.string.launch_wifi_text));
mLaunchButton.callOnClick();
ShadowActivity shadowActivity = Shadows.shadowOf(activity);
@@ -529,7 +528,7 @@
public void testSetWifiMode_noUsageInfo_shouldDisableLaunchButton() {
mSummaryPreference = spy(mSummaryPreference);
mSummaryPreference.setWifiMode(true, "Test cycle text");
- doReturn(0L).when(mSummaryPreference).getHistoriclUsageLevel();
+ doReturn(0L).when(mSummaryPreference).getHistoricalUsageLevel();
bindViewHolder();
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index 9651054..49e3e86 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.anyString;
@@ -30,31 +31,35 @@
import android.content.Context;
import android.net.NetworkPolicyManager;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowDashboardFragment;
import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
+import com.android.settings.testutils.shadow.ShadowUserManager;
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.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import androidx.fragment.app.FragmentActivity;
-
@Config(shadows = {
- SettingsShadowResourcesImpl.class,
- SettingsShadowResources.SettingsShadowTheme.class,
- ShadowUtils.class,
- ShadowDataUsageUtils.class,
- ShadowDashboardFragment.class
+ SettingsShadowResourcesImpl.class,
+ SettingsShadowResources.SettingsShadowTheme.class,
+ ShadowUtils.class,
+ ShadowDataUsageUtils.class,
+ ShadowDashboardFragment.class,
+ ShadowUserManager.class,
})
@RunWith(SettingsRobolectricTestRunner.class)
public class DataUsageSummaryTest {
@@ -76,15 +81,21 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowApplication shadowContext = ShadowApplication.getInstance();
+ ShadowUserManager.getShadow().setIsAdminUser(true);
shadowContext.setSystemService(Context.NETWORK_POLICY_SERVICE, mNetworkPolicyManager);
- mContext = shadowContext.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
mSummaryProvider = DataUsageSummary.SUMMARY_PROVIDER_FACTORY
.createSummaryProvider(mActivity, mSummaryLoader);
}
+ @After
+ public void tearDown() {
+ ShadowUserManager.getShadow().reset();
+ }
+
@Test
public void formatUsage_shouldLookLikeFormatFileSize() {
SettingsShadowResources.overrideResource(com.android.internal.R.string.fileSizeSuffix,
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
index a35c897..9a67df8 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java
@@ -17,14 +17,21 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.usage.NetworkStatsManager;
import android.content.Context;
import android.net.ConnectivityManager;
import android.telephony.TelephonyManager;
import android.util.DataUnit;
+import android.util.FeatureFlagUtils;
+import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,6 +39,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -41,15 +49,19 @@
private ConnectivityManager mManager;
@Mock
private TelephonyManager mTelephonyManager;
+ @Mock
+ private NetworkStatsManager mNetworkStatsManager;
+
private Context mContext;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
ShadowApplication shadowContext = ShadowApplication.getInstance();
- mContext = shadowContext.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
shadowContext.setSystemService(Context.CONNECTIVITY_SERVICE, mManager);
shadowContext.setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
+ shadowContext.setSystemService(Context.NETWORK_STATS_SERVICE, mNetworkStatsManager);
}
@Test
@@ -87,4 +99,17 @@
assertThat(formattedDataUsage).isEqualTo("1.00 GB");
}
+
+ @Test
+ public void hasEthernet_shouldQueryEthernetSummaryForUser() throws Exception {
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.DATA_USAGE_V2, true);
+ when(mManager.isNetworkSupported(anyInt())).thenReturn(true);
+ final String subscriber = "TestSub";
+ when(mTelephonyManager.getSubscriberId()).thenReturn(subscriber);
+
+ DataUsageUtils.hasEthernet(mContext);
+
+ verify(mNetworkStatsManager).querySummaryForUser(eq(ConnectivityManager.TYPE_ETHERNET),
+ eq(subscriber), anyLong() /* startTime */, anyLong() /* endTime */);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java
index 66bcfbd..983b96d 100644
--- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.datausage;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.nullable;
@@ -32,6 +33,9 @@
import android.content.pm.ApplicationInfo;
import android.os.Process;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.AppStateBaseBridge;
@@ -39,6 +43,7 @@
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -54,12 +59,10 @@
import java.util.ArrayList;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
ShadowRestrictedLockUtils.class,
+ ShadowRestrictedLockUtilsInternal.class,
UnrestrictedDataAccessPreferenceControllerTest.ShadowAppStateBaseBridge.class
})
public class UnrestrictedDataAccessPreferenceControllerTest {
@@ -126,7 +129,7 @@
final String testPkg1 = "com.example.one";
final String testPkg2 = "com.example.two";
- ShadowRestrictedLockUtils.setRestrictedPkgs(testPkg2);
+ ShadowRestrictedLockUtilsInternal.setRestrictedPkgs(testPkg2);
doAnswer((invocation) -> {
final UnrestrictedDataAccessPreference preference = invocation.getArgument(0);
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java
index 762642d..f1795f3 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java
@@ -23,6 +23,8 @@
import android.provider.Settings;
import android.text.format.DateFormat;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,8 +38,6 @@
import java.util.List;
import java.util.Locale;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AutoTimeFormatPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
index e725877..4d1ba38 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datetime;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
index 0193484..11b2efd 100644
--- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datetime;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.robolectric.shadow.api.Shadow.extract;
@@ -24,6 +25,8 @@
import android.net.ConnectivityManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
@@ -35,8 +38,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowConnectivityManager.class)
public class AutoTimeZonePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
index 7fd5b46..0f5e088 100644
--- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datetime;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
index 802d9ed..ee495d3 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datetime;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
index 244ca5c..5180455 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.datetime;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,9 +39,6 @@
import java.util.List;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TimeFormatPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
index c6f99a3..d73c8db 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datetime;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
index 38aace8..a8c09f2 100644
--- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datetime;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java
index b1b14f5..365bfa2 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java
@@ -18,6 +18,8 @@
import static com.google.common.truth.Truth.assertThat;
+import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
@@ -29,8 +31,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BaseTimeZoneAdapterTest {
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java
index d801e8c..06d2b2b 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java
@@ -21,6 +21,8 @@
import android.app.Activity;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -28,8 +30,6 @@
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BaseTimeZonePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
index d2457f5..9f3453d 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java
index 1d119e7..6802e8a 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java
@@ -21,6 +21,8 @@
import android.app.Activity;
import android.icu.util.TimeZone;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -28,8 +30,6 @@
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FixedOffsetPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java
index 878384e..f333115 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java
@@ -20,6 +20,8 @@
import android.app.Activity;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -27,8 +29,6 @@
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RegionPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
index 6addd6f..e7e01c9 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datetime.timezone;
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;
@@ -24,17 +25,20 @@
import android.widget.Filter;
import android.widget.LinearLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder;
import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem;
import com.android.settings.datetime.timezone.model.TimeZoneData;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import libcore.util.CountryZonesFinder;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
@@ -45,9 +49,6 @@
import java.util.List;
import java.util.Locale;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
RegionSearchPickerTest.ShadowBaseTimeZonePicker.class,
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java
index 9478e06..3c98985 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java
@@ -21,6 +21,8 @@
import android.app.Activity;
import android.icu.util.TimeZone;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -28,8 +30,6 @@
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RegionZonePreferenceControllerTest {
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 b5522b3..948a927 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
@@ -19,6 +19,8 @@
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.spy;
+import androidx.preference.Preference;
+
import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -29,8 +31,6 @@
import java.util.Date;
import java.util.Locale;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TimeZoneInfoPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java
index 725313e..51d4a4b 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datetime.timezone;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
index d388dcd..d7fdd2c 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
@@ -17,6 +17,7 @@
package com.android.settings.datetime.timezone.model;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
index f952605..b6a9322 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java
@@ -7,6 +7,9 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -19,9 +22,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AutomaticStorageManagerDescriptionPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
index f78d8f9..073078b 100644
--- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.deletionhelper;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.never;
@@ -27,6 +28,10 @@
import android.os.SystemProperties;
import android.provider.Settings;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,10 +46,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AutomaticStorageManagerSwitchBarControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
index b876de0..2ed0942 100644
--- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController
.STREAMING_LABEL_ID;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
@@ -30,6 +31,10 @@
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -40,10 +45,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AbstractBluetoothA2dpPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
index 2e8ff85..e472dbb 100644
--- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -26,6 +27,9 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,9 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AdbPreferenceControllerTest {
@@ -67,7 +68,7 @@
@Test
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ADB_ENABLED, -1);
assertThat(mode).isEqualTo(AdbPreferenceController.ADB_SETTING_OFF);
@@ -78,7 +79,7 @@
@Test
public void onAdbDialogConfirmed_shouldEnableAdbSetting() {
mController.onAdbDialogConfirmed();
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ADB_ENABLED, -1);
assertThat(mode).isEqualTo(AdbPreferenceController.ADB_SETTING_ON);
@@ -86,7 +87,7 @@
@Test
public void onAdbDialogDismissed_preferenceShouldNotBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(), Settings.Global.ADB_ENABLED,
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.ADB_ENABLED,
AdbPreferenceController.ADB_SETTING_OFF);
mController.onAdbDialogDismissed();
diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
index b5a2723..2175f39 100644
--- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java
@@ -20,13 +20,18 @@
.SETTING_VALUE_OFF;
import static com.android.settings.development.AllowAppsOnExternalPreferenceController
.SETTING_VALUE_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,9 +41,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AllowAppsOnExternalPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/AngleEnabledAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AngleEnabledAppPreferenceControllerTest.java
new file mode 100644
index 0000000..03837c2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/AngleEnabledAppPreferenceControllerTest.java
@@ -0,0 +1,138 @@
+/*
+ * 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 static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_ANGLE_ENABLED_APP;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class AngleEnabledAppPreferenceControllerTest {
+
+ @Mock
+ private Preference mPreference;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+ @Mock
+ private DevelopmentSettingsDashboardFragment mFragment;
+ @Mock
+ private PackageManager mPackageManager;
+
+ private Context mContext;
+ private AngleEnabledAppPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = spy(new AngleEnabledAppPreferenceController(mContext, mFragment));
+ ReflectionHelpers
+ .setField(mController, "mPackageManager" /* field name */, mPackageManager);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void handlePreferenceTreeClick_preferenceClicked_launchActivity() {
+ final Intent activityStartIntent = new Intent(mContext, AppPicker.class);
+ final String preferenceKey = mController.getPreferenceKey();
+ doReturn(activityStartIntent).when(mController).getActivityStartIntent();
+ when(mPreference.getKey()).thenReturn(preferenceKey);
+ mController.handlePreferenceTreeClick(mPreference);
+
+ verify(mFragment).startActivityForResult(activityStartIntent,
+ REQUEST_CODE_ANGLE_ENABLED_APP);
+ }
+
+ @Test
+ public void updateState_foobarAppSelected_shouldUpdateSummaryWithAngleEnabledAppLabel() {
+ final String angleEnabledApp = "foobar";
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.Global.putString(contentResolver, Settings.Global.ANGLE_ENABLED_APP,
+ angleEnabledApp);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setSummary(
+ mContext.getString(R.string.angle_enabled_app_set, angleEnabledApp));
+ }
+
+ @Test
+ public void updateState_noAppSelected_shouldUpdateSummaryWithNoAppSelected() {
+ final String angleEnabledApp = null;
+ final ContentResolver contentResolver = mContext.getContentResolver();
+ Settings.Global.putString(contentResolver, Settings.Global.ANGLE_ENABLED_APP,
+ angleEnabledApp);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setSummary(
+ mContext.getString(R.string.angle_enabled_app_not_set));
+ }
+
+ @Test
+ public void onActivityResult_foobarAppSelected_shouldUpdateSummaryWithAngleEnabledLabel() {
+ Intent activityResultIntent = new Intent(mContext, AppPicker.class);
+ final String appLabel = "foobar";
+ activityResultIntent.setAction(appLabel);
+ final boolean result = mController
+ .onActivityResult(REQUEST_CODE_ANGLE_ENABLED_APP, Activity.RESULT_OK,
+ activityResultIntent);
+
+ assertThat(result).isTrue();
+ verify(mPreference).setSummary(
+ mContext.getString(R.string.angle_enabled_app_set, appLabel));
+ }
+
+ @Test
+ public void onActivityResult_badRequestCode_shouldReturnFalse() {
+ assertThat(mController.onActivityResult(
+ -1 /* requestCode */, -1 /* resultCode */, null /* intent */)).isFalse();
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ verify(mPreference).setSummary(
+ mContext.getString(R.string.angle_enabled_app_not_set));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
index 1312c89..accd05b 100644
--- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java
@@ -20,6 +20,7 @@
.ANIMATOR_DURATION_SCALE_SELECTOR;
import static com.android.settings.development.AnimatorDurationScalePreferenceController
.DEFAULT_VALUE;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -27,6 +28,9 @@
import android.os.RemoteException;
import android.view.IWindowManager;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,9 +42,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AnimatorDurationScalePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
index 358c824..e1fc149 100644
--- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java
@@ -20,13 +20,18 @@
.SETTING_VALUE_OFF;
import static com.android.settings.development.AppsNotRespondingPreferenceController
.SETTING_VALUE_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,9 +41,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppsNotRespondingPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java
index c58fa64..6878c32 100644
--- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java
@@ -25,6 +25,9 @@
import android.content.Context;
import android.os.RemoteException;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,9 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BackgroundProcessLimitPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java
index 75c0f45..69c8d2b 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java
@@ -18,13 +18,18 @@
import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController
.A2DP_OFFLOAD_DISABLED_PROPERTY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.SystemProperties;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,9 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothA2dpHwOffloadPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
index 76696d2..9cc7436 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java
@@ -18,13 +18,18 @@
import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController
.BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.SystemProperties;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,9 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothAbsoluteVolumePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java
index 4827700..a4da197 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,10 @@
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -34,10 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothAudioBitsPerSamplePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
index b857730..eb1737b 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,10 @@
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -34,10 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothAudioChannelModePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
index cf24c09..23eea32 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,10 @@
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -34,10 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothAudioCodecPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java
index dd9fa05..516c8b2 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,10 @@
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -34,10 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothAudioQualityPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
index 1654a68..cb9337f 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,10 @@
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -34,10 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothAudioSampleRatePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
index 2441a47..2d0c70a 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController
.BLUETOOTH_AVRCP_VERSION_PROPERTY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,6 +28,9 @@
import android.content.res.Resources;
import android.os.SystemProperties;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,9 +41,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothAvrcpVersionPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java
index 23ea1e8..9750d3a 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java
@@ -18,11 +18,17 @@
import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController
.BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,10 +38,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadows.ShadowSystemProperties;
-
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothDeviceNoNamePreferenceControllerTest {
@@ -54,7 +56,7 @@
mContext = RuntimeEnvironment.application;
mController = new BluetoothDeviceNoNamePreferenceController(mContext);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mPreference);
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
@@ -62,8 +64,9 @@
public void onPreferenceChanged_settingEnabled_shouldTurnOnBluetoothDeviceNoName() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final boolean mode = ShadowSystemProperties
- .native_get_boolean(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, false /* default */);
+ final boolean mode = SystemProperties.getBoolean(
+ BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
+ false /* default */);
assertThat(mode).isTrue();
}
@@ -72,16 +75,16 @@
public void onPreferenceChanged_settingDisabled_shouldTurnOffBluetoothDeviceNoName() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final boolean mode = ShadowSystemProperties
- .native_get_boolean(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, true /* default */);
+ final boolean mode = SystemProperties.getBoolean(
+ BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, true /* default */);
assertThat(mode).isFalse();
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- ShadowSystemProperties
- .native_set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, Boolean.toString(true));
+ SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
+ Boolean.toString(true));
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -89,8 +92,8 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- ShadowSystemProperties
- .native_set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, Boolean.toString(false));
+ SystemProperties.set(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
+ Boolean.toString(false));
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -100,8 +103,9 @@
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
- final boolean mode = ShadowSystemProperties
- .native_get_boolean(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY, true /* default */);
+ final boolean mode = SystemProperties.getBoolean(
+ BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY,
+ true /* default */);
assertThat(mode).isFalse();
verify(mPreference).setEnabled(false);
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
index a454b8e..030aaa2 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.development
.BluetoothMaxConnectedAudioDevicesPreferenceController.MAX_CONNECTED_AUDIO_DEVICES_PROPERTY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
@@ -26,6 +28,9 @@
import android.content.res.Resources;
import android.os.SystemProperties;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,9 +42,6 @@
import org.mockito.Spy;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java
index b4038a7..0d75bdb 100644
--- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java
@@ -18,13 +18,18 @@
import static com.android.settings.development.BluetoothSnoopLogPreferenceController
.BLUETOOTH_BTSNOOP_ENABLE_PROPERTY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.SystemProperties;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -33,9 +38,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothSnoopLogPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
index af63dc3..b4ee99c 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java
@@ -20,7 +20,9 @@
.SETTING_VALUE_OFF;
import static com.android.settings.development.BugReportInPowerPreferenceController
.SETTING_VALUE_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -30,6 +32,9 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -39,9 +44,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BugReportInPowerPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
index 77bd6b8..39fd368 100644
--- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
index 033cb26..d39a8c2 100644
--- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java
@@ -20,12 +20,17 @@
import static com.android.settings.development.CameraLaserSensorPreferenceController
.USERDEBUG_BUILD;
import static com.android.settings.development.CameraLaserSensorPreferenceController.USER_BUILD;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.os.SystemProperties;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,9 +41,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class CameraLaserSensorPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java
new file mode 100644
index 0000000..0f22390
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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 static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public final class CbrsDataSwitchPreferenceControllerTest {
+
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+ private Context mContext;
+ private TelephonyManager mTelephonyManager;
+ private SwitchPreference mPreference;
+ private CbrsDataSwitchPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new CbrsDataSwitchPreferenceController(mContext);
+ mPreference = new SwitchPreference(mContext);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
+ mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void onPreferenceChanged_settingEnabled_shouldEnableANAS() {
+ mController.onPreferenceChange(mPreference, true);
+
+ assertThat(mTelephonyManager.isAlternativeNetworkEnabled()).isTrue();
+ }
+
+ @Test
+ public void onPreferenceChanged_settingDisabled_shouldDisableANAS() {
+ mController.onPreferenceChange(mPreference, false);
+
+ assertThat(mTelephonyManager.isAlternativeNetworkEnabled()).isFalse();
+ }
+
+ @Test
+ public void updateState_settingEnabled_shouldEnablePreference() {
+ mTelephonyManager.setAlternativeNetworkState(true);
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+ @Test
+ public void updateState_settingDisabled_shouldDisablePreference() {
+ mTelephonyManager.setAlternativeNetworkState(false);
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
index 6c7c1eb..6ab4d4c 100644
--- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.development.ClearAdbKeysPreferenceController
.RO_ADB_SECURE_PROPERTY_KEY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -26,10 +28,14 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.hardware.usb.IUsbManager;
+import android.debug.IAdbManager;
import android.os.RemoteException;
import android.os.SystemProperties;
+import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -45,10 +51,6 @@
import org.robolectric.annotation.Implements;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.Fragment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowUtils.class)
public class ClearAdbKeysPreferenceControllerTest {
@@ -58,7 +60,7 @@
@Mock
private SwitchPreference mPreference;
@Mock
- private IUsbManager mUsbManager;
+ private IAdbManager mAdbManager;
@Mock
private DevelopmentSettingsDashboardFragment mFragment;
@@ -69,7 +71,7 @@
MockitoAnnotations.initMocks(this);
final Context context = RuntimeEnvironment.application;
mController = spy(new ClearAdbKeysPreferenceController(context, mFragment));
- ReflectionHelpers.setField(mController, "mUsbManager", mUsbManager);
+ ReflectionHelpers.setField(mController, "mAdbManager", mAdbManager);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
}
@@ -166,7 +168,7 @@
public void onClearAdbKeysConfirmed_shouldClearKeys() throws RemoteException {
mController.onClearAdbKeysConfirmed();
- verify(mUsbManager).clearUsbDebuggingKeys();
+ verify(mAdbManager).clearDebuggingKeys();
}
@Implements(ClearAdbKeysWarningDialog.class)
diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
index 4b92801..8d9549a 100644
--- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java
@@ -18,13 +18,18 @@
import static com.android.settings.development.CoolColorTemperaturePreferenceController
.COLOR_TEMPERATURE_PROPERTY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.SystemProperties;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,9 +40,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class CoolColorTemperaturePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
index f240340..d201928 100644
--- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,9 @@
import android.os.SystemProperties;
import android.view.ThreadedRenderer;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,9 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DebugGpuOverdrawPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
index 4a63783..a372860 100644
--- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,9 @@
import android.os.SystemProperties;
import android.view.ThreadedRenderer;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,9 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DebugNonRectClipOperationsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java
index 7c4cc97..790b46a 100644
--- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DebugViewAttributesPreferenceControllerTest {
@@ -60,7 +61,7 @@
public void onPreferenceChanged_turnOnViewAttributes() {
mController.onPreferenceChange(null, true);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DEBUG_VIEW_ATTRIBUTES, -1);
assertThat(mode).isEqualTo(DebugViewAttributesPreferenceController.SETTING_VALUE_ON);
@@ -70,7 +71,7 @@
public void onPreferenceChanged_turnOffViewAttributes() {
mController.onPreferenceChange(null, false);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DEBUG_VIEW_ATTRIBUTES, -1);
assertThat(mode).isEqualTo(DebugViewAttributesPreferenceController.SETTING_VALUE_OFF);
@@ -78,7 +79,7 @@
@Test
public void updateState_preferenceShouldBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(), Settings.Global.DEBUG_VIEW_ATTRIBUTES,
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEBUG_VIEW_ATTRIBUTES,
DebugViewAttributesPreferenceController.SETTING_VALUE_ON);
mController.updateState(mPreference);
@@ -87,7 +88,7 @@
@Test
public void updateState_preferenceShouldNotBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(), Settings.Global.DEBUG_VIEW_ATTRIBUTES,
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.DEBUG_VIEW_ATTRIBUTES,
DebugViewAttributesPreferenceController.SETTING_VALUE_OFF);
mController.updateState(mPreference);
@@ -97,7 +98,7 @@
@Test
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DEBUG_VIEW_ATTRIBUTES, -1);
assertThat(mode).isEqualTo(DebugViewAttributesPreferenceController.SETTING_VALUE_OFF);
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
index da32ce8..a3abb07 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -24,7 +25,6 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.os.UserManager;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
@@ -32,6 +32,7 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
import com.android.settingslib.development.AbstractEnableAdbPreferenceController;
@@ -43,16 +44,15 @@
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowUserManager;
import org.robolectric.util.ReflectionHelpers;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowUserManager.class)
public class DevelopmentSettingsDashboardFragmentTest {
private ToggleSwitch mSwitch;
@@ -68,14 +68,14 @@
mSwitch = switchBar.getSwitch();
mDashboard = spy(new DevelopmentSettingsDashboardFragment());
ReflectionHelpers.setField(mDashboard, "mSwitchBar", switchBar);
- UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- mShadowUserManager = Shadows.shadowOf(userManager);
+ mShadowUserManager = ShadowUserManager.getShadow();
mShadowUserManager.setIsAdminUser(true);
}
@After
public void tearDown() {
ShadowEnableDevelopmentSettingWarningDialog.reset();
+ mShadowUserManager.reset();
}
@Test
@@ -86,7 +86,7 @@
@Test
public void shouldLogAsFeatureFlagPage() {
assertThat(mDashboard.getMetricsCategory())
- .isEqualTo(MetricsProto.MetricsEvent.DEVELOPMENT);
+ .isEqualTo(MetricsProto.MetricsEvent.DEVELOPMENT);
}
@Test
@@ -183,7 +183,7 @@
public void onOemUnlockDialogConfirmed_shouldCallControllerOemConfirmed() {
final OemUnlockPreferenceController controller = mock(OemUnlockPreferenceController.class);
doReturn(controller).when(mDashboard)
- .getDevelopmentOptionsController(OemUnlockPreferenceController.class);
+ .getDevelopmentOptionsController(OemUnlockPreferenceController.class);
mDashboard.onOemUnlockDialogConfirmed();
verify(controller).onOemUnlockConfirmed();
}
@@ -192,7 +192,7 @@
public void onOemUnlockDialogConfirmed_shouldCallControllerOemDismissed() {
final OemUnlockPreferenceController controller = mock(OemUnlockPreferenceController.class);
doReturn(controller).when(mDashboard)
- .getDevelopmentOptionsController(OemUnlockPreferenceController.class);
+ .getDevelopmentOptionsController(OemUnlockPreferenceController.class);
mDashboard.onOemUnlockDialogDismissed();
verify(controller).onOemUnlockDismissed();
}
@@ -201,7 +201,7 @@
public void onAdbDialogConfirmed_shouldCallControllerDialogConfirmed() {
final AdbPreferenceController controller = mock(AdbPreferenceController.class);
doReturn(controller).when(mDashboard)
- .getDevelopmentOptionsController(AdbPreferenceController.class);
+ .getDevelopmentOptionsController(AdbPreferenceController.class);
mDashboard.onEnableAdbDialogConfirmed();
verify(controller).onAdbDialogConfirmed();
@@ -211,7 +211,7 @@
public void onAdbDialogDismissed_shouldCallControllerOemDismissed() {
final AdbPreferenceController controller = mock(AdbPreferenceController.class);
doReturn(controller).when(mDashboard)
- .getDevelopmentOptionsController(AdbPreferenceController.class);
+ .getDevelopmentOptionsController(AdbPreferenceController.class);
mDashboard.onEnableAdbDialogDismissed();
verify(controller).onAdbDialogDismissed();
@@ -220,9 +220,9 @@
@Test
public void onAdbClearKeysDialogConfirmed_shouldCallControllerDialogConfirmed() {
final ClearAdbKeysPreferenceController controller =
- mock(ClearAdbKeysPreferenceController.class);
+ mock(ClearAdbKeysPreferenceController.class);
doReturn(controller).when(mDashboard)
- .getDevelopmentOptionsController(ClearAdbKeysPreferenceController.class);
+ .getDevelopmentOptionsController(ClearAdbKeysPreferenceController.class);
mDashboard.onAdbClearKeysDialogConfirmed();
verify(controller).onClearAdbKeysConfirmed();
@@ -231,9 +231,9 @@
@Test
public void onDisableLogPersistDialogConfirmed_shouldCallControllerDialogConfirmed() {
final LogPersistPreferenceController controller =
- mock(LogPersistPreferenceController.class);
+ mock(LogPersistPreferenceController.class);
doReturn(controller).when(mDashboard)
- .getDevelopmentOptionsController(LogPersistPreferenceController.class);
+ .getDevelopmentOptionsController(LogPersistPreferenceController.class);
mDashboard.onDisableLogPersistDialogConfirmed();
verify(controller).onDisableLogPersistDialogConfirmed();
@@ -242,9 +242,9 @@
@Test
public void onDisableLogPersistDialogRejected_shouldCallControllerDialogRejected() {
final LogPersistPreferenceController controller =
- mock(LogPersistPreferenceController.class);
+ mock(LogPersistPreferenceController.class);
doReturn(controller).when(mDashboard)
- .getDevelopmentOptionsController(LogPersistPreferenceController.class);
+ .getDevelopmentOptionsController(LogPersistPreferenceController.class);
mDashboard.onDisableLogPersistDialogRejected();
verify(controller).onDisableLogPersistDialogRejected();
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
index e026ca1..688db76 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java
@@ -18,13 +18,17 @@
import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.os.UserManager;
+
+import androidx.lifecycle.LifecycleOwner;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.SwitchBar.OnSwitchChangeListener;
@@ -37,16 +41,13 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.List;
-import androidx.lifecycle.LifecycleOwner;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = ShadowUtils.class)
+@Config(shadows = {ShadowUtils.class, ShadowUserManager.class})
public class DevelopmentSwitchBarControllerTest {
@Mock
@@ -59,8 +60,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
final Context context = RuntimeEnvironment.application;
- UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
- Shadows.shadowOf(userManager).setIsAdminUser(true);
+ ShadowUserManager.getShadow().setIsAdminUser(true);
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
mSwitchBar = new SwitchBar(context);
@@ -70,6 +70,7 @@
@After
public void tearDown() {
ShadowUtils.reset();
+ ShadowUserManager.getShadow().reset();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
index 08f5e0b..5c76e08 100644
--- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DisableAutomaticUpdatesPreferenceControllerTest {
@@ -60,7 +61,7 @@
public void onPreferenceChanged_turnOnAutomaticUpdates() {
mController.onPreferenceChange(null, true);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, -1);
assertThat(mode).isEqualTo(
@@ -71,7 +72,7 @@
public void onPreferenceChanged_turnOffAutomaticUpdates() {
mController.onPreferenceChange(null, false);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE, -1);
assertThat(mode).isEqualTo(
@@ -80,7 +81,7 @@
@Test
public void updateState_preferenceShouldBeChecked() {
- Settings.System
+ Settings.Global
.putInt(mContext.getContentResolver(), Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
DisableAutomaticUpdatesPreferenceController.ENABLE_UPDATES_SETTING);
mController.updateState(mPreference);
@@ -90,7 +91,7 @@
@Test
public void updateState_preferenceShouldNotBeChecked() {
- Settings.System
+ Settings.Global
.putInt(mContext.getContentResolver(), Settings.Global.OTA_DISABLE_AUTOMATIC_UPDATE,
DisableAutomaticUpdatesPreferenceController.DISABLE_UPDATES_SETTING);
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
index c77fcab..1b25460 100644
--- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java
@@ -17,6 +17,8 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.AdditionalMatchers.aryEq;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -31,6 +33,9 @@
import android.os.RemoteException;
import android.view.DisplayCutout;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -42,16 +47,13 @@
import java.util.ArrayList;
import java.util.Arrays;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EmulateDisplayCutoutPreferenceControllerTest {
- private static final OverlayInfo ONE_DISABLED = createFakeOverlay("emulation.one", false);
- private static final OverlayInfo ONE_ENABLED = createFakeOverlay("emulation.one", true);
- private static final OverlayInfo TWO_DISABLED = createFakeOverlay("emulation.two", false);
- private static final OverlayInfo TWO_ENABLED = createFakeOverlay("emulation.two", true);
+ private static final OverlayInfo ONE_DISABLED = createFakeOverlay("emulation.one", false, 1);
+ private static final OverlayInfo ONE_ENABLED = createFakeOverlay("emulation.one", true, 1);
+ private static final OverlayInfo TWO_DISABLED = createFakeOverlay("emulation.two", false, 2);
+ private static final OverlayInfo TWO_ENABLED = createFakeOverlay("emulation.two", true, 2);
@Mock
private Context mContext;
@@ -135,6 +137,16 @@
}
@Test
+ public void ordered_by_priority() throws Exception {
+ mockCurrentOverlays(TWO_DISABLED, ONE_DISABLED);
+
+ mController.updateState(null);
+
+ verify(mPreference).setEntryValues(
+ aryEq(new String[]{"", ONE_DISABLED.packageName, TWO_DISABLED.packageName}));
+ }
+
+ @Test
public void onDeveloperOptionsSwitchDisabled() throws Exception {
mockCurrentOverlays(ONE_ENABLED, TWO_DISABLED);
final PreferenceScreen screen = mock(PreferenceScreen.class);
@@ -152,16 +164,16 @@
mOverlayManager);
}
- private static OverlayInfo createFakeOverlay(String pkg, boolean enabled) {
+ private static OverlayInfo createFakeOverlay(String pkg, boolean enabled, int priority) {
final int state = (enabled) ? OverlayInfo.STATE_ENABLED : OverlayInfo.STATE_DISABLED;
return new OverlayInfo(pkg /* packageName */,
- pkg + ".target" /* targetPackageName */,
+ "android" /* targetPackageName */,
DisplayCutout.EMULATION_OVERLAY_CATEGORY /* category */,
pkg + ".baseCodePath" /* baseCodePath */,
state /* state */,
0 /* userId */,
- 0 /* priority */,
+ priority,
true /* isStatic */);
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java
index bb7b3ad..1319c97 100644
--- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java
@@ -20,13 +20,18 @@
.SETTING_VALUE_OFF;
import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController
.SETTING_VALUE_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,9 +41,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EnableGnssRawMeasFullTrackingPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
index 0176464..21d14ca 100644
--- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java
@@ -20,13 +20,18 @@
.SETTING_VALUE_OFF;
import static com.android.settings.development.EnableGpuDebugLayersPreferenceController
.SETTING_VALUE_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,9 +41,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EnableGpuDebugLayersPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
index 65ca41a..8bbb7e2 100644
--- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.development.FileEncryptionPreferenceController
.FILE_ENCRYPTION_PROPERTY_KEY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.never;
@@ -30,6 +32,9 @@
import android.os.SystemProperties;
import android.os.storage.IStorageManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,9 +46,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FileEncryptionPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
index 9d3ff8d..a238e76 100644
--- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.SystemProperties;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ForceMSAAPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
index fd5175c..b58f756 100644
--- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java
@@ -20,7 +20,9 @@
.SETTING_VALUE_OFF;
import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_ON;
import static com.android.settings.development.FreeformWindowsPreferenceController.USER_BUILD_TYPE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -29,6 +31,9 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,9 +43,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FreeformWindowsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
index c15b6ec..d2e2d31 100644
--- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,9 @@
import android.os.SystemProperties;
import android.view.ThreadedRenderer;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -33,9 +37,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class GpuViewUpdatesPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
index df747c5..9ab7cec 100644
--- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.os.SystemProperties;
import android.view.ThreadedRenderer;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class HardwareLayersUpdatesPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
index 7da9ad2..9a69acf 100644
--- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static com.android.settings.development.HardwareOverlaysPreferenceController
.SURFACE_FLINGER_READ_CODE;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
@@ -32,6 +33,9 @@
import android.os.IBinder;
import android.os.RemoteException;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowParcel;
@@ -43,9 +47,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class HardwareOverlaysPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
index 29ec6a0..9a80bea 100644
--- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.development.HdcpCheckingPreferenceController
.HDCP_CHECKING_PROPERTY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -27,6 +29,9 @@
import android.content.Context;
import android.os.SystemProperties;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,9 +42,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class HdcpCheckingPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
index 0df11af..05aee64 100644
--- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.android.settings.development.KeepActivitiesPreferenceController.SETTING_VALUE_OFF;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -27,6 +28,9 @@
import android.os.RemoteException;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,9 +40,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class KeepActivitiesPreferenceControllerTest {
@@ -83,7 +84,7 @@
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ALWAYS_FINISH_ACTIVITIES, SETTING_VALUE_ON);
mController.updateState(mPreference);
@@ -92,7 +93,7 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.ALWAYS_FINISH_ACTIVITIES, SETTING_VALUE_OFF);
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java
index 8b80831..b0af1d5 100644
--- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java
@@ -12,6 +12,9 @@
import android.os.RemoteException;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -23,9 +26,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LocalBackupPasswordPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java
index 5bcfa3d..04de348 100644
--- a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static com.android.settings.development.LocalTerminalPreferenceController
.TERMINAL_APP_PACKAGE;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -28,6 +29,9 @@
import android.content.pm.PackageManager;
import android.os.UserManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,9 +40,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LocalTerminalPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
index 51dd34a..afbd806 100644
--- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java
@@ -23,6 +23,10 @@
import android.content.Context;
import android.os.SystemProperties;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -33,10 +37,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LogPersistPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
index 3ea25e1..aee0ba8 100644
--- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java
@@ -21,6 +21,9 @@
import android.content.Context;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.R;
@@ -31,9 +34,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LogdSizePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java
index 14ecc3a..481e598 100644
--- a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java
@@ -23,6 +23,9 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.applications.ProcStatsData;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class MemoryUsagePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
index a7e28b2..a578429 100644
--- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class MobileDataAlwaysOnPreferenceControllerTest {
@@ -60,7 +61,7 @@
public void onPreferenceChanged_turnOnPreference_shouldEnableMobileDataAlwaysOn() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.MOBILE_DATA_ALWAYS_ON, -1 /* default */);
assertThat(mode).isEqualTo(MobileDataAlwaysOnPreferenceController.SETTING_VALUE_ON);
@@ -70,7 +71,7 @@
public void onPreferenceChanged_turnOffPreference_shouldDisableMobileDataAlwaysOn() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.MOBILE_DATA_ALWAYS_ON, -1 /* default */);
assertThat(mode).isEqualTo(MobileDataAlwaysOnPreferenceController.SETTING_VALUE_OFF);
@@ -78,7 +79,7 @@
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON,
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON,
MobileDataAlwaysOnPreferenceController.SETTING_VALUE_ON);
mController.updateState(mPreference);
@@ -87,7 +88,7 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON,
+ Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON,
MobileDataAlwaysOnPreferenceController.SETTING_VALUE_OFF);
mController.updateState(mPreference);
@@ -97,7 +98,7 @@
@Test
public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() {
mController.onDeveloperOptionsSwitchDisabled();
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.MOBILE_DATA_ALWAYS_ON, -1 /* default */);
assertThat(mode).isEqualTo(MobileDataAlwaysOnPreferenceController.SETTING_VALUE_OFF);
diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
index a8f5341..f6214ae 100644
--- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
@@ -2,7 +2,9 @@
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
.REQUEST_MOCK_LOCATION_APP;
+
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.anyString;
@@ -18,6 +20,9 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,9 +36,6 @@
import java.util.Collections;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class MockLocationAppPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
index dbac1ba..965f756 100644
--- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
*/
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -25,6 +26,9 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,9 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NotificationChannelWarningsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
index fb0ed79..03f8200 100644
--- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
.REQUEST_CODE_ENABLE_OEM_UNLOCK;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -33,6 +35,9 @@
import android.service.oemlock.OemLockManager;
import android.telephony.TelephonyManager;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -43,9 +48,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class OemUnlockPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java
index cdbcb5c..8140c32 100644
--- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -27,6 +29,9 @@
import android.content.Context;
import android.content.res.Resources;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -37,9 +42,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PictureColorModePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
index 55234b8..768ccec 100644
--- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PointerLocationPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
index 68f1160..1708068 100644
--- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,9 @@
import android.os.SystemProperties;
import android.view.ThreadedRenderer;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,9 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ProfileGpuRenderingPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
index 4808cef..046636b 100644
--- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java
@@ -17,12 +17,16 @@
*/
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ResizableActivityPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
index f490add..f79cbe0 100644
--- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -25,6 +26,9 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,9 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RtlLayoutPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
index d291130..6b083da 100644
--- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,9 @@
import android.content.res.Resources;
import android.provider.Settings;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,9 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SecondaryDisplayPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
index 85a3b63..0d9eeda 100644
--- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes
.REQUEST_CODE_DEBUG_APP;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -31,6 +33,9 @@
import android.content.pm.PackageManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,9 +47,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SelectDebugAppPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java
index 6b5202d..04b0b3f 100644
--- a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,9 @@
import android.content.pm.IShortcutService;
import android.os.RemoteException;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,9 +38,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ShortcutManagerThrottlingPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
index 2080493..2acd44a 100644
--- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java
@@ -20,12 +20,17 @@
.SETTING_VALUE_OFF;
import static com.android.settings.development.ShowFirstCrashDialogPreferenceController
.SETTING_VALUE_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,9 +40,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ShowFirstCrashDialogPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
index ee32c0b..38ec01b 100644
--- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.os.SystemProperties;
import android.view.View;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ShowLayoutBoundsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
index 46e50fe..e768e52 100644
--- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController
.SURFACE_FLINGER_READ_CODE;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq;
@@ -32,6 +33,9 @@
import android.os.IBinder;
import android.os.RemoteException;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowParcel;
@@ -43,9 +47,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ShowSurfaceUpdatesPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
index 4fa5bf9..b6d02ca 100644
--- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ShowTapsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
index 9760b55..633e8e4 100644
--- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java
@@ -20,7 +20,9 @@
.SETTING_VALUE_OFF;
import static com.android.settings.development.SimulateColorSpacePreferenceController
.SETTING_VALUE_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,6 +31,9 @@
import android.content.res.Resources;
import android.provider.Settings;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,9 +44,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SimulateColorSpacePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java
new file mode 100644
index 0000000..7a0dd68
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/SmsAccessRestrictionPreferenceControllerTest.java
@@ -0,0 +1,110 @@
+/*
+ * 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.development;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SmsAccessRestrictionPreferenceControllerTest {
+
+ @Mock
+ private SwitchPreference mPreference;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+
+ private Context mContext;
+ private SmsAccessRestrictionPreferenceController mController;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new SmsAccessRestrictionPreferenceController(mContext);
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+ .thenReturn(mPreference);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void onPreferenceChange_settingEnabled_enableSmsRestrictionShouldBeOn() {
+ mController.onPreferenceChange(mPreference, true /* new value */);
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, -1 /* default */);
+
+ assertThat(mode).isEqualTo(1);
+ }
+
+ @Test
+ public void onPreferenceChange_settingDisabled_enableSmsRestrictionShouldBeOff() {
+ mController.onPreferenceChange(mPreference, false /* new value */);
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, -1 /* default */);
+
+ assertThat(mode).isEqualTo(0);
+ }
+
+ @Test
+ public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, 0);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(false);
+ }
+
+ @Test
+ public void updateState_settingEnabled_preferenceShouldBeChecked() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, 1);
+ mController.updateState(mPreference);
+
+ verify(mPreference).setChecked(true);
+ }
+
+ @Test
+ public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
+ mController.onDeveloperOptionsSwitchDisabled();
+
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, -1 /* default */);
+
+ assertThat(mode).isEqualTo(0);
+ verify(mPreference).setChecked(false);
+ verify(mPreference).setEnabled(false);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java
index ad773d7..97b4bf0 100644
--- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -27,6 +28,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -40,8 +43,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class StayAwakePreferenceControllerTest {
@@ -71,7 +72,7 @@
public void onPreferenceChanged_turnOnStayAwake() {
mController.onPreferenceChange(null, true);
- final int mode = Settings.System.getInt(mContentResolver,
+ final int mode = Settings.Global.getInt(mContentResolver,
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, -1);
assertThat(mode).isEqualTo(StayAwakePreferenceController.SETTING_VALUE_ON);
@@ -81,7 +82,7 @@
public void onPreferenceChanged_turnOffStayAwake() {
mController.onPreferenceChange(null, false);
- final int mode = Settings.System.getInt(mContentResolver,
+ final int mode = Settings.Global.getInt(mContentResolver,
Settings.Global.STAY_ON_WHILE_PLUGGED_IN, -1);
assertThat(mode).isEqualTo(StayAwakePreferenceController.SETTING_VALUE_OFF);
@@ -89,7 +90,7 @@
@Test
public void updateState_preferenceShouldBeChecked() {
- Settings.System.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+ Settings.Global.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
StayAwakePreferenceController.SETTING_VALUE_ON);
mController.updateState(mPreference);
@@ -98,7 +99,7 @@
@Test
public void updateState_preferenceShouldNotBeChecked() {
- Settings.System.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+ Settings.Global.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
StayAwakePreferenceController.SETTING_VALUE_OFF);
mController.updateState(mPreference);
@@ -118,7 +119,7 @@
@Test
public void observerOnChangeCalledWithSameUri_preferenceShouldBeUpdated() {
- Settings.System.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+ Settings.Global.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
StayAwakePreferenceController.SETTING_VALUE_ON);
mController.onResume();
mController.mSettingsObserver.onChange(false,
@@ -129,7 +130,7 @@
@Test
public void observerOnChangeCalledWithDifferentUri_preferenceShouldNotBeUpdated() {
- Settings.System.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
+ Settings.Global.putInt(mContentResolver, Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
StayAwakePreferenceController.SETTING_VALUE_ON);
mController.onResume();
mController.mSettingsObserver.onChange(false, null);
diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
index f73ce46..3fceb1c 100644
--- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -25,6 +26,9 @@
import android.os.SystemProperties;
import android.view.IWindowManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,9 +39,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class StrictModePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
index 832deb8..dc1d622 100644
--- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TetheringHardwareAccelPreferenceControllerTest {
@@ -60,7 +61,7 @@
public void onPreferenceChanged_settingEnabled_turnOnTetheringAccel() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */);
assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_ON);
@@ -70,7 +71,7 @@
public void onPreferenceChanged_settingDisabled_turnOffTetheringAccel() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */);
assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF);
@@ -78,7 +79,7 @@
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.TETHER_OFFLOAD_DISABLED,
TetheringHardwareAccelPreferenceController.SETTING_VALUE_ON);
mController.updateState(mPreference);
@@ -88,7 +89,7 @@
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.TETHER_OFFLOAD_DISABLED,
TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF);
mController.updateState(mPreference);
@@ -99,7 +100,7 @@
@Test
public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsSwitchDisabled();
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.TETHER_OFFLOAD_DISABLED, -1 /* default */);
assertThat(mode).isEqualTo(TetheringHardwareAccelPreferenceController.SETTING_VALUE_OFF);
diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java
index 6460570..8bd4374 100644
--- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java
@@ -20,6 +20,7 @@
.DEFAULT_VALUE;
import static com.android.settings.development.TransitionAnimationScalePreferenceController
.TRANSITION_ANIMATION_SCALE_SELECTOR;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,6 +29,9 @@
import android.os.RemoteException;
import android.view.IWindowManager;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,9 +43,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TransitionAnimationScalePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
index 7fd31c8..0c82bb4 100644
--- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class UsbAudioRoutingPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
index cbee66e..fa04d69 100644
--- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -30,6 +31,8 @@
import android.provider.Settings;
import android.provider.Settings.Global;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -45,8 +48,6 @@
import java.util.Collections;
import java.util.List;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class VerifyAppsOverUsbPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
index 4171267..87d1135 100644
--- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java
@@ -21,7 +21,9 @@
import static com.android.settings.development.WaitForDebuggerPreferenceController
.SETTING_VALUE_OFF;
import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -35,6 +37,9 @@
import android.os.RemoteException;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -44,9 +49,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WaitForDebuggerPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
index c68c2f2..cc60b87 100644
--- a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
@@ -23,6 +23,9 @@
import android.content.pm.PackageManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.webview.WebViewUpdateServiceWrapper;
@@ -36,9 +39,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WebViewAppPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
index dafa5f2..e749ea6 100644
--- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java
@@ -20,12 +20,17 @@
.SETTING_VALUE_OFF;
import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController
.SETTING_VALUE_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,9 +41,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiConnectedMacRandomizationPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
index cf03aed..f712423 100644
--- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java
@@ -17,12 +17,16 @@
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiDisplayCertificationPreferenceControllerTest {
@@ -60,7 +61,7 @@
public void onPreferenceChanged_turnOnWifiDisplayCertification() {
mController.onPreferenceChange(mPreference, true /* new value */);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, -1 /* default */);
assertThat(mode).isEqualTo(WifiDisplayCertificationPreferenceController.SETTING_VALUE_ON);
@@ -70,7 +71,7 @@
public void onPreferenceChanged_turnOffWifiDisplayCertification() {
mController.onPreferenceChange(mPreference, false /* new value */);
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, -1 /* default */);
assertThat(mode).isEqualTo(WifiDisplayCertificationPreferenceController.SETTING_VALUE_OFF);
@@ -78,7 +79,7 @@
@Test
public void updateState_preferenceShouldBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
WifiDisplayCertificationPreferenceController.SETTING_VALUE_ON);
mController.updateState(mPreference);
@@ -88,7 +89,7 @@
@Test
public void updateState_preferenceShouldNotBeChecked() {
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON,
WifiDisplayCertificationPreferenceController.SETTING_VALUE_OFF);
mController.updateState(mPreference);
@@ -99,7 +100,7 @@
@Test
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
- final int mode = Settings.System.getInt(mContext.getContentResolver(),
+ final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_DISPLAY_CERTIFICATION_ON, -1 /* default */);
assertThat(mode).isEqualTo(WifiDisplayCertificationPreferenceController.SETTING_VALUE_OFF);
diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
index 72e8704..daeff01 100644
--- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
@@ -22,6 +22,9 @@
import android.content.Context;
import android.net.wifi.WifiManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -30,9 +33,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiVerboseLoggingPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
index f0bb2dd..322eed7 100644
--- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java
@@ -20,6 +20,7 @@
.DEFAULT_VALUE;
import static com.android.settings.development.WindowAnimationScalePreferenceController
.WINDOW_ANIMATION_SCALE_SELECTOR;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,6 +29,9 @@
import android.os.RemoteException;
import android.view.IWindowManager;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,9 +43,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WindowAnimationScalePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java
index b9da71d..1268797 100644
--- a/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/autofill/AutofillLoggingLevelPreferenceControllerTest.java
@@ -16,27 +16,37 @@
package com.android.settings.development.autofill;
+import static androidx.lifecycle.Lifecycle.Event.ON_CREATE;
+import static androidx.lifecycle.Lifecycle.Event.ON_DESTROY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
-import android.os.RemoteException;
import android.view.autofill.AutofillManager;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.R;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-
-import androidx.preference.PreferenceScreen;
-import androidx.preference.ListPreference;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
@RunWith(SettingsRobolectricTestRunner.class)
public class AutofillLoggingLevelPreferenceControllerTest {
@@ -57,20 +67,30 @@
private String[] mListValues;
private String[] mListSummaries;
+ private LifecycleOwner mLifecycleOwner;
+ private Lifecycle mLifecycle;
+
@Before
public void setup() {
MockitoAnnotations.initMocks(this); // TODO: use @Rule
+ mLifecycleOwner = () -> mLifecycle;
+ mLifecycle = new Lifecycle(mLifecycleOwner);
mContext = RuntimeEnvironment.application;
mHelper = new AutofillTestingHelper(mContext);
final Resources resources = mContext.getResources();
mListValues = resources.getStringArray(R.array.autofill_logging_level_values);
mListSummaries = resources.getStringArray(R.array.autofill_logging_level_entries);
- mController = new AutofillLoggingLevelPreferenceController(mContext);
+ mController = new AutofillLoggingLevelPreferenceController(mContext, mLifecycle);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mPreference);
+ .thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
}
+ @After
+ public void tearDown() {
+ ShadowAutofillLoggingLevelPreferenceController.reset();
+ }
+
@Test
public void handlePreferenceTreeClick_differentPreferenceKey_shouldNotTrigger()
throws Exception {
@@ -141,4 +161,28 @@
verify(mPreference).setValue(mListValues[IDX_VERBOSE]);
verify(mPreference).setSummary(mListSummaries[IDX_VERBOSE]);
}
+
+ @Test
+ @Config(shadows = ShadowAutofillLoggingLevelPreferenceController.class)
+ public void onDestory_shouldUnregisterObserver() {
+ mLifecycle.handleLifecycleEvent(ON_CREATE);
+ mLifecycle.handleLifecycleEvent(ON_DESTROY);
+
+ assertThat(ShadowAutofillLoggingLevelPreferenceController.isUnregisterObserver).isTrue();
+ }
+
+ @Implements(AutofillLoggingLevelPreferenceController.class)
+ public static class ShadowAutofillLoggingLevelPreferenceController {
+ private static boolean isUnregisterObserver = false;
+
+ @Implementation
+ public void onDestroy() {
+ isUnregisterObserver = true;
+ }
+
+ @Resetter
+ public static void reset() {
+ isUnregisterObserver = false;
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java
index e560a83..f95cb35 100644
--- a/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/autofill/AutofillResetOptionsPreferenceControllerTest.java
@@ -17,13 +17,15 @@
package com.android.settings.development.autofill;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.verify;
+
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.os.RemoteException;
import android.view.autofill.AutofillManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -33,9 +35,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AutofillResetOptionsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
index c9c9753..24fe733 100644
--- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.development.featureflags;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
@@ -25,6 +27,9 @@
import android.content.Context;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,9 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FeatureFlagPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
index c42d46c..a6ff088 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.development.qstile;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -31,6 +32,10 @@
import android.os.RemoteException;
import android.service.quicksettings.TileService;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.statusbar.IStatusBarService;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -46,10 +51,6 @@
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DevelopmentTilePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java
index 8367fd3..12661e3 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilesTest.java
@@ -17,12 +17,14 @@
package com.android.settings.development.qstile;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.content.ComponentName;
import android.content.pm.PackageManager;
+import android.os.UserManager;
import android.service.quicksettings.Tile;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,6 +36,9 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.shadows.ShadowUserManager;
@RunWith(SettingsRobolectricTestRunner.class)
public class DevelopmentTilesTest {
@@ -49,6 +54,9 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mService = spy(Robolectric.setupService(DevelopmentTiles.ShowLayout.class));
+ final ShadowUserManager um = Shadows.shadowOf(
+ RuntimeEnvironment.application.getSystemService(UserManager.class));
+ um.setIsAdminUser(true);
doReturn(mTile).when(mService).getQsTile();
}
diff --git a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
index 7644749..636b067 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
@@ -20,7 +20,9 @@
.SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE;
import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace
.SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE;
+
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.isNull;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java
index b1073ac..1560c51 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
index 2234414..c88237d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
@@ -32,6 +33,11 @@
import android.provider.Settings;
import android.text.BidiFormatter;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -51,11 +57,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowUserManager;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowUtils.class)
public class BuildNumberPreferenceControllerTest {
@@ -80,10 +81,8 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- final UserManager userManager =
- (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- mShadowUserManager = Shadows.shadowOf(userManager);
- mShadowUserManager.setIsAdminUser(true);
+ mShadowUserManager = Shadows.shadowOf(
+ RuntimeEnvironment.application.getSystemService(UserManager.class));
mFactory = FakeFeatureFactory.setupForTest();
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
@@ -100,8 +99,6 @@
@After
public void tearDown() {
ShadowUtils.reset();
- mShadowUserManager.setIsAdminUser(false);
- mShadowUserManager.setIsDemoUser(false);
}
@Test
@@ -200,6 +197,7 @@
@Test
public void onActivityResult_confirmPasswordRequestCompleted_enableDevPref() {
+ mShadowUserManager.setIsAdminUser(true);
mController =
new BuildNumberPreferenceController(mContext, mActivity, mFragment, mLifecycle);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
index 78eb030..aa84adf 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@@ -25,6 +26,13 @@
import android.content.Context;
import android.os.Build;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,17 +45,10 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DeviceModelPreferenceControllerTest {
- private final String KEY = "device_model_key";
+ private final String KEY = "device_model";
@Mock
private Fragment mFragment;
@@ -100,6 +101,11 @@
.add(any(HardwareInfoDialogFragment.class), eq(HardwareInfoDialogFragment.TAG));
}
+ @Test
+ public void isSliceable_shouldBeTrue() {
+ assertThat(mController.isSliceable()).isTrue();
+ }
+
private boolean containBuildModel(CharSequence result) {
final String oracle = mContext.getResources().getString(R.string.model_summary,
Build.MODEL);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
index 3ca06aa..9fb756a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -30,6 +32,8 @@
import android.os.Build;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.widget.ValidatedEditTextPreference;
@@ -40,11 +44,10 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowBluetoothAdapter.class})
public class DeviceNamePreferenceControllerTest {
@@ -65,7 +68,7 @@
MockitoAnnotations.initMocks(this);
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.WIFI_SERVICE, mWifiManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mPreference = new ValidatedEditTextPreference(mContext);
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
final WifiConfiguration configuration = new WifiConfiguration();
@@ -112,7 +115,7 @@
@Test
public void setDeviceName_preferenceUpdatedWhenDeviceNameUpdated() {
- forceAcceptDeviceName();
+ acceptDeviceName(true);
mController.displayPreference(mScreen);
mController.onPreferenceChange(mPreference, TESTING_STRING);
@@ -121,7 +124,7 @@
@Test
public void setDeviceName_bluetoothNameUpdatedWhenDeviceNameUpdated() {
- forceAcceptDeviceName();
+ acceptDeviceName(true);
mController.displayPreference(mScreen);
mController.onPreferenceChange(mPreference, TESTING_STRING);
@@ -130,7 +133,7 @@
@Test
public void setDeviceName_wifiTetherNameUpdatedWhenDeviceNameUpdated() {
- forceAcceptDeviceName();
+ acceptDeviceName(true);
mController.displayPreference(mScreen);
mController.onPreferenceChange(mPreference, TESTING_STRING);
@@ -148,21 +151,39 @@
@Test
public void setDeviceName_ignoresIfCancelPressed() {
- forceAcceptDeviceName();
+ acceptDeviceName(true);
mController.displayPreference(mScreen);
mController.onPreferenceChange(mPreference, TESTING_STRING);
assertThat(mBluetoothAdapter.getName()).isEqualTo(TESTING_STRING);
}
- private void forceAcceptDeviceName() {
+ @Test
+ public void setDeviceName_okInDeviceNameWarningDialog_shouldChangePreferenceText() {
+ acceptDeviceName(true);
+ mController.displayPreference(mScreen);
+ mController.onPreferenceChange(mPreference, TESTING_STRING);
+
+ assertThat(mPreference.getSummary()).isEqualTo(TESTING_STRING);
+ }
+
+ @Test
+ public void setDeviceName_cancelInDeviceNameWarningDialog_shouldNotChangePreferenceText() {
+ acceptDeviceName(false);
+ mController.displayPreference(mScreen);
+ mController.onPreferenceChange(mPreference, TESTING_STRING);
+
+ assertThat(mPreference.getSummary()).isNotEqualTo(TESTING_STRING);
+ assertThat(mPreference.getText()).isEqualTo(mPreference.getSummary());
+ }
+
+ private void acceptDeviceName(boolean accept) {
mController.setHost(
new DeviceNamePreferenceController.DeviceNamePreferenceHost() {
@Override
public void showDeviceNameWarningDialog(String deviceName) {
- mController.confirmDeviceName();
+ mController.updateDeviceName(accept);
}
});
}
-
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
index c216331..2c2c2f2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java
@@ -16,11 +16,15 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.SystemProperties;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -30,9 +34,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FccEquipmentIdPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
index 323a116..e84aa65 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java
@@ -16,11 +16,16 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -30,10 +35,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FeedbackPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
index 23ca244..abcce00 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/HardwareInfoDialogFragmentTest.java
@@ -26,18 +26,18 @@
import android.os.SystemProperties;
import android.view.View;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResourcesImpl.class)
public class HardwareInfoDialogFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
index c269f71..7b1de47 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java
index d1e8d98..4a741cf 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
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;
@@ -31,6 +32,9 @@
import android.telephony.TelephonyManager;
import android.util.ArrayMap;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -53,9 +57,6 @@
import java.util.List;
import java.util.Map;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class})
public class MyDeviceInfoFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
index 08baa30..82056a2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
@@ -16,8 +16,8 @@
package com.android.settings.deviceinfo;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -26,9 +26,14 @@
import android.content.Context;
import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,10 +42,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
@RunWith(SettingsRobolectricTestRunner.class)
public class PhoneNumberPreferenceControllerTest {
@@ -54,6 +55,8 @@
@Mock
private SubscriptionInfo mSubscriptionInfo;
@Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
private PreferenceScreen mScreen;
private Context mContext;
@@ -62,9 +65,10 @@
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
- mController = spy(new PhoneNumberPreferenceController(mContext));
- ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
+ mContext = spy(RuntimeEnvironment.application);
+ when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+ when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+ mController = spy(new PhoneNumberPreferenceController(mContext, "phone_number"));
final String prefKey = mController.getPreferenceKey();
when(mScreen.findPreference(prefKey)).thenReturn(mPreference);
when(mScreen.getContext()).thenReturn(mContext);
@@ -74,17 +78,19 @@
}
@Test
- public void isAvailable_shouldBeTrueIfCallCapable() {
+ public void getAvailabilityStatus_isVoiceCapable_shouldBeAVAILABLE() {
when(mTelephonyManager.isVoiceCapable()).thenReturn(true);
- assertTrue(mController.isAvailable());
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
}
@Test
- public void isAvailable_shouldBeFalseIfNotCallCapable() {
+ public void getAvailabilityStatus_isNotVoiceCapable_shouldBeUNSUPPORTED_ON_DEVICE() {
when(mTelephonyManager.isVoiceCapable()).thenReturn(false);
- assertFalse(mController.isAvailable());
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.UNSUPPORTED_ON_DEVICE);
}
@Test
@@ -125,4 +131,19 @@
mContext.getString(R.string.status_number_sim_slot, 2 /* sim slot */));
verify(mSecondPreference).setSummary(phoneNumber);
}
+
+ @Test
+ public void getSummary_cannotGetActiveSubscriptionInfo_shouldShowUnknown() {
+ when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(null);
+
+ CharSequence primaryNumber = mController.getSummary();
+
+ assertThat(primaryNumber).isNotNull();
+ assertThat(primaryNumber).isEqualTo(mContext.getString(R.string.device_info_default));
+ }
+
+ @Test
+ public void isSliceable_shouldBeTrue() {
+ assertThat(mController.isSliceable()).isTrue();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java
index 49025a8..768a9ea 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java
@@ -23,9 +23,11 @@
import android.os.storage.VolumeRecord;
import android.widget.Button;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settings.deviceinfo.PrivateVolumeForget.ForgetConfirmFragment;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowStorageManager;
@@ -35,9 +37,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentActivity;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowStorageManager.class, SettingsShadowResourcesImpl.class})
@@ -50,8 +50,12 @@
public void setUp() {
final Bundle bundle = new Bundle();
bundle.putString(VolumeRecord.EXTRA_FS_UUID, "id");
- mFragment = Robolectric.buildFragment(PrivateVolumeForget.class,
- bundle).create().start().resume().get();
+ mFragment = FragmentController.of(new PrivateVolumeForget(), bundle)
+ .create()
+ .start()
+ .resume()
+ .visible()
+ .get();
mActivity = mFragment.getActivity();
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java
index 0d720e3..81c52c5 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeFormatTest.java
@@ -25,7 +25,6 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowStorageManager;
@@ -36,6 +35,7 @@
import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -49,8 +49,12 @@
public void setUp() {
final Bundle bundle = new Bundle();
bundle.putString(VolumeInfo.EXTRA_VOLUME_ID, "id");
- mFragment = Robolectric.buildFragment(PrivateVolumeFormat.class,
- bundle).create().start().resume().get();
+ mFragment = FragmentController.of(new PrivateVolumeFormat(), bundle)
+ .create()
+ .start()
+ .resume()
+ .visible()
+ .get();
mShadowActivity = Shadows.shadowOf(mFragment.getActivity());
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
index 56bc11e..983621c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java
@@ -17,10 +17,12 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.Activity;
import android.content.pm.PackageManager;
import android.os.storage.VolumeInfo;
import android.view.Menu;
@@ -36,7 +38,7 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -67,7 +69,7 @@
when(mMigrateMenuItem.getItemId()).thenReturn(100);
mController = new PrivateVolumeOptionMenuController(
- RuntimeEnvironment.application, mPrimaryInfo, mPm);
+ Robolectric.setupActivity(Activity.class), mPrimaryInfo, mPm);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java
index 94f5286..65f24e3 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeUnmountTest.java
@@ -23,7 +23,6 @@
import android.widget.Button;
import com.android.settings.R;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowStorageManager;
@@ -32,6 +31,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -44,8 +44,12 @@
public void setUp() {
Bundle bundle = new Bundle();
bundle.putString(VolumeInfo.EXTRA_VOLUME_ID, "id");
- mFragment = Robolectric.buildFragment(PrivateVolumeUnmount.class,
- bundle).create().start().resume().get();
+ mFragment = FragmentController.of(new PrivateVolumeUnmount(), bundle)
+ .create()
+ .start()
+ .resume()
+ .visible()
+ .get();
}
@After
@@ -57,7 +61,7 @@
public void OnClickListener_shouldCallUnmount() {
assertThat(ShadowStorageManager.isUnmountCalled()).isFalse();
- Button confirm = (Button) mFragment.getView().findViewById(R.id.confirm);
+ final Button confirm = mFragment.getView().findViewById(R.id.confirm);
confirm.performClick();
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
index eb1ac54..24028d2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
@@ -25,6 +26,9 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,9 +41,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RegulatoryInfoPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
index ca77a87..bd0eaf3 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
@@ -30,6 +31,8 @@
import android.util.SparseArray;
import android.view.View;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper;
import com.android.settings.deviceinfo.storage.StorageAsyncLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -44,8 +47,6 @@
import java.util.List;
-import androidx.recyclerview.widget.RecyclerView;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class StorageDashboardFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
index 88ac8e9..d42b40f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
@@ -16,12 +16,15 @@
package com.android.settings.deviceinfo;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
+
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.view.LayoutInflater;
import android.widget.ProgressBar;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -30,8 +33,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class StorageItemPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
index 440a6f5..61fbf1f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java
@@ -16,6 +16,7 @@
package com.android.settings.deviceinfo;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
index 943bd9d..cb02c76 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageSettingsTest.java
@@ -17,7 +17,6 @@
package com.android.settings.deviceinfo;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -25,14 +24,9 @@
import static org.mockito.Mockito.when;
import android.app.Activity;
-import android.app.usage.StorageStatsManager;
import android.content.Intent;
-import android.icu.text.NumberFormat;
import android.os.storage.VolumeInfo;
-import android.text.format.Formatter;
-import com.android.settings.R;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
@@ -41,8 +35,6 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
import java.util.ArrayList;
import java.util.List;
@@ -66,34 +58,6 @@
}
@Test
- public void updateSummary_shouldDisplayUsedPercentAndFreeSpace() throws Exception {
- final SummaryLoader loader = mock(SummaryLoader.class);
- final SummaryLoader.SummaryProvider provider =
- StorageSettings.SUMMARY_PROVIDER_FACTORY.createSummaryProvider(mActivity, loader);
- final VolumeInfo volumeInfo = mVolumes.get(0);
- when(volumeInfo.isMountedReadable()).thenReturn(true);
- when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
- when(mStorageManagerVolumeProvider
- .getTotalBytes(nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
- .thenReturn(500L);
- when(mStorageManagerVolumeProvider
- .getFreeBytes(nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
- .thenReturn(0L);
-
- ReflectionHelpers
- .setField(provider, "mStorageManagerVolumeProvider", mStorageManagerVolumeProvider);
- ReflectionHelpers.setField(provider, "mContext", RuntimeEnvironment.application);
-
- provider.setListening(true);
-
- final String percentage = NumberFormat.getPercentInstance().format(1);
- final String freeSpace = Formatter.formatFileSize(RuntimeEnvironment.application, 0);
- verify(loader).setSummary(provider,
- RuntimeEnvironment.application.getString(
- R.string.storage_summary, percentage, freeSpace));
- }
-
- @Test
public void handlePublicVolumeClick_startsANonNullActivityWhenVolumeHasNoBrowse() {
VolumeInfo volumeInfo = mock(VolumeInfo.class, RETURNS_DEEP_STUBS);
when(volumeInfo.isMountedReadable()).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
new file mode 100644
index 0000000..00484df
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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.deviceinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.app.usage.StorageStatsManager;
+import android.content.Context;
+import android.icu.text.NumberFormat;
+import android.os.storage.VolumeInfo;
+import android.text.format.Formatter;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class TopLevelStoragePreferenceControllerTest {
+
+ @Mock
+ private StorageManagerVolumeProvider mStorageManagerVolumeProvider;
+
+ private Context mContext;
+ private TopLevelStoragePreferenceController mController;
+ private List<VolumeInfo> mVolumes;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = RuntimeEnvironment.application;
+ mVolumes = new ArrayList<>();
+ mVolumes.add(mock(VolumeInfo.class, RETURNS_DEEP_STUBS));
+ when(mStorageManagerVolumeProvider.getVolumes()).thenReturn(mVolumes);
+
+ mController = new TopLevelStoragePreferenceController(mContext, "test_key");
+ }
+
+ @Test
+ public void updateSummary_shouldDisplayUsedPercentAndFreeSpace() throws Exception {
+ final VolumeInfo volumeInfo = mVolumes.get(0);
+ when(volumeInfo.isMountedReadable()).thenReturn(true);
+ when(volumeInfo.getType()).thenReturn(VolumeInfo.TYPE_PRIVATE);
+ when(mStorageManagerVolumeProvider
+ .getTotalBytes(nullable(StorageStatsManager.class), nullable(VolumeInfo.class)))
+ .thenReturn(500L);
+ 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));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/deviceinfo/DeviceNameWarningDialogTest.java b/tests/robotests/src/com/android/settings/deviceinfo/deviceinfo/DeviceNameWarningDialogTest.java
index e28e6ec..0be0ac2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/deviceinfo/DeviceNameWarningDialogTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/deviceinfo/DeviceNameWarningDialogTest.java
@@ -1,7 +1,6 @@
package com.android.settings.deviceinfo.deviceinfo;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -9,12 +8,11 @@
import com.android.settings.deviceinfo.aboutphone.DeviceNameWarningDialog;
import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment;
-import com.android.settings.testutils.FragmentController;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
public class DeviceNameWarningDialogTest {
@@ -23,26 +21,26 @@
@Test
public void onClick_okSetsName() {
final FragmentController<DeviceNameWarningDialog> fragmentController =
- Robolectric.buildFragment(DeviceNameWarningDialog.class);
+ FragmentController.of(new DeviceNameWarningDialog());
final DeviceNameWarningDialog fragment = spy(fragmentController.get());
final MyDeviceInfoFragment deviceInfoFragment = mock(MyDeviceInfoFragment.class);
fragment.setTargetFragment(deviceInfoFragment, 0);
fragmentController.create().start().resume();
fragment.onClick(null, DialogInterface.BUTTON_POSITIVE);
- verify(deviceInfoFragment).onSetDeviceNameConfirm();
+ verify(deviceInfoFragment).onSetDeviceNameConfirm(true);
}
@Test
public void onClick_cancelDoesNothing() {
final FragmentController<DeviceNameWarningDialog> fragmentController =
- Robolectric.buildFragment(DeviceNameWarningDialog.class);
+ FragmentController.of(new DeviceNameWarningDialog());
final DeviceNameWarningDialog fragment = spy(fragmentController.get());
final MyDeviceInfoFragment deviceInfoFragment = mock(MyDeviceInfoFragment.class);
fragment.setTargetFragment(deviceInfoFragment, 0);
fragmentController.create().start().resume();
fragment.onClick(null, DialogInterface.BUTTON_NEGATIVE);
- verify(deviceInfoFragment, never()).onSetDeviceNameConfirm();
+ verify(deviceInfoFragment).onSetDeviceNameConfirm(false);
}
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java
index f50c725..3e7ce7a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java
@@ -16,9 +16,13 @@
package com.android.settings.deviceinfo.firmwareversion;
-import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_PROPERTY;
-import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_LABEL_ID;
-import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_VALUE_ID;
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
+ .BASEBAND_PROPERTY;
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
+ .BASEBAND_VERSION_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController
+ .BASEBAND_VERSION_VALUE_ID;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.shadow.api.Shadow.extract;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java
index 2db2e6f..2138881 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java
@@ -16,7 +16,9 @@
package com.android.settings.deviceinfo.firmwareversion;
-import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController.BUILD_NUMBER_VALUE_ID;
+import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController
+ .BUILD_NUMBER_VALUE_ID;
+
import static org.mockito.Mockito.verify;
import android.os.Build;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java
index 6b4da5b..7b07db4 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java
@@ -16,8 +16,11 @@
package com.android.settings.deviceinfo.firmwareversion;
-import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_LABEL_ID;
-import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_VALUE_ID;
+import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController
+ .FIRMWARE_VERSION_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController
+ .FIRMWARE_VERSION_VALUE_ID;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doNothing;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
index 512062c..e7b1893 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java
@@ -21,6 +21,11 @@
import android.content.Context;
import android.os.Build;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,15 +41,10 @@
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.Resetter;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FirmwareVersionPreferenceControllerTest {
- private final String KEY = "firmware_key";
+ private final String KEY = "firmware_version";
@Mock
private Fragment mFragment;
@@ -103,6 +103,11 @@
assertThat(result).isFalse();
}
+ @Test
+ public void isSliceable_shouldBeTrue() {
+ assertThat(mController.isSliceable()).isTrue();
+ }
+
@Implements(FirmwareVersionDialogFragment.class)
public static class ShadowFirmwareVersionDialogFragment {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
index f47c07e..24f4874 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java
@@ -16,7 +16,9 @@
package com.android.settings.deviceinfo.firmwareversion;
-import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController.KERNEL_VERSION_VALUE_ID;
+import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController
+ .KERNEL_VERSION_VALUE_ID;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java
index 7dc0014..fe7633c 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java
@@ -16,8 +16,11 @@
package com.android.settings.deviceinfo.firmwareversion;
-import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_LABEL_ID;
-import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_VALUE_ID;
+import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController
+ .SECURITY_PATCH_LABEL_ID;
+import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController
+ .SECURITY_PATCH_VALUE_ID;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -26,6 +29,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Build;
@@ -38,7 +42,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
import org.robolectric.util.ReflectionHelpers;
import java.util.Collections;
@@ -59,7 +63,7 @@
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = spy(Robolectric.setupActivity(Activity.class));
when(mDialog.getContext()).thenReturn(mContext);
}
@@ -88,7 +92,7 @@
@Test
public void onClick_noActivityIntent_shouldDoNothing() {
when(mPackageManager.queryIntentActivities(any(), anyInt()))
- .thenReturn(Collections.emptyList());
+ .thenReturn(Collections.emptyList());
mController = new SecurityPatchLevelDialogController(mDialog);
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
@@ -100,7 +104,7 @@
@Test
public void onClick_activityIntentFound_shouldStartActivity() {
when(mPackageManager.queryIntentActivities(any(), anyInt()))
- .thenReturn(Collections.singletonList(null));
+ .thenReturn(Collections.singletonList(null));
mController = new SecurityPatchLevelDialogController(mDialog);
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
index 349eddc..7213d12 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
@@ -23,6 +23,7 @@
import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MEID_NUMBER_VALUE;
import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MIN_NUMBER_VALUE;
import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_PRL_VERSION_VALUE;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
index d1056b5..e633ea2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
import static android.telephony.TelephonyManager.PHONE_TYPE_GSM;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -29,6 +30,11 @@
import android.os.UserManager;
import android.telephony.TelephonyManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,11 +47,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ImeiInfoPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java
index 1e83619..0547d5f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java
@@ -15,6 +15,7 @@
package com.android.settings.deviceinfo.legal;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -28,6 +29,9 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,9 +45,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class CopyrightPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java
index 16af0f3..d4962e0 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java
@@ -15,6 +15,7 @@
package com.android.settings.deviceinfo.legal;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -28,6 +29,9 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,9 +45,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LicensePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java
index 202f72b..7e4a92a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java
@@ -15,6 +15,7 @@
package com.android.settings.deviceinfo.legal;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -28,6 +29,9 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,9 +45,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TermsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java
index 65b6716..eff1520 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java
@@ -15,6 +15,7 @@
package com.android.settings.deviceinfo.legal;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -28,6 +29,9 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,9 +45,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WebViewLicensePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index 606fe07..541e9d3 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -45,6 +45,7 @@
.SIGNAL_STRENGTH_LABEL_ID;
import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController
.SIGNAL_STRENGTH_VALUE_ID;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -65,6 +66,8 @@
import android.telephony.TelephonyManager;
import android.telephony.euicc.EuiccManager;
+import androidx.lifecycle.LifecycleOwner;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -79,8 +82,6 @@
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers;
-import androidx.lifecycle.LifecycleOwner;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SimStatusDialogControllerTest {
@@ -178,7 +179,7 @@
}
@Test
- public void initialize_updateDataStateWithPowerOff_shouldUpdateSettingAndResetSignalStrength() {
+ public void initialize_updateServiceStateWithPowerOff_shouldUpdateTextAndResetSignalStrength() {
when(mServiceState.getState()).thenReturn(ServiceState.STATE_POWER_OFF);
when(mPersistableBundle.getBoolean(
CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
@@ -191,6 +192,33 @@
}
@Test
+ public void initialize_updateVoiceDataOutOfService_shouldUpdateSettingAndResetSignalStrength() {
+ when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+ when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+ when(mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
+
+ mController.initialize();
+
+ final String offServiceText = mContext.getString(R.string.radioInfo_service_out);
+ verify(mDialog).setText(SERVICE_STATE_VALUE_ID, offServiceText);
+ verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, "0");
+ }
+
+ @Test
+ public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateTextToBeInService() {
+ when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+ when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+ when(mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
+
+ mController.initialize();
+
+ final String inServiceText = mContext.getString(R.string.radioInfo_service_in);
+ verify(mDialog).setText(SERVICE_STATE_VALUE_ID, inServiceText);
+ }
+
+ @Test
public void initialize_updateSignalStrengthWith50_shouldUpdateSignalStrengthTo50() {
final int signalDbm = 50;
final int signalAsu = 50;
@@ -207,6 +235,27 @@
}
@Test
+ public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateSignalStrengthTo50() {
+ when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+ when(mServiceState.getDataRegState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+ when(mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
+
+ final int signalDbm = 50;
+ final int signalAsu = 50;
+ doReturn(signalDbm).when(mController).getDbm(mSignalStrength);
+ doReturn(signalAsu).when(mController).getAsuLevel(mSignalStrength);
+ when(mPersistableBundle.getBoolean(
+ CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
+
+ mController.initialize();
+
+ final String signalStrengthString =
+ mContext.getString(R.string.sim_signal_strength, signalDbm, signalAsu);
+ verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+ }
+
+ @Test
public void initialize_updateVoiceNetworkTypeWithEdge_shouldUpdateSettingToEdge() {
when(mTelephonyManager.getVoiceNetworkType(anyInt())).thenReturn(
TelephonyManager.NETWORK_TYPE_EDGE);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
index 7846292..e814fc4 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java
@@ -27,6 +27,11 @@
import android.os.UserManager;
import android.telephony.TelephonyManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,11 +44,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SimStatusPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
index e206d52..4c767a2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.deviceinfo.storage;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@@ -30,6 +31,11 @@
import android.os.SystemProperties;
import android.provider.Settings;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.os.RoSystemProperties;
import com.android.settings.core.BasePreferenceController;
@@ -48,11 +54,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AutomaticStorageManagementSwitchPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
index 9f56388..5da2cb8 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java
@@ -18,21 +18,28 @@
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.CACHE_APPS_SIZE_KEY;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_APP_BYTES;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_AUDIO_BYTES;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_IMAGE_BYTES;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_TOTAL_BYTES;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_VIDEO_BYTES;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper
+ .EXTERNAL_AUDIO_BYTES;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper
+ .EXTERNAL_IMAGE_BYTES;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper
+ .EXTERNAL_TOTAL_BYTES;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper
+ .EXTERNAL_VIDEO_BYTES;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.FREE_BYTES_KEY;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.GAME_APPS_SIZE_KEY;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.MUSIC_APPS_SIZE_KEY;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.OTHER_APPS_SIZE_KEY;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.PHOTO_APPS_SIZE_KEY;
-import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.SHARED_PREFERENCES_NAME;
+import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper
+ .SHARED_PREFERENCES_NAME;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TIMESTAMP_KEY;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TOTAL_BYTES_KEY;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.USER_ID_KEY;
import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.VIDEO_APPS_SIZE_KEY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
index cde850a..d525501 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.deviceinfo.storage;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -29,6 +31,10 @@
import android.os.UserManager;
import android.util.SparseArray;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -45,10 +51,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SecondaryUserControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index 4ec5f5f..0741d6d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -19,7 +19,9 @@
import static com.android.settings.applications.manageapplications.ManageApplications
.EXTRA_WORK_ONLY;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq;
@@ -38,6 +40,12 @@
import android.view.LayoutInflater;
import android.widget.LinearLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -61,12 +69,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class StorageItemPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
index df43c04..6892191 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.TestUtils.GIGABYTE;
import static com.android.settings.TestUtils.KILOBYTE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.spy;
@@ -26,6 +28,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.Activity;
import android.content.Context;
import android.os.storage.VolumeInfo;
import android.text.format.Formatter;
@@ -34,6 +37,8 @@
import android.widget.Button;
import android.widget.LinearLayout;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -47,17 +52,15 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
import java.io.File;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
- SettingsShadowResources.class,
- SettingsShadowResources.SettingsShadowTheme.class
+ SettingsShadowResources.class,
+ SettingsShadowResources.SettingsShadowTheme.class
})
public class StorageSummaryDonutPreferenceControllerTest {
@@ -72,7 +75,7 @@
public void setUp() throws Exception {
SettingsShadowResources.overrideResource(
com.android.internal.R.string.config_headlineFontFamily, "");
- mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+ mContext = spy(Robolectric.setupActivity(Activity.class));
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
mController = new StorageSummaryDonutPreferenceController(mContext);
@@ -80,7 +83,8 @@
LayoutInflater inflater = LayoutInflater.from(mContext);
final View view =
- inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext), false);
+ inflater.inflate(mPreference.getLayoutResource(), new LinearLayout(mContext),
+ false);
mHolder = PreferenceViewHolder.createInstanceForTests(view);
}
@@ -90,37 +94,37 @@
}
@Test
- public void testEmpty() throws Exception {
+ public void testEmpty() {
final long totalSpace = 32 * GIGABYTE;
final long usedSpace = 0;
mController.updateBytes(0, 32 * GIGABYTE);
mController.updateState(mPreference);
final Formatter.BytesResult usedSpaceResults =
- Formatter.formatBytes(mContext.getResources(), usedSpace, 0 /* flags */);
+ Formatter.formatBytes(mContext.getResources(), usedSpace, 0 /* flags */);
assertThat(mPreference.getTitle().toString())
- .isEqualTo(usedSpaceResults.value + " " + usedSpaceResults.units);
+ .isEqualTo(usedSpaceResults.value + " " + usedSpaceResults.units);
assertThat(mPreference.getSummary().toString())
- .isEqualTo("Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
+ .isEqualTo("Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
}
@Test
- public void testTotalStorage() throws Exception {
+ public void testTotalStorage() {
final long totalSpace = KILOBYTE * 10;
final long usedSpace = KILOBYTE;
mController.updateBytes(KILOBYTE, totalSpace);
mController.updateState(mPreference);
final Formatter.BytesResult usedSpaceResults =
- Formatter.formatBytes(mContext.getResources(), usedSpace, 0 /* flags */);
+ Formatter.formatBytes(mContext.getResources(), usedSpace, 0 /* flags */);
assertThat(mPreference.getTitle().toString())
- .isEqualTo(usedSpaceResults.value + " " + usedSpaceResults.units);
+ .isEqualTo(usedSpaceResults.value + " " + usedSpaceResults.units);
assertThat(mPreference.getSummary().toString())
- .isEqualTo("Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
+ .isEqualTo("Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
}
@Test
- public void testPopulateWithVolume() throws Exception {
+ public void testPopulateWithVolume() {
final long totalSpace = KILOBYTE * 10;
final long freeSpace = KILOBYTE;
final long usedSpace = totalSpace - freeSpace;
@@ -136,21 +140,21 @@
mController.updateState(mPreference);
final Formatter.BytesResult usedSpaceResults =
- Formatter.formatBytes(mContext.getResources(), usedSpace, 0 /* flags */);
+ Formatter.formatBytes(mContext.getResources(), usedSpace, 0 /* flags */);
assertThat(mPreference.getTitle().toString())
- .isEqualTo(usedSpaceResults.value + " " + usedSpaceResults.units);
+ .isEqualTo(usedSpaceResults.value + " " + usedSpaceResults.units);
assertThat(mPreference.getSummary().toString())
- .isEqualTo("Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
+ .isEqualTo("Used of " + Formatter.formatShortFileSize(mContext, totalSpace));
}
@Test
- public void testFreeUpSpaceMetricIsTriggered() throws Exception {
+ public void testFreeUpSpaceMetricIsTriggered() {
mPreference.onBindViewHolder(mHolder);
final Button button = (Button) mHolder.findViewById(R.id.deletion_helper_button);
mPreference.onClick(button);
verify(mMetricsFeatureProvider, times(1))
- .action(any(Context.class), eq(MetricsEvent.STORAGE_FREE_UP_SPACE_NOW));
+ .action(any(Context.class), eq(MetricsEvent.STORAGE_FREE_UP_SPACE_NOW));
}
}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
index 8595c54..4706b7d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
@@ -17,18 +17,24 @@
package com.android.settings.deviceinfo.storage;
import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
+
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.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
import android.util.SparseArray;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.SettingsActivity;
import com.android.settings.SubSettings;
import com.android.settings.deviceinfo.StorageProfileFragment;
@@ -42,10 +48,7 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
+import org.robolectric.Robolectric;
@RunWith(SettingsRobolectricTestRunner.class)
public class UserProfileControllerTest {
@@ -62,7 +65,7 @@
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = spy(Robolectric.setupActivity(Activity.class));
mPrimaryProfile = new UserInfo();
mController = new UserProfileController(mContext, mPrimaryProfile, 0);
when(mScreen.getContext()).thenReturn(mContext);
@@ -72,7 +75,7 @@
}
@Test
- public void controllerAddsPrimaryProfilePreference() throws Exception {
+ public void controllerAddsPrimaryProfilePreference() {
final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
verify(mScreen).addPreference(argumentCaptor.capture());
final Preference preference = argumentCaptor.getValue();
@@ -82,7 +85,7 @@
}
@Test
- public void tappingProfilePreferenceSendsToStorageProfileFragment() throws Exception {
+ public void tappingProfilePreferenceSendsToStorageProfileFragment() {
final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
verify(mScreen).addPreference(argumentCaptor.capture());
@@ -98,7 +101,7 @@
}
@Test
- public void acceptingResultUpdatesPreferenceSize() throws Exception {
+ public void acceptingResultUpdatesPreferenceSize() {
final SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
final StorageAsyncLoader.AppsStorageResult userResult =
new StorageAsyncLoader.AppsStorageResult();
@@ -119,7 +122,7 @@
}
@Test
- public void iconCallbackChangesPreferenceIcon() throws Exception {
+ public void iconCallbackChangesPreferenceIcon() {
final SparseArray<Drawable> icons = new SparseArray<>();
final UserIconDrawable drawable = mock(UserIconDrawable.class);
when(drawable.mutate()).thenReturn(drawable);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
index 57de339..1e912ba 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
@@ -1,6 +1,7 @@
package com.android.settings.deviceinfo.storage;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index 311c3f3..0c8bc7b 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
index 6428876..a8d5e19 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.display;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -30,6 +32,8 @@
import android.os.UserHandle;
import android.provider.Settings;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
@@ -44,8 +48,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowSecureSettings.class)
public class AmbientDisplayNotificationsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
index ac3435d..05226c3 100644
--- a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
+++ b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java
@@ -17,6 +17,7 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
index 5ceb70f..6f667ae 100644
--- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java
@@ -19,6 +19,7 @@
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
+
import static com.google.common.truth.Truth.assertThat;
import android.content.ContentResolver;
diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
index 791922e..e4db3ee 100644
--- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
@@ -27,6 +28,8 @@
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.FakeFeatureFactory;
@@ -44,8 +47,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowSystemSettings.class)
public class AutoRotatePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
index 140fc5c..708c9c1 100644
--- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.display;
import static android.provider.Settings.System.SHOW_BATTERY_PERCENT;
+
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
index 36190e8..a22a159 100644
--- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.display;
import static android.content.Context.POWER_SERVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.reset;
@@ -30,6 +32,9 @@
import android.os.PowerManager;
import android.provider.Settings.System;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -42,9 +47,6 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowContentResolver;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BrightnessLevelPreferenceControllerTest {
@@ -83,6 +85,12 @@
}
@Test
+ public void isInVrMode_noVrManager_shouldAlwaysReturnFalse() {
+ doReturn(null).when(mController).safeGetVrManager();
+ assertThat(mController.isInVrMode()).isFalse();
+ }
+
+ @Test
public void onStart_shouldRegisterObserver() {
BrightnessLevelPreferenceController controller =
new BrightnessLevelPreferenceController(mContext, null);
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
index 83343fe..eddace1 100644
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java
@@ -17,12 +17,15 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,8 +37,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ColorModePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
index 84d142c..3aae145 100644
--- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java
@@ -16,6 +16,7 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
@@ -26,6 +27,10 @@
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.app.ColorDisplayController;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
@@ -46,10 +51,6 @@
import java.util.List;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class ColorModePreferenceFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
index 21f3c0a..db33cbe 100644
--- a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
@@ -23,6 +23,9 @@
import android.app.UiModeManager;
import android.content.Context;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,9 +35,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DarkUIPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java
index 1a67140..30dedb6 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java
@@ -15,6 +15,7 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
@@ -22,6 +23,8 @@
import android.provider.Settings.Secure;
import android.view.View;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,8 +38,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class NightDisplayActivationPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java
new file mode 100644
index 0000000..0822076
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/ScreenZoomSettingsTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ScreenZoomSettingsTest {
+
+ private ScreenZoomSettings mSettings;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mSettings = spy(new ScreenZoomSettings());
+ doReturn(mContext).when(mSettings).getContext();
+ }
+
+ @Test
+ public void getPreviewSampleResIds_default_return3Previews() {
+ assertThat(mSettings.getPreviewSampleResIds()).hasLength(3);
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void getPreviewSampleResIds_extraPreviewDisabled_return1Preview() {
+ assertThat(mSettings.getPreviewSampleResIds()).hasLength(1);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java
index db811e0..a5b3449 100644
--- a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java
@@ -17,11 +17,14 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,8 +35,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ShowOperatorNamePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
index 19ffdc6..9d15ca0 100644
--- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -33,6 +34,8 @@
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
+import androidx.preference.ListPreference;
+
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -47,8 +50,6 @@
import java.util.Arrays;
-import androidx.preference.ListPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ThemePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java b/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java
index 40a5975..a1d94fa 100644
--- a/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/display/TimeoutListPreferenceTest.java
@@ -16,6 +16,7 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.robolectric.RuntimeEnvironment.application;
diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
index a575a60..f6f0d7f 100644
--- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.display;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -32,7 +34,7 @@
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import org.junit.After;
@@ -76,7 +78,7 @@
@After
public void tearDown() {
- ShadowRestrictedLockUtils.reset();
+ ShadowRestrictedLockUtilsInternal.reset();
}
@Test
@@ -137,13 +139,13 @@
}
@Test
- @Config(shadows = ShadowRestrictedLockUtils.class)
+ @Config(shadows = ShadowRestrictedLockUtilsInternal.class)
public void updateState_selectedTimeoutLargerThanAdminMax_shouldSetSummaryToUpdatedPrefValue() {
final int profileUserId = UserHandle.myUserId();
final long allowedTimeout = 480000L; // 8 minutes
when(mUserManager.getProfiles(profileUserId)).thenReturn(Collections.emptyList());
ShadowDevicePolicyManager.getShadow().setMaximumTimeToLock(profileUserId, allowedTimeout);
- ShadowRestrictedLockUtils.setMaximumTimeToLockIsSet(true);
+ ShadowRestrictedLockUtilsInternal.setMaximumTimeToLockIsSet(true);
final CharSequence[] timeouts = {"15000", "30000", "60000", "120000", "300000", "600000"};
final CharSequence[] summaries = {"15s", "30s", "1m", "2m", "5m", "10m"};
// set current timeout to be 10 minutes, which is longer than the allowed 8 minutes
diff --git a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
new file mode 100644
index 0000000..fe4fcc8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
@@ -0,0 +1,92 @@
+/*
+ * 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.display;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+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 com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class TopLevelDisplayPreferenceControllerTest {
+ @Mock
+ private Context mContext;
+ @Mock
+ private PackageManager mPackageManager;
+
+ private TopLevelDisplayPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ when(mContext.getPackageManager()).thenReturn(mPackageManager);
+ when(mContext.getString(R.string.config_wallpaper_picker_package))
+ .thenReturn("pkg");
+ when(mContext.getString(R.string.config_wallpaper_picker_class))
+ .thenReturn("cls");
+
+ mController = new TopLevelDisplayPreferenceController(mContext, "test_key");
+ }
+
+ @Test
+ public void getAvailability_alwaysAvailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void getSummary_hasWallpaper_shouldReturnWallpaperSummary() {
+ final List<ResolveInfo> resolveInfos = new ArrayList<>();
+ resolveInfos.add(mock(ResolveInfo.class));
+ when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
+ .thenReturn(resolveInfos);
+
+ assertThat(mController.getSummary())
+ .isEqualTo(mContext.getText(R.string.display_dashboard_summary));
+ }
+
+ @Test
+ public void getSummary_hasWallpaper_shouldReturnNoWallpaperSummary() {
+ final List<ResolveInfo> resolveInfos = new ArrayList<>();
+ when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
+ .thenReturn(resolveInfos);
+
+ assertThat(mController.getSummary())
+ .isEqualTo(mContext.getText(R.string.display_dashboard_nowallpaper_summary));
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
index 963bb14..b7fb5ed 100644
--- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
+++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
index 89ca00a..b4305b6 100644
--- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -44,6 +45,7 @@
private static final String WALLPAPER_PACKAGE = "TestPkg";
private static final String WALLPAPER_CLASS = "TestCls";
+ private static final String TEST_KEY = "test_key";
@Mock
private Context mContext;
@@ -53,7 +55,7 @@
private WallpaperPreferenceController mController;
@Before
- public void setUp() throws PackageManager.NameNotFoundException {
+ public void setUp() {
MockitoAnnotations.initMocks(this);
when(mContext.getString(R.string.config_wallpaper_picker_package))
.thenReturn(WALLPAPER_PACKAGE);
@@ -61,11 +63,11 @@
.thenReturn(WALLPAPER_CLASS);
when(mContext.getPackageManager()).thenReturn(mPackageManager);
- mController = new WallpaperPreferenceController(mContext);
+ mController = new WallpaperPreferenceController(mContext, TEST_KEY);
}
@Test
- public void isAvailable_wallpaerPickerEnabled_shouldReturnTrue() {
+ public void isAvailable_wallpaperPickerEnabled_shouldReturnTrue() {
final List<ResolveInfo> resolveInfos = new ArrayList<>();
resolveInfos.add(mock(ResolveInfo.class));
when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt()))
@@ -75,7 +77,7 @@
}
@Test
- public void isAvailable_wallpaerPickerDisbled_shouldReturnFalseAndNoCrash() {
+ public void isAvailable_wallpaperPickerDisabled_shouldReturnFalse() {
when(mPackageManager.queryIntentActivities(any(Intent.class), anyInt())).thenReturn(null);
assertThat(mController.isAvailable()).isFalse();
@@ -85,6 +87,5 @@
.thenReturn(resolveInfos);
assertThat(mController.isAvailable()).isFalse();
- // should not crash
}
}
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
index 103cb53..a26997c 100644
--- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.dream;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
index 74847ee..d324441 100644
--- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.dream;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
index 07f4a9d..b9703e2 100644
--- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.dream;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
index 2e54721..fc7edc2 100644
--- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.dream;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,8 @@
import android.view.View.OnClickListener;
import android.widget.Button;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,8 +41,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class StartNowPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
index cf7c659..17c6ced 100644
--- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.dream;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
index 96b0c83..e4f5cff 100644
--- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java
@@ -22,6 +22,8 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.dream.DreamBackend;
import com.android.settingslib.dream.DreamBackend.WhenToDream;
@@ -34,8 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WhenToDreamPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
index 5321c10..0a661b4 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java
@@ -27,6 +27,7 @@
import android.content.Intent;
import android.content.pm.UserInfo;
import android.os.Process;
+import android.os.UserHandle;
import android.os.UserManager;
import android.view.ViewGroup;
import android.widget.FrameLayout;
@@ -66,7 +67,7 @@
@Before
public void setUp() {
- mActivity = Robolectric.buildActivity(CustomActivity.class).get();
+ mActivity = Robolectric.setupActivity(CustomActivity.class);
mActivityShadow = Shadow.extract(mActivity);
mHelper = new ActionDisabledByAdminDialogHelper(mActivity);
}
@@ -76,7 +77,7 @@
final int userId = 123;
final ComponentName component = new ComponentName("some.package.name",
"some.package.name.SomeClass");
- final EnforcedAdmin admin = new EnforcedAdmin(component, userId);
+ final EnforcedAdmin admin = new EnforcedAdmin(component, UserHandle.of(userId));
mHelper.showAdminPolicies(admin, mActivity);
@@ -90,7 +91,7 @@
@Test
public void testShowAdminPoliciesWithoutComponent() {
final int userId = 123;
- final EnforcedAdmin admin = new EnforcedAdmin(null, userId);
+ final EnforcedAdmin admin = new EnforcedAdmin(null, UserHandle.of(userId));
mHelper.showAdminPolicies(admin, mActivity);
final Intent intent = mActivityShadow.getNextStartedActivity();
assertEquals(intent.getComponent(), new ComponentName(mActivity,
@@ -124,10 +125,6 @@
assertEquals(Shadows.shadowOf(textView).innerText(),
mActivity.getString(R.string.disabled_by_policy_title_screen_capture));
- mHelper.setAdminSupportTitle(view, DevicePolicyManager.POLICY_MANDATORY_BACKUPS);
- assertEquals(Shadows.shadowOf(textView).innerText(),
- mActivity.getString(R.string.disabled_by_policy_title_turn_off_backups));
-
mHelper.setAdminSupportTitle(view, DevicePolicyManager.POLICY_SUSPEND_PACKAGES);
assertEquals(Shadows.shadowOf(textView).innerText(),
mActivity.getString(R.string.disabled_by_policy_title_suspend_packages));
@@ -150,7 +147,7 @@
final ViewGroup view = new FrameLayout(mActivity);
final ComponentName component = new ComponentName("some.package.name",
"some.package.name.SomeClass");
- final EnforcedAdmin admin = new EnforcedAdmin(component, 123);
+ final EnforcedAdmin admin = new EnforcedAdmin(component, UserHandle.of(123));
final TextView textView = new TextView(mActivity);
textView.setId(R.id.admin_support_msg);
@@ -173,7 +170,7 @@
final ShadowUserManager userManagerShadow = Shadow.extract(userManager);
final ComponentName component = new ComponentName("some.package.name",
"some.package.name.SomeClass");
- final EnforcedAdmin admin = new EnforcedAdmin(component, 123);
+ final EnforcedAdmin admin = new EnforcedAdmin(component, UserHandle.of(123));
dpmShadow.setShortSupportMessageForUser(component, 123, "some message");
dpmShadow.setIsAdminActiveAsUser(false);
diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java
index ebdfad6..e016a06 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogTest.java
@@ -43,7 +43,7 @@
public void testGetAdminDetailsFromIntent() {
final int userId = 123;
final ComponentName component = new ComponentName("com.some.package", ".SomeClass");
- final EnforcedAdmin expectedAdmin = new EnforcedAdmin(component, userId);
+ final EnforcedAdmin expectedAdmin = new EnforcedAdmin(component, UserHandle.of(userId));
final Intent intent = new Intent();
intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, component);
@@ -54,7 +54,7 @@
@Test
public void testGetAdminDetailsFromNullIntent() {
final int userId = UserHandle.myUserId();
- final EnforcedAdmin expectedAdmin = new EnforcedAdmin(null, userId);
+ final EnforcedAdmin expectedAdmin = new EnforcedAdmin(null, UserHandle.of(userId));
Assert.assertEquals(expectedAdmin, mDialog.getAdminDetailsFromIntent(null));
}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
index 33213d4..1c47d91 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java
@@ -17,12 +17,15 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
import android.text.format.DateUtils;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -35,8 +38,6 @@
import java.util.Date;
import java.util.GregorianCalendar;
-import androidx.preference.Preference;
-
/**
* Common base for testing subclasses of {@link AdminActionPreferenceControllerBase}.
*/
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index d76fc91..2da6a88 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -17,6 +17,7 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyObject;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doAnswer;
@@ -24,6 +25,8 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -36,8 +39,6 @@
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import androidx.preference.Preference;
-
/**
* Common base for testing subclasses of {@link AdminGrantedPermissionsPreferenceControllerBase}.
*/
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
index 574a050..8c704fc 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java
@@ -17,10 +17,13 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,8 +35,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public final class AlwaysOnVpnCurrentUserPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
index eb45aa7..759edb3 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java
@@ -17,10 +17,13 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,8 +34,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AlwaysOnVpnManagedProfilePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
index 2684204..5c19792 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
@@ -17,13 +17,18 @@
package com.android.settings.enterprise;
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.pm.UserInfo;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
@@ -41,9 +46,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ApplicationListFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
index 750b46b..833efd4 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.enterprise;
import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -33,6 +35,9 @@
import android.content.pm.UserInfo;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.UserAppInfo;
@@ -52,9 +57,6 @@
import java.util.List;
import java.util.Set;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ApplicationListPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java
deleted file mode 100644
index bd8c77c..0000000
--- a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java
+++ /dev/null
@@ -1,72 +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.enterprise;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-
-import androidx.preference.Preference;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class BackupsEnabledPreferenceControllerTest {
-
- private static final String KEY_BACKUPS_ENABLED = "backups_enabled";
-
- private Context mContext;
- private FakeFeatureFactory mFeatureFactory;
-
- private BackupsEnabledPreferenceController mController;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- mFeatureFactory = FakeFeatureFactory.setupForTest();
- mController = new BackupsEnabledPreferenceController(mContext);
- }
-
- @Test
- public void testIsAvailable() {
- when(mFeatureFactory.enterprisePrivacyFeatureProvider.areBackupsMandatory())
- .thenReturn(false);
- assertThat(mController.isAvailable()).isFalse();
-
- when(mFeatureFactory.enterprisePrivacyFeatureProvider.areBackupsMandatory())
- .thenReturn(true);
- assertThat(mController.isAvailable()).isTrue();
- }
-
- @Test
- public void testHandlePreferenceTreeClick() {
- assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
- .isFalse();
- }
-
- @Test
- public void testGetPreferenceKey() {
- assertThat(mController.getPreferenceKey()).isEqualTo(KEY_BACKUPS_ENABLED);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
index a3eeb71..63c5981 100644
--- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
index 2355e81..48bb0ce 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java
@@ -17,8 +17,11 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -26,8 +29,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class CaCertsCurrentUserPreferenceControllerTest
extends CaCertsPreferenceControllerTestBase {
diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
index 4ac2825..47db2c7 100644
--- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java
@@ -17,10 +17,13 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -30,8 +33,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-
/**
* Base test class for testing {@link CaCertsPreferenceControllerBase}'s subclass.
*/
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
index 034293b..ac3ee27 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.anyObject;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.eq;
@@ -24,6 +25,8 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -38,8 +41,6 @@
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EnterpriseInstalledPackagesPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index 0136506..92c420a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -17,6 +17,7 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.when;
@@ -345,15 +346,6 @@
.isEqualTo(3);
}
- @Test
- public void testAreBackupsMandatory() {
- assertThat(mProvider.areBackupsMandatory()).isFalse();
- ComponentName transportComponent = new ComponentName("test", "test");
- when(mDevicePolicyManager.getMandatoryBackupTransport())
- .thenReturn(transportComponent);
- assertThat(mProvider.areBackupsMandatory()).isTrue();
- }
-
private void resetAndInitializePackageManager() {
reset(mPackageManager);
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN))
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
index 0fcff3e..dc5794c 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java
@@ -17,10 +17,13 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,8 +35,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EnterprisePrivacyPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
index 7bbe9bc..f1d03c7 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -98,7 +99,7 @@
private void verifyPreferenceControllers(List<AbstractPreferenceController> controllers) {
assertThat(controllers).isNotNull();
- assertThat(controllers.size()).isEqualTo(18);
+ assertThat(controllers.size()).isEqualTo(17);
int position = 0;
assertThat(controllers.get(position++)).isInstanceOf(NetworkLogsPreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(BugReportsPreferenceController.class);
@@ -126,8 +127,6 @@
assertThat(controllers.get(position++)).isInstanceOf(
CaCertsManagedProfilePreferenceController.class);
assertThat(controllers.get(position++)).isInstanceOf(
- BackupsEnabledPreferenceController.class);
- assertThat(controllers.get(position++)).isInstanceOf(
PreferenceCategoryController.class);
assertThat(controllers.get(position++)).isInstanceOf(
FailedPasswordWipeCurrentUserPreferenceController.class);
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
index 70400dc..5455968 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
@@ -17,11 +17,15 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,9 +40,6 @@
import java.util.List;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EnterpriseSetDefaultAppsListFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
index c567f72..2b3ed73 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -33,6 +34,10 @@
import android.content.res.Resources;
import android.os.UserHandle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.EnterpriseDefaultApps;
@@ -53,10 +58,6 @@
import java.util.Arrays;
import java.util.Collections;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EnterpriseSetDefaultAppsListPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
index 4f73ea7..eabd4bb 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.argThat;
@@ -29,6 +30,8 @@
import android.content.pm.UserInfo;
import android.os.UserHandle;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.applications.EnterpriseDefaultApps;
import com.android.settings.applications.UserAppInfo;
@@ -46,8 +49,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public final class EnterpriseSetDefaultAppsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
index ba40752..9dd02de 100644
--- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java
@@ -17,10 +17,13 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -30,8 +33,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-
/**
* Common base for testing subclasses of {@link FailedPasswordWipePreferenceControllerBase}.
*/
diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
index 0a50ed6..10e569a 100644
--- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java
@@ -17,10 +17,13 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,8 +34,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class GlobalHttpProxyPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
index 8fe7325..d625760 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java
@@ -17,10 +17,13 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,8 +35,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ImePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
index e9066aa..6615853 100644
--- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java
@@ -17,12 +17,15 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.res.Resources;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,8 +38,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ManageDeviceAdminPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
index 2201e69..56d90f5 100644
--- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
index 2736d56..00eb3f9 100644
--- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.enterprise;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java
index e7cae8e..56a84bb 100644
--- a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java
@@ -18,14 +18,17 @@
package com.android.settings.flashlight;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
import android.content.Context;
-import android.content.res.Resources;
import android.provider.Settings;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.SliceTester;
@@ -37,13 +40,6 @@
import java.util.List;
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.widget.SliceLiveData;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FlashlightSliceBuilderTest {
@@ -52,12 +48,7 @@
@Before
public void setUp() {
- mContext = spy(RuntimeEnvironment.application);
-
- // Prevent crash in SliceMetadata.
- Resources resources = spy(mContext.getResources());
- doReturn(60).when(resources).getDimensionPixelSize(anyInt());
- doReturn(resources).when(mContext).getResources();
+ mContext = RuntimeEnvironment.application;
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index e486807..b356c49 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -17,7 +17,9 @@
package com.android.settings.fuelgauge;
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -40,6 +42,11 @@
import android.os.Bundle;
import android.os.UserHandle;
+import androidx.fragment.app.FragmentActivity;
+import androidx.loader.app.LoaderManager;
+import androidx.preference.Preference;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
@@ -68,11 +75,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.FragmentActivity;
-import androidx.loader.app.LoaderManager;
-import androidx.preference.Preference;
-import androidx.recyclerview.widget.RecyclerView;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowEntityHeaderController.class, ShadowActivityManager.class})
public class AdvancedPowerUsageDetailTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java
index 406ed77..fcd483a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java
@@ -23,6 +23,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,8 +35,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AutoRestrictionPreferenceControllerTest {
private static final int ON = 1;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
index 1a3155d..6b52b65 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
@@ -17,10 +17,13 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doNothing;
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 static org.mockito.Mockito.when;
@@ -38,6 +41,7 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.ShadowFragment;
+import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
import org.junit.Before;
@@ -49,8 +53,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {SettingsShadowResources.SettingsShadowTheme.class, ShadowFragment.class})
public class BackgroundActivityPreferenceControllerTest {
@@ -80,7 +82,7 @@
@Mock
private PowerWhitelistBackend mPowerWhitelistBackend;
private BackgroundActivityPreferenceController mController;
- private Preference mPreference;
+ private RestrictedPreference mPreference;
private Context mShadowContext;
private BatteryUtils mBatteryUtils;
@@ -109,7 +111,7 @@
mBatteryUtils = spy(new BatteryUtils(mShadowContext));
doNothing().when(mBatteryUtils).setForceAppStandby(anyInt(), anyString(), anyInt());
- mPreference = new Preference(mShadowContext);
+ mPreference = spy(new RestrictedPreference(mShadowContext, null /* attrs */));
mPreference.setKey(BackgroundActivityPreferenceController.KEY_BACKGROUND_ACTIVITY);
mController = spy(new BackgroundActivityPreferenceController(
mContext, mFragment, UID_LOW_SDK, LOW_SDK_PACKAGE, mPowerWhitelistBackend));
@@ -118,7 +120,7 @@
}
@Test
- public void testHandlePreferenceTreeClick_restrictApp_showDialog() {
+ public void handlePreferenceTreeClick_restrictApp_showDialog() {
doReturn(AppOpsManager.MODE_ALLOWED).when(mAppOpsManager)
.checkOpNoThrow(anyInt(), anyInt(), anyString());
@@ -128,7 +130,7 @@
}
@Test
- public void testHandlePreferenceTreeClick_unRestrictApp_showDialog() {
+ public void handlePreferenceTreeClick_unRestrictApp_showDialog() {
doReturn(AppOpsManager.MODE_IGNORED).when(mAppOpsManager)
.checkOpNoThrow(anyInt(), anyInt(), anyString());
@@ -138,7 +140,7 @@
}
@Test
- public void testUpdateState_noError_setEnabled() {
+ public void updateState_noError_setEnabled() {
when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_ALLOWED);
@@ -149,7 +151,7 @@
}
@Test
- public void testUpdateState_whitelisted() {
+ public void updateState_whitelisted() {
when(mPowerWhitelistBackend.isWhitelisted(LOW_SDK_PACKAGE)).thenReturn(true);
mController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isFalse();
@@ -158,7 +160,16 @@
}
@Test
- public void testUpdateSummary_modeError_showSummaryDisabled() {
+ public void updateState_disabledByAdmin_doNothing() {
+ doReturn(true).when(mPreference).isDisabledByAdmin();
+
+ mController.updateState(mPreference);
+
+ verify(mPreference, never()).setEnabled(anyBoolean());
+ }
+
+ @Test
+ public void updateSummary_modeError_showSummaryDisabled() {
when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_ERRORED);
final CharSequence expectedSummary = mShadowContext.getText(
@@ -169,7 +180,7 @@
}
@Test
- public void testUpdateSummary_modeDefault_showNotRestricted() {
+ public void updateSummary_modeDefault_showNotRestricted() {
when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_DEFAULT);
@@ -179,7 +190,7 @@
}
@Test
- public void testUpdateSummary_modeIgnored_showRestricted() {
+ public void updateSummary_modeIgnored_showRestricted() {
when(mAppOpsManager.checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, UID_LOW_SDK,
LOW_SDK_PACKAGE)).thenReturn(AppOpsManager.MODE_IGNORED);
@@ -189,7 +200,7 @@
}
@Test
- public void testIsAvailable_ReturnTrue() {
+ public void isAvailable_ReturnTrue() {
assertThat(mController.isAvailable()).isTrue();
}
}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java
index c29a012..2ef359b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java
@@ -26,6 +26,8 @@
import android.text.TextUtils;
import android.text.format.DateUtils;
+import androidx.preference.PreferenceGroup;
+
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsImpl;
import com.android.settings.R;
@@ -41,8 +43,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceGroup;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BatteryAppListPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index 5bab7f4..fb34640 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -16,7 +16,9 @@
package com.android.settings.fuelgauge;
import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 337b950..5541654 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -18,7 +18,9 @@
package com.android.settings.fuelgauge;
import static androidx.lifecycle.Lifecycle.Event.ON_START;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
@@ -34,6 +36,11 @@
import android.os.PowerManager;
import android.widget.TextView;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.BasePreferenceController;
@@ -55,11 +62,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPowerManager;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-import androidx.recyclerview.widget.RecyclerView;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
SettingsShadowResources.class,
@@ -140,7 +142,7 @@
}
@Test
- public void testDisplayPreference_displayBatteryLevel() {
+ public void displayPreference_displayBatteryLevel() {
mController.displayPreference(mPreferenceScreen);
assertThat(((BatteryMeterView) mBatteryLayoutPref.findViewById(
@@ -150,7 +152,7 @@
}
@Test
- public void testUpdatePreference_hasRemainingTime_showRemainingLabel() {
+ public void updatePreference_hasRemainingTime_showRemainingLabel() {
mBatteryInfo.remainingLabel = TIME_LEFT;
mController.updateHeaderPreference(mBatteryInfo);
@@ -159,7 +161,7 @@
}
@Test
- public void testUpdatePreference_updateBatteryInfo() {
+ public void updatePreference_updateBatteryInfo() {
mBatteryInfo.remainingLabel = TIME_LEFT;
mBatteryInfo.batteryLevel = BATTERY_LEVEL;
mBatteryInfo.discharging = true;
@@ -171,7 +173,7 @@
}
@Test
- public void testUpdatePreference_noRemainingTime_showStatusLabel() {
+ public void updatePreference_noRemainingTime_showStatusLabel() {
mBatteryInfo.remainingLabel = null;
mBatteryInfo.statusLabel = BATTERY_STATUS;
@@ -181,7 +183,7 @@
}
@Test
- public void testOnStart_shouldStyleActionBar() {
+ public void onStart_shouldStyleActionBar() {
when(mEntityHeaderController.setRecyclerView(nullable(RecyclerView.class), eq(mLifecycle)))
.thenReturn(mEntityHeaderController);
@@ -192,16 +194,21 @@
}
@Test
- public void testQuickUpdateHeaderPreference_showBatteryLevelAndChargingState() {
+ public void quickUpdateHeaderPreference_onlyUpdateBatteryLevelAndChargingState() {
+ mSummary.setText(BATTERY_STATUS);
+ mSummary2.setText(BATTERY_STATUS);
+
mController.quickUpdateHeaderPreference();
assertThat(mBatteryMeterView.getBatteryLevel()).isEqualTo(BATTERY_LEVEL);
assertThat(mBatteryMeterView.getCharging()).isTrue();
assertThat(mBatteryPercentText.getText()).isEqualTo("60%");
+ assertThat(mSummary.getText()).isEqualTo(BATTERY_STATUS);
+ assertThat(mSummary2.getText()).isEqualTo(BATTERY_STATUS);
}
@Test
- public void testQuickUpdateHeaderPreference_showPowerSave() {
+ public void quickUpdateHeaderPreference_showPowerSave() {
boolean testValues[] = {false, true};
ShadowPowerManager shadowPowerManager = Shadows.shadowOf(mPowerManager);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
index d9e5bc0..75f316f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java
@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.spy;
@@ -27,6 +28,8 @@
import android.view.View;
import android.widget.TextView;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -40,8 +43,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public class BatteryHistoryPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
index bebf31f..dc5834e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.doReturn;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 44486f8..ccc86a2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.any;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
index 3497e43..364a63a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java
@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
index d8ee8f6..afbb5b6 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
@@ -27,6 +27,9 @@
import android.content.Context;
import android.content.Intent;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.dashboard.DashboardFragment;
@@ -40,9 +43,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BatteryOptimizationPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
index ad5537c..7e88784 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java
@@ -16,7 +16,7 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doNothing;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -25,6 +25,8 @@
import android.os.PowerManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,8 +37,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BatterySaverControllerTest {
@@ -56,7 +56,6 @@
mBatterySaverController = spy(new BatterySaverController(mContext));
ReflectionHelpers.setField(mBatterySaverController, "mPowerManager", mPowerManager);
ReflectionHelpers.setField(mBatterySaverController, "mBatterySaverPref", mBatterySaverPref);
- doNothing().when(mBatterySaverController).refreshConditionManager();
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index b274492..4cb7ff5 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -20,7 +20,9 @@
import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE;
import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP;
import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
index ef7bc98..140a426 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java
@@ -25,6 +25,8 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,8 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PowerGaugePreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index af9566b..2f3cb7c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -31,6 +32,8 @@
import android.view.MenuInflater;
import android.view.MenuItem;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -44,8 +47,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PowerUsageAdvancedTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
index 4b96a4d..012ebb2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java
@@ -25,6 +25,8 @@
import android.content.Context;
import android.os.Bundle;
+import androidx.loader.app.LoaderManager;
+
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowDashboardFragment;
@@ -39,8 +41,6 @@
import java.util.List;
-import androidx.loader.app.LoaderManager;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowDashboardFragment.class)
public class PowerUsageBaseTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index 2dc4198..6d18109 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 68d9994..cf1a5f3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -16,7 +16,9 @@
package com.android.settings.fuelgauge;
import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADVANCED_BATTERY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
@@ -40,6 +42,8 @@
import android.view.View;
import android.widget.TextView;
+import androidx.loader.app.LoaderManager;
+
import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R;
@@ -50,7 +54,6 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-import com.android.settingslib.core.AbstractPreferenceController;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -69,8 +72,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.loader.app.LoaderManager;
-
// TODO: Improve this test class so that it starts up the real activity and fragment.
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
@@ -343,18 +344,6 @@
verify(mFragment).restartBatteryTipLoader();
}
- @Test
- public void getDashboardLabel_returnsCorrectLabel() {
- BatteryInfo info = new BatteryInfo();
- info.batteryPercentString = "3%";
- assertThat(PowerUsageSummary.getDashboardLabel(mRealContext, info))
- .isEqualTo(info.batteryPercentString);
-
- info.remainingLabel = "Phone will shut down soon";
- assertThat(PowerUsageSummary.getDashboardLabel(mRealContext, info))
- .isEqualTo("3% - Phone will shut down soon");
- }
-
public static class TestFragment extends PowerUsageSummary {
private Context mContext;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
index 267f263..0d3a391 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
@@ -26,12 +26,15 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
+import android.app.Activity;
import android.app.AppOpsManager;
import android.content.Context;
import android.content.Intent;
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.fuelgauge.batterytip.AppInfo;
@@ -43,13 +46,11 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RestrictAppPreferenceControllerTest {
private static final int ALLOWED_UID = 111;
@@ -92,7 +93,7 @@
mOtherUserPackageOps = new AppOpsManager.PackageOps(
RESTRICTED_PACKAGE_NAME, OTHER_USER_UID, restrictedOps);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = spy(Robolectric.setupActivity(Activity.class));
doReturn(mAppOpsManager).when(mContext).getSystemService(Context.APP_OPS_SERVICE);
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
doReturn(mContext).when(mFragment).getContext();
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
index 7219f18..e5a4b3d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -30,6 +31,12 @@
import android.util.IconDrawableFactory;
import android.util.SparseLongArray;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+
import com.android.settings.SettingsActivity;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper;
@@ -42,7 +49,6 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.Before;
import org.junit.Test;
@@ -52,16 +58,12 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.CheckBoxPreference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowAlertDialogCompat.class, SettingsShadowResourcesImpl.class})
public class RestrictedAppDetailsTest {
@@ -166,7 +168,8 @@
final BatteryTipDialogFragment dialogFragment = mRestrictedAppDetails.createDialogFragment(
mAppInfo, true);
- FragmentTestUtils.startFragment(dialogFragment);
+ FragmentController.setupFragment(dialogFragment, FragmentActivity.class,
+ 0 /* containerViewId */, null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
@@ -178,7 +181,8 @@
final BatteryTipDialogFragment dialogFragment = mRestrictedAppDetails.createDialogFragment(
mAppInfo, false);
- FragmentTestUtils.startFragment(dialogFragment);
+ FragmentController.setupFragment(dialogFragment, FragmentActivity.class,
+ 0 /* containerViewId */, null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
index 971de7a..96b1d7d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java
@@ -24,6 +24,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,8 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SmartBatteryPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
new file mode 100644
index 0000000..b1bc074
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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.fuelgauge;
+
+import static com.android.settings.fuelgauge.TopLevelBatteryPreferenceController.getDashboardLabel;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class TopLevelBatteryPreferenceControllerTest {
+
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ }
+
+ @Test
+ public void getDashboardLabel_returnsCorrectLabel() {
+ BatteryInfo info = new BatteryInfo();
+ info.batteryPercentString = "3%";
+ assertThat(getDashboardLabel(mContext, info))
+ .isEqualTo(info.batteryPercentString);
+
+ info.remainingLabel = "Phone will shut down soon";
+ assertThat(getDashboardLabel(mContext, info))
+ .isEqualTo("3% - Phone will shut down soon");
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java
index aa677f4..2bc5b14 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java
@@ -22,6 +22,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -32,8 +34,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class AutoBatterySaverPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
index abf2cdc..5a92ce7 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java
@@ -20,6 +20,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.lifecycle.LifecycleOwner;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.widget.SeekBarPreference;
@@ -32,8 +34,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.lifecycle.LifecycleOwner;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class AutoBatterySeekBarPreferenceControllerTest {
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 a4e8a7e..c09af2b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterysaver;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -25,6 +26,8 @@
import android.os.PowerManager;
import android.widget.Button;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.TwoStateButtonPreference;
@@ -38,8 +41,6 @@
import org.robolectric.shadows.ShadowPowerManager;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowPowerManager.class)
public class BatterySaverButtonPreferenceControllerTest {
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 4a2f5ca..f600d41 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip;
import static com.google.common.truth.Truth.assertThat;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
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 ecba92c..8e7590b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip;
import static com.google.common.truth.Truth.assertThat;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
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 1ebcc42..8622e65 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
@@ -19,7 +19,9 @@
import static android.os.StatsDimensionsValue.FLOAT_VALUE_TYPE;
import static android.os.StatsDimensionsValue.INT_VALUE_TYPE;
import static android.os.StatsDimensionsValue.TUPLE_VALUE_TYPE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java
index 5b6e271..4097e7c 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge.batterytip;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -23,6 +24,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,8 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BatteryManagerPreferenceControllerTest {
private static final int ON = 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 8882101..bd4f899 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
@@ -17,12 +17,16 @@
package com.android.settings.fuelgauge.batterytip;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.text.format.DateUtils;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settings.fuelgauge.Estimate;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
@@ -35,7 +39,6 @@
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.Before;
import org.junit.Test;
@@ -44,12 +47,11 @@
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
import java.util.ArrayList;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class,
SettingsShadowResourcesImpl.class})
@@ -105,7 +107,8 @@
mDialogFragment = BatteryTipDialogFragment.newInstance(mHighUsageTip, METRICS_KEY);
- FragmentTestUtils.startFragment(mDialogFragment);
+ FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
+ 0 /* containerViewId */, null /* bundle */);
Robolectric.getForegroundThreadScheduler().advanceToLastPostedRunnable();
@@ -120,7 +123,8 @@
public void testOnCreateDialog_restrictOneAppTip_fireRestrictOneAppDialog() {
mDialogFragment = BatteryTipDialogFragment.newInstance(mRestrictedOneAppTip, METRICS_KEY);
- FragmentTestUtils.startFragment(mDialogFragment);
+ FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
+ 0 /* containerViewId */, null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
@@ -139,7 +143,8 @@
mDialogFragment = BatteryTipDialogFragment.newInstance(mRestrictTwoAppsTip, METRICS_KEY);
- FragmentTestUtils.startFragment(mDialogFragment);
+ FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
+ 0 /* containerViewId */, null /* bundle */);
Robolectric.getForegroundThreadScheduler().advanceToLastPostedRunnable();
@@ -168,7 +173,8 @@
mDialogFragment = BatteryTipDialogFragment.newInstance(restrictSixAppsTip, METRICS_KEY);
- FragmentTestUtils.startFragment(mDialogFragment);
+ FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
+ 0 /* containerViewId */, null /* bundle */);
Robolectric.getForegroundThreadScheduler().advanceToLastPostedRunnable();
@@ -188,7 +194,8 @@
mDialogFragment = BatteryTipDialogFragment.newInstance(mUnrestrictAppTip, METRICS_KEY);
ShadowUtils.setApplicationLabel(PACKAGE_NAME, DISPLAY_NAME);
- FragmentTestUtils.startFragment(mDialogFragment);
+ FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
+ 0 /* containerViewId */, null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
@@ -203,7 +210,8 @@
doReturn(AVERAGE_TIME_MS).when(mSummaryTip).getAverageTimeMs();
mDialogFragment = BatteryTipDialogFragment.newInstance(mSummaryTip, METRICS_KEY);
- FragmentTestUtils.startFragment(mDialogFragment);
+ FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
+ 0 /* containerViewId */, null /* bundle */);
final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
index 3ada030..3485113 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
index e7aafef..afa8e4e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
@@ -17,7 +17,9 @@
import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType
.SMART_BATTERY_MANAGER;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -28,6 +30,12 @@
import android.os.Bundle;
import android.text.format.DateUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -49,12 +57,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BatteryTipPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java
index 39555b2..55ab113 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentActionTest.java
@@ -18,6 +18,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.app.Activity;
import android.content.Context;
import com.android.internal.logging.nano.MetricsProto;
@@ -37,7 +38,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
import java.util.ArrayList;
import java.util.List;
@@ -63,7 +64,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = Robolectric.setupActivity(Activity.class);
mAppInfos = new ArrayList<>();
mAppInfos.add(new AppInfo.Builder()
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
index c4c3d02..24284ef 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
index bcbcdff..379d28f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
index b5392bc..657a5e3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java
index 179f2a1..0133ecf 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetectorTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
index 42d8822..f10ea7e 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.ContentResolver;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java
index df38d34..27cb04b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java
@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip.detectors;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.text.format.DateUtils;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
index ec048aa..1c8bfdb 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java
@@ -21,9 +21,13 @@
import android.os.Parcel;
import android.os.Parcelable;
+import androidx.annotation.IdRes;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.testutils.DrawableTestHelper;
import org.junit.Before;
import org.junit.Test;
@@ -33,9 +37,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.IdRes;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BatteryTipTest {
@@ -59,7 +60,7 @@
assertThat(preference.getTitle()).isEqualTo(TITLE);
assertThat(preference.getSummary()).isEqualTo(SUMMARY);
- assertThat(preference.getIcon()).isEqualTo(mContext.getDrawable(ICON_ID));
+ DrawableTestHelper.assertDrawableResId(preference.getIcon(), ICON_ID);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java
index f9e52d3..752e3ab 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java
@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge.batterytip.tips;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
index f0c202c..1ff21f8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge.batterytip.tips;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
index f623b9d..fe72113 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java
@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge.batterytip.tips;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
index dd3e281..317e426 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge.batterytip.tips;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java
index 4ca8757..221c37f 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTipTest.java
@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge.batterytip.tips;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
index 21b5047..59696ab 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.gestures;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
index 9793f7d..9946361 100644
--- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.gestures;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
index 459f5ef..20bf4e6 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java
@@ -17,9 +17,11 @@
package com.android.settings.gestures;
import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED;
+
import static com.android.settings.gestures.DoubleTapPowerPreferenceController.OFF;
import static com.android.settings.gestures.DoubleTapPowerPreferenceController.ON;
import static com.android.settings.gestures.DoubleTapPowerPreferenceController.isSuggestionComplete;
+
import static com.google.common.truth.Truth.assertThat;
import android.content.ContentResolver;
@@ -80,7 +82,7 @@
@Test
public void testIsChecked_configIsNotSet_shouldReturnTrue() {
// Set the setting to be enabled.
- Settings.System.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
+ Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, ON);
mController = new DoubleTapPowerPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
assertThat(mController.isChecked()).isTrue();
@@ -89,7 +91,7 @@
@Test
public void testIsChecked_configIsSet_shouldReturnFalse() {
// Set the setting to be disabled.
- Settings.System.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
+ Settings.Secure.putInt(mContentResolver, CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED, OFF);
mController = new DoubleTapPowerPreferenceController(mContext, KEY_DOUBLE_TAP_POWER);
assertThat(mController.isChecked()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
index a36dbf7..39792b4 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java
@@ -17,9 +17,10 @@
package com.android.settings.gestures;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
@@ -59,21 +60,21 @@
@Test
public void testIsChecked_configIsSet_shouldReturnTrue() {
// Set the setting to be enabled.
- when(mAmbientDisplayConfiguration.pulseOnDoubleTapEnabled(anyInt())).thenReturn(true);
+ when(mAmbientDisplayConfiguration.doubleTapGestureEnabled(anyInt())).thenReturn(true);
assertThat(mController.isChecked()).isTrue();
}
@Test
public void testIsChecked_configIsNotSet_shouldReturnFalse() {
- when(mAmbientDisplayConfiguration.pulseOnDoubleTapEnabled(anyInt())).thenReturn(false);
+ when(mAmbientDisplayConfiguration.doubleTapGestureEnabled(anyInt())).thenReturn(false);
assertThat(mController.isChecked()).isFalse();
}
@Test
public void isSuggestionCompleted_ambientDisplay_falseWhenNotVisited() {
- when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(true);
+ when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(true);
// No stored value in shared preferences if not visited yet.
final Context context = RuntimeEnvironment.application;
final SharedPreferences prefs =
@@ -85,7 +86,7 @@
@Test
public void isSuggestionCompleted_ambientDisplay_trueWhenVisited() {
- when(mAmbientDisplayConfiguration.pulseOnDoubleTapAvailable()).thenReturn(false);
+ when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(false);
final Context context = RuntimeEnvironment.application;
final SharedPreferences prefs =
new SuggestionFeatureProviderImpl(context).getSharedPrefs(context);
@@ -98,18 +99,6 @@
}
@Test
- public void canHandleClicks_falseWhenAlwaysOnEnabled() {
- when(mAmbientDisplayConfiguration.alwaysOnEnabled(anyInt())).thenReturn(true);
- assertThat(mController.canHandleClicks()).isFalse();
- }
-
- @Test
- public void canHandleClicks_trueWhenAlwaysOnDisabled() {
- when(mAmbientDisplayConfiguration.alwaysOnEnabled(anyInt())).thenReturn(false);
- assertThat(mController.canHandleClicks()).isTrue();
- }
-
- @Test
public void getAvailabilityStatus_aodNotSupported_UNSUPPORTED_ON_DEVICE() {
when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(false);
when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);
@@ -119,15 +108,6 @@
}
@Test
- public void getAvailabilityStatus_aodOn_DISABLED_DEPENDENT_SETTING() {
- when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(true);
- when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);
- final int availabilityStatus = mController.getAvailabilityStatus();
-
- assertThat(availabilityStatus).isEqualTo(DISABLED_DEPENDENT_SETTING);
- }
-
- @Test
public void getAvailabilityStatus_aodSupported_aodOff_AVAILABLE() {
when(mAmbientDisplayConfiguration.doubleTapSensorAvailable()).thenReturn(true);
when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
index 0ec5ae1..ae97336 100644
--- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.gestures;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -138,7 +139,7 @@
public void testIsChecked_configIsSet_shouldReturnTrue() {
// Set the setting to be enabled.
final Context context = RuntimeEnvironment.application;
- Settings.System.putInt(context.getContentResolver(),
+ Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 1);
mController = new DoubleTwistPreferenceController(context, KEY_DOUBLE_TWIST);
@@ -149,7 +150,7 @@
public void testIsChecked_configIsNotSet_shouldReturnFalse() {
// Set the setting to be disabled.
final Context context = RuntimeEnvironment.application;
- Settings.System.putInt(context.getContentResolver(),
+ Settings.Secure.putInt(context.getContentResolver(),
Settings.Secure.CAMERA_DOUBLE_TWIST_TO_FLIP_ENABLED, 0);
mController = new DoubleTwistPreferenceController(context, KEY_DOUBLE_TWIST);
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
index 61ac5ad..7d1eab3 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.gestures;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
@@ -26,6 +27,10 @@
import android.content.Context;
import android.os.Bundle;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.VideoPreference;
@@ -37,10 +42,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class GesturePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
index 9d58693..d8f800d 100644
--- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.gestures;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,6 +27,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -45,8 +48,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class GesturesSettingsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
index af0146b..e889d41 100644
--- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java
@@ -17,12 +17,11 @@
package com.android.settings.gestures;
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -62,7 +61,7 @@
@Test
public void testIsChecked_configIsSet_shouldReturnTrue() {
// Set the setting to be enabled.
- when(mAmbientDisplayConfiguration.pulseOnPickupEnabled(anyInt())).thenReturn(true);
+ when(mAmbientDisplayConfiguration.pickupGestureEnabled(anyInt())).thenReturn(true);
assertThat(mController.isChecked()).isTrue();
}
@@ -70,28 +69,12 @@
@Test
public void testIsChecked_configIsNotSet_shouldReturnFalse() {
// Set the setting to be disabled.
- when(mAmbientDisplayConfiguration.pulseOnPickupEnabled(anyInt())).thenReturn(false);
+ when(mAmbientDisplayConfiguration.pickupGestureEnabled(anyInt())).thenReturn(false);
assertThat(mController.isChecked()).isFalse();
}
@Test
- public void testCanHandleClicks_configIsSet_shouldReturnTrue() {
- mController = spy(mController);
- doReturn(true).when(mController).pulseOnPickupCanBeModified();
-
- assertThat(mController.canHandleClicks()).isTrue();
- }
-
- @Test
- public void testCanHandleClicks_configIsNotSet_shouldReturnFalse() {
- mController = spy(mController);
- doReturn(false).when(mController).pulseOnPickupCanBeModified();
-
- assertThat(mController.canHandleClicks()).isFalse();
- }
-
- @Test
public void isSuggestionCompleted_ambientDisplayPickup_trueWhenVisited() {
when(mContext.getResources().getBoolean(anyInt())).thenReturn(true);
when(mContext.getResources().getString(anyInt())).thenReturn("foo");
@@ -106,7 +89,7 @@
@Test
public void getAvailabilityStatus_aodNotSupported_UNSUPPORTED_ON_DEVICE() {
- when(mAmbientDisplayConfiguration.dozePulsePickupSensorAvailable()).thenReturn(false);
+ when(mAmbientDisplayConfiguration.dozePickupSensorAvailable()).thenReturn(false);
when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);
final int availabilityStatus = mController.getAvailabilityStatus();
@@ -114,17 +97,8 @@
}
@Test
- public void getAvailabilityStatus_aodOn_DISABLED_DEPENDENT_SETTING() {
- when(mAmbientDisplayConfiguration.dozePulsePickupSensorAvailable()).thenReturn(true);
- when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(false);
- final int availabilityStatus = mController.getAvailabilityStatus();
-
- assertThat(availabilityStatus).isEqualTo(DISABLED_DEPENDENT_SETTING);
- }
-
- @Test
public void getAvailabilityStatus_aodSupported_aodOff_AVAILABLE() {
- when(mAmbientDisplayConfiguration.dozePulsePickupSensorAvailable()).thenReturn(true);
+ when(mAmbientDisplayConfiguration.dozePickupSensorAvailable()).thenReturn(true);
when(mAmbientDisplayConfiguration.ambientDisplayAvailable()).thenReturn(true);
final int availabilityStatus = mController.getAvailabilityStatus();
diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
index d78880b..72865cf 100644
--- a/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PickupGestureSettingsTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016 The Android Open Source Project
+ * 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.
diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java
index a114719..9e83e05 100644
--- a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java
@@ -20,8 +20,11 @@
import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE;
import static android.provider.Settings.Secure.VOLUME_HUSH_OFF;
import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE;
+
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java
index d0a804f6..65c3b5d 100644
--- a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java
@@ -19,8 +19,11 @@
import static android.provider.Settings.Secure.VOLUME_HUSH_GESTURE;
import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE;
import static android.provider.Settings.Secure.VOLUME_HUSH_OFF;
+
import static com.google.common.truth.Truth.assertThat;
+
import static junit.framework.Assert.assertEquals;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -28,6 +31,9 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,9 +43,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PreventRingingPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
index 8522229..b2816b5 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.gestures;
import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -98,7 +100,7 @@
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
// Set the setting to be enabled.
final Context context = RuntimeEnvironment.application;
- Settings.System.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 1);
+ Settings.Secure.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 1);
mController = new SwipeToNotificationPreferenceController(context, KEY_SWIPE_DOWN);
assertThat(mController.isChecked()).isTrue();
@@ -110,7 +112,7 @@
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
// Set the setting to be disabled.
final Context context = RuntimeEnvironment.application;
- Settings.System.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 0);
+ Settings.Secure.putInt(context.getContentResolver(), SYSTEM_NAVIGATION_KEYS_ENABLED, 0);
mController = new SwipeToNotificationPreferenceController(context, KEY_SWIPE_DOWN);
assertThat(mController.isChecked()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java
index b140b52..1ce6d0a 100644
--- a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java
@@ -21,7 +21,9 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.ApplicationInfo;
import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
import com.android.internal.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -69,7 +71,14 @@
mContext.getString(com.android.internal.R.string.config_recentsComponentName));
final Intent quickStepIntent = new Intent(ACTION_QUICKSTEP)
.setPackage(recentsComponentName.getPackageName());
- mPackageManager.addResolveInfoForIntent(quickStepIntent, new ResolveInfo());
+ final ResolveInfo info = new ResolveInfo();
+ info.serviceInfo = new ServiceInfo();
+ info.resolvePackageName = recentsComponentName.getPackageName();
+ info.serviceInfo.packageName = info.resolvePackageName;
+ info.serviceInfo.name = recentsComponentName.getClassName();
+ info.serviceInfo.applicationInfo = new ApplicationInfo();
+ info.serviceInfo.applicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
+ mPackageManager.addResolveInfoForIntent(quickStepIntent, info);
assertThat(SwipeUpPreferenceController.isGestureAvailable(mContext)).isTrue();
}
@@ -121,7 +130,7 @@
@Test
public void isSliceableCorrectKey_returnsTrue() {
final SwipeUpPreferenceController controller =
- new SwipeUpPreferenceController(mContext,"gesture_swipe_up");
+ new SwipeUpPreferenceController(mContext, "gesture_swipe_up");
assertThat(controller.isSliceable()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java
new file mode 100644
index 0000000..c6249fb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGesturePreferenceControllerTest.java
@@ -0,0 +1,101 @@
+/*
+ * 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.gestures;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class WakeLockScreenGesturePreferenceControllerTest {
+
+ private static final String KEY_WAKE_LOCK_SCREEN = "gesture_wake_lock_screen";
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Context mContext;
+ @Mock
+ private AmbientDisplayConfiguration mAmbientDisplayConfiguration;
+
+ private WakeLockScreenGesturePreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mController = new WakeLockScreenGesturePreferenceController(mContext, KEY_WAKE_LOCK_SCREEN);
+ mController.setConfig(mAmbientDisplayConfiguration);
+ }
+
+ @Test
+ public void testIsChecked_configIsSet_shouldReturnTrue() {
+ // Set the setting to be enabled.
+ when(mAmbientDisplayConfiguration.wakeLockScreenGestureEnabled(anyInt())).thenReturn(true);
+ assertThat(mController.isChecked()).isTrue();
+ }
+
+ @Test
+ public void testIsChecked_configIsNotSet_shouldReturnFalse() {
+ // Set the setting to be disabled.
+ when(mAmbientDisplayConfiguration.wakeLockScreenGestureEnabled(anyInt())).thenReturn(false);
+ assertThat(mController.isChecked()).isFalse();
+ }
+
+ @Test
+ public void getAvailabilityStatus_gestureNotSupported_UNSUPPORTED_ON_DEVICE() {
+ when(mAmbientDisplayConfiguration.wakeLockScreenGestureAvailable()).thenReturn(false);
+ final int availabilityStatus = mController.getAvailabilityStatus();
+
+ assertThat(availabilityStatus).isEqualTo(UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_gestureSupported_AVAILABLE() {
+ when(mAmbientDisplayConfiguration.wakeLockScreenGestureAvailable()).thenReturn(true);
+ final int availabilityStatus = mController.getAvailabilityStatus();
+
+ assertThat(availabilityStatus).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void isSliceableCorrectKey_returnsTrue() {
+ final WakeLockScreenGesturePreferenceController controller =
+ new WakeLockScreenGesturePreferenceController(mContext, KEY_WAKE_LOCK_SCREEN);
+ assertThat(controller.isSliceable()).isTrue();
+ }
+
+ @Test
+ public void isSliceableIncorrectKey_returnsFalse() {
+ final WakeLockScreenGesturePreferenceController controller =
+ new WakeLockScreenGesturePreferenceController(mContext, "bad_key");
+ assertThat(controller.isSliceable()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java
new file mode 100644
index 0000000..0cd777d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/WakeLockScreenGestureSettingsTest.java
@@ -0,0 +1,51 @@
+/*
+ * 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.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class WakeLockScreenGestureSettingsTest {
+
+ private WakeLockScreenGestureSettings mSettings;
+
+ @Before
+ public void setUp() {
+ mSettings = new WakeLockScreenGestureSettings();
+ }
+
+ @Test
+ public void testSearchIndexProvider_shouldIndexResource() {
+ final List<SearchIndexableResource> indexRes =
+ WakeLockScreenGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+ RuntimeEnvironment.application, true /* enabled */);
+
+ assertThat(indexRes).isNotNull();
+ assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java
new file mode 100644
index 0000000..0af4540
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/WakeScreenGesturePreferenceControllerTest.java
@@ -0,0 +1,101 @@
+/*
+ * 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.gestures;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import com.android.internal.hardware.AmbientDisplayConfiguration;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class WakeScreenGesturePreferenceControllerTest {
+
+ private static final String KEY_WAKE_SCREEN = "gesture_wake_screen";
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private Context mContext;
+ @Mock
+ private AmbientDisplayConfiguration mAmbientDisplayConfiguration;
+
+ private WakeScreenGesturePreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mController = new WakeScreenGesturePreferenceController(mContext, KEY_WAKE_SCREEN);
+ mController.setConfig(mAmbientDisplayConfiguration);
+ }
+
+ @Test
+ public void testIsChecked_configIsSet_shouldReturnTrue() {
+ // Set the setting to be enabled.
+ when(mAmbientDisplayConfiguration.wakeScreenGestureEnabled(anyInt())).thenReturn(true);
+ assertThat(mController.isChecked()).isTrue();
+ }
+
+ @Test
+ public void testIsChecked_configIsNotSet_shouldReturnFalse() {
+ // Set the setting to be disabled.
+ when(mAmbientDisplayConfiguration.wakeScreenGestureEnabled(anyInt())).thenReturn(false);
+ assertThat(mController.isChecked()).isFalse();
+ }
+
+ @Test
+ public void getAvailabilityStatus_gestureNotSupported_UNSUPPORTED_ON_DEVICE() {
+ when(mAmbientDisplayConfiguration.wakeScreenGestureAvailable()).thenReturn(false);
+ final int availabilityStatus = mController.getAvailabilityStatus();
+
+ assertThat(availabilityStatus).isEqualTo(UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_gestureSupported_AVAILABLE() {
+ when(mAmbientDisplayConfiguration.wakeScreenGestureAvailable()).thenReturn(true);
+ final int availabilityStatus = mController.getAvailabilityStatus();
+
+ assertThat(availabilityStatus).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void isSliceableCorrectKey_returnsTrue() {
+ final WakeScreenGesturePreferenceController controller =
+ new WakeScreenGesturePreferenceController(mContext, "gesture_wake_screen");
+ assertThat(controller.isSliceable()).isTrue();
+ }
+
+ @Test
+ public void isSliceableIncorrectKey_returnsFalse() {
+ final WakeScreenGesturePreferenceController controller =
+ new WakeScreenGesturePreferenceController(mContext, "bad_key");
+ assertThat(controller.isSliceable()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java
new file mode 100644
index 0000000..1d7e225
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/WakeScreenGestureSettingsTest.java
@@ -0,0 +1,51 @@
+/*
+ * 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.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class WakeScreenGestureSettingsTest {
+
+ private WakeScreenGestureSettings mSettings;
+
+ @Before
+ public void setUp() {
+ mSettings = new WakeScreenGestureSettings();
+ }
+
+ @Test
+ public void testSearchIndexProvider_shouldIndexResource() {
+ final List<SearchIndexableResource> indexRes =
+ WakeScreenGestureSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+ RuntimeEnvironment.application, true /* enabled */);
+
+ assertThat(indexRes).isNotNull();
+ assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
new file mode 100644
index 0000000..f122819
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.homepage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.shadows.ShadowActivity;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SettingsHomepageActivityTest {
+
+ @Test
+ public void launch_featureFlagOff_shouldRedirectToSettingsActivity() {
+ FeatureFlagUtils.setEnabled(RuntimeEnvironment.application, FeatureFlags.DYNAMIC_HOMEPAGE,
+ false);
+
+ final ShadowActivity shadowActivity = Shadows.shadowOf(
+ Robolectric.setupActivity(SettingsHomepageActivity.class));
+ assertThat(shadowActivity.getNextStartedActivity().getComponent().getClassName())
+ .isEqualTo(SettingsActivity.class.getName());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
new file mode 100644
index 0000000..83ab948
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
@@ -0,0 +1,49 @@
+/*
+ * 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.homepage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class TopLevelSettingsTest {
+ private Context mContext;
+ private TopLevelSettings mSettings;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mSettings = spy(new TopLevelSettings());
+ when(mSettings.getContext()).thenReturn(mContext);
+ }
+
+ @Test
+ public void shouldForceRoundedIcon_true() {
+ assertThat(mSettings.shouldForceRoundedIcon()).isTrue();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java
new file mode 100644
index 0000000..0ffabb4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardContentProviderTest.java
@@ -0,0 +1,266 @@
+/*
+ * 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.homepage.contextualcards;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowThreadUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowThreadUtils.class)
+public class CardContentProviderTest {
+
+ private Context mContext;
+ private CardContentProvider mProvider;
+ private ContentResolver mResolver;
+ private Uri mUri;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mProvider = spy(Robolectric.setupContentProvider(CardContentProvider.class));
+ mResolver = mContext.getContentResolver();
+ mUri = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(CardContentProvider.CARD_AUTHORITY)
+ .path(CardDatabaseHelper.CARD_TABLE)
+ .build();
+ }
+
+ @After
+ public void cleanUp() {
+ ShadowThreadUtils.reset();
+ CardDatabaseHelper.getInstance(mContext).close();
+ CardDatabaseHelper.sCardDatabaseHelper = null;
+ }
+
+ @Test
+ public void cardData_insert() {
+ final int rowsBeforeInsert = getRowCount();
+ mResolver.insert(mUri, generateOneRow());
+ final int rowsAfterInsert = getRowCount();
+
+ assertThat(rowsAfterInsert - rowsBeforeInsert).isEqualTo(1);
+ }
+
+ @Test
+ public void cardData_bulkInsert_twoRows() {
+ final int rowsBeforeInsert = getRowCount();
+ mResolver.bulkInsert(mUri, generateTwoRows());
+ final int rowsAfterInsert = getRowCount();
+
+ assertThat(rowsAfterInsert - rowsBeforeInsert).isEqualTo(2);
+ }
+
+ @Test
+ public void cardData_query() {
+ mResolver.insert(mUri, generateOneRow());
+ final int count = getRowCount();
+
+ assertThat(count).isGreaterThan(0);
+ }
+
+ @Test
+ public void cardData_delete() {
+ mResolver.insert(mUri, generateOneRow());
+ final int delCount = mResolver.delete(mUri, null, null);
+
+ assertThat(delCount).isGreaterThan(0);
+ }
+
+ @Test
+ public void cardData_update() {
+ mResolver.insert(mUri, generateOneRow());
+
+ final double updatingScore = 0.87;
+ final ContentValues values = new ContentValues();
+ values.put(CardDatabaseHelper.CardColumns.SCORE, updatingScore);
+ final String strWhere = CardDatabaseHelper.CardColumns.NAME + "=?";
+ final String[] selectionArgs = {"auto_rotate"};
+ final int updateCount = mResolver.update(mUri, values, strWhere, selectionArgs);
+
+ assertThat(updateCount).isGreaterThan(0);
+
+ final String[] columns = {CardDatabaseHelper.CardColumns.SCORE};
+ final Cursor cr = mResolver.query(mUri, columns, strWhere, selectionArgs, null);
+ cr.moveToFirst();
+ final double qryScore = cr.getDouble(0);
+
+ cr.close();
+ assertThat(qryScore).isEqualTo(updatingScore);
+ }
+
+ @Test
+ public void insert_isMainThread_shouldEnableStrictMode() {
+ ShadowThreadUtils.setIsMainThread(true);
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", true);
+
+ mProvider.insert(mUri, generateOneRow());
+
+ verify(mProvider).enableStrictMode();
+ }
+
+ @Test
+ public void query_isMainThread_shouldEnableStrictMode() {
+ ShadowThreadUtils.setIsMainThread(true);
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", true);
+
+ mProvider.query(mUri, null, null, null);
+
+ verify(mProvider).enableStrictMode();
+ }
+
+ @Test
+ public void delete_isMainThread_shouldEnableStrictMode() {
+ ShadowThreadUtils.setIsMainThread(true);
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", true);
+
+ mProvider.delete(mUri, null, null);
+
+ verify(mProvider).enableStrictMode();
+ }
+
+ @Test
+ public void update_isMainThread_shouldEnableStrictMode() {
+ ShadowThreadUtils.setIsMainThread(true);
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", true);
+ final ContentValues values = new ContentValues();
+ values.put(CardDatabaseHelper.CardColumns.SCORE, "0.01");
+
+ mProvider.update(mUri, values, null, null);
+
+ verify(mProvider).enableStrictMode();
+ }
+
+ @Test
+ public void insert_notMainThread_shouldNotEnableStrictMode() {
+ ShadowThreadUtils.setIsMainThread(false);
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", true);
+
+ mProvider.insert(mUri, generateOneRow());
+
+ verify(mProvider, never()).enableStrictMode();
+ }
+
+ @Test
+ public void query_notMainThread_shouldNotEnableStrictMode() {
+ ShadowThreadUtils.setIsMainThread(false);
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", true);
+
+ mProvider.query(mUri, null, null, null);
+
+ verify(mProvider, never()).enableStrictMode();
+ }
+
+ @Test
+ public void delete_notMainThread_shouldNotEnableStrictMode() {
+ ShadowThreadUtils.setIsMainThread(false);
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", true);
+
+ mProvider.delete(mUri, null, null);
+
+ verify(mProvider, never()).enableStrictMode();
+ }
+
+ @Test
+ public void update_notMainThread_shouldNotEnableStrictMode() {
+ ShadowThreadUtils.setIsMainThread(false);
+ ReflectionHelpers.setStaticField(Build.class, "IS_DEBUGGABLE", true);
+ final ContentValues values = new ContentValues();
+ values.put(CardDatabaseHelper.CardColumns.SCORE, "0.01");
+
+ mProvider.update(mUri, values, null, null);
+
+ verify(mProvider, never()).enableStrictMode();
+ }
+
+ @Test(expected = UnsupportedOperationException.class)
+ public void getType_shouldCrash() {
+ mProvider.getType(null);
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void invalid_Uri_shouldCrash() {
+ final Uri invalid_Uri = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(CardContentProvider.CARD_AUTHORITY)
+ .path("Invalid_table")
+ .build();
+
+ mProvider.getTableFromMatch(invalid_Uri);
+ }
+
+ private ContentValues generateOneRow() {
+ final ContentValues values = new ContentValues();
+ values.put(CardDatabaseHelper.CardColumns.NAME, "auto_rotate");
+ values.put(CardDatabaseHelper.CardColumns.TYPE, 1);
+ values.put(CardDatabaseHelper.CardColumns.SCORE, 0.9);
+ values.put(CardDatabaseHelper.CardColumns.SLICE_URI,
+ "content://com.android.settings.slices/action/auto_rotate");
+ values.put(CardDatabaseHelper.CardColumns.CATEGORY, 2);
+ values.put(CardDatabaseHelper.CardColumns.PACKAGE_NAME, "com.android.settings");
+ values.put(CardDatabaseHelper.CardColumns.APP_VERSION, 10001);
+
+ return values;
+ }
+
+ private ContentValues[] generateTwoRows() {
+ final ContentValues[] twoRows = new ContentValues[2];
+ twoRows[0] = generateOneRow();
+
+ final ContentValues values = new ContentValues();
+ values.put(CardDatabaseHelper.CardColumns.NAME, "toggle_airplane");
+ values.put(CardDatabaseHelper.CardColumns.TYPE, 1);
+ values.put(CardDatabaseHelper.CardColumns.SCORE, 0.95);
+ values.put(CardDatabaseHelper.CardColumns.SLICE_URI,
+ "content://com.android.settings.slices/action/toggle_airplane");
+ values.put(CardDatabaseHelper.CardColumns.CATEGORY, 2);
+ values.put(CardDatabaseHelper.CardColumns.PACKAGE_NAME, "com.android.settings");
+ values.put(CardDatabaseHelper.CardColumns.APP_VERSION, 10001);
+ twoRows[1] = values;
+
+ return twoRows;
+ }
+
+ private int getRowCount() {
+ final Cursor cr = mResolver.query(mUri, null, null, null);
+ final int count = cr.getCount();
+ cr.close();
+ return count;
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java
new file mode 100644
index 0000000..b25508b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java
@@ -0,0 +1,83 @@
+/*
+ * 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.homepage.contextualcards;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class CardDatabaseHelperTest {
+
+ private Context mContext;
+ private CardDatabaseHelper mCardDatabaseHelper;
+ private SQLiteDatabase mDatabase;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mCardDatabaseHelper = CardDatabaseHelper.getInstance(mContext);
+ mDatabase = mCardDatabaseHelper.getWritableDatabase();
+ }
+
+ @After
+ public void cleanUp() {
+ CardDatabaseHelper.getInstance(mContext).close();
+ CardDatabaseHelper.sCardDatabaseHelper = null;
+ }
+
+ @Test
+ public void testDatabaseSchema() {
+ final Cursor cursor = mDatabase.rawQuery("SELECT * FROM " + CardDatabaseHelper.CARD_TABLE,
+ null);
+ final String[] columnNames = cursor.getColumnNames();
+
+ final String[] expectedNames = {
+ CardDatabaseHelper.CardColumns.NAME,
+ CardDatabaseHelper.CardColumns.TYPE,
+ CardDatabaseHelper.CardColumns.SCORE,
+ CardDatabaseHelper.CardColumns.SLICE_URI,
+ CardDatabaseHelper.CardColumns.CATEGORY,
+ CardDatabaseHelper.CardColumns.LOCALIZED_TO_LOCALE,
+ CardDatabaseHelper.CardColumns.PACKAGE_NAME,
+ CardDatabaseHelper.CardColumns.APP_VERSION,
+ CardDatabaseHelper.CardColumns.TITLE_RES_NAME,
+ CardDatabaseHelper.CardColumns.TITLE_TEXT,
+ CardDatabaseHelper.CardColumns.SUMMARY_RES_NAME,
+ CardDatabaseHelper.CardColumns.SUMMARY_TEXT,
+ CardDatabaseHelper.CardColumns.ICON_RES_NAME,
+ CardDatabaseHelper.CardColumns.ICON_RES_ID,
+ CardDatabaseHelper.CardColumns.CARD_ACTION,
+ CardDatabaseHelper.CardColumns.EXPIRE_TIME_MS,
+ CardDatabaseHelper.CardColumns.SUPPORT_HALF_WIDTH,
+ CardDatabaseHelper.CardColumns.CARD_DISMISSED,
+ };
+
+ assertThat(columnNames).isEqualTo(expectedNames);
+ cursor.close();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ConditionalContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ConditionalContextualCardTest.java
new file mode 100644
index 0000000..2cff9f2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ConditionalContextualCardTest.java
@@ -0,0 +1,42 @@
+/*
+ * 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.homepage.contextualcards;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ConditionalContextualCardTest {
+
+ @Test(expected = IllegalArgumentException.class)
+ public void newInstance_changeCardType_shouldCrash() {
+ new ConditionalContextualCard.Builder()
+ .setCardType(ContextualCard.CardType.SUGGESTION)
+ .build();
+ }
+
+ @Test
+ public void getCardType_shouldAlwaysBeConditional() {
+ assertThat(new ConditionalContextualCard.Builder().build().getCardType())
+ .isEqualTo(ContextualCard.CardType.CONDITIONAL);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
new file mode 100644
index 0000000..e98e36f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.homepage.contextualcards;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.net.Uri;
+
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowContentResolver;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ContextualCardLoaderTest {
+
+ private Context mContext;
+ private ContextualCardLoader mContextualCardLoader;
+ private SettingsSliceProvider mProvider;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mContextualCardLoader = new ContextualCardLoader(mContext);
+ mProvider = new SettingsSliceProvider();
+ ShadowContentResolver.registerProviderInternal(SettingsSliceProvider.SLICE_AUTHORITY,
+ mProvider);
+ }
+
+ @Test
+ public void createStaticCards_shouldContainCorrectCards() {
+ final Uri batteryInfo = BatterySlice.BATTERY_CARD_URI;
+ final List<Uri> expectedUris = Arrays.asList(batteryInfo);
+
+ final List<Uri> actualCardUris = mContextualCardLoader.createStaticCards().stream().map(
+ ContextualCard::getSliceUri).collect(Collectors.toList());
+
+ assertThat(actualCardUris).containsExactlyElementsIn(expectedUris);
+ }
+
+ @Test
+ public void isCardEligibleToDisplay_customCard_returnTrue() {
+ final ContextualCard customCard = new ContextualCard.Builder()
+ .setName("custom_card")
+ .setCardType(ContextualCard.CardType.DEFAULT)
+ .setTitleText("custom_title")
+ .setSummaryText("custom_summary")
+ .build();
+
+ assertThat(mContextualCardLoader.isCardEligibleToDisplay(customCard)).isTrue();
+ }
+
+ @Test
+ public void isCardEligibleToDisplay_invalidScheme_returnFalse() {
+ final String sliceUri = "contet://com.android.settings.slices/action/flashlight";
+
+ assertThat(
+ mContextualCardLoader.isCardEligibleToDisplay(
+ getContextualCard(sliceUri))).isFalse();
+ }
+
+ @Test
+ public void isCardEligibleToDisplay_noProvider_returnFalse() {
+ final String sliceUri = "content://com.android.settings.test.slices/action/flashlight";
+
+ assertThat(
+ mContextualCardLoader.isCardEligibleToDisplay(
+ getContextualCard(sliceUri))).isFalse();
+ }
+
+ private ContextualCard getContextualCard(String sliceUri) {
+ return new ContextualCard.Builder()
+ .setName("test_card")
+ .setCardType(ContextualCard.CardType.SLICE)
+ .setSliceUri(Uri.parse(sliceUri))
+ .build();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java
new file mode 100644
index 0000000..8b541c6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/SettingsContextualCardProviderTest.java
@@ -0,0 +1,81 @@
+/*
+ * 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.homepage.contextualcards;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentResolver;
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.android.settings.intelligence.ContextualCardProto.ContextualCard;
+import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.wifi.WifiSlice;
+
+import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardCategory;
+import com.google.android.settings.intelligence.libs.contextualcards.ContextualCardProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SettingsContextualCardProviderTest {
+
+ private ContentResolver mResolver;
+ private Uri mUri;
+ private SettingsContextualCardProvider mProvider;
+
+ @Before
+ public void setUp() {
+ mResolver = RuntimeEnvironment.application.getContentResolver();
+ mUri = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsContextualCardProvider.CARD_AUTHORITY)
+ .build();
+ mProvider = Robolectric.setupContentProvider(SettingsContextualCardProvider.class);
+ }
+
+ @Test
+ public void contentProviderCall_returnCorrectSize() throws Exception {
+ final int actualNo = mProvider.getContextualCards().getCardCount();
+
+ final Bundle returnValue =
+ mResolver.call(mUri, ContextualCardProvider.METHOD_GET_CARD_LIST, "", null);
+ final ContextualCardList cards =
+ ContextualCardList.parseFrom(
+ returnValue.getByteArray(ContextualCardProvider.BUNDLE_CARD_LIST));
+ assertThat(cards.getCardCount()).isEqualTo(actualNo);
+ }
+
+ @Test
+ public void getContextualCards_wifiSlice_shouldGetCorrectCategory() {
+ final ContextualCardList cards = mProvider.getContextualCards();
+ ContextualCard wifiCard = null;
+ for (ContextualCard card : cards.getCardList()) {
+ if (card.getSliceUri().equals(WifiSlice.WIFI_URI.toString())) {
+ wifiCard = card;
+ }
+ }
+
+ assertThat(wifiCard.getCategory()).isEqualTo(ContextualCardCategory.IMPORTANT);
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
similarity index 62%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
index c72131f..d27e024 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionControllerBaseTest.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
import android.content.Context;
import android.content.Intent;
-import android.graphics.drawable.Drawable;
import android.media.AudioManager;
+import com.android.settings.homepage.contextualcards.ContextualCard;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,7 +34,7 @@
import org.robolectric.RuntimeEnvironment;
@RunWith(SettingsRobolectricTestRunner.class)
-public class AbnormalRingerConditionBaseTest {
+public class AbnormalRingerConditionControllerBaseTest {
@Mock
private ConditionManager mConditionManager;
@@ -46,53 +46,44 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- when(mConditionManager.getContext()).thenReturn(mContext);
- mCondition = new TestCondition(mConditionManager);
+
+ mCondition = new TestCondition(mContext, mConditionManager);
}
@Test
- public void newInstance_shouldMonitorRingerStateChangeBroadcast() {
+ public void startMonitor_shouldMonitorRingerStateChangeBroadcast() {
final Intent broadcast1 = new Intent("foo.bar.action");
final Intent broadcast2 = new Intent(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);
+ mCondition.startMonitoringStateChange();
+
mContext.sendBroadcast(broadcast1);
- assertThat(mCondition.mRefreshCalled).isFalse();
+ verify(mConditionManager, never()).onConditionChanged();
mContext.sendBroadcast(broadcast2);
- assertThat(mCondition.mRefreshCalled).isTrue();
+ verify(mConditionManager).onConditionChanged();
}
- private static class TestCondition extends AbnormalRingerConditionBase {
- private boolean mRefreshCalled;
+ private static class TestCondition extends AbnormalRingerConditionController {
- TestCondition(ConditionManager manager) {
- super(manager);
+ public TestCondition(Context appContext, ConditionManager conditionManager) {
+ super(appContext, conditionManager);
}
- @Override
- public void refreshState() {
- mRefreshCalled = true;
- }
@Override
- public int getMetricsConstant() {
+ public long getId() {
return 0;
}
@Override
- public Drawable getIcon() {
- return null;
+ public boolean isDisplayable() {
+ return false;
}
@Override
- public CharSequence getTitle() {
- return null;
+ public ContextualCard buildContextualCard() {
+ return new ConditionalContextualCard.Builder().build();
}
-
- @Override
- public CharSequence getSummary() {
- return null;
- }
-
}
}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java
new file mode 100644
index 0000000..a962bc1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionControllerTest.java
@@ -0,0 +1,75 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.net.NetworkPolicyManager;
+
+import com.android.settings.Settings;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowApplication;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class BackgroundDataConditionControllerTest {
+
+ @Mock
+ private ConditionManager mConditionManager;
+ @Mock
+ private NetworkPolicyManager mNetworkPolicyManager;
+ private Activity mActivity;
+ private BackgroundDataConditionController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ ShadowApplication.getInstance().setSystemService(Context.NETWORK_POLICY_SERVICE,
+ mNetworkPolicyManager);
+ mActivity = Robolectric.setupActivity(Activity.class);
+ mController = new BackgroundDataConditionController(mActivity, mConditionManager);
+ }
+
+ @Test
+ public void onPrimaryClick_shouldReturn2SummaryActivity() {
+ final ComponentName componentName =
+ new ComponentName(mActivity, Settings.DataUsageSummaryActivity.class);
+
+ mController.onPrimaryClick(mActivity);
+
+ final ShadowActivity shadowActivity = Shadow.extract(mActivity);
+ assertThat(shadowActivity.getNextStartedActivity().getComponent()).isEqualTo(componentName);
+ }
+
+ @Test
+ public void onActionClick_shouldRefreshCondition() {
+ mController.onActionClick();
+ verify(mConditionManager).onConditionChanged();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/BatterySaverConditionTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java
similarity index 60%
rename from tests/robotests/src/com/android/settings/dashboard/conditional/BatterySaverConditionTest.java
rename to tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java
index fa05ae0..d28ab0f 100644
--- a/tests/robotests/src/com/android/settings/dashboard/conditional/BatterySaverConditionTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java
@@ -14,19 +14,18 @@
* limitations under the License.
*/
-package com.android.settings.dashboard.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Matchers.any;
+
+import static org.mockito.ArgumentMatchers.any;
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.IntentFilter;
import android.os.PowerManager;
-import com.android.settings.R;
import com.android.settings.fuelgauge.BatterySaverReceiver;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -40,63 +39,49 @@
import org.robolectric.shadows.ShadowPowerManager;
@RunWith(SettingsRobolectricTestRunner.class)
-public class BatterySaverConditionTest {
+public class BatterySaverConditionControllerTest {
@Mock
private ConditionManager mConditionManager;
private ShadowPowerManager mPowerManager;
private Context mContext;
- private BatterySaverCondition mCondition;
+ private BatterySaverConditionController mController;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
mPowerManager = Shadows.shadowOf(mContext.getSystemService(PowerManager.class));
- when(mConditionManager.getContext()).thenReturn(mContext);
- mCondition = spy(new BatterySaverCondition(mConditionManager));
+ mController = new BatterySaverConditionController(mContext, mConditionManager);
}
@Test
- public void verifyText() {
- assertThat(mCondition.getTitle()).isEqualTo(
- mContext.getText(R.string.condition_battery_title));
- assertThat(mCondition.getSummary()).isEqualTo(
- mContext.getText(R.string.condition_battery_summary));
- assertThat(mCondition.getActions()[0]).isEqualTo(
- mContext.getText(R.string.condition_turn_off));
- }
-
- @Test
- public void onResume_shouldRegisterReceiver() {
- mCondition.onResume();
+ public void startMonitor_shouldRegisterReceiver() {
+ mController.startMonitoringStateChange();
verify(mContext).registerReceiver(any(BatterySaverReceiver.class), any(IntentFilter.class));
}
@Test
- public void onPause_shouldUnregisterReceiver() {
- mCondition.onResume();
- mCondition.onPause();
+ public void stopMonitor_shouldUnregisterReceiver() {
+ mController.startMonitoringStateChange();
+ mController.stopMonitoringStateChange();
verify(mContext).unregisterReceiver(any(BatterySaverReceiver.class));
}
@Test
- public void refreshState_PowerSaverOn_shouldActivate() {
+ public void isDisplayable_PowerSaverOn_true() {
mPowerManager.setIsPowerSaveMode(true);
- mCondition.refreshState();
-
- assertThat(mCondition.isActive()).isTrue();
+ assertThat(mController.isDisplayable()).isTrue();
}
@Test
- public void refreshState_PowerSaverOff_shouldNotActivate() {
+ public void isDisplayable_PowerSaverOff_false() {
mPowerManager.setIsPowerSaveMode(false);
- mCondition.refreshState();
-
- assertThat(mCondition.isActive()).isFalse();
+ assertThat(mController.isDisplayable()).isFalse();
}
+
}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java
new file mode 100644
index 0000000..ab82a54
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardControllerTest.java
@@ -0,0 +1,98 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ConditionContextualCardControllerTest {
+
+ @Mock
+ private ConditionManager mConditionManager;
+ @Mock
+ private ContextualCardUpdateListener mListener;
+ private Context mContext;
+ private ConditionContextualCardController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+ mController = spy(new ConditionContextualCardController(mContext));
+ ReflectionHelpers.setField(mController, "mConditionManager", mConditionManager);
+ }
+
+ @Test
+ public void onStart_shouldStartMonitoring() {
+ mController.onStart();
+
+ verify(mConditionManager).startMonitoringStateChange();
+ }
+
+ @Test
+ public void onStop_shouldStopMonitoring() {
+ mController.onStop();
+
+ verify(mConditionManager).stopMonitoringStateChange();
+ }
+
+ @Test
+ public void onConditionsChanged_listenerIsSet_shouldUpdateData() {
+ final ContextualCard fakeConditionalCard = new ConditionalContextualCard.Builder().build();
+ final List<ContextualCard> conditionalCards = new ArrayList<>();
+ conditionalCards.add(fakeConditionalCard);
+ when(mConditionManager.getDisplayableCards()).thenReturn(conditionalCards);
+ mController.setCardUpdateListener(mListener);
+
+ mController.onConditionsChanged();
+
+ verify(mListener).onContextualCardUpdated(any());
+ }
+
+ @Test
+ public void onConditionsChanged_listenerNotSet_shouldNotUpdateData() {
+ final ContextualCard fakeConditionalCard = new ConditionalContextualCard.Builder().build();
+ final List<ContextualCard> conditionalCards = new ArrayList<>();
+ conditionalCards.add(fakeConditionalCard);
+ when(mConditionManager.getDisplayableCards()).thenReturn(conditionalCards);
+
+ mController.onConditionsChanged();
+
+ verify(mListener, never()).onContextualCardUpdated(any());
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java
new file mode 100644
index 0000000..ccfbbfb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRendererTest.java
@@ -0,0 +1,110 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+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;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ControllerRendererPool;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ConditionContextualCardRendererTest {
+
+ @Mock
+ private ControllerRendererPool mControllerRendererPool;
+ @Mock
+ private ConditionContextualCardController mController;
+ private Context mContext;
+ private ConditionContextualCardRenderer mRenderer;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+ mRenderer = new ConditionContextualCardRenderer(mContext, mControllerRendererPool);
+ }
+
+ @Test
+ public void bindView_shouldSetListener() {
+ final int viewType = mRenderer.getViewType();
+ final RecyclerView recyclerView = new RecyclerView(mContext);
+ recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
+ final View view = LayoutInflater.from(mContext).inflate(viewType, recyclerView, false);
+ final RecyclerView.ViewHolder viewHolder = mRenderer.createViewHolder(view);
+ final View card = view.findViewById(R.id.content);
+ when(mControllerRendererPool.getController(mContext,
+ ContextualCard.CardType.CONDITIONAL)).thenReturn(mController);
+
+ mRenderer.bindView(viewHolder, buildConditionContextualCard());
+
+ assertThat(card).isNotNull();
+ assertThat(card.hasOnClickListeners()).isTrue();
+ }
+
+ @Test
+ public void viewClick_shouldInvokeControllerPrimaryClick() {
+ final int viewType = mRenderer.getViewType();
+ final RecyclerView recyclerView = new RecyclerView(mContext);
+ recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
+ final View view = LayoutInflater.from(mContext).inflate(viewType, recyclerView, false);
+ final RecyclerView.ViewHolder viewHolder = mRenderer.createViewHolder(view);
+ final View card = view.findViewById(R.id.content);
+ when(mControllerRendererPool.getController(mContext,
+ ContextualCard.CardType.CONDITIONAL)).thenReturn(mController);
+
+ mRenderer.bindView(viewHolder, buildConditionContextualCard());
+
+ assertThat(card).isNotNull();
+ card.performClick();
+
+ verify(mController).onPrimaryClick(any(ContextualCard.class));
+ }
+
+ private ContextualCard buildConditionContextualCard() {
+ return new ConditionalContextualCard.Builder()
+ .setConditionId(123)
+ .setMetricsConstant(1)
+ .setActionText("test_action")
+ .setName("test_name")
+ .setTitleText("test_title")
+ .setSummaryText("test_summary")
+ .setIconDrawable(mContext.getDrawable(R.drawable.ic_do_not_disturb_on_24dp))
+ .setIsHalfWidth(true)
+ .build();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
new file mode 100644
index 0000000..e8d5caa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
@@ -0,0 +1,132 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ConditionManagerTest {
+
+ private static final long ID = 123L;
+
+ @Mock
+ private ConditionalCardController mController;
+ @Mock
+ private ConditionListener mConditionListener;
+
+ private Context mContext;
+ private ConditionManager mManager;
+
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mManager = spy(new ConditionManager(mContext, mConditionListener));
+
+ when(mController.getId()).thenReturn(ID);
+ when(mController.buildContextualCard()).thenReturn(
+ new ConditionalContextualCard.Builder()
+ .build());
+ mManager.mCardControllers.clear();
+ mManager.mCardControllers.add(mController);
+ }
+
+ @Test
+ public void getDisplayableCards_nothingDisplayable() {
+ assertThat(mManager.getDisplayableCards()).isEmpty();
+ }
+
+ @Test
+ public void getDisplayableCards_hasDisplayable() {
+ when(mController.isDisplayable()).thenReturn(true);
+
+ assertThat(mManager.getDisplayableCards()).hasSize(1);
+ }
+
+ @Test
+ public void onPrimaryClick_shouldRelayToController() {
+ mManager.onPrimaryClick(mContext, ID);
+
+ verify(mController).onPrimaryClick(mContext);
+ }
+
+ @Test
+ public void onActionClick_shouldRelayToController() {
+ mManager.onActionClick(ID);
+
+ verify(mController).onActionClick();
+ }
+
+ @Test
+ public void startMonitoringStateChange_multipleTimes_shouldRegisterOnce() {
+ final int loopCount = 10;
+ for (int i = 0; i < loopCount; i++) {
+ mManager.startMonitoringStateChange();
+ }
+
+ verify(mController).startMonitoringStateChange();
+ verify(mManager, times(loopCount)).onConditionChanged();
+ }
+
+ @Test
+ public void stopMonitoringStateChange_beforeStart_shouldDoNothing() {
+ mManager.stopMonitoringStateChange();
+ mManager.stopMonitoringStateChange();
+ mManager.stopMonitoringStateChange();
+
+ verify(mController, never()).startMonitoringStateChange();
+ verify(mController, never()).stopMonitoringStateChange();
+ }
+
+ @Test
+ public void stopMonitoringStateChange_multipleTimes_shouldUnregisterOnce() {
+ mManager.startMonitoringStateChange();
+
+ mManager.stopMonitoringStateChange();
+ mManager.stopMonitoringStateChange();
+ mManager.stopMonitoringStateChange();
+
+ verify(mController).startMonitoringStateChange();
+ verify(mController).stopMonitoringStateChange();
+ }
+
+ @Test
+ public void onConditionChanged_shouldNotifyListener() {
+ mManager.onConditionChanged();
+
+ verify(mConditionListener).onConditionsChanged();
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java
new file mode 100644
index 0000000..9eb6145
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/DndConditionalCardControllerTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class DndConditionalCardControllerTest {
+
+ @Mock
+ private ConditionManager mConditionManager;
+ private Context mContext;
+ private DndConditionCardController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+ mController = new DndConditionCardController(mContext, mConditionManager);
+ }
+
+ @Test
+ public void cycleMonitoring_shouldRegisterAndUnregisterReceiver() {
+ mController.startMonitoringStateChange();
+ mController.stopMonitoringStateChange();
+
+ verify(mContext).registerReceiver(any(DndConditionCardController.Receiver.class),
+ eq(DndConditionCardController.DND_FILTER));
+ verify(mContext).unregisterReceiver(any(DndConditionCardController.Receiver.class));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java
new file mode 100644
index 0000000..0ef23be
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionControllerTest.java
@@ -0,0 +1,54 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class NightDisplayConditionControllerTest {
+
+ @Mock
+ private ConditionManager mConditionManager;
+
+ private Context mContext;
+ private NightDisplayConditionController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mController = new NightDisplayConditionController(mContext, mConditionManager);
+ }
+
+ @Test
+ public void onActivated_shouldUpdateCondition() {
+ mController.onActivated(true);
+
+ verify(mConditionManager).onConditionChanged();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java
new file mode 100644
index 0000000..2bc92a3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionControllerTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.homepage.contextualcards.conditional;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.app.Activity;
+import android.content.ComponentName;
+
+import com.android.settings.Settings;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowActivity;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class WorkModeConditionControllerTest {
+
+ @Mock
+ private ConditionManager mConditionManager;
+ private Activity mActivity;
+ private WorkModeConditionController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mActivity = spy(Robolectric.setupActivity(Activity.class));
+ mController = new WorkModeConditionController(mActivity, mConditionManager);
+ }
+
+ @Test
+ public void onPrimaryClick_shouldLaunchAccountsSetting() {
+ final ComponentName componentName =
+ new ComponentName(mActivity, Settings.AccountDashboardActivity.class);
+
+ mController.onPrimaryClick(mActivity);
+
+ final ShadowActivity shadowActivity = Shadow.extract(mActivity);
+ assertThat(shadowActivity.getNextStartedActivity().getComponent()).isEqualTo(componentName);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java
new file mode 100644
index 0000000..72c29fa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySliceTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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.homepage.contextualcards.deviceinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SliceTester;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class BatterySliceTest {
+
+ private Context mContext;
+ private BatterySlice mBatterySlice;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+
+ // Set-up specs for SliceMetadata.
+ SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+
+ mBatterySlice = spy(new BatterySlice(mContext));
+ }
+
+ @Test
+ public void getSlice_shouldBeCorrectSliceContent() {
+ doNothing().when(mBatterySlice).loadBatteryInfo();
+ doReturn("10%").when(mBatterySlice).getBatteryPercentString();
+ doReturn("test").when(mBatterySlice).getSummary();
+ final Slice slice = mBatterySlice.getSlice();
+ final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+ final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_settings_battery);
+ assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.power_usage_summary_title));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
new file mode 100644
index 0000000..fc74df9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSliceTest.java
@@ -0,0 +1,92 @@
+/*
+ * 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.homepage.contextualcards.deviceinfo;
+
+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.spy;
+
+import android.content.Context;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SliceTester;
+import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowDataUsageUtils.class)
+public class DataUsageSliceTest {
+ private static final String DATA_USAGE_TITLE = "Data usage";
+ private static final String DATA_USAGE_SUMMARY = "test_summary";
+
+ private Context mContext;
+ private DataUsageSlice mDataUsageSlice;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+
+ // Set-up specs for SliceMetadata.
+ SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+
+ mDataUsageSlice = spy(new DataUsageSlice(mContext));
+ }
+
+ @Test
+ public void getSlice_hasSim_shouldBeCorrectSliceContent() {
+ ShadowDataUsageUtils.HAS_SIM = true;
+ doReturn(DATA_USAGE_TITLE).when(mDataUsageSlice).getDataUsageText(any());
+ doReturn(DATA_USAGE_SUMMARY).when(mDataUsageSlice).getCycleTime(any());
+ final Slice slice = mDataUsageSlice.getSlice();
+ final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+ final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_settings_data_usage);
+ assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.data_usage_summary_title));
+ }
+
+ @Test
+ public void getSlice_hasNoSim_shouldShowNoSimCard() {
+ ShadowDataUsageUtils.HAS_SIM = false;
+ final Slice slice = mDataUsageSlice.getSlice();
+ final List<SliceItem> sliceItems = slice.getItems();
+
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.data_usage_summary_title));
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.no_sim_card));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java
new file mode 100644
index 0000000..2083456
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSliceTest.java
@@ -0,0 +1,93 @@
+/*
+ * 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.homepage.contextualcards.deviceinfo;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SliceTester;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class DeviceInfoSliceTest {
+
+ @Mock
+ private SubscriptionInfo mSubscriptionInfo;
+
+ private Context mContext;
+ private DeviceInfoSlice mDeviceInfoSlice;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+
+ // Set-up specs for SliceMetadata.
+ SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+
+ mDeviceInfoSlice = spy(new DeviceInfoSlice(mContext));
+ }
+
+ @Test
+ public void getSlice_hasSubscriptionInfo_shouldBeCorrectSliceContent() {
+ final String phoneNumber = "1111111111";
+ doReturn(mSubscriptionInfo).when(mDeviceInfoSlice).getFirstSubscriptionInfo();
+ doReturn(phoneNumber).when(mDeviceInfoSlice).getPhoneNumber();
+ final Slice slice = mDeviceInfoSlice.getSlice();
+ final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+ final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_info_outline_24dp);
+ assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.device_info_label));
+ SliceTester.assertTitle(sliceItems, phoneNumber);
+ }
+
+ @Test
+ public void getSlice_hasNoSubscriptionInfo_shouldShowUnknown() {
+ final Slice slice = mDeviceInfoSlice.getSlice();
+ final List<SliceItem> sliceItems = slice.getItems();
+
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.device_info_label));
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.device_info_default));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
new file mode 100644
index 0000000..17d7bd2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
@@ -0,0 +1,81 @@
+/*
+ * 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.homepage.contextualcards.deviceinfo;
+
+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.spy;
+
+import android.content.Context;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SliceTester;
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class StorageSliceTest {
+ private static final String USED_BYTES_TEXT = "test used bytes";
+ private static final String SUMMARY_TEXT = "test summary";
+
+ private Context mContext;
+ private StorageSlice mStorageSlice;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+
+ // Set-up specs for SliceMetadata.
+ SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+
+ mStorageSlice = spy(new StorageSlice(mContext));
+ }
+
+ @Test
+ public void getSlice_shouldBeCorrectSliceContent() {
+ final PrivateStorageInfo info = new PrivateStorageInfo(100L, 600L);
+ doReturn(info).when(mStorageSlice).getPrivateStorageInfo();
+ doReturn(USED_BYTES_TEXT).when(mStorageSlice).getStorageUsedText(any());
+ doReturn(SUMMARY_TEXT).when(mStorageSlice).getStorageSummaryText(any());
+ final Slice slice = mStorageSlice.getSlice();
+ final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+ final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_homepage_storage);
+ assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.storage_label));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSliceTest.java
new file mode 100644
index 0000000..23da127
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/ConnectedDeviceSliceTest.java
@@ -0,0 +1,99 @@
+/*
+ * 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.homepage.contextualcards.slices;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceProvider;
+import androidx.slice.widget.SliceLiveData;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.SliceTester;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ConnectedDeviceSliceTest {
+
+ @Mock
+ private CachedBluetoothDevice mCachedBluetoothDevice;
+
+ private List<CachedBluetoothDevice> mCachedDevices = new ArrayList<CachedBluetoothDevice>();
+ private Context mContext;
+ private ConnectedDeviceSlice mConnectedDeviceSlice;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+
+ // Set-up specs for SliceMetadata.
+ SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+
+ mConnectedDeviceSlice = spy(new ConnectedDeviceSlice(mContext));
+ }
+
+ @Test
+ public void getSlice_hasConnectedDevices_shouldBeCorrectSliceContent() {
+ final String title = "BluetoothTitle";
+ final String summary = "BluetoothSummary";
+ final IconCompat icon = IconCompat.createWithResource(mContext,
+ R.drawable.ic_homepage_connected_device);
+ final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0,
+ new Intent("test action"), 0);
+ doReturn(title).when(mCachedBluetoothDevice).getName();
+ doReturn(summary).when(mCachedBluetoothDevice).getConnectionSummary();
+ mCachedDevices.add(mCachedBluetoothDevice);
+ doReturn(mCachedDevices).when(mConnectedDeviceSlice).getBluetoothConnectedDevices();
+ doReturn(icon).when(mConnectedDeviceSlice).getConnectedDeviceIcon(any());
+ doReturn(pendingIntent).when(mConnectedDeviceSlice).getBluetoothDetailIntent(any());
+ final Slice slice = mConnectedDeviceSlice.getSlice();
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ SliceTester.assertTitle(sliceItems, title);
+ }
+
+ @Test
+ public void getSlice_hasNoConnectedDevices_shouldReturnCorrectHeader() {
+ final List<CachedBluetoothDevice> connectedBluetoothList = new ArrayList<>();
+ doReturn(connectedBluetoothList).when(mConnectedDeviceSlice).getBluetoothConnectedDevices();
+ final Slice slice = mConnectedDeviceSlice.getSlice();
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ SliceTester.assertTitle(sliceItems, mContext.getString(R.string.no_connected_devices));
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
new file mode 100644
index 0000000..025f262
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
@@ -0,0 +1,131 @@
+/*
+ * 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.homepage.contextualcards.slices;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LiveData;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.slice.Slice;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SliceContextualCardRendererTest {
+
+ @Mock
+ private LiveData<Slice> mSliceLiveData;
+
+ private Context mContext;
+ private SliceContextualCardRenderer mRenderer;
+ private LifecycleOwner mLifecycleOwner;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ mLifecycleOwner = new ContextualCardsFragment();
+ mRenderer = new SliceContextualCardRenderer(mContext, mLifecycleOwner);
+ }
+
+ @Test
+ public void bindView_shouldSetScrollableToFalse() {
+ final String sliceUri = "content://com.android.settings.slices/action/flashlight";
+ RecyclerView.ViewHolder viewHolder = getSliceViewHolder();
+
+ mRenderer.bindView(viewHolder, buildContextualCard(sliceUri));
+
+ assertThat(
+ ((SliceContextualCardRenderer.SliceViewHolder) viewHolder).sliceView.isScrollable
+ ()).isFalse();
+ }
+
+ @Test
+ public void bindView_invalidScheme_sliceShouldBeNull() {
+ final String sliceUri = "contet://com.android.settings.slices/action/flashlight";
+ RecyclerView.ViewHolder viewHolder = getSliceViewHolder();
+
+ mRenderer.bindView(viewHolder, buildContextualCard(sliceUri));
+
+ assertThat(
+ ((SliceContextualCardRenderer.SliceViewHolder) viewHolder).sliceView.getSlice())
+ .isNull();
+ }
+
+ @Test
+ public void bindView_newSliceLiveData_shouldAddDataToMap() {
+ final String sliceUri = "content://com.android.settings.slices/action/flashlight";
+
+ mRenderer.bindView(getSliceViewHolder(), buildContextualCard(sliceUri));
+
+ assertThat(mRenderer.mSliceLiveDataMap.size()).isEqualTo(1);
+ }
+
+ @Test
+ public void bindView_sliceLiveDataShouldObserveSliceView() {
+ final String sliceUri = "content://com.android.settings.slices/action/flashlight";
+
+ mRenderer.bindView(getSliceViewHolder(), buildContextualCard(sliceUri));
+
+ assertThat(mRenderer.mSliceLiveDataMap.get(sliceUri).hasObservers()).isTrue();
+ }
+
+ @Test
+ public void bindview_sliceLiveDataShouldRemoveObservers() {
+ final String sliceUri = "content://com.android.settings.slices/action/flashlight";
+ mRenderer.mSliceLiveDataMap.put(sliceUri, mSliceLiveData);
+
+ mRenderer.bindView(getSliceViewHolder(), buildContextualCard(sliceUri));
+
+ verify(mSliceLiveData).removeObservers(mLifecycleOwner);
+ }
+
+ private RecyclerView.ViewHolder getSliceViewHolder() {
+ final int viewType = mRenderer.getViewType();
+ final RecyclerView recyclerView = new RecyclerView(mContext);
+ recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
+ final View view = LayoutInflater.from(mContext).inflate(viewType, recyclerView, false);
+ final RecyclerView.ViewHolder viewHolder = mRenderer.createViewHolder(view);
+
+ return viewHolder;
+ }
+
+ private ContextualCard buildContextualCard(String sliceUri) {
+ return new ContextualCard.Builder()
+ .setName("test_name")
+ .setSliceUri(Uri.parse(sliceUri))
+ .build();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
index e5ecd6d..b672e58 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java
@@ -19,7 +19,9 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java
index 5621d04..cb3d655 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnablerTest.java
@@ -17,12 +17,15 @@
package com.android.settings.inputmethod;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Intent;
import android.os.Bundle;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,8 +35,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class InputMethodAndSubtypeEnablerTest {
diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java
index 1d8d57d..334ca4b 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.inputmethod;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -26,6 +27,10 @@
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodSubtype;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowInputMethodManagerWithMethodList;
@@ -41,10 +46,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowInputMethodManagerWithMethodList.class)
public class InputMethodAndSubtypePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java
index a2a8265..005471f1 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.inputmethod;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.never;
@@ -29,6 +30,11 @@
import android.hardware.input.KeyboardLayout;
import android.view.InputDevice;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowInputDevice;
@@ -43,11 +49,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class KeyboardLayoutPickerControllerTest {
diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
index d486644..18813e6 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java
@@ -17,6 +17,7 @@
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.verify;
@@ -26,6 +27,8 @@
import android.hardware.input.InputManager;
import android.view.InputDevice;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowInputDevice;
@@ -39,8 +42,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PhysicalKeyboardPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
index fcd9c6e..5a1a93b 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.inputmethod;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -25,6 +26,8 @@
import android.view.textservice.SpellCheckerInfo;
import android.view.textservice.TextServicesManager;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,8 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SpellCheckerPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java
index a2b6e87..5c5042c 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.inputmethod;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -28,6 +29,10 @@
import android.net.Uri;
import android.provider.UserDictionary;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -39,10 +44,6 @@
import java.util.TreeSet;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class UserDictionaryListControllerTest {
diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
index 9ae36a2..43e89ff 100644
--- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java
@@ -17,6 +17,7 @@
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.verify;
@@ -29,6 +30,9 @@
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
+import androidx.core.text.BidiFormatter;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -43,9 +47,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.core.text.BidiFormatter;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class VirtualKeyboardPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index a129c55..43e8b18 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.language;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
@@ -40,6 +41,8 @@
import android.view.inputmethod.InputMethodManager;
import android.view.textservice.TextServicesManager;
+import androidx.lifecycle.LifecycleObserver;
+
import com.android.settings.R;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -58,8 +61,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.lifecycle.LifecycleObserver;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LanguageAndInputSettingsTest {
diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
index 5506b99..83b29fc 100644
--- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.language;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,8 @@
import android.content.Context;
import android.content.res.AssetManager;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,8 +41,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PhoneLanguagePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java
index 9d42088..8101d40 100644
--- a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.language;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
index cffe921..c483b8c 100644
--- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.language;
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;
@@ -25,6 +26,9 @@
import android.speech.tts.TextToSpeech;
import android.speech.tts.TtsEngines;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,9 +42,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TtsPreferenceControllerTest {
@@ -58,7 +59,8 @@
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
- mController = new TtsPreferenceController(mContext, mTtsEngines);
+ mController = new TtsPreferenceController(mContext, "test_key");
+ mController.mTtsEngines = mTtsEngines;
mPreference = new Preference(RuntimeEnvironment.application);
mPreference.setKey(mController.getPreferenceKey());
when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
index 29b5278..e1440b7 100644
--- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java
@@ -20,6 +20,8 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.inputmethod.UserDictionaryList;
import com.android.settings.inputmethod.UserDictionarySettings;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -35,8 +37,6 @@
import java.util.TreeSet;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class UserDictionaryPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
index 16c694e..a15fdff 100644
--- a/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/AppLocationPermissionPreferenceControllerTest.java
@@ -31,16 +31,16 @@
@Test
public void isAvailable_noLocationLinkPermission_shouldReturnFalse() {
- Settings.System.putInt(mContext.getContentResolver(),
- android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED, 0);
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED, 0);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void displayPreference_hasLocationLinkPermission_shouldReturnTrue() {
- Settings.System.putInt(mContext.getContentResolver(),
- android.provider.Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED, 1);
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED, 1);
assertThat(mController.isAvailable()).isTrue();
}
diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java
index 908393e..6903bcd 100644
--- a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.location;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -23,6 +24,8 @@
import android.provider.Settings;
import android.provider.Settings.Global;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,8 +35,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BluetoothScanningPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
index c9878bf..3302d2a 100644
--- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
@@ -16,7 +16,9 @@
package com.android.settings.location;
import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
@@ -39,6 +41,8 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.lifecycle.LifecycleOwner;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -57,8 +61,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.lifecycle.LifecycleOwner;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
ShadowSecureSettings.class,
diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java
index 9991c3d..00d8adb 100644
--- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.location;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doNothing;
@@ -37,6 +38,10 @@
import android.location.LocationManager;
import android.os.Bundle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -51,10 +56,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LocationFooterPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
index 80be34b..58874be 100644
--- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.location;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -30,6 +31,9 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -47,9 +51,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LocationForWorkPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
deleted file mode 100644
index c9717a6..0000000
--- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java
+++ /dev/null
@@ -1,151 +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.location;
-
-import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
-import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.location.LocationManager;
-import android.provider.Settings.Secure;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class LocationPreferenceControllerTest {
- @Mock
- private Preference mPreference;
- @Mock
- private PreferenceScreen mScreen;
-
- private LifecycleOwner mLifecycleOwner;
- private Lifecycle mLifecycle;
- private LocationPreferenceController mController;
-
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private Context mContext;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- mLifecycleOwner = () -> mLifecycle;
- mLifecycle = new Lifecycle(mLifecycleOwner);
- mController = new LocationPreferenceController(mContext, mLifecycle);
- when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
- }
-
- @Test
- public void isAvailable_shouldReturnTrue() {
- assertThat(mController.isAvailable()).isTrue();
- }
-
- @Test
- public void updateState_shouldSetSummary() {
- mController.updateState(mPreference);
-
- verify(mPreference).setSummary(nullable(String.class));
- }
-
- @Test
- public void updateSummary_shouldSetSummary() {
- mController.displayPreference(mScreen);
- mController.updateSummary();
-
- verify(mPreference).setSummary(nullable(String.class));
- }
-
- @Test
- public void getLocationSummary_locationOff_shouldSetSummaryOff() {
- final ContentResolver contentResolver = mContext.getContentResolver();
- Secure.putInt(contentResolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_OFF);
-
- final String locationSummary = mController.getLocationSummary(mContext);
- assertThat(locationSummary).isEqualTo(mContext.getString(R.string.location_off_summary));
- }
-
- @Test
- public void getLocationSummary_sensorsOnly_shouldSetSummaryOn() {
- final ContentResolver contentResolver = mContext.getContentResolver();
- Secure.putInt(contentResolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_SENSORS_ONLY);
-
- final String locationSummary = mController.getLocationSummary(mContext);
- assertThat(locationSummary).isEqualTo(mContext.getString(R.string.location_on_summary));
- }
-
- @Test
- public void getLocationSummary_highAccuracy_shouldSetSummaryOn() {
- final ContentResolver contentResolver = mContext.getContentResolver();
- Secure.putInt(contentResolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_HIGH_ACCURACY);
-
- final String locationSummary = mController.getLocationSummary(mContext);
- assertThat(locationSummary).isEqualTo(mContext.getString(R.string.location_on_summary));
- }
-
- @Test
- public void getLocationSummary_batterySaving_shouldSetSummaryOn() {
- final ContentResolver contentResolver = mContext.getContentResolver();
- Secure.putInt(contentResolver, Secure.LOCATION_MODE, Secure.LOCATION_MODE_BATTERY_SAVING);
-
- final String locationSummary = mController.getLocationSummary(mContext);
- assertThat(locationSummary).isEqualTo(mContext.getString(R.string.location_on_summary));
- }
-
- @Test
- public void onResume_shouldRegisterObserver() {
- mLifecycle.handleLifecycleEvent(ON_RESUME);
- verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
- }
-
- @Test
- public void onPause_shouldUnregisterObserver() {
- mLifecycle.handleLifecycleEvent(ON_RESUME);
- mLifecycle.handleLifecycleEvent(ON_PAUSE);
- verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
- }
-
- @Test
- public void locationProvidersChangedReceiver_updatesPreferenceSummary() {
- mController.displayPreference(mScreen);
- mController.onResume();
-
- mController.mLocationProvidersChangedReceiver
- .onReceive(mContext, new Intent(LocationManager.PROVIDERS_CHANGED_ACTION));
-
- verify(mPreference).setSummary(any());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
index f0904d0..81e5f7c 100644
--- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.location;
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;
@@ -31,6 +32,11 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.widget.RestrictedAppPreference;
@@ -48,11 +54,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(
shadows = {
diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java
index 18ef007..ecbf858 100644
--- a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java
@@ -1,12 +1,16 @@
package com.android.settings.location;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
import android.content.Context;
-import android.content.res.Resources;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -19,14 +23,6 @@
import java.util.List;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.widget.SliceLiveData;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LocationSliceBuilderTest {
@@ -34,12 +30,7 @@
@Before
public void setUp() {
- mContext = spy(RuntimeEnvironment.application);
-
- // Prevent crash in SliceMetadata.
- Resources resources = spy(mContext.getResources());
- doReturn(60).when(resources).getDimensionPixelSize(anyInt());
- doReturn(resources).when(mContext).getResources();
+ mContext = RuntimeEnvironment.application;
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
index 6f10c85..475cb83 100644
--- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java
@@ -25,6 +25,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.lifecycle.LifecycleOwner;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
@@ -39,8 +41,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.lifecycle.LifecycleOwner;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LocationSwitchBarControllerTest {
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
index 723659a..10e5681 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java
@@ -16,7 +16,9 @@
package com.android.settings.location;
import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
@@ -32,13 +34,18 @@
import android.provider.Settings;
import android.text.TextUtils;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.applications.appinfo.AppInfoDashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.location.RecentLocationApps;
import com.android.settingslib.location.RecentLocationApps.Request;
+import com.android.settingslib.widget.apppreference.AppPreference;
import org.junit.Before;
import org.junit.Test;
@@ -54,11 +61,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RecentLocationRequestPreferenceControllerTest {
@@ -171,7 +173,7 @@
@Test
public void onPreferenceClick_shouldLaunchAppDetails() {
- final Context context= mock(Context.class);
+ final Context context = mock(Context.class);
when(mFragment.getContext()).thenReturn(context);
final List<RecentLocationApps.Request> requests = new ArrayList<>();
@@ -208,7 +210,7 @@
AppPreference appPreference = mock(AppPreference.class, "AppPreference" + i);
doReturn(title).when(appPreference).getTitle();
doReturn(appPreference)
- .when(mController).createAppPreference(any(Context.class), eq(req));
+ .when(mController).createAppPreference(any(Context.class), eq(req));
}
return requests;
}
diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java
index 0cb7e73..be56f96 100644
--- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java
@@ -27,11 +27,15 @@
import android.content.Context;
import android.provider.Settings.Secure;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.widget.AppPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.location.RecentLocationApps;
import com.android.settingslib.location.RecentLocationApps.Request;
+import com.android.settingslib.widget.apppreference.AppPreference;
import org.junit.Before;
import org.junit.Test;
@@ -43,10 +47,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
/** Unit tests for {@link RecentLocationRequestSeeAllPreferenceController} */
@RunWith(SettingsRobolectricTestRunner.class)
public class RecentLocationRequestSeeAllPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java
index d0a3240..fa0b649 100644
--- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.location;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -23,6 +24,8 @@
import android.provider.Settings;
import android.provider.Settings.Global;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,8 +35,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiScanningPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
index 2d85141..91a545c 100644
--- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -27,6 +28,10 @@
import android.provider.Settings;
import android.provider.SettingsSlicesContract;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -41,10 +46,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AirplaneModePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
index 76d20f4..b6242c3 100644
--- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
+++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
@@ -17,12 +17,15 @@
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doNothing;
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 static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.ContentValues;
@@ -35,9 +38,14 @@
import android.view.MenuItem;
import android.view.View;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.MultiSelectListPreference;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.network.ApnEditor.ApnData;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -48,12 +56,7 @@
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.MockitoAnnotations;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.EditTextPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.MultiSelectListPreference;
-import androidx.preference.SwitchPreference;
+import org.robolectric.Robolectric;
@RunWith(SettingsRobolectricTestRunner.class)
public class ApnEditorTest {
@@ -449,6 +452,15 @@
assertThat(ApnEditor.formatInteger("not an int")).isEqualTo("not an int");
}
+ @Test
+ public void onCreate_noAction_shouldFinishAndNoCrash() {
+ doNothing().when(mApnEditorUT).addPreferencesFromResource(anyInt());
+
+ mApnEditorUT.onCreate(null);
+
+ verify(mApnEditorUT).finish();
+ }
+
private void initCursor() {
doReturn(2).when(mCursor).getColumnCount();
doReturn(Integer.valueOf(2)).when(mCursor).getInt(CURSOR_INTEGER_INDEX);
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index 2c15a6d..a8959c7 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -17,7 +17,12 @@
import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
+import static com.android.settings.network.MobileNetworkPreferenceController.MOBILE_NETWORK_CLASS;
+import static com.android.settings.network.MobileNetworkPreferenceController.MOBILE_NETWORK_PACKAGE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -25,14 +30,23 @@
import static org.mockito.Mockito.when;
import static org.robolectric.shadow.api.Shadow.extract;
+import android.app.Activity;
+import android.content.ComponentName;
import android.content.Context;
+import android.content.Intent;
import android.net.ConnectivityManager;
import android.os.UserManager;
import android.provider.Settings;
import android.provider.Settings.Global;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
+import android.util.FeatureFlagUtils;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowConnectivityManager;
import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -43,15 +57,12 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
ShadowConnectivityManager.class,
@@ -68,14 +79,17 @@
private Lifecycle mLifecycle;
private LifecycleOwner mLifecycleOwner;
private MobileNetworkPreferenceController mController;
+ private Preference mPreference;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = spy(Robolectric.setupActivity(Activity.class));
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+ mPreference = new Preference(mContext);
+ mPreference.setKey(MobileNetworkPreferenceController.KEY_MOBILE_NETWORK_SETTINGS);
}
@Test
@@ -173,4 +187,18 @@
mController.updateState(mPreference);
assertThat(mPreference.isEnabled()).isFalse();
}
+
+ @Test
+ public void handlePreferenceTreeClick_mobileFeatureDisabled_sendIntent() {
+ mController = new MobileNetworkPreferenceController(mContext);
+ FeatureFlagUtils.setEnabled(mContext, FeatureFlags.MOBILE_NETWORK_V2, false);
+ ArgumentCaptor<Intent> argument = ArgumentCaptor.forClass(Intent.class);
+
+ mController.handlePreferenceTreeClick(mPreference);
+
+ verify(mContext).startActivity(argument.capture());
+ final ComponentName componentName = argument.getValue().getComponent();
+ assertThat(componentName.getPackageName()).isEqualTo(MOBILE_NETWORK_PACKAGE);
+ assertThat(componentName.getClassName()).isEqualTo(MOBILE_NETWORK_CLASS);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
index d6310ab..e0370a4 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -16,17 +16,11 @@
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.SearchIndexableResource;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
import com.android.settingslib.drawer.CategoryKey;
import org.junit.Before;
@@ -64,60 +58,4 @@
assertThat(indexRes).hasSize(1);
assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
}
-
- @Test
- public void summaryProviderSetListening_hasMobileAndHotspot_shouldReturnMobileSummary() {
- final WifiMasterSwitchPreferenceController wifiPreferenceController =
- mock(WifiMasterSwitchPreferenceController.class);
- final MobileNetworkPreferenceController mobileNetworkPreferenceController =
- mock(MobileNetworkPreferenceController.class);
- final TetherPreferenceController tetherPreferenceController =
- mock(TetherPreferenceController.class);
-
- final SummaryLoader summaryLoader = mock(SummaryLoader.class);
- final SummaryLoader.SummaryProvider provider =
- new NetworkDashboardFragment.SummaryProvider(mContext, summaryLoader,
- wifiPreferenceController, mobileNetworkPreferenceController,
- tetherPreferenceController);
-
- provider.setListening(false);
-
- verifyZeroInteractions(summaryLoader);
-
- when(wifiPreferenceController.isAvailable()).thenReturn(true);
- when(mobileNetworkPreferenceController.isAvailable()).thenReturn(true);
- when(tetherPreferenceController.isAvailable()).thenReturn(true);
-
- provider.setListening(true);
-
- verify(summaryLoader).setSummary(provider, "Wi\u2011Fi, mobile, data usage, and hotspot");
- }
-
- @Test
- public void summaryProviderSetListening_noMobileOrHotspot_shouldReturnSimpleSummary() {
- final WifiMasterSwitchPreferenceController wifiPreferenceController =
- mock(WifiMasterSwitchPreferenceController.class);
- final MobileNetworkPreferenceController mobileNetworkPreferenceController =
- mock(MobileNetworkPreferenceController.class);
- final TetherPreferenceController tetherPreferenceController =
- mock(TetherPreferenceController.class);
-
- final SummaryLoader summaryLoader = mock(SummaryLoader.class);
- final SummaryLoader.SummaryProvider provider =
- new NetworkDashboardFragment.SummaryProvider(mContext, summaryLoader,
- wifiPreferenceController, mobileNetworkPreferenceController,
- tetherPreferenceController);
-
- provider.setListening(false);
-
- verifyZeroInteractions(summaryLoader);
-
- when(wifiPreferenceController.isAvailable()).thenReturn(true);
- when(mobileNetworkPreferenceController.isAvailable()).thenReturn(false);
- when(tetherPreferenceController.isAvailable()).thenReturn(false);
-
- provider.setListening(true);
-
- verify(summaryLoader).setSummary(provider, "Wi\u2011Fi and data usage");
- }
}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
index 3a1833b..8b0fe98 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
index 92994e0..35431a0 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
index 7289851..7b94045 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -26,6 +27,8 @@
import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppData;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -39,8 +42,6 @@
import java.util.Collections;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NetworkScorerPickerPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
index e405891..83fa55c 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -29,6 +30,9 @@
import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppData;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.RadioButtonPreference;
@@ -45,9 +49,6 @@
import java.util.ArrayList;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NetworkScorerPickerTest {
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
index cb26fb6..2e3e819 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
@@ -20,7 +20,9 @@
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC;
import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME;
import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -35,6 +37,8 @@
import android.widget.Button;
import android.widget.LinearLayout;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowOs;
@@ -48,8 +52,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
-import androidx.appcompat.app.AlertDialog;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowOs.class)
public class PrivateDnsModeDialogPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
index eb17bcb..464b290 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java
@@ -22,11 +22,15 @@
import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE;
import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER;
+
import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.CALLS_REAL_METHODS;
@@ -39,6 +43,7 @@
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.withSettings;
+import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.net.ConnectivityManager;
@@ -46,10 +51,18 @@
import android.net.LinkProperties;
import android.net.Network;
import android.os.Handler;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.provider.Settings;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
@@ -59,8 +72,8 @@
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.annotation.Config;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowContentResolver;
@@ -70,11 +83,11 @@
import java.util.Collections;
import java.util.List;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {
+ ShadowUserManager.class,
+ ShadowDevicePolicyManager.class
+})
public class PrivateDnsPreferenceControllerTest {
private final static String HOSTNAME = "dns.example.com";
@@ -104,6 +117,7 @@
private ShadowContentResolver mShadowContentResolver;
private Lifecycle mLifecycle;
private LifecycleOwner mLifecycleOwner;
+ private ShadowUserManager mShadowUserManager;
@Before
public void setUp() {
@@ -123,6 +137,8 @@
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
mLifecycle.addObserver(mController);
+
+ mShadowUserManager = ShadowUserManager.getShadow();
}
private void updateLinkProperties(LinkProperties lp) {
@@ -260,6 +276,31 @@
verify(mPreference).setSummary(getResourceString(R.string.private_dns_mode_opportunistic));
}
+ @Test
+ public void isEnabled_canBeDisabledByAdmin() {
+ final int userId = UserHandle.myUserId();
+ final List<UserManager.EnforcingUser> enforcingUsers = Collections.singletonList(
+ new UserManager.EnforcingUser(userId,
+ UserManager.RESTRICTION_SOURCE_DEVICE_OWNER)
+ );
+ mShadowUserManager.setUserRestrictionSources(
+ UserManager.DISALLOW_CONFIG_PRIVATE_DNS,
+ UserHandle.of(userId),
+ enforcingUsers);
+
+ ShadowDevicePolicyManager.getShadow().setDeviceOwnerComponentOnAnyUser(
+ new ComponentName("test", "test"));
+
+ mController.updateState(mPreference);
+ verify(mPreference).setEnabled(false);
+ }
+
+ @Test
+ public void isEnabled_isEnabledByDefault() {
+ mController.updateState(mPreference);
+ verify(mPreference).setEnabled(true);
+ }
+
private void setPrivateDnsMode(String mode) {
Settings.Global.putString(mContentResolver, PRIVATE_DNS_MODE, mode);
}
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index c1cd8fb..e800cdd 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -35,6 +35,8 @@
import android.net.ConnectivityManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -48,8 +50,6 @@
import java.util.concurrent.atomic.AtomicReference;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TetherPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
new file mode 100644
index 0000000..8198042
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
@@ -0,0 +1,93 @@
+/*
+ * 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.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.UserManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
+import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowUserManager;
+import org.robolectric.util.ReflectionHelpers;
+
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
+public class TopLevelNetworkEntryPreferenceControllerTest {
+
+ @Mock
+ private WifiMasterSwitchPreferenceController mWifiPreferenceController;
+ @Mock
+ private MobileNetworkPreferenceController mMobileNetworkPreferenceController;
+ @Mock
+ private TetherPreferenceController mTetherPreferenceController;
+
+ private Context mContext;
+ private TopLevelNetworkEntryPreferenceController mController;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
+ final ShadowUserManager um = Shadows.shadowOf(
+ RuntimeEnvironment.application.getSystemService(UserManager.class));
+ um.setIsAdminUser(true);
+
+ mController = new TopLevelNetworkEntryPreferenceController(mContext, "test_key");
+
+ ReflectionHelpers.setField(mController, "mWifiPreferenceController",
+ mWifiPreferenceController);
+ ReflectionHelpers.setField(mController, "mMobileNetworkPreferenceController",
+ mMobileNetworkPreferenceController);
+ ReflectionHelpers.setField(mController, "mTetherPreferenceController",
+ mTetherPreferenceController);
+ }
+
+ @Test
+ public void getSummary_hasMobileAndHotspot_shouldReturnMobileSummary() {
+ when(mWifiPreferenceController.isAvailable()).thenReturn(true);
+ when(mMobileNetworkPreferenceController.isAvailable()).thenReturn(true);
+ when(mTetherPreferenceController.isAvailable()).thenReturn(true);
+
+ assertThat(mController.getSummary())
+ .isEqualTo("Wi\u2011Fi, mobile, data usage, and hotspot");
+ }
+
+ @Test
+ public void getSummary_noMobileOrHotspot_shouldReturnSimpleSummary() {
+ when(mWifiPreferenceController.isAvailable()).thenReturn(true);
+ when(mMobileNetworkPreferenceController.isAvailable()).thenReturn(false);
+ when(mTetherPreferenceController.isAvailable()).thenReturn(false);
+
+ assertThat(mController.getSummary())
+ .isEqualTo("Wi\u2011Fi and data usage");
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
index dc5aa9a..11541ed 100644
--- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
@@ -34,6 +36,10 @@
import android.os.UserHandle;
import android.provider.SettingsSlicesContract;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.net.VpnConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -46,10 +52,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowServiceManager;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class VpnPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
new file mode 100644
index 0000000..9664428
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
@@ -0,0 +1,137 @@
+/*
+ * 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.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.network.ApnSettings;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ApnPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mInvalidTelephonyManager;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private ApnPreferenceController mController;
+ private RestrictedPreference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(Robolectric.setupActivity(Activity.class));
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+ doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
+
+ mPreference = new RestrictedPreference(mContext);
+ mController = new ApnPreferenceController(mContext, "mobile_data");
+ mController.init(SUB_ID);
+ mController.setPreference(mPreference);
+ mController.mCarrierConfigManager = mCarrierConfigManager;
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void getAvailabilityStatus_apnSettingsNotSupported_returnUnavailable() {
+ doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+ final PersistableBundle bundle = new PersistableBundle();
+ bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, false);
+ doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_apnSettingsSupportedWithCDMA_returnAvailable() {
+ doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+ final PersistableBundle bundle = new PersistableBundle();
+ bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
+ doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_apnSettingsSupportedWithGsm_returnAvailable() {
+ doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+ final PersistableBundle bundle = new PersistableBundle();
+ bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);
+ doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_carrierConfigNull_returnUnavailable() {
+ doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+ when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void handPreferenceTreeClick_fireIntent() {
+ ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+
+ mController.handlePreferenceTreeClick(mPreference);
+
+ verify(mContext).startActivity(captor.capture());
+ final Intent intent = captor.getValue();
+ assertThat(intent.getAction()).isEqualTo(Settings.ACTION_APN_SETTINGS);
+ assertThat(intent.getIntExtra(ApnSettings.SUB_ID, 0)).isEqualTo(SUB_ID);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java
new file mode 100644
index 0000000..8673de8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class CarrierPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mInvalidTelephonyManager;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private CarrierPreferenceController mController;
+ private RestrictedPreference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+ doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
+
+ mPreference = new RestrictedPreference(mContext);
+ mController = new CarrierPreferenceController(mContext, "mobile_data");
+ mController.init(SUB_ID);
+ mController.mCarrierConfigManager = mCarrierConfigManager;
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void getAvailabilityStatus_cdmaWithFlagOff_returnUnavailable() {
+ doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+ final PersistableBundle bundle = new PersistableBundle();
+ bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, false);
+ doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_cdmaWithFlagOnreturnAvailable() {
+ doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+ final PersistableBundle bundle = new PersistableBundle();
+ bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true);
+ doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_gsmWithFlagOnreturnAvailable() {
+ doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+ final PersistableBundle bundle = new PersistableBundle();
+ bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true);
+ doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
new file mode 100644
index 0000000..85a627d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
@@ -0,0 +1,138 @@
+/*
+ * 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.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+
+import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class DataServiceSetupPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ private static final String SETUP_URL = "url://tmp_url:^1";
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mInvalidTelephonyManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private PersistableBundle mCarrierConfig;
+ private DataServiceSetupPreferenceController mController;
+ private Preference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(Robolectric.setupActivity(Activity.class));
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+ doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
+ Settings.Global.putString(mContext.getContentResolver(),
+ Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, SETUP_URL);
+
+ mCarrierConfig = new PersistableBundle();
+ doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ mPreference = new RestrictedPreference(mContext);
+ mController = new DataServiceSetupPreferenceController(mContext, "data_service_setup");
+ mController.init(SUB_ID);
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void getAvailabilityStatus_allConfigOn_returnAvailable() {
+ doReturn(PhoneConstants.LTE_ON_CDMA_TRUE).when(mTelephonyManager).getLteOnCdmaMode();
+ mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+ false);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_missUrl_returnUnavailable() {
+ Settings.Global.putString(mContext.getContentResolver(),
+ Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, "");
+ doReturn(PhoneConstants.LTE_ON_CDMA_TRUE).when(mTelephonyManager).getLteOnCdmaMode();
+ mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+ false);
+
+ mController = new DataServiceSetupPreferenceController(mContext, "data_service_setup");
+ mController.init(SUB_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_notCdma_returnUnavailable() {
+ doReturn(PhoneConstants.LTE_ON_CDMA_FALSE).when(mTelephonyManager).getLteOnCdmaMode();
+ mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+ false);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void handlePreferenceTreeClick_startActivity() {
+ ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+
+ mController.handlePreferenceTreeClick(mPreference);
+
+ verify(mContext).startActivity(captor.capture());
+
+ final Intent intent = captor.getValue();
+ assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
+ assertThat(intent.getData()).isEqualTo(
+ Uri.parse(TextUtils.expandTemplate(SETUP_URL, "").toString()));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
new file mode 100644
index 0000000..ea6f903
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java
@@ -0,0 +1,103 @@
+/*
+ * 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.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.provider.Settings;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class DataUsagePreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ private DataUsagePreferenceController mController;
+ private SwitchPreference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(Robolectric.setupActivity(Activity.class));
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+
+ mPreference = new SwitchPreference(mContext);
+ mController = new DataUsagePreferenceController(mContext, "data_usage");
+ mController.init(SUB_ID);
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void getAvailabilityStatus_validSubId_returnAvailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_invalidSubId_returnUnsearchable() {
+ mController.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+ }
+
+ @Test
+ public void handlePreferenceTreeClick_needDialog_showDialog() {
+ final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+ mController.handlePreferenceTreeClick(mPreference);
+
+ verify(mContext).startActivity(captor.capture());
+ final Intent intent = captor.getValue();
+
+ assertThat(intent.getAction()).isEqualTo(Settings.ACTION_MOBILE_DATA_USAGE);
+ assertThat(intent.getIntExtra(Settings.EXTRA_SUB_ID, 0)).isEqualTo(SUB_ID);
+ }
+
+ @Test
+ public void updateState_invalidSubId_disabled() {
+ mController.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
new file mode 100644
index 0000000..02710fb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
@@ -0,0 +1,153 @@
+/*
+ * 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.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class EnabledNetworkModePreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mInvalidTelephonyManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private PersistableBundle mPersistableBundle;
+ private EnabledNetworkModePreferenceController mController;
+ private ListPreference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
+ doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+ doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ doReturn(mContext).when(mContext).createPackageContext(anyString(), anyInt());
+ mPersistableBundle = new PersistableBundle();
+ doReturn(mPersistableBundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ mPreference = new ListPreference(mContext);
+ mPreference.setEntries(R.array.enabled_networks_choices);
+ mPreference.setEntryValues(R.array.enabled_networks_values);
+ mController = new EnabledNetworkModePreferenceController(mContext, "enabled_network");
+ mController.init(SUB_ID);
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {
+ mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+ true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_notWorldPhone_returnAvailable() {
+ mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+ false);
+ mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL, false);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void init_initShow4GForLTE() {
+ mPersistableBundle.putBoolean(CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL,
+ true);
+
+ mController.init(SUB_ID);
+
+ assertThat(mController.mShow4GForLTE).isTrue();
+ }
+
+ @Test
+ public void updateState_updateByNetworkMode() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+ TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getValue()).isEqualTo(
+ String.valueOf(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
+ assertThat(mPreference.getSummary()).isEqualTo("3G");
+ }
+
+ @Test
+ public void onPreferenceChange_updateSuccess() {
+ doReturn(true).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
+ TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
+
+ mController.onPreferenceChange(mPreference,
+ String.valueOf(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA));
+
+ assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isEqualTo(
+ TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
+ }
+
+ @Test
+ public void onPreferenceChange_updateFail() {
+ doReturn(false).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
+ TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
+
+ mController.onPreferenceChange(mPreference,
+ String.valueOf(TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA));
+
+ assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo(
+ TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java
new file mode 100644
index 0000000..dee4c5e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java
@@ -0,0 +1,138 @@
+/*
+ * 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.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.ims.ImsManager;
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class Enhanced4gLtePreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mInvalidTelephonyManager;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+ @Mock
+ private ImsManager mImsManager;
+
+ private Enhanced4gLtePreferenceController mController;
+ private SwitchPreference mPreference;
+ private PersistableBundle mCarrierConfig;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
+ doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+ doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ mCarrierConfig = new PersistableBundle();
+ doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ mPreference = new RestrictedSwitchPreference(mContext);
+ mController = new Enhanced4gLtePreferenceController(mContext, "roaming");
+ mController.mImsManager = mImsManager;
+ mController.init(SUB_ID);
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void getAvailabilityStatus_invalidSubId_returnUnavailable() {
+ mController.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_volteDisabled_returnUnavailable() {
+ doReturn(false).when(mImsManager).isVolteEnabledByPlatform();
+ doReturn(true).when(mImsManager).isVolteProvisionedOnDevice();
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void updateState_variant4gLte_useVariantTitle() {
+ mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 1);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getTitle()).isEqualTo(
+ mContext.getString(R.string.enhanced_4g_lte_mode_title_variant));
+ }
+
+ @Test
+ public void updateState_configEnabled_prefEnabled() {
+ mPreference.setEnabled(false);
+ mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 1);
+ doReturn(TelephonyManager.CALL_STATE_IDLE).when(mTelephonyManager).getCallState(SUB_ID);
+ doReturn(true).when(mImsManager).isNonTtyOrTtyOnVolteEnabled();
+ mCarrierConfig.putBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void updateState_configOn_prefChecked() {
+ mPreference.setChecked(false);
+ doReturn(true).when(mImsManager).isEnhanced4gLteModeSettingEnabledByUser();
+ doReturn(true).when(mImsManager).isNonTtyOrTtyOnVolteEnabled();
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
similarity index 95%
rename from tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java
rename to tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
index 434a89d..d260a97 100644
--- a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
@@ -14,14 +14,15 @@
* limitations under the License.
*/
-package com.android.settings.mobilenetwork;
+package com.android.settings.network.telephony;
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
import static android.app.slice.Slice.HINT_TITLE;
import static android.app.slice.SliceItem.FORMAT_TEXT;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -30,15 +31,22 @@
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.telephony.CarrierConfigManager;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.SliceLiveData;
+
import com.android.ims.ImsManager;
import com.android.settings.R;
+import com.android.settings.slices.CustomSliceManager;
import com.android.settings.slices.SettingsSliceProvider;
import com.android.settings.slices.SliceBroadcastReceiver;
import com.android.settings.slices.SlicesFeatureProvider;
-import com.android.settings.slices.CustomSliceManager;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -52,14 +60,6 @@
import java.util.List;
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.core.SliceQuery;
-import androidx.slice.widget.SliceLiveData;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class Enhanced4gLteSliceHelperTest {
@@ -79,13 +79,14 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider();
+ CustomSliceManager manager = new CustomSliceManager(mContext);
when(mSlicesFeatureProvider.getCustomSliceManager(any(Context.class)))
- .thenReturn(new CustomSliceManager(mContext));
+ .thenReturn(manager);
//setup for SettingsSliceProvider tests
mProvider = spy(new SettingsSliceProvider());
@@ -95,11 +96,6 @@
//setup for SliceBroadcastReceiver test
mReceiver = spy(new SliceBroadcastReceiver());
- // Prevent crash in SliceMetadata.
- Resources resources = spy(mContext.getResources());
- doReturn(60).when(resources).getDimensionPixelSize(anyInt());
- doReturn(resources).when(mContext).getResources();
-
mEnhanced4gLteSliceHelper = new FakeEnhanced4gLteSliceHelper(mContext);
// Set-up specs for SliceMetadata.
diff --git a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
new file mode 100644
index 0000000..8fd2c28
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
@@ -0,0 +1,79 @@
+/*
+ * 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.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.TelephonyManager;
+import android.telephony.euicc.EuiccManager;
+
+import androidx.preference.Preference;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class EuiccPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+
+ private EuiccPreferenceController mController;
+ private Preference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(Robolectric.setupActivity(Activity.class));
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+
+ mPreference = new Preference(mContext);
+ mController = new EuiccPreferenceController(mContext, "euicc");
+ mController.init(SUB_ID);
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void handlePreferenceTreeClick_startActivity() {
+ ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+
+ mController.handlePreferenceTreeClick(mPreference);
+
+ verify(mContext).startActivity(captor.capture());
+ assertThat(captor.getValue().getAction()).isEqualTo(
+ EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
new file mode 100644
index 0000000..2fc3d98
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
@@ -0,0 +1,149 @@
+/*
+ * 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.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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 android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class MobileDataPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private FragmentManager mFragmentManager;
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mInvalidTelephonyManager;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private SubscriptionInfo mSubscriptionInfo;
+ @Mock
+ private FragmentTransaction mFragmentTransaction;
+
+ private MobileDataPreferenceController mController;
+ private SwitchPreference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+ doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
+
+ mPreference = new SwitchPreference(mContext);
+ mController = new MobileDataPreferenceController(mContext, "mobile_data");
+ mController.init(mFragmentManager, SUB_ID);
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void getAvailabilityStatus_invalidSubscription_returnUnavailable() {
+ mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void isDialogNeeded_disableSingleSim_returnTrue() {
+ doReturn(true).when(mTelephonyManager).isDataEnabled();
+ doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+ doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+ doReturn(1).when(mTelephonyManager).getSimCount();
+
+ assertThat(mController.isDialogNeeded()).isTrue();
+ assertThat(mController.mDialogType).isEqualTo(MobileDataDialogFragment.TYPE_DISABLE_DIALOG);
+ }
+
+ @Test
+ public void isDialogNeeded_enableNonDefaultSimInMultiSimMode_returnTrue() {
+ doReturn(false).when(mTelephonyManager).isDataEnabled();
+ doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+ doReturn(null).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+ doReturn(2).when(mTelephonyManager).getSimCount();
+ doReturn(1).when(mTelephonyManager).getNumberOfModemsWithSimultaneousDataConnections();
+
+ assertThat(mController.isDialogNeeded()).isTrue();
+ assertThat(mController.mDialogType).isEqualTo(
+ MobileDataDialogFragment.TYPE_MULTI_SIM_DIALOG);
+ }
+
+ @Test
+ public void handlePreferenceTreeClick_needDialog_showDialog() {
+ mController.mNeedDialog = true;
+
+ mController.handlePreferenceTreeClick(mPreference);
+
+ verify(mFragmentManager).beginTransaction();
+ }
+
+ @Test
+ public void onPreferenceChange_needDialog_doNothing() {
+ doReturn(true).when(mTelephonyManager).isDataEnabled();
+ doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+ doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+ doReturn(1).when(mTelephonyManager).getSimCount();
+
+ mController.onPreferenceChange(mPreference, true);
+
+ verify(mTelephonyManager, never()).setDataEnabled(true);
+ }
+
+ @Test
+ public void onPreferenceChange_notNeedDialog_update() {
+ doReturn(true).when(mTelephonyManager).isDataEnabled();
+ doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+ doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+ doReturn(2).when(mTelephonyManager).getSimCount();
+
+ mController.onPreferenceChange(mPreference, true);
+
+ verify(mTelephonyManager).setDataEnabled(true);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
new file mode 100644
index 0000000..68634a8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
@@ -0,0 +1,172 @@
+/*
+ * 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.network.telephony;
+
+import static com.android.settings.network.telephony.MobileNetworkActivity.MOBILE_SETTINGS_TAG;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.view.Menu;
+import android.view.View;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.android.internal.view.menu.ContextMenuBuilder;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class MobileNetworkActivityTest {
+
+ private static final int CURRENT_SUB_ID = 3;
+ private static final int PREV_SUB_ID = 1;
+
+ private Context mContext;
+ private MobileNetworkActivity mMobileNetworkActivity;
+ private List<SubscriptionInfo> mSubscriptionInfos;
+ private Fragment mShowFragment;
+ private Fragment mHideFragment;
+
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private SubscriptionInfo mSubscriptionInfo;
+ @Mock
+ private SubscriptionInfo mSubscriptionInfo2;
+ @Mock
+ private FragmentManager mFragmentManager;
+ @Mock
+ private FragmentTransaction mFragmentTransaction;
+ @Mock
+ private BottomNavigationView mBottomNavigationView;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mContext = spy(RuntimeEnvironment.application);
+
+ mMobileNetworkActivity = spy(new MobileNetworkActivity());
+ mSubscriptionInfos = new ArrayList<>();
+ mShowFragment = new Fragment();
+ mHideFragment = new Fragment();
+ mMobileNetworkActivity.mSubscriptionInfos = mSubscriptionInfos;
+ mMobileNetworkActivity.mSubscriptionManager = mSubscriptionManager;
+ when(mSubscriptionInfo.getSubscriptionId()).thenReturn(PREV_SUB_ID);
+ when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(CURRENT_SUB_ID);
+
+ doReturn(mSubscriptionManager).when(mMobileNetworkActivity).getSystemService(
+ SubscriptionManager.class);
+ doReturn(mBottomNavigationView).when(mMobileNetworkActivity).findViewById(R.id.bottom_nav);
+ doReturn(mFragmentManager).when(mMobileNetworkActivity).getSupportFragmentManager();
+ doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
+ doReturn(mHideFragment).when(mFragmentManager).findFragmentByTag(
+ MOBILE_SETTINGS_TAG + PREV_SUB_ID);
+ doReturn(mShowFragment).when(mFragmentManager).findFragmentByTag(
+ MOBILE_SETTINGS_TAG + CURRENT_SUB_ID);
+ }
+
+ @Test
+ public void updateBottomNavigationView_oneSubscription_shouldBeGone() {
+ mSubscriptionInfos.add(mSubscriptionInfo);
+ doReturn(mSubscriptionInfos).when(mSubscriptionManager).getActiveSubscriptionInfoList();
+
+ mMobileNetworkActivity.updateBottomNavigationView();
+
+ verify(mBottomNavigationView).setVisibility(View.GONE);
+ }
+
+ @Test
+ public void updateBottomNavigationView_twoSubscription_updateMenu() {
+ final Menu menu = new ContextMenuBuilder(mContext);
+ mSubscriptionInfos.add(mSubscriptionInfo);
+ mSubscriptionInfos.add(mSubscriptionInfo);
+ doReturn(mSubscriptionInfos).when(mSubscriptionManager).getActiveSubscriptionInfoList();
+ doReturn(menu).when(mBottomNavigationView).getMenu();
+
+ mMobileNetworkActivity.updateBottomNavigationView();
+
+ assertThat(menu.size()).isEqualTo(2);
+ }
+
+ @Test
+ public void switchFragment_newFragment_replaceIt() {
+ mMobileNetworkActivity.mCurSubscriptionId = PREV_SUB_ID;
+
+ mMobileNetworkActivity.switchFragment(mShowFragment, CURRENT_SUB_ID);
+
+ verify(mFragmentTransaction).replace(R.id.main_content, mShowFragment,
+ MOBILE_SETTINGS_TAG + CURRENT_SUB_ID);
+ }
+
+ @Test
+ public void getSubscriptionId_hasIntent_getIdFromIntent() {
+ final Intent intent = new Intent();
+ intent.putExtra(Settings.EXTRA_SUB_ID, CURRENT_SUB_ID);
+ doReturn(intent).when(mMobileNetworkActivity).getIntent();
+ doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(CURRENT_SUB_ID);
+
+ assertThat(mMobileNetworkActivity.getSubscriptionId()).isEqualTo(CURRENT_SUB_ID);
+ }
+
+ @Test
+ public void getSubscriptionId_noIntent_firstIdInList() {
+ doReturn(null).when(mMobileNetworkActivity).getIntent();
+ mSubscriptionInfos.add(mSubscriptionInfo);
+ mSubscriptionInfos.add(mSubscriptionInfo2);
+
+ assertThat(mMobileNetworkActivity.getSubscriptionId()).isEqualTo(PREV_SUB_ID);
+ }
+
+ @Test
+ public void onSaveInstanceState_saveCurrentSubId() {
+ mMobileNetworkActivity = Robolectric.buildActivity(
+ MobileNetworkActivity.class).get();
+ mMobileNetworkActivity.mCurSubscriptionId = PREV_SUB_ID;
+ final Bundle bundle = new Bundle();
+
+ mMobileNetworkActivity.saveInstanceState(bundle);
+
+ assertThat(bundle.getInt(Settings.EXTRA_SUB_ID)).isEqualTo(
+ PREV_SUB_ID);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
new file mode 100644
index 0000000..676c9f4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
@@ -0,0 +1,185 @@
+/*
+ * 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.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+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.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telecom.PhoneAccountHandle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class MobileNetworkUtilsTest {
+ private static final String PACKAGE_NAME = "com.android.app";
+ private static final int SUB_ID_1 = 1;
+ private static final int SUB_ID_2 = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mTelephonyManager2;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private SubscriptionInfo mSubscriptionInfo1;
+ @Mock
+ private SubscriptionInfo mSubscriptionInfo2;
+ @Mock
+ private PackageManager mPackageManager;
+ @Mock
+ private PhoneAccountHandle mPhoneAccountHandle;
+ @Mock
+ private ComponentName mComponentName;
+ @Mock
+ private ResolveInfo mResolveInfo;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private Context mContext;
+ private PersistableBundle mCarrierConfig;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+ when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+ when(mTelephonyManager.createForSubscriptionId(SUB_ID_1)).thenReturn(mTelephonyManager);
+ when(mTelephonyManager.createForSubscriptionId(SUB_ID_2)).thenReturn(mTelephonyManager2);
+ when(mContext.getPackageManager()).thenReturn(mPackageManager);
+ when(mPhoneAccountHandle.getComponentName()).thenReturn(mComponentName);
+ when(mComponentName.getPackageName()).thenReturn(PACKAGE_NAME);
+ when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+ mCarrierConfigManager);
+
+ mCarrierConfig = new PersistableBundle();
+ when(mCarrierConfigManager.getConfigForSubId(SUB_ID_1)).thenReturn(mCarrierConfig);
+
+ when(mSubscriptionInfo1.getSubscriptionId()).thenReturn(SUB_ID_1);
+ when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2);
+
+ when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+ Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+ }
+
+ @Test
+ public void setMobileDataEnabled_setEnabled_enabled() {
+ MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_1, true, false);
+
+ verify(mTelephonyManager).setDataEnabled(true);
+ verify(mTelephonyManager2, never()).setDataEnabled(anyBoolean());
+ }
+
+ @Test
+ public void setMobileDataEnabled_setDisabled_disabled() {
+ MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_2, true, false);
+
+ verify(mTelephonyManager2).setDataEnabled(true);
+ verify(mTelephonyManager, never()).setDataEnabled(anyBoolean());
+ }
+
+ @Test
+ public void setMobileDataEnabled_disableOtherSubscriptions() {
+ MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_1, true, true);
+
+ verify(mTelephonyManager).setDataEnabled(true);
+ verify(mTelephonyManager2).setDataEnabled(false);
+ }
+
+ @Test
+ public void buildConfigureIntent_nullHandle_returnNull() {
+ assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext, null)).isNull();
+ }
+
+ @Test
+ public void buildConfigureIntent_noActivityHandleIntent_returnNull() {
+ when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
+ .thenReturn(new ArrayList<>());
+
+ assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
+ mPhoneAccountHandle)).isNull();
+ }
+
+ @Test
+ public void buildConfigureIntent_hasActivityHandleIntent_returnIntent() {
+ when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
+ .thenReturn(Arrays.asList(mResolveInfo));
+
+ assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
+ mPhoneAccountHandle)).isNotNull();
+ }
+
+ @Test
+ public void isCdmaOptions_phoneTypeCdma_returnTrue() {
+ when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_CDMA);
+
+ assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
+ }
+
+ @Test
+ public void isCdmaOptions_worldModeWithGsmWcdma_returnTrue() {
+ when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
+ when(mContext.getString(R.string.config_world_mode)).thenReturn("true");
+ Settings.Global.putInt(mContext.getContentResolver(),
+ android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+ TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
+
+ assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
+ }
+
+ @Test
+ public void isCdmaOptions_carrierWorldModeWithoutHideCarrier_returnTrue() {
+ when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
+ mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+ false);
+ mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL, true);
+
+ assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
new file mode 100644
index 0000000..956b601
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/NetworkSelectSettingsTest.java
@@ -0,0 +1,107 @@
+/*
+ * 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.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.CellInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.Arrays;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class NetworkSelectSettingsTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private CellInfo mCellInfo1;
+ @Mock
+ private CellInfo mCellInfo2;
+ @Mock
+ private PreferenceManager mPreferenceManager;
+ private Context mContext;
+
+ private PreferenceCategory mConnectedPreferenceCategory;
+ private PreferenceCategory mPreferenceCategory;
+
+ private NetworkSelectSettings mNetworkSelectSettings;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+ when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+ when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+
+ when(mCellInfo1.isRegistered()).thenReturn(true);
+ when(mCellInfo2.isRegistered()).thenReturn(false);
+
+ mConnectedPreferenceCategory = spy(new PreferenceCategory(mContext));
+ doReturn(mPreferenceManager).when(mConnectedPreferenceCategory).getPreferenceManager();
+ mPreferenceCategory = spy(new PreferenceCategory(mContext));
+ doReturn(mPreferenceManager).when(mPreferenceCategory).getPreferenceManager();
+
+ mNetworkSelectSettings = spy(new NetworkSelectSettings());
+ doReturn(mContext).when(mNetworkSelectSettings).getContext();
+ doReturn(mPreferenceManager).when(mNetworkSelectSettings).getPreferenceManager();
+ doReturn(mContext).when(mPreferenceManager).getContext();
+
+ mNetworkSelectSettings.mTelephonyManager = mTelephonyManager;
+ mNetworkSelectSettings.mConnectedPreferenceCategory = mConnectedPreferenceCategory;
+ mNetworkSelectSettings.mPreferenceCategory = mPreferenceCategory;
+ mNetworkSelectSettings.mCellInfoList = Arrays.asList(mCellInfo1, mCellInfo2);
+ }
+
+ @Test
+ public void updateAllPreferenceCategory_containCorrectPreference() {
+ mNetworkSelectSettings.updateAllPreferenceCategory();
+
+ assertThat(mConnectedPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+ final NetworkOperatorPreference connectedPreference =
+ (NetworkOperatorPreference) mConnectedPreferenceCategory.getPreference(0);
+ assertThat(connectedPreference.getCellInfo()).isEqualTo(mCellInfo1);
+ assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+ final NetworkOperatorPreference preference =
+ (NetworkOperatorPreference) mPreferenceCategory.getPreference(0);
+ assertThat(preference.getCellInfo()).isEqualTo(mCellInfo2);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
new file mode 100644
index 0000000..d11e11c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
@@ -0,0 +1,144 @@
+/*
+ * 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.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.ListPreference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class PreferredNetworkModePreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private FragmentManager mFragmentManager;
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mInvalidTelephonyManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private PersistableBundle mPersistableBundle;
+ private PreferredNetworkModePreferenceController mController;
+ private ListPreference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
+ doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+ doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ mPersistableBundle = new PersistableBundle();
+ doReturn(mPersistableBundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ mPreference = new ListPreference(mContext);
+ mPreference.setEntries(R.array.preferred_network_mode_choices);
+ mPreference.setEntryValues(R.array.preferred_network_mode_values);
+ mController = new PreferredNetworkModePreferenceController(mContext, "mobile_data");
+ mController.init(SUB_ID);
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {
+ mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+ true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_worldPhone_returnAvailable() {
+ mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+ false);
+ mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL, true);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void updateState_updateByNetworkMode() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+ TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getValue()).isEqualTo(
+ String.valueOf(TelephonyManager.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
+ assertThat(mPreference.getSummary()).isEqualTo(
+ mContext.getString(R.string.preferred_network_mode_tdscdma_gsm_wcdma_summary));
+ }
+
+ @Test
+ public void onPreferenceChange_updateSuccess() {
+ doReturn(true).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
+ TelephonyManager.NETWORK_MODE_LTE_TDSCDMA);
+
+ mController.onPreferenceChange(mPreference,
+ String.valueOf(TelephonyManager.NETWORK_MODE_LTE_TDSCDMA));
+
+ assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isEqualTo(
+ TelephonyManager.NETWORK_MODE_LTE_TDSCDMA);
+ }
+
+ @Test
+ public void onPreferenceChange_updateFail() {
+ doReturn(false).when(mTelephonyManager).setPreferredNetworkType(SUB_ID,
+ TelephonyManager.NETWORK_MODE_LTE_TDSCDMA);
+
+ mController.onPreferenceChange(mPreference,
+ String.valueOf(TelephonyManager.NETWORK_MODE_LTE_TDSCDMA));
+
+ assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo(
+ TelephonyManager.NETWORK_MODE_LTE_TDSCDMA);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java
new file mode 100644
index 0000000..79d281f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java
@@ -0,0 +1,144 @@
+/*
+ * 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.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class RoamingPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private FragmentManager mFragmentManager;
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mInvalidTelephonyManager;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private FragmentTransaction mFragmentTransaction;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private RoamingPreferenceController mController;
+ private RestrictedSwitchPreference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
+ doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+ doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
+
+ mPreference = new RestrictedSwitchPreference(mContext);
+ mController = new RoamingPreferenceController(mContext, "roaming");
+ mController.init(mFragmentManager, SUB_ID);
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void getAvailabilityStatus_validSubId_returnAvailable() {
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE);
+ }
+
+ @Test
+ public void getAvailabilityStatus_invalidSubId_returnUnsearchable() {
+ mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ assertThat(mController.getAvailabilityStatus()).isEqualTo(
+ BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+ }
+
+ @Test
+ public void isDialogNeeded_roamingDisabledWithoutFlag_returnTrue() {
+ final PersistableBundle bundle = new PersistableBundle();
+ bundle.putBoolean(CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL, false);
+ doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+ doReturn(false).when(mTelephonyManager).isDataRoamingEnabled();
+
+ assertThat(mController.isDialogNeeded()).isTrue();
+ }
+
+ @Test
+ public void isDialogNeeded_roamingEnabled_returnFalse() {
+ doReturn(true).when(mTelephonyManager).isDataRoamingEnabled();
+
+ assertThat(mController.isDialogNeeded()).isFalse();
+ }
+
+ @Test
+ public void handlePreferenceTreeClick_needDialog_showDialog() {
+ mController.mNeedDialog = true;
+
+ mController.handlePreferenceTreeClick(mPreference);
+
+ verify(mFragmentManager).beginTransaction();
+ }
+
+ @Test
+ public void updateState_invalidSubId_disabled() {
+ mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void updateState_validSubId_enabled() {
+ doReturn(true).when(mTelephonyManager).isDataRoamingEnabled();
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java
new file mode 100644
index 0000000..e50e264
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/VideoCallingPreferenceControllerTest.java
@@ -0,0 +1,129 @@
+/*
+ * 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.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.TelephonyManager;
+import android.telephony.ims.feature.ImsFeature;
+
+import androidx.preference.SwitchPreference;
+
+import com.android.ims.ImsManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class VideoCallingPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private ImsManager mImsManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private VideoCallingPreferenceController mController;
+ private PersistableBundle mCarrierConfig;
+ private SwitchPreference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() throws Exception {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
+ doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+
+ mCarrierConfig = new PersistableBundle();
+ mCarrierConfig.putBoolean(
+ CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, true);
+ doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+ mPreference = new SwitchPreference(mContext);
+ mController = new VideoCallingPreferenceController(mContext, "wifi_calling");
+ mController.init(SUB_ID);
+ mController.mImsManager = mImsManager;
+ mPreference.setKey(mController.getPreferenceKey());
+
+ doReturn(true).when(mImsManager).isVtEnabledByPlatform();
+ doReturn(true).when(mImsManager).isVtProvisionedOnDevice();
+ doReturn(ImsFeature.STATE_READY).when(mImsManager).getImsServiceState();
+ doReturn(true).when(mTelephonyManager).isDataEnabled();
+ }
+
+ @Test
+ public void isVideoCallEnabled_allFlagsOn_returnTrue() {
+ assertThat(mController.isVideoCallEnabled()).isTrue();
+ }
+
+ @Test
+ public void isVideoCallEnabled_disabledByPlatform_returnFalse() {
+ doReturn(false).when(mImsManager).isVtEnabledByPlatform();
+
+ assertThat(mController.isVideoCallEnabled()).isFalse();
+ }
+
+ @Test
+ public void isVideoCallEnabled_dataDisabled_returnFalse() {
+ mCarrierConfig.putBoolean(
+ CarrierConfigManager.KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, false);
+ doReturn(false).when(mTelephonyManager).isDataEnabled();
+
+ assertThat(mController.isVideoCallEnabled()).isFalse();
+ }
+
+ @Test
+ public void updateState_4gLteOff_disabled() {
+ doReturn(false).when(mImsManager).isEnhanced4gLteModeSettingEnabledByUser();
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ assertThat(mPreference.isChecked()).isFalse();
+ }
+
+ @Test
+ public void updateState_4gLteOnWithoutCall_checked() {
+ doReturn(true).when(mImsManager).isVtEnabledByUser();
+ doReturn(true).when(mImsManager).isEnhanced4gLteModeSettingEnabledByUser();
+ doReturn(true).when(mImsManager).isNonTtyOrTtyOnVolteEnabled();
+ doReturn(TelephonyManager.CALL_STATE_IDLE).when(mTelephonyManager).getCallState(SUB_ID);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ assertThat(mPreference.isChecked()).isTrue();
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
new file mode 100644
index 0000000..a209b00
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
+import com.android.ims.ImsConfig;
+import com.android.ims.ImsManager;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class WifiCallingPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private ImsManager mImsManager;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+
+ private WifiCallingPreferenceController mController;
+ private Preference mPreference;
+ private PreferenceCategory mPreferenceCategory;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+ when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+ when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+
+ mPreference = new Preference(mContext);
+ mController = new WifiCallingPreferenceController(mContext, "wifi_calling");
+ mController.init(SUB_ID);
+ mController.mImsManager = mImsManager;
+ mPreference.setKey(mController.getPreferenceKey());
+
+ mPreferenceCategory = new PreferenceCategory(mContext);
+ when(mPreferenceScreen.findPreference(
+ WifiCallingPreferenceController.KEY_PREFERENCE_CATEGORY)).thenReturn(
+ mPreferenceCategory);
+
+ }
+
+ @Test
+ public void updateState_noSimCallManager_setCorrectSummary() {
+ mController.mSimCallManager = null;
+ when(mImsManager.isWfcEnabledByUser()).thenReturn(true);
+ when(mImsManager.getWfcMode(anyBoolean())).thenReturn(
+ ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getSummary()).isEqualTo(
+ mContext.getString(com.android.internal.R.string.wfc_mode_wifi_only_summary));
+ }
+
+ @Test
+ public void updateState_notCallIdle_disable() {
+ when(mTelephonyManager.getCallState(SUB_ID)).thenReturn(
+ TelephonyManager.CALL_STATE_RINGING);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void displayPreference_notAvailable_setCategoryInvisible() {
+ mController.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ mController.displayPreference(mPreferenceScreen);
+
+ assertThat(mPreferenceCategory.isVisible()).isFalse();
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java
new file mode 100644
index 0000000..8945649
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.network.telephony.cdma;
+
+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 android.telephony.TelephonyManager;
+
+import androidx.preference.PreferenceManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class CdmaListPreferenceTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private PreferenceManager mPreferenceManager;
+
+ private CdmaListPreference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+
+ mPreference = spy(new CdmaListPreference(mContext, null));
+ mPreference.setSubId(SUB_ID);
+ }
+
+ @Test
+ public void onClick_inEcm_doNothing() {
+ doReturn(true).when(mTelephonyManager).getEmergencyCallbackMode();
+
+ mPreference.onClick();
+
+ verify(mPreferenceManager, never()).showDialog(mPreference);
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
new file mode 100644
index 0000000..4044b6c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
@@ -0,0 +1,131 @@
+/*
+ * 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.network.telephony.cdma;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
+
+import com.android.internal.telephony.Phone;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class CdmaSubscriptionPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private PreferenceManager mPreferenceManager;
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mInvalidTelephonyManager;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private CdmaSubscriptionPreferenceController mController;
+ private ListPreference mPreference;
+ private PersistableBundle mCarrierConfig;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+ doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+ doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
+
+ mCarrierConfig = new PersistableBundle();
+ when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
+
+ mPreference = new ListPreference(mContext);
+ mController = new CdmaSubscriptionPreferenceController(mContext, "mobile_data");
+ mController.init(mPreferenceManager, SUB_ID);
+ mController.mPreference = mPreference;
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void onPreferenceChange_selectNV_returnNVMode() {
+ doReturn(true).when(mTelephonyManager).setCdmaSubscriptionMode(anyInt());
+
+ mController.onPreferenceChange(mPreference, Integer.toString(Phone.CDMA_SUBSCRIPTION_NV));
+
+ assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.CDMA_SUBSCRIPTION_MODE,
+ Phone.CDMA_SUBSCRIPTION_RUIM_SIM)).isEqualTo(Phone.CDMA_SUBSCRIPTION_NV);
+ }
+
+ @Test
+ public void updateState_stateRUIM_displayRUIM() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.CDMA_SUBSCRIPTION_MODE, Phone.CDMA_SUBSCRIPTION_NV);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getValue()).isEqualTo(Integer.toString(Phone.CDMA_SUBSCRIPTION_NV));
+ }
+
+ @Test
+ public void updateState_stateUnknown_doNothing() {
+ mPreference.setValue(Integer.toString(Phone.CDMA_SUBSCRIPTION_NV));
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.CDMA_SUBSCRIPTION_MODE, Phone.CDMA_SUBSCRIPTION_UNKNOWN);
+
+ mController.updateState(mPreference);
+
+ // Still NV mode
+ assertThat(mPreference.getValue()).isEqualTo(Integer.toString(Phone.CDMA_SUBSCRIPTION_NV));
+ }
+
+ @Test
+ public void deviceSupportsNvAndRuim() {
+ SystemProperties.set("ril.subscription.types", "NV,RUIM");
+ assertThat(mController.deviceSupportsNvAndRuim()).isTrue();
+
+ SystemProperties.set("ril.subscription.types", "");
+
+ assertThat(mController.deviceSupportsNvAndRuim()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
new file mode 100644
index 0000000..f00afc9
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
@@ -0,0 +1,148 @@
+/*
+ * 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.network.telephony.cdma;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class CdmaSystemSelectPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+
+ @Mock
+ private PreferenceManager mPreferenceManager;
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private TelephonyManager mInvalidTelephonyManager;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private CdmaSystemSelectPreferenceController mController;
+ private ListPreference mPreference;
+ private PersistableBundle mCarrierConfig;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+ doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
+ doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+ doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+ SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+ doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
+
+ mCarrierConfig = new PersistableBundle();
+ when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
+
+
+ mPreference = new ListPreference(mContext);
+ mController = new CdmaSystemSelectPreferenceController(mContext, "mobile_data");
+ mController.init(mPreferenceManager, SUB_ID);
+ mController.mPreference = mPreference;
+ mPreference.setKey(mController.getPreferenceKey());
+ }
+
+ @Test
+ public void onPreferenceChange_selectHome_returnHomeMode() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.CDMA_ROAMING_MODE,
+ TelephonyManager.CDMA_ROAMING_MODE_ANY);
+ doReturn(true).when(mTelephonyManager).setCdmaRoamingMode(anyInt());
+
+ mController.onPreferenceChange(mPreference,
+ Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
+
+ assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.CDMA_ROAMING_MODE,
+ TelephonyManager.CDMA_ROAMING_MODE_ANY)).isEqualTo(
+ TelephonyManager.CDMA_ROAMING_MODE_HOME);
+ }
+
+ @Test
+ public void updateState_stateHome_displayHome() {
+ doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
+ mTelephonyManager).getCdmaRoamingMode();
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getValue()).isEqualTo(
+ Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
+ }
+
+ @Test
+ public void updateState_LteGSMWcdma_disabled() {
+ doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
+ mTelephonyManager).getCdmaRoamingMode();
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+ TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+
+ @Test
+ public void updateState_stateOther_resetToDefault() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.CDMA_ROAMING_MODE,
+ TelephonyManager.CDMA_ROAMING_MODE_HOME);
+ doReturn(TelephonyManager.CDMA_ROAMING_MODE_AFFILIATED).when(
+ mTelephonyManager).getCdmaRoamingMode();
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.getValue()).isEqualTo(
+ Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_ANY));
+ assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+ Settings.Global.CDMA_ROAMING_MODE,
+ TelephonyManager.CDMA_ROAMING_MODE_HOME)).isEqualTo(
+ TelephonyManager.CDMA_ROAMING_MODE_ANY);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
new file mode 100644
index 0000000..5f65241
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.network.telephony.gsm;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class AutoSelectPreferenceControllerTest {
+ private static final int SUB_ID = 2;
+ private static final String OPERATOR_NAME = "T-mobile";
+
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+
+ private PersistableBundle mCarrierConfig;
+ private AutoSelectPreferenceController mController;
+ private Preference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+ when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+ when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+ mCarrierConfigManager);
+ when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+
+ mCarrierConfig = new PersistableBundle();
+ mCarrierConfig.putBoolean(CarrierConfigManager.KEY_ONLY_AUTO_SELECT_IN_HOME_NETWORK_BOOL,
+ true);
+ when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
+
+ mPreference = new Preference(mContext);
+ mController = new AutoSelectPreferenceController(mContext, "auto_select");
+ mController.init(SUB_ID);
+ }
+
+ @Test
+ public void setChecked_isChecked_updateValue() {
+ when(mTelephonyManager.getNetworkSelectionMode()).thenReturn(
+ TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
+
+ assertThat(mController.setChecked(true)).isTrue();
+
+ verify(mTelephonyManager).setNetworkSelectionModeAutomatic();
+ }
+
+ @Test
+ public void updateState_isRoaming_enabled() {
+ when(mTelephonyManager.getServiceState().getRoaming()).thenReturn(true);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isTrue();
+ }
+
+ @Test
+ public void updateState_notRoamingWithAutoSelectOn_disabled() {
+ when(mTelephonyManager.getServiceState().getRoaming()).thenReturn(false);
+ doReturn(OPERATOR_NAME).when(mTelephonyManager).getSimOperatorName();
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ assertThat(mPreference.getSummary()).isEqualTo(
+ mContext.getString(R.string.manual_mode_disallowed_summary,
+ mTelephonyManager.getSimOperatorName()));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
new file mode 100644
index 0000000..d5fc6e0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
@@ -0,0 +1,110 @@
+/*
+ * 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.network.telephony.gsm;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class OpenNetworkSelectPagePreferenceControllerTest {
+ private static final int SUB_ID = 2;
+ private static final String OPERATOR_NAME = "T-mobile";
+
+ @Mock
+ private TelephonyManager mTelephonyManager;
+ @Mock
+ private SubscriptionManager mSubscriptionManager;
+ @Mock
+ private CarrierConfigManager mCarrierConfigManager;
+ @Mock
+ private ServiceState mServiceState;
+
+ private PersistableBundle mCarrierConfig;
+ private OpenNetworkSelectPagePreferenceController mController;
+ private Preference mPreference;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ mContext = spy(RuntimeEnvironment.application);
+ when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+ when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+ when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+ mCarrierConfigManager);
+ when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+ when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
+
+ mCarrierConfig = new PersistableBundle();
+ when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
+
+ mPreference = new Preference(mContext);
+ mController = new OpenNetworkSelectPagePreferenceController(mContext,
+ "open_network_select");
+ mController.init(SUB_ID);
+ }
+
+ @Test
+ public void updateState_modeAuto_disabled() {
+ when(mTelephonyManager.getNetworkSelectionMode()).thenReturn(
+ TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
+
+ mController.updateState(mPreference);
+
+ assertThat(mPreference.isEnabled()).isFalse();
+ }
+
+ @Test
+ public void getSummary_inService_returnOperatorName() {
+ when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+ doReturn(OPERATOR_NAME).when(mTelephonyManager).getNetworkOperatorName();
+
+ assertThat(mController.getSummary()).isEqualTo(OPERATOR_NAME);
+ }
+
+ @Test
+ public void getSummary_notInService_returnDisconnect() {
+ when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+ doReturn(OPERATOR_NAME).when(mTelephonyManager).getNetworkOperatorName();
+
+ assertThat(mController.getSummary()).isEqualTo(
+ mContext.getString(R.string.network_disconnected));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
index 71f94fd..bf2c132 100644
--- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.nfc;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -27,8 +28,10 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedPreference;
import org.junit.Before;
@@ -42,8 +45,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AndroidBeamPreferenceControllerTest {
@@ -68,7 +69,7 @@
when(mContext.getApplicationContext()).thenReturn(mContext);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
when(mContext.getSystemService(Context.NFC_SERVICE)).thenReturn(mManager);
- when(RestrictedLockUtils.hasBaseUserRestriction(mContext,
+ when(RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId())).thenReturn(false);
when(NfcAdapter.getDefaultAdapter(mContext)).thenReturn(mNfcAdapter);
@@ -103,7 +104,7 @@
public void isBeamEnable_disAllowBeam_shouldReturnFalse() {
when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_OFF);
- when(RestrictedLockUtils.hasBaseUserRestriction(mContext,
+ when(RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId())).thenReturn(true);
mAndroidBeamController.displayPreference(mScreen);
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java
index 6bc4d30..5dfc4f7 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java
@@ -24,6 +24,8 @@
import android.provider.Settings;
import android.provider.Settings.Global;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowNfcAdapter;
@@ -32,11 +34,8 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowNfcAdapter.class})
public class NfcAirplaneModeObserverTest {
@@ -48,10 +47,10 @@
@Before
public void setUp() {
- mContext = ShadowApplication.getInstance().getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext);
- mNfcPreference = new SwitchPreference(RuntimeEnvironment.application);
+ mNfcPreference = new SwitchPreference(mContext);
mNfcAirplaneModeObserver =
new NfcAirplaneModeObserver(mContext, mNfcAdapter, mNfcPreference);
@@ -76,7 +75,7 @@
final ContentResolver contentResolver = mContext.getContentResolver();
Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 1);
Settings.Global.putString(contentResolver,
- Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS, Settings.Global.RADIO_NFC);
+ Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS, Settings.Global.RADIO_NFC);
mNfcAirplaneModeObserver.onChange(false, NfcAirplaneModeObserver.AIRPLANE_MODE_URI);
@@ -89,7 +88,7 @@
final ContentResolver contentResolver = mContext.getContentResolver();
Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 1);
Settings.Global.putString(contentResolver,
- Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS, Global.RADIO_WIFI);
+ Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS, Global.RADIO_WIFI);
mNfcAirplaneModeObserver.onChange(false, NfcAirplaneModeObserver.AIRPLANE_MODE_URI);
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java
index 1fc63cf..cba7091 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.nfc;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -25,6 +26,8 @@
import android.nfc.NfcAdapter;
import android.provider.Settings;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,8 +37,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NfcEnablerTest {
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java
index b3e857f..113cb29 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.nfc;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,9 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import androidx.preference.DropDownPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,9 +40,6 @@
import java.util.ArrayList;
-import androidx.preference.DropDownPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NfcForegroundPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
index a23822f..7db070d 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.nfc;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -24,6 +25,8 @@
import android.content.Context;
import android.content.pm.PackageManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,8 +40,6 @@
import java.util.ArrayList;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NfcPaymentPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
index 990900c..90a71e5 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.nfc;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -27,6 +28,9 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,9 +44,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NfcPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index 2700779..b85bdda 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -18,6 +18,7 @@
package com.android.settings.nfc;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
index 8cb22b3..6537a40 100644
--- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.doCallRealMethod;
@@ -28,6 +29,8 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.accounts.AccountRestrictionHelper;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedPreference;
@@ -39,8 +42,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AdjustVolumeRestrictedPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
index 4f48b77..517c94b 100644
--- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
index 2c7c490..a9df135 100644
--- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java
@@ -20,8 +20,10 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -36,6 +38,9 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -49,9 +54,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AllowSoundPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java
index 9f411b1..83c0b06 100644
--- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java
@@ -19,8 +19,10 @@
import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -32,6 +34,8 @@
import android.content.Intent;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -42,8 +46,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppLinkPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
index 17a6714..dc368a2 100644
--- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java
@@ -21,8 +21,10 @@
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
import static android.provider.Settings.Secure.NOTIFICATION_BADGING;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
@@ -38,6 +40,9 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -51,9 +56,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BadgePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
index 150a89f..72313bb 100644
--- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java
@@ -30,6 +30,10 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,10 +44,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class BadgingNotificationPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
index bdc7d69..06ef601 100644
--- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java
@@ -22,9 +22,11 @@
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -52,6 +54,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -79,7 +82,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = spy(new BlockPreferenceController(mContext, mImportanceListener, mBackend));
mSwitch = new SwitchBar(mContext);
when(mPreference.findViewById(R.id.switch_bar)).thenReturn(mSwitch);
diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
index ee01c8d..220269e 100644
--- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java
@@ -17,12 +17,17 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.SystemProperties;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -31,10 +36,6 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.robolectric.shadows.ShadowSystemProperties;
-
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
@RunWith(SettingsRobolectricTestRunner.class)
public class BootSoundPreferenceControllerTest {
@@ -51,8 +52,8 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- when(mContext.getResources().getBoolean(com.android.settings.R.bool.has_boot_sounds))
- .thenReturn(true);
+ when(mContext.getResources().getBoolean(R.bool.has_boot_sounds))
+ .thenReturn(true);
mController = new BootSoundPreferenceController(mContext);
when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
@@ -61,7 +62,7 @@
@Test
public void isAvailable_hasBootSounds_shouldReturnTrue() {
when(mContext.getResources().getBoolean(
- com.android.settings.R.bool.has_boot_sounds)).thenReturn(true);
+ R.bool.has_boot_sounds)).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@@ -69,15 +70,14 @@
@Test
public void isAvailable_noBootSounds_shouldReturnFale() {
when(mContext.getResources().getBoolean(
- com.android.settings.R.bool.has_boot_sounds)).thenReturn(false);
+ R.bool.has_boot_sounds)).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void displayPreference_bootSoundEnabled_shouldCheckedPreference() {
- ShadowSystemProperties.native_set(BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, "1");
-
+ SystemProperties.set(BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, "true");
mController.displayPreference(mScreen);
verify(mPreference).setChecked(true);
@@ -85,7 +85,7 @@
@Test
public void displayPreference_bootSoundDisabled_shouldUncheckedPreference() {
- ShadowSystemProperties.native_set(BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, "0");
+ SystemProperties.set(BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, "0");
mController.displayPreference(mScreen);
@@ -99,7 +99,7 @@
mController.handlePreferenceTreeClick(mPreference);
assertThat(SystemProperties.get(
- BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, null)).isEqualTo("1");
+ BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, null)).isEqualTo("1");
}
@Test
@@ -109,6 +109,6 @@
mController.handlePreferenceTreeClick(mPreference);
assertThat(SystemProperties.get(
- BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, null)).isEqualTo("0");
+ BootSoundPreferenceController.PROPERTY_BOOT_SOUNDS, null)).isEqualTo("0");
}
}
diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
index 61e5287..c3c0a33 100644
--- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
index 2796049..4d22bfe 100644
--- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java
@@ -26,6 +26,10 @@
import android.content.Context;
import android.provider.Settings.Secure;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -36,10 +40,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ChargingSoundPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
index f97172e..d3463ce 100644
--- a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java
@@ -24,7 +24,9 @@
import static com.android.settings.notification.ConfigureNotificationSettings.KEY_SWIPE_DOWN;
import static com.android.settings.notification.ConfigureNotificationSettings
.SUMMARY_PROVIDER_FACTORY;
+
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;
diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java
index c1428a4..6d3f1b4 100644
--- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java
@@ -32,6 +32,8 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,10 +42,9 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DeletedChannelsPreferenceControllerTest {
@@ -63,7 +64,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = new DeletedChannelsPreferenceController(mContext, mBackend);
}
diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java
index 2d304cc..649918a 100644
--- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java
@@ -18,8 +18,10 @@
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -31,6 +33,8 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -41,8 +45,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DescriptionPreferenceControllerTest {
@@ -60,7 +62,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = spy(new DescriptionPreferenceController(mContext));
}
diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
index fe248a6..8bc6d34 100644
--- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
@@ -25,6 +26,10 @@
import android.provider.Settings.System;
import android.telephony.TelephonyManager;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,10 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DialPadTonePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
index 1b26a76..e086e7f 100644
--- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java
@@ -20,8 +20,10 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_MIN;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -35,6 +37,9 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -48,9 +53,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DndPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
index 7ddf100..7ad6230 100644
--- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
@@ -26,6 +27,10 @@
import android.content.Context;
import android.provider.Settings.Global;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.DropDownPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,10 +40,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.DropDownPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DockAudioMediaPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
index 3945d27..a087cf2 100644
--- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
@@ -25,6 +26,10 @@
import android.content.Context;
import android.provider.Settings.Global;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,10 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DockingSoundPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
index 93273c8..ef38211 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.eq;
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
index f2687b2..5c71c64 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
@@ -25,6 +26,10 @@
import android.provider.Settings.Global;
import android.telephony.TelephonyManager;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.DropDownPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,10 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.DropDownPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EmergencyTonePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
index 81383f7..57c8712 100644
--- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java
@@ -17,8 +17,10 @@
package com.android.settings.notification;
import static android.app.NotificationManager.IMPORTANCE_NONE;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -32,6 +34,9 @@
import android.os.UserManager;
import android.view.View;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceFragmentCompat;
+
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -40,11 +45,9 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceFragmentCompat;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class HeaderPreferenceControllerTest {
@@ -66,7 +69,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
PreferenceFragmentCompat fragment = mock(PreferenceFragmentCompat.class);
when(fragment.getContext()).thenReturn(mContext);
FragmentActivity activity = mock(FragmentActivity.class);
diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
index bb7b05f..0c706fb 100644
--- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java
@@ -20,10 +20,12 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE;
+
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNull;
import static junit.framework.Assert.assertTrue;
+
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -36,6 +38,9 @@
import android.os.UserManager;
import android.text.TextUtils;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.RestrictedListPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
@@ -49,9 +54,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ImportancePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
index c9d6530..6ceaffa 100644
--- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java
@@ -21,8 +21,10 @@
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -37,6 +39,9 @@
import android.os.UserManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settingslib.RestrictedLockUtils;
@@ -52,9 +57,6 @@
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class LightsPreferenceControllerTest {
@@ -83,7 +85,7 @@
// By default allow lights
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_intrusiveNotificationLed, true);
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1);
+ Settings.System.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1);
}
@Test
@@ -105,7 +107,7 @@
@Test
public void testIsAvailable_notIfSettingNotAllowed() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 0);
+ Settings.System.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 0);
NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_DEFAULT);
mController.onResume(appRow, channel, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java
index bd83703..af810ac 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -26,6 +27,9 @@
import android.widget.LinearLayout;
import android.widget.Switch;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
@@ -35,9 +39,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NotificationAppPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
index 9da6d72..088fade 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertNull;
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
index a245c80..5d6e1fe 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java
@@ -22,8 +22,10 @@
import static android.app.NotificationManager.IMPORTANCE_MIN;
import static android.app.NotificationManager.IMPORTANCE_NONE;
import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.any;
@@ -38,6 +40,8 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
@@ -47,10 +51,9 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NotificationPreferenceControllerTest {
@@ -71,7 +74,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = new TestPreferenceController(mContext, mBackend);
}
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
index 9d805e8..cd3fad7 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java
index d8ef938..65c60c7 100644
--- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.notification;
import static android.app.NotificationManager.IMPORTANCE_NONE;
+
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;
@@ -28,6 +30,8 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,8 +42,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NotificationsOffPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
index 98cbc76..7a98386 100644
--- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
index b4f86a7..235d7b2 100644
--- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java
@@ -29,6 +29,10 @@
import android.content.res.Resources;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -40,10 +44,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PulseNotificationPreferenceControllerTest {
@@ -138,14 +138,14 @@
@Test
public void isChecked_configOn_shouldReturnTrue() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1);
+ Settings.System.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1);
assertThat(mController.isChecked()).isTrue();
}
@Test
public void isChecked_configOff_shouldReturnFalse() {
- Settings.Secure.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 0);
+ Settings.System.putInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 0);
assertThat(mController.isChecked()).isFalse();
}
@@ -156,7 +156,7 @@
assertThat(mController.isChecked()).isTrue();
assertThat(
- Settings.Secure.getInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 0))
+ Settings.System.getInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 0))
.isEqualTo(1);
}
@@ -166,7 +166,7 @@
assertThat(mController.isChecked()).isFalse();
assertThat(
- Settings.Secure.getInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1))
+ Settings.System.getInt(mContext.getContentResolver(), NOTIFICATION_LIGHT_PULSE, 1))
.isEqualTo(0);
}
}
diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
index 4c15769..e222b20 100644
--- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -40,6 +41,12 @@
import android.service.notification.NotifyingApp;
import android.text.TextUtils;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.AppUtils;
@@ -60,12 +67,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RecentNotifyingAppsPreferenceControllerTest {
@@ -188,9 +189,8 @@
mController.displayPreference(mScreen);
verify(mCategory).setTitle(R.string.recent_notifications);
- // Only add app1. app2 is skipped because of the package name, app3 skipped because
- // it's invalid app.
- verify(mCategory, times(1)).addPreference(any(Preference.class));
+ // Only add app1 & app2. app3 skipped because it's invalid app.
+ verify(mCategory, times(2)).addPreference(any(Preference.class));
verify(mSeeAllPref).setSummary(null);
verify(mSeeAllPref).setIcon(R.drawable.ic_chevron_right_24dp);
@@ -246,35 +246,6 @@
}
@Test
- public void display_hasRecentButNoneDisplayable_showAppInfo() {
- final List<NotifyingApp> apps = new ArrayList<>();
- final NotifyingApp app1 = new NotifyingApp()
- .setPackage("com.android.phone")
- .setLastNotified(System.currentTimeMillis());
- final NotifyingApp app2 = new NotifyingApp()
- .setPackage("com.android.settings")
- .setLastNotified(System.currentTimeMillis());
- apps.add(app1);
- apps.add(app2);
-
- // app1, app2 are not displayable
- when(mAppState.getEntry(app1.getPackage(), UserHandle.myUserId()))
- .thenReturn(mock(ApplicationsState.AppEntry.class));
- when(mAppState.getEntry(app2.getPackage(), UserHandle.myUserId()))
- .thenReturn(mock(ApplicationsState.AppEntry.class));
- when(mPackageManager.resolveActivity(any(Intent.class), anyInt())).thenReturn(
- new ResolveInfo());
- when(mBackend.getRecentApps()).thenReturn(apps);
-
- mController.displayPreference(mScreen);
-
- verify(mCategory, never()).addPreference(any(Preference.class));
- verify(mCategory).setTitle(null);
- verify(mSeeAllPref).setTitle(R.string.notifications_title);
- verify(mSeeAllPref).setIcon(null);
- }
-
- @Test
public void display_showRecents_formatSummary() {
final List<NotifyingApp> apps = new ArrayList<>();
final NotifyingApp app1 = new NotifyingApp()
diff --git a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java
index 20139bb..b62495c 100644
--- a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java
@@ -4,7 +4,9 @@
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS;
import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.robolectric.Robolectric.buildActivity;
import android.content.ContentResolver;
@@ -20,7 +22,7 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils;
@@ -37,7 +39,7 @@
SettingsShadowResourcesImpl.class,
SettingsShadowResources.SettingsShadowTheme.class,
ShadowUtils.class,
- ShadowRestrictedLockUtils.class,
+ ShadowRestrictedLockUtilsInternal.class,
ShadowUserManager.class,
})
public class RedactionInterstitialTest {
@@ -47,7 +49,7 @@
@After
public void tearDown() {
ShadowUserManager.getShadow().reset();
- ShadowRestrictedLockUtils.reset();
+ ShadowRestrictedLockUtilsInternal.reset();
}
@Test
@@ -83,7 +85,7 @@
@Test
public void primaryUserUnredactedRestrictionTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */);
- ShadowRestrictedLockUtils.setKeyguardDisabledFeatures(
+ ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
setupActivity();
@@ -95,7 +97,7 @@
@Test
public void primaryUserNotificationRestrictionTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */);
- ShadowRestrictedLockUtils.setKeyguardDisabledFeatures(
+ ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
setupActivity();
@@ -119,7 +121,7 @@
public void managedProfileUnredactedRestrictionTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */);
ShadowUserManager.getShadow().addManagedProfile(UserHandle.myUserId());
- ShadowRestrictedLockUtils.setKeyguardDisabledFeatures(
+ ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
setupActivity();
diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
index 65bc7e6..50a01bc 100644
--- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.app.NotificationManager;
diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
index 6c4253f..3bd3292 100644
--- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -24,6 +25,8 @@
import android.content.Context;
import android.media.RingtoneManager;
+import androidx.preference.Preference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,8 +35,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RingtonePreferenceControllerBaseTest {
diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
index f370368..d3d4bc1 100644
--- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -25,6 +26,10 @@
import android.content.Context;
import android.provider.Settings.System;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,10 +40,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ScreenLockSoundPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
index a70e7b6..6d51cde 100644
--- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.notification;
import static com.android.settings.notification.SettingPref.TYPE_GLOBAL;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -27,6 +29,9 @@
import android.content.Context;
import android.provider.Settings.Global;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -41,9 +46,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SettingPrefControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
index cbf01b1..cfffbdc 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java
@@ -20,8 +20,10 @@
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -42,6 +44,9 @@
import android.provider.Settings;
import android.util.AttributeSet;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -54,12 +59,10 @@
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.class)
public class SoundPreferenceControllerTest {
@@ -88,7 +91,7 @@
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
SettingsShadowResources.overrideResource(com.android.internal.R.string.ringtone_silent,
"silent");
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = spy(new SoundPreferenceController(
mContext, mFragment, mImportanceListener, mBackend));
}
diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
index 3e0d0b4..3510a60 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
index 622d5cd..9bb380d 100644
--- a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java
@@ -16,6 +16,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.ComponentName;
diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
index 4d4a4af..abea4e3 100644
--- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java
@@ -17,16 +17,20 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
-import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.media.AudioManager;
import android.provider.Settings.System;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,10 +41,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TouchSoundPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
index 5f96ea5..daf7ffb 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.when;
@@ -25,6 +26,10 @@
import android.os.Vibrator;
import android.provider.Settings.System;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,10 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class VibrateOnTouchPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
index 91ee47e..aa1824d 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java
@@ -17,9 +17,12 @@
package com.android.settings.notification;
import static android.provider.Settings.System.VIBRATE_WHEN_RINGING;
+
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
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;
@@ -29,6 +32,10 @@
import android.provider.Settings;
import android.telephony.TelephonyManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -40,10 +47,6 @@
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowContentResolver;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class VibrateWhenRingPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
index 29b7049..69438e2 100644
--- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java
@@ -20,8 +20,10 @@
import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
import static android.app.NotificationManager.IMPORTANCE_HIGH;
import static android.app.NotificationManager.IMPORTANCE_LOW;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
@@ -36,6 +38,9 @@
import android.os.UserManager;
import android.os.Vibrator;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -49,9 +54,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class VibrationPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
index fbc2512..8aad02e 100644
--- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java
@@ -23,8 +23,10 @@
import static android.app.NotificationManager.VISIBILITY_NO_OVERRIDE;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS;
import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS;
+
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -57,6 +59,7 @@
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
@@ -89,7 +92,7 @@
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);
shadowApplication.setSystemService(Context.USER_SERVICE, mUm);
shadowApplication.setSystemService(Context.DEVICE_POLICY_SERVICE, mDm);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = spy(new VisibilityPreferenceController(mContext, mLockUtils, mBackend));
// by default the lockscreen is secure
@@ -200,7 +203,7 @@
mController.updateState(pref);
ArgumentCaptor<CharSequence[]> argumentCaptor =
- ArgumentCaptor.forClass(CharSequence[].class);
+ ArgumentCaptor.forClass(CharSequence[].class);
verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
assertFalse(toStringList(argumentCaptor.getValue())
.contains(String.valueOf(VISIBILITY_NO_OVERRIDE)));
@@ -248,7 +251,7 @@
mController.updateState(pref);
ArgumentCaptor<CharSequence[]> argumentCaptor =
- ArgumentCaptor.forClass(CharSequence[].class);
+ ArgumentCaptor.forClass(CharSequence[].class);
verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
assertEquals(2, toStringList(argumentCaptor.getValue()).size());
assertFalse(toStringList(argumentCaptor.getValue())
@@ -265,7 +268,7 @@
mController.updateState(pref);
ArgumentCaptor<CharSequence[]> argumentCaptor =
- ArgumentCaptor.forClass(CharSequence[].class);
+ ArgumentCaptor.forClass(CharSequence[].class);
verify(pref, times(1)).setEntryValues(argumentCaptor.capture());
List<String> values = toStringList(argumentCaptor.getValue());
assertEquals(3, values.size());
diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
index d583d37..99a97c3 100644
--- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
@@ -26,6 +27,9 @@
import android.content.Context;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,9 +38,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class VolumeSeekBarPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
index 76f2b14..4397e71 100644
--- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -30,6 +31,11 @@
import android.os.UserManager;
import android.telephony.TelephonyManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
import com.android.settings.DefaultRingtonePreference;
import com.android.settings.R;
import com.android.settings.RingtonePreference;
@@ -41,11 +47,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WorkSoundPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java
index 7f7be56..c679205 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -25,6 +26,8 @@
import android.view.View;
import android.widget.RadioButton;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,8 +36,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenCustomRadioButtonPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java
index 1360605..eb89f82 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java
@@ -25,7 +25,9 @@
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -33,6 +35,8 @@
import android.app.NotificationManager;
import android.content.Context;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,11 +47,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenFooterPreferenceControllerTest {
private ZenFooterPreferenceController mController;
@@ -59,7 +62,8 @@
private Context mContext;
@Mock
private PreferenceScreen mScreen;
- @Mock NotificationManager mNotificationManager;
+ @Mock
+ NotificationManager mNotificationManager;
private static final String PREF_KEY = "main_pref";
@@ -67,7 +71,7 @@
public void setup() {
MockitoAnnotations.initMocks(this);
ShadowApplication shadowApplication = ShadowApplication.getInstance();
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
when(mNotificationManager.getNotificationPolicy()).thenReturn(
mock(NotificationManager.Policy.class));
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java
index e68359a..df4df51 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java
@@ -20,6 +20,7 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -71,14 +72,15 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
- mController = new ZenModeAlarmsPreferenceController(mContext, mock(Lifecycle.class));
+ mController = new ZenModeAlarmsPreferenceController(mContext, mock(Lifecycle.class),
+ "zen_mode_behavior_alarms");
ReflectionHelpers.setField(mController, "mBackend", mBackend);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mockPref);
+ .thenReturn(mockPref);
mController.displayPreference(mPreferenceScreen);
}
@@ -123,7 +125,7 @@
mController.onPreferenceChange(mockPref, allowAlarms);
verify(mBackend)
- .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS, allowAlarms);
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS, allowAlarms);
}
@Test
@@ -132,6 +134,6 @@
mController.onPreferenceChange(mockPref, allowAlarms);
verify(mBackend)
- .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS, allowAlarms);
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS, allowAlarms);
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java
index 63b0e31..ec50e2b 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static junit.framework.Assert.assertEquals;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -25,6 +26,10 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.fragment.app.Fragment;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -42,10 +47,6 @@
import java.util.List;
import java.util.Map;
-import androidx.fragment.app.Fragment;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeAutomaticRulesPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java
deleted file mode 100644
index b6cb3ee..0000000
--- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java
+++ /dev/null
@@ -1,80 +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.notification;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.NotificationManager;
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import androidx.preference.Preference;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public final class ZenModeBehaviorCallsPreferenceControllerTest {
-
- private ZenModeBehaviorCallsPreferenceController mController;
- @Mock
- private NotificationManager mNotificationManager;
- @Mock
- private NotificationManager.Policy mPolicy;
-
- private Context mContext;
- @Mock
- private ZenModeBackend mBackend;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- ShadowApplication shadowApplication = ShadowApplication.getInstance();
- shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
-
- mContext = RuntimeEnvironment.application;
- when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
-
- mController = new ZenModeBehaviorCallsPreferenceController(
- mContext, mock(Lifecycle.class));
- ReflectionHelpers.setField(mController, "mBackend", mBackend);
- }
-
- @Test
- public void testIsAvailable() {
- assertTrue(mController.isAvailable());
- }
-
- @Test
- public void testHasSummary() {
- Preference pref = mock(Preference.class);
- mController.updateState(pref);
- verify(pref).setSummary(any());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java
index 79a3671..c4b2b3d 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java
@@ -21,7 +21,9 @@
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_OFF;
+
import static junit.framework.Assert.assertTrue;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -36,6 +38,9 @@
import android.service.notification.ZenModeConfig.ZenRule;
import android.util.ArrayMap;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -50,9 +55,6 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeBehaviorFooterPreferenceControllerTest {
@@ -84,7 +86,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getZenModeConfig()).thenReturn(mZenModeConfig);
@@ -93,7 +95,7 @@
ReflectionHelpers.setField(mController, "mZenModeConfigWrapper", mConfigWrapper);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mockPref);
+ .thenReturn(mockPref);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java
deleted file mode 100644
index 15bc48a..0000000
--- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java
+++ /dev/null
@@ -1,80 +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.notification;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.NotificationManager;
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import androidx.preference.Preference;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public final class ZenModeBehaviorMsgEventReminderPreferenceControllerTest {
-
- private ZenModeBehaviorMsgEventReminderPreferenceController mController;
- @Mock
- private NotificationManager mNotificationManager;
- @Mock
- private NotificationManager.Policy mPolicy;
-
- private Context mContext;
- @Mock
- private ZenModeBackend mBackend;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- ShadowApplication shadowApplication = ShadowApplication.getInstance();
- shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
-
- mContext = RuntimeEnvironment.application;
- when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
-
- mController = new ZenModeBehaviorMsgEventReminderPreferenceController(
- mContext, mock(Lifecycle.class));
- ReflectionHelpers.setField(mController, "mBackend", mBackend);
- }
-
- @Test
- public void testIsAvailable() {
- assertTrue(mController.isAvailable());
- }
-
- @Test
- public void testHasSummary() {
- Preference pref = mock(Preference.class);
- mController.updateState(pref);
- verify(pref).setSummary(any());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java
deleted file mode 100644
index d4d214f..0000000
--- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java
+++ /dev/null
@@ -1,80 +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.notification;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.NotificationManager;
-import android.content.Context;
-
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-
-import androidx.preference.Preference;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public final class ZenModeBehaviorSoundPreferenceControllerTest {
-
- private ZenModeBehaviorSoundPreferenceController mController;
- @Mock
- private NotificationManager mNotificationManager;
- @Mock
- private NotificationManager.Policy mPolicy;
-
- private Context mContext;
- @Mock
- private ZenModeBackend mBackend;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- ShadowApplication shadowApplication = ShadowApplication.getInstance();
- shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
-
- mContext = RuntimeEnvironment.application;
- when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
-
- mController = new ZenModeBehaviorSoundPreferenceController(
- mContext, mock(Lifecycle.class));
- ReflectionHelpers.setField(mController, "mBackend", mBackend);
- }
-
- @Test
- public void testIsAvailable() {
- assertTrue(mController.isAvailable());
- }
-
- @Test
- public void testHasSummary() {
- Preference pref = mock(Preference.class);
- mController.updateState(pref);
- verify(pref).setSummary(any());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
index 9450df0..a3c3261 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java
@@ -21,6 +21,7 @@
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_OFF;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -32,6 +33,10 @@
import android.view.View;
import android.widget.Button;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -44,10 +49,6 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.FragmentManager;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeButtonPreferenceControllerTest {
@@ -76,7 +77,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mContentResolver = RuntimeEnvironment.application.getContentResolver();
mController = new ZenModeButtonPreferenceController(mContext, mock(Lifecycle.class),
mock(FragmentManager.class));
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
index 9ff5acb..fdc43f3 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 The Android Open Source Project
+ * 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.
@@ -16,20 +16,15 @@
package com.android.settings.notification;
-import static android.provider.Settings.Global.ZEN_MODE;
-import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
-import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
-import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.NotificationManager;
-import android.content.ContentResolver;
import android.content.Context;
-import android.provider.Settings;
-import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -42,35 +37,20 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
+import androidx.preference.Preference;
@RunWith(SettingsRobolectricTestRunner.class)
-public class ZenModeCallsPreferenceControllerTest {
+public final class ZenModeCallsPreferenceControllerTest {
private ZenModeCallsPreferenceController mController;
-
- @Mock
- private ZenModeBackend mBackend;
@Mock
private NotificationManager mNotificationManager;
@Mock
- private ListPreference mockPref;
- @Mock
private NotificationManager.Policy mPolicy;
- @Mock
- private PreferenceScreen mPreferenceScreen;
- private ContentResolver mContentResolver;
- private Context mContext;
- /**
- * Array Values Key
- * 0: anyone
- * 1: contacts
- * 2: starred
- * 3: none
- */
- private String[] mValues;
+ private Context mContext;
+ @Mock
+ private ZenModeBackend mBackend;
@Before
public void setup() {
@@ -78,101 +58,23 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
- mValues = mContext.getResources().getStringArray(R.array.zen_mode_contacts_values);
- mContentResolver = RuntimeEnvironment.application.getContentResolver();
+ mContext = RuntimeEnvironment.application;
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
- when(mBackend.getPriorityCallSenders())
- .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
- when(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE))
- .thenCallRealMethod();
- when(mBackend.getContactsSummary(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
- .thenCallRealMethod();
-
- mController = new ZenModeCallsPreferenceController(mContext, mock(Lifecycle.class));
+ mController = new ZenModeCallsPreferenceController(
+ mContext, mock(Lifecycle.class), "zen_mode_calls_settings");
ReflectionHelpers.setField(mController, "mBackend", mBackend);
-
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mockPref);
- mController.displayPreference(mPreferenceScreen);
}
@Test
- public void updateState_TotalSilence() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
-
- when(mBackend.isPriorityCategoryEnabled(
- NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
- .thenReturn(false);
- final ListPreference mockPref = mock(ListPreference.class);
- mController.updateState(mockPref);
-
- verify(mockPref).setEnabled(false);
- verify(mockPref).setSummary(R.string.zen_mode_from_none);
+ public void testIsAvailable() {
+ assertTrue(mController.isAvailable());
}
@Test
- public void updateState_AlarmsOnly() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
-
- final ListPreference mockPref = mock(ListPreference.class);
- mController.updateState(mockPref);
-
- verify(mockPref).setEnabled(false);
- verify(mockPref).setSummary(R.string.zen_mode_from_none);
+ public void testHasSummary() {
+ Preference pref = mock(Preference.class);
+ mController.updateState(pref);
+ verify(pref).setSummary(any());
}
-
- @Test
- public void updateState_Priority() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
-
- when(mBackend.isPriorityCategoryEnabled(
- NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
- .thenReturn(true);
-
- mController.updateState(mockPref);
-
- verify(mockPref).setEnabled(true);
- verify(mockPref).setSummary(R.string.zen_mode_from_starred);
- }
-
- @Test
- public void onPreferenceChange_setSelectedContacts_any() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- when(mBackend.getPriorityCallSenders()).thenReturn(
- NotificationManager.Policy.PRIORITY_SENDERS_ANY);
- mController.updateState(mockPref);
- verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
- ZenModeBackend.ZEN_MODE_FROM_ANYONE)]);
- }
-
- @Test
- public void onPreferenceChange_setSelectedContacts_none() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- when(mBackend.getPriorityCallSenders()).thenReturn(ZenModeBackend.SOURCE_NONE);
- mController.updateState(mockPref);
- verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
- ZenModeBackend.ZEN_MODE_FROM_NONE)]);
- }
-
- @Test
- public void onPreferenceChange_setSelectedContacts_starred() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- when(mBackend.getPriorityCallSenders()).thenReturn(
- NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
- mController.updateState(mockPref);
- verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
- ZenModeBackend.ZEN_MODE_FROM_STARRED)]);
- }
-
- @Test
- public void onPreferenceChange_setSelectedContacts_contacts() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- when(mBackend.getPriorityCallSenders()).thenReturn(
- NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS);
- mController.updateState(mockPref);
- verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
- ZenModeBackend.ZEN_MODE_FROM_CONTACTS)]);
- }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java
index b9d2978..2d5e54a 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java
@@ -57,7 +57,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mContentResolver = RuntimeEnvironment.application.getContentResolver();
mController = new ZenModeDurationPreferenceController(mContext, mock(Lifecycle.class));
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java
new file mode 100644
index 0000000..9a922ba
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventRuleSettingsTest.java
@@ -0,0 +1,120 @@
+/*
+ * 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.notification;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+
+import androidx.fragment.app.FragmentActivity;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.shadows.ShadowToast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
+public class ZenModeEventRuleSettingsTest {
+
+ @Mock
+ private FragmentActivity mActivity;
+
+ @Mock
+ private Intent mIntent;
+
+ @Mock
+ private NotificationManager mNotificationManager;
+
+ private TestFragment mFragment;
+ private Context mContext;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+
+ ShadowApplication shadowApplication = ShadowApplication.getInstance();
+ shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+ mContext = RuntimeEnvironment.application;
+
+ mFragment = spy(new TestFragment());
+ mFragment.onAttach(application);
+
+ doReturn(mActivity).when(mFragment).getActivity();
+
+ Resources res = application.getResources();
+
+ doReturn(res).when(mFragment).getResources();
+ when(mActivity.getTheme()).thenReturn(res.newTheme());
+ when(mActivity.getIntent()).thenReturn(mIntent);
+ when(mActivity.getResources()).thenReturn(res);
+ when(mFragment.getContext()).thenReturn(mContext);
+ }
+
+ @Test
+ public void onCreate_noRuleId_shouldToastAndFinishAndNoCrash() {
+ final String expected = mContext.getString(R.string.zen_mode_rule_not_found_text);
+
+ mFragment.onCreate(null);
+
+ // verify the toast
+ assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(expected);
+
+ // verify the finish
+ verify(mActivity).finish();
+
+ //should not crash
+ }
+
+ @Test
+ public void testNoDuplicateCalendars() {
+ List<ZenModeEventRuleSettings.CalendarInfo> calendarsList = new ArrayList<>();
+ mFragment.addCalendar(1234, "calName", 1, calendarsList);
+ mFragment.addCalendar(1234, "calName", 2, calendarsList);
+ mFragment.addCalendar(1234, "calName", 3, calendarsList);
+ assertThat(calendarsList.size()).isEqualTo(1);
+ }
+
+ private static class TestFragment extends ZenModeEventRuleSettings {
+
+ @Override
+ protected Object getSystemService(final String name) {
+ return null;
+ }
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java
index 36e61a4..7d5efa7 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java
@@ -20,6 +20,7 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,6 +30,9 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -41,9 +45,6 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeEventsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java
index afdfcf3..9217f64 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java
@@ -20,6 +20,7 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,6 +30,9 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -42,9 +46,6 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeMediaPreferenceControllerTest {
private ZenModeMediaPreferenceController mController;
@@ -69,7 +70,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
@@ -78,7 +79,7 @@
ReflectionHelpers.setField(mController, "mBackend", mBackend);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mockPref);
+ .thenReturn(mockPref);
mController.displayPreference(mPreferenceScreen);
}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
index c4aaa8c..890f6c2 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017 The Android Open Source Project
+ * 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.
@@ -16,20 +16,13 @@
package com.android.settings.notification;
-import static android.provider.Settings.Global.ZEN_MODE;
-import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
-import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
-import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.NotificationManager;
-import android.content.ContentResolver;
import android.content.Context;
-import android.provider.Settings;
-import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -42,35 +35,18 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
-public class ZenModeMessagesPreferenceControllerTest {
+public final class ZenModeMessagesPreferenceControllerTest {
private ZenModeMessagesPreferenceController mController;
-
- @Mock
- private ZenModeBackend mBackend;
@Mock
private NotificationManager mNotificationManager;
@Mock
- private ListPreference mockPref;
- @Mock
private NotificationManager.Policy mPolicy;
- @Mock
- private PreferenceScreen mPreferenceScreen;
- private ContentResolver mContentResolver;
- private Context mContext;
- /**
- * Array Values Key
- * 0: anyone
- * 1: contacts
- * 2: starred
- * 3: none
- */
- private String[] mValues;
+ private Context mContext;
+ @Mock
+ private ZenModeBackend mBackend;
@Before
public void setup() {
@@ -78,101 +54,24 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
- mValues = mContext.getResources().getStringArray(R.array.zen_mode_contacts_values);
- mContentResolver = RuntimeEnvironment.application.getContentResolver();
+ mContext = RuntimeEnvironment.application;
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
- when(mBackend.getPriorityMessageSenders())
- .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
- when(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE))
- .thenCallRealMethod();
- when(mBackend.getContactsSummary(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
- .thenCallRealMethod();
-
- mController = new ZenModeMessagesPreferenceController(mContext, mock(Lifecycle.class));
+ mController = new ZenModeMessagesPreferenceController(
+ mContext, mock(Lifecycle.class), "zen_mode_messages_settings");
ReflectionHelpers.setField(mController, "mBackend", mBackend);
-
- when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
- mockPref);
- mController.displayPreference(mPreferenceScreen);
}
@Test
- public void updateState_TotalSilence() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
-
- when(mBackend.isPriorityCategoryEnabled(
- NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
- .thenReturn(false);
- final ListPreference mockPref = mock(ListPreference.class);
- mController.updateState(mockPref);
-
- verify(mockPref).setEnabled(false);
- verify(mockPref).setSummary(R.string.zen_mode_from_none);
+ public void testIsAvailable() {
+ assertTrue(mController.isAvailable());
}
- @Test
- public void updateState_AlarmsOnly() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
-
- final ListPreference mockPref = mock(ListPreference.class);
- mController.updateState(mockPref);
-
- verify(mockPref).setEnabled(false);
- verify(mockPref).setSummary(R.string.zen_mode_from_none);
- }
-
- @Test
- public void updateState_Priority() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
-
- when(mBackend.isPriorityCategoryEnabled(
- NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
- .thenReturn(true);
-
- mController.updateState(mockPref);
-
- verify(mockPref).setEnabled(true);
- verify(mockPref).setSummary(R.string.zen_mode_from_starred);
- }
-
- @Test
- public void onPreferenceChange_setSelectedContacts_any() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- when(mBackend.getPriorityMessageSenders()).thenReturn(
- NotificationManager.Policy.PRIORITY_SENDERS_ANY);
- mController.updateState(mockPref);
- verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
- ZenModeBackend.ZEN_MODE_FROM_ANYONE)]);
- }
-
- @Test
- public void onPreferenceChange_setSelectedContacts_none() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- when(mBackend.getPriorityMessageSenders()).thenReturn(ZenModeBackend.SOURCE_NONE);
- mController.updateState(mockPref);
- verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
- ZenModeBackend.ZEN_MODE_FROM_NONE)]);
- }
-
- @Test
- public void onPreferenceChange_setSelectedContacts_starred() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- when(mBackend.getPriorityMessageSenders()).thenReturn(
- NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
- mController.updateState(mockPref);
- verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
- ZenModeBackend.ZEN_MODE_FROM_STARRED)]);
- }
-
- @Test
- public void onPreferenceChange_setSelectedContacts_contacts() {
- Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
- when(mBackend.getPriorityMessageSenders()).thenReturn(
- NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS);
- mController.updateState(mockPref);
- verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
- ZenModeBackend.ZEN_MODE_FROM_CONTACTS)]);
- }
-}
\ No newline at end of file
+// TODO: (b/111475013 - beverlyt) set messages summary
+// @Test
+// public void testHasSummary() {
+// Preference pref = mock(Preference.class);
+// mController.updateState(pref);
+// verify(pref).setSummary(any());
+// }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
index ece25e2..141813b 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.notification;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
@@ -29,6 +31,8 @@
import android.app.NotificationManager.Policy;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,11 +41,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModePreferenceControllerTest {
@@ -62,7 +65,7 @@
MockitoAnnotations.initMocks(this);
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = new ZenModePreferenceController(mContext, KEY_ZEN_MODE);
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
mSummaryBuilder = spy(new ZenModeSettings.SummaryBuilder(mContext));
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java
new file mode 100644
index 0000000..36a1382
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModePriorityCallsPreferenceControllerTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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.notification;
+
+import static android.provider.Settings.Global.ZEN_MODE;
+import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ZenModePriorityCallsPreferenceControllerTest {
+
+ private ZenModePriorityCallsPreferenceController mController;
+
+ @Mock
+ private ZenModeBackend mBackend;
+ @Mock
+ private NotificationManager mNotificationManager;
+ @Mock
+ private ListPreference mockPref;
+ @Mock
+ private NotificationManager.Policy mPolicy;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+ private ContentResolver mContentResolver;
+ private Context mContext;
+
+ /**
+ * Array Values Key
+ * 0: anyone
+ * 1: contacts
+ * 2: starred
+ * 3: none
+ */
+ private String[] mValues;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ ShadowApplication shadowApplication = ShadowApplication.getInstance();
+ shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+ mContext = RuntimeEnvironment.application;
+ mValues = mContext.getResources().getStringArray(R.array.zen_mode_contacts_values);
+ mContentResolver = RuntimeEnvironment.application.getContentResolver();
+ when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+
+ when(mBackend.getPriorityCallSenders())
+ .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
+ when(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE))
+ .thenCallRealMethod();
+ when(mBackend.getContactsSummary(NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+ .thenCallRealMethod();
+
+ mController = new ZenModePriorityCallsPreferenceController(mContext, mock(Lifecycle.class));
+ ReflectionHelpers.setField(mController, "mBackend", mBackend);
+
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mockPref);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void updateState_TotalSilence() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+
+ when(mBackend.isPriorityCategoryEnabled(
+ NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+ .thenReturn(false);
+ final ListPreference mockPref = mock(ListPreference.class);
+ mController.updateState(mockPref);
+
+ verify(mockPref).setEnabled(false);
+ verify(mockPref).setSummary(R.string.zen_mode_from_none);
+ }
+
+ @Test
+ public void updateState_AlarmsOnly() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
+
+ final ListPreference mockPref = mock(ListPreference.class);
+ mController.updateState(mockPref);
+
+ verify(mockPref).setEnabled(false);
+ verify(mockPref).setSummary(R.string.zen_mode_from_none);
+ }
+
+ @Test
+ public void updateState_Priority() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+
+ when(mBackend.isPriorityCategoryEnabled(
+ NotificationManager.Policy.PRIORITY_CATEGORY_CALLS))
+ .thenReturn(true);
+
+ mController.updateState(mockPref);
+
+ verify(mockPref).setEnabled(true);
+ verify(mockPref).setSummary(R.string.zen_mode_from_starred);
+ }
+
+ @Test
+ public void onPreferenceChange_setSelectedContacts_any() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+ when(mBackend.getPriorityCallSenders()).thenReturn(
+ NotificationManager.Policy.PRIORITY_SENDERS_ANY);
+ mController.updateState(mockPref);
+ verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
+ ZenModeBackend.ZEN_MODE_FROM_ANYONE)]);
+ }
+
+ @Test
+ public void onPreferenceChange_setSelectedContacts_none() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+ when(mBackend.getPriorityCallSenders()).thenReturn(ZenModeBackend.SOURCE_NONE);
+ mController.updateState(mockPref);
+ verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
+ ZenModeBackend.ZEN_MODE_FROM_NONE)]);
+ }
+
+ @Test
+ public void onPreferenceChange_setSelectedContacts_starred() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+ when(mBackend.getPriorityCallSenders()).thenReturn(
+ NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
+ mController.updateState(mockPref);
+ verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
+ ZenModeBackend.ZEN_MODE_FROM_STARRED)]);
+ }
+
+ @Test
+ public void onPreferenceChange_setSelectedContacts_contacts() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+ when(mBackend.getPriorityCallSenders()).thenReturn(
+ NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS);
+ mController.updateState(mockPref);
+ verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
+ ZenModeBackend.ZEN_MODE_FROM_CONTACTS)]);
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java
new file mode 100644
index 0000000..75605a4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ZenModePriorityMessagesPreferenceControllerTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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.notification;
+
+import static android.provider.Settings.Global.ZEN_MODE;
+import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
+import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
+import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class ZenModePriorityMessagesPreferenceControllerTest {
+
+ private ZenModePriorityMessagesPreferenceController mController;
+
+ @Mock
+ private ZenModeBackend mBackend;
+ @Mock
+ private NotificationManager mNotificationManager;
+ @Mock
+ private ListPreference mockPref;
+ @Mock
+ private NotificationManager.Policy mPolicy;
+ @Mock
+ private PreferenceScreen mPreferenceScreen;
+ private ContentResolver mContentResolver;
+ private Context mContext;
+
+ /**
+ * Array Values Key
+ * 0: anyone
+ * 1: contacts
+ * 2: starred
+ * 3: none
+ */
+ private String[] mValues;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ ShadowApplication shadowApplication = ShadowApplication.getInstance();
+ shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
+
+ mContext = RuntimeEnvironment.application;
+ mValues = mContext.getResources().getStringArray(R.array.zen_mode_contacts_values);
+ mContentResolver = RuntimeEnvironment.application.getContentResolver();
+ when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
+
+ when(mBackend.getPriorityMessageSenders())
+ .thenReturn(NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
+ when(mBackend.getContactsSummary(ZenModeBackend.SOURCE_NONE))
+ .thenCallRealMethod();
+ when(mBackend.getContactsSummary(NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
+ .thenCallRealMethod();
+
+ mController = new ZenModePriorityMessagesPreferenceController(mContext, mock(Lifecycle.class));
+ ReflectionHelpers.setField(mController, "mBackend", mBackend);
+
+ when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
+ mockPref);
+ mController.displayPreference(mPreferenceScreen);
+ }
+
+ @Test
+ public void updateState_TotalSilence() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_NO_INTERRUPTIONS);
+
+ when(mBackend.isPriorityCategoryEnabled(
+ NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
+ .thenReturn(false);
+ final ListPreference mockPref = mock(ListPreference.class);
+ mController.updateState(mockPref);
+
+ verify(mockPref).setEnabled(false);
+ verify(mockPref).setSummary(R.string.zen_mode_from_none);
+ }
+
+ @Test
+ public void updateState_AlarmsOnly() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_ALARMS);
+
+ final ListPreference mockPref = mock(ListPreference.class);
+ mController.updateState(mockPref);
+
+ verify(mockPref).setEnabled(false);
+ verify(mockPref).setSummary(R.string.zen_mode_from_none);
+ }
+
+ @Test
+ public void updateState_Priority() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+
+ when(mBackend.isPriorityCategoryEnabled(
+ NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES))
+ .thenReturn(true);
+
+ mController.updateState(mockPref);
+
+ verify(mockPref).setEnabled(true);
+ verify(mockPref).setSummary(R.string.zen_mode_from_starred);
+ }
+
+ @Test
+ public void onPreferenceChange_setSelectedContacts_any() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+ when(mBackend.getPriorityMessageSenders()).thenReturn(
+ NotificationManager.Policy.PRIORITY_SENDERS_ANY);
+ mController.updateState(mockPref);
+ verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
+ ZenModeBackend.ZEN_MODE_FROM_ANYONE)]);
+ }
+
+ @Test
+ public void onPreferenceChange_setSelectedContacts_none() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+ when(mBackend.getPriorityMessageSenders()).thenReturn(ZenModeBackend.SOURCE_NONE);
+ mController.updateState(mockPref);
+ verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
+ ZenModeBackend.ZEN_MODE_FROM_NONE)]);
+ }
+
+ @Test
+ public void onPreferenceChange_setSelectedContacts_starred() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+ when(mBackend.getPriorityMessageSenders()).thenReturn(
+ NotificationManager.Policy.PRIORITY_SENDERS_STARRED);
+ mController.updateState(mockPref);
+ verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
+ ZenModeBackend.ZEN_MODE_FROM_STARRED)]);
+ }
+
+ @Test
+ public void onPreferenceChange_setSelectedContacts_contacts() {
+ Settings.Global.putInt(mContentResolver, ZEN_MODE, ZEN_MODE_IMPORTANT_INTERRUPTIONS);
+ when(mBackend.getPriorityMessageSenders()).thenReturn(
+ NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS);
+ mController.updateState(mockPref);
+ verify(mockPref).setValue(mValues[mController.getIndexOfSendersValue(
+ ZenModeBackend.ZEN_MODE_FROM_CONTACTS)]);
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java
index b009c36..de20fb4 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java
@@ -20,6 +20,7 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,6 +30,9 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -41,9 +45,6 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeRemindersPreferenceControllerTest {
@@ -71,7 +72,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
@@ -79,7 +80,7 @@
ReflectionHelpers.setField(mController, "mBackend", mBackend);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
- .thenReturn(mockPref);
+ .thenReturn(mockPref);
mController.displayPreference(mPreferenceScreen);
}
@@ -126,7 +127,7 @@
mController.onPreferenceChange(mockPref, allow);
verify(mBackend)
- .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS, allow);
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS, allow);
}
@Test
@@ -135,6 +136,6 @@
mController.onPreferenceChange(mockPref, allow);
verify(mBackend)
- .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS, allow);
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS, allow);
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
index eeef37c..fd6a9af 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
@@ -20,6 +20,7 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,6 +30,9 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -41,9 +45,6 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeRepeatCallersPreferenceControllerTest {
@@ -70,7 +71,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
@@ -141,7 +142,8 @@
mController.onPreferenceChange(mockPref, allow);
verify(mBackend)
- .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allow);
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS,
+ allow);
}
@Test
@@ -150,6 +152,7 @@
mController.onPreferenceChange(mockPref, allow);
verify(mBackend)
- .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allow);
+ .saveSoundPolicy(NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS,
+ allow);
}
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
index e955b2f..ecfb784 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -28,6 +29,8 @@
import android.content.Intent;
import android.content.res.Resources;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -37,12 +40,11 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowToast;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public class ZenModeScheduleRuleSettingsTest {
@@ -65,7 +67,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mFragment = spy(new TestFragment());
mFragment.onAttach(application);
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java
index aba4a3d..c1634fb 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java
@@ -21,7 +21,9 @@
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_OFF;
+
import static junit.framework.Assert.assertTrue;
+
import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -38,6 +40,9 @@
import android.service.notification.ZenModeConfig.ZenRule;
import android.util.ArrayMap;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -51,9 +56,6 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeSettingsFooterPreferenceControllerTest {
@@ -86,12 +88,12 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getZenModeConfig()).thenReturn(mZenModeConfig);
mController =
- new ZenModeSettingsFooterPreferenceController(mContext, mock(Lifecycle.class));
+ new ZenModeSettingsFooterPreferenceController(mContext, mock(Lifecycle.class));
ReflectionHelpers.setField(mZenModeConfig, AUTOMATIC_RULES_FIELD, mInjectedAutomaticRules);
ReflectionHelpers.setField(mController, "mZenModeConfigWrapper", mConfigWrapper);
@@ -274,7 +276,7 @@
injectedManualRule.conditionId = mock(Uri.class);
when(mConfigWrapper.parseManualRuleTime(injectedManualRule.conditionId)).thenReturn(time);
when(mConfigWrapper.getFormattedTime(time, mContext.getUserId()))
- .thenReturn(timePlaceholder);
+ .thenReturn(timePlaceholder);
ReflectionHelpers.setField(mZenModeConfig, MANUAL_RULE_FIELD, injectedManualRule);
}
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
index 39e9271..4fc7d57 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.notification;
import static com.google.common.truth.Truth.assertThat;
+
import static junit.framework.Assert.assertEquals;
import android.app.NotificationManager;
@@ -68,63 +69,6 @@
}
@Test
- public void testGetMsgEventReminderSettingSummary_none() {
- Policy policy = new Policy(0, 0, 0, 0);
- assertThat(mBuilder.getMsgEventReminderSettingSummary(policy)).isEqualTo("None");
- }
-
- @Test
- public void testGetMsgEventReminderSettingSummary_single() {
- Policy policy = new Policy(
- Policy.PRIORITY_CATEGORY_ALARMS | Policy.PRIORITY_CATEGORY_EVENTS, 0 , 0 , 0);
- assertThat(mBuilder.getMsgEventReminderSettingSummary(policy)).isEqualTo("Events");
- }
-
- @Test
- public void testGetMsgEventReminderSettingSummary_someMsgs() {
- Policy policy = new Policy(Policy.PRIORITY_CATEGORY_MESSAGES, 0,
- Policy.PRIORITY_SENDERS_CONTACTS , 0);
- assertThat(mBuilder.getMsgEventReminderSettingSummary(policy)).isEqualTo("Some messages");
-
- policy = new Policy(Policy.PRIORITY_CATEGORY_MESSAGES, 0,
- Policy.PRIORITY_SENDERS_STARRED , 0);
- assertThat(mBuilder.getMsgEventReminderSettingSummary(policy)).isEqualTo("Some messages");
- }
-
- @Test
- public void testGetMsgEventReminderSettingSummary_msgs() {
- Policy policy = new Policy(Policy.PRIORITY_CATEGORY_MESSAGES, 0, 0, 0);
- assertThat(mBuilder.getMsgEventReminderSettingSummary(policy)).isEqualTo("Messages");
- }
-
- @Test
- public void testGetMsgEventReminderSettingSummary_someMsgsAndOther() {
- Policy policy = new Policy(
- Policy.PRIORITY_CATEGORY_MESSAGES | Policy.PRIORITY_CATEGORY_REMINDERS,
- 0, Policy.PRIORITY_SENDERS_CONTACTS , 0);
- assertThat(mBuilder.getMsgEventReminderSettingSummary(policy))
- .isEqualTo("Some messages and reminders");
- }
-
- @Test
- public void testGetMsgEventReminderSettingSummary_someMsgsAndAllOthers() {
- Policy policy = new Policy(Policy.PRIORITY_CATEGORY_EVENTS
- | Policy.PRIORITY_CATEGORY_MESSAGES | Policy.PRIORITY_CATEGORY_REMINDERS,
- 0, Policy.PRIORITY_SENDERS_CONTACTS , 0);
- assertThat(mBuilder.getMsgEventReminderSettingSummary(policy))
- .isEqualTo("Some messages, events, and reminders");
- }
-
- @Test
- public void testGetMsgEventReminderSettingSummary_noMsgsAndOther() {
- Policy policy = new Policy(
- Policy.PRIORITY_CATEGORY_EVENTS | Policy.PRIORITY_CATEGORY_REMINDERS,
- 0,0, 0);
- assertThat(mBuilder.getMsgEventReminderSettingSummary(policy))
- .isEqualTo("Events and reminders");
- }
-
- @Test
public void testGetCallsSettingSummary_none() {
Policy policy = new Policy(0, 0, 0, 0);
assertThat(mBuilder.getCallsSettingSummary(policy)).isEqualTo("None");
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java
index 8da0ba7..ee51317 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java
@@ -17,17 +17,21 @@
package com.android.settings.notification;
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.provider.Settings;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.SliceTester;
@@ -41,13 +45,6 @@
import java.util.List;
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.widget.SliceLiveData;
-
@Config(shadows = ShadowNotificationManager.class)
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeSliceBuilderTest {
@@ -56,12 +53,7 @@
@Before
public void setUp() {
- mContext = spy(RuntimeEnvironment.application);
-
- // Prevent crash in SliceMetadata.
- Resources resources = spy(mContext.getResources());
- doReturn(60).when(resources).getDimensionPixelSize(anyInt());
- doReturn(resources).when(mContext).getResources();
+ mContext = RuntimeEnvironment.application;
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
index ca36544..9e6eb82 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
@@ -30,6 +32,9 @@
import android.content.Intent;
import android.database.Cursor;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -40,14 +45,12 @@
import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeStarredContactsPreferenceControllerTest {
@@ -76,7 +79,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
when(testIntent.resolveActivity(any())).thenReturn(mComponentName);
@@ -161,8 +164,8 @@
// expected - no null values
List<String> contacts = mMessagesController.getStarredContacts(testCursorWithNullValues);
- for (int i = 0 ; i < contacts.size(); i++) {
- assertThat(contacts.get(i)).isNotNull();
+ for (String contact : contacts) {
+ assertThat(contact).isNotNull();
}
}
@@ -181,6 +184,7 @@
doAnswer(new Answer<Boolean>() {
int count = 0;
+
@Override
public Boolean answer(InvocationOnMock invocation) throws Throwable {
if (count < size) {
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java
index 908f3bf..57bc303 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java
@@ -20,6 +20,7 @@
import static android.provider.Settings.Global.ZEN_MODE_ALARMS;
import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -29,6 +30,9 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -41,9 +45,6 @@
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeSystemPreferenceControllerTest {
private ZenModeSystemPreferenceController mController;
@@ -68,7 +69,7 @@
ShadowApplication shadowApplication = ShadowApplication.getInstance();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
mController = new ZenModeSystemPreferenceController(mContext, mock(Lifecycle.class));
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java
index 45573a9..65c39f8 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java
@@ -20,6 +20,7 @@
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
@@ -34,6 +35,8 @@
import android.content.Context;
import android.content.res.Resources;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.DisabledCheckBoxPreference;
@@ -44,11 +47,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeVisEffectPreferenceControllerTest {
private ZenModeVisEffectPreferenceController mController;
@@ -61,7 +63,8 @@
private FakeFeatureFactory mFeatureFactory;
@Mock
private PreferenceScreen mScreen;
- @Mock NotificationManager mNotificationManager;
+ @Mock
+ NotificationManager mNotificationManager;
private static final String PREF_KEY = "main_pref";
private static final int PREF_METRICS = 1;
@@ -72,7 +75,7 @@
public void setup() {
MockitoAnnotations.initMocks(this);
ShadowApplication shadowApplication = ShadowApplication.getInstance();
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
when(mNotificationManager.getNotificationPolicy()).thenReturn(
@@ -128,7 +131,7 @@
public void updateState_checkedFalse_parentChecked() {
mController = new ZenModeVisEffectPreferenceController(mContext, mock(Lifecycle.class),
PREF_KEY, SUPPRESSED_EFFECT_PEEK, PREF_METRICS,
- new int[] {PARENT_EFFECT1, PARENT_EFFECT2});
+ new int[]{PARENT_EFFECT1, PARENT_EFFECT2});
ReflectionHelpers.setField(mController, "mBackend", mBackend);
when(mBackend.isVisualEffectSuppressed(SUPPRESSED_EFFECT_PEEK)).thenReturn(false);
when(mBackend.isVisualEffectSuppressed(PARENT_EFFECT1)).thenReturn(false);
@@ -144,7 +147,7 @@
public void updateState_checkedFalse_parentNotChecked() {
mController = new ZenModeVisEffectPreferenceController(mContext, mock(Lifecycle.class),
PREF_KEY, SUPPRESSED_EFFECT_PEEK, PREF_METRICS,
- new int[] {PARENT_EFFECT1, PARENT_EFFECT2});
+ new int[]{PARENT_EFFECT1, PARENT_EFFECT2});
ReflectionHelpers.setField(mController, "mBackend", mBackend);
when(mBackend.isVisualEffectSuppressed(SUPPRESSED_EFFECT_PEEK)).thenReturn(false);
when(mBackend.isVisualEffectSuppressed(PARENT_EFFECT1)).thenReturn(false);
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java
index cca7fd5..5ae37e3 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java
@@ -25,8 +25,10 @@
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;
+
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent
.ACTION_ZEN_SOUND_AND_VIS_EFFECTS;
+
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
@@ -36,6 +38,8 @@
import android.app.NotificationManager;
import android.content.Context;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,11 +49,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeVisEffectsAllPreferenceControllerTest {
private ZenModeVisEffectsAllPreferenceController mController;
@@ -62,7 +65,8 @@
private FakeFeatureFactory mFeatureFactory;
@Mock
private PreferenceScreen mScreen;
- @Mock NotificationManager mNotificationManager;
+ @Mock
+ NotificationManager mNotificationManager;
private static final String PREF_KEY = "main_pref";
@@ -70,7 +74,7 @@
public void setup() {
MockitoAnnotations.initMocks(this);
ShadowApplication shadowApplication = ShadowApplication.getInstance();
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
when(mNotificationManager.getNotificationPolicy()).thenReturn(
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
index ae9a7bb..a318a39 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java
@@ -25,7 +25,9 @@
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;
+
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.verify;
@@ -34,6 +36,8 @@
import android.app.NotificationManager;
import android.content.Context;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -43,11 +47,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeVisEffectsCustomPreferenceControllerTest {
private ZenModeVisEffectsCustomPreferenceController mController;
@@ -60,7 +63,8 @@
private FakeFeatureFactory mFeatureFactory;
@Mock
private PreferenceScreen mScreen;
- @Mock NotificationManager mNotificationManager;
+ @Mock
+ NotificationManager mNotificationManager;
private static final String PREF_KEY = "main_pref";
@@ -68,7 +72,7 @@
public void setup() {
MockitoAnnotations.initMocks(this);
ShadowApplication shadowApplication = ShadowApplication.getInstance();
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
when(mNotificationManager.getNotificationPolicy()).thenReturn(
diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java
index 09dd3a0..fe45d1c 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java
@@ -25,7 +25,9 @@
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;
+
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_SOUND_ONLY;
+
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
@@ -36,6 +38,8 @@
import android.app.NotificationManager;
import android.content.Context;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -45,11 +49,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ZenModeVisEffectsNonePreferenceControllerTest {
private ZenModeVisEffectsNonePreferenceController mController;
@@ -62,16 +65,16 @@
private FakeFeatureFactory mFeatureFactory;
@Mock
private PreferenceScreen mScreen;
- @Mock NotificationManager mNotificationManager;
+ @Mock
+ NotificationManager mNotificationManager;
private static final String PREF_KEY = "main_pref";
- private static final int PREF_METRICS = 1;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
ShadowApplication shadowApplication = ShadowApplication.getInstance();
- mContext = shadowApplication.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNotificationManager);
when(mNotificationManager.getNotificationPolicy()).thenReturn(
diff --git a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
index 5b031aa..833d866 100644
--- a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java
@@ -19,11 +19,14 @@
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS;
import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;
+
import static com.android.settings.notification.ZenOnboardingActivity.ALWAYS_SHOW_THRESHOLD;
import static com.android.settings.notification.ZenOnboardingActivity
.PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME;
import static com.android.settings.notification.ZenOnboardingActivity.isSuggestionComplete;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
index 609b3a5..ad530ba 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
@@ -88,10 +89,12 @@
}
@Test
- public void isScreenLockVisible_notCurrentUser_shouldHideSwipe() {
+ public void isScreenLockVisible_notCurrentUser_shouldHideInsecure() {
mController = new ChooseLockGenericController(application, 1 /* userId */);
assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
.isFalse();
+ assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+ .isFalse();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
index 369cb3c..b2cd043 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -16,64 +16,170 @@
package com.android.settings.password;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.Mockito.doNothing;
-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 static org.robolectric.RuntimeEnvironment.application;
+import static org.robolectric.Shadows.shadowOf;
import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
+import android.app.admin.DevicePolicyManager;
+import android.content.Intent;
import android.provider.Settings.Global;
+import androidx.annotation.Nullable;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.biometrics.BiometricEnrollBase;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
-
-import androidx.fragment.app.FragmentActivity;
+import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
+import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowStorageManager;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+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.RuntimeEnvironment;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+ shadows = {
+ SettingsShadowResources.class,
+ SettingsShadowTheme.class,
+ ShadowLockPatternUtils.class,
+ ShadowStorageManager.class,
+ ShadowUserManager.class,
+ ShadowUtils.class
+ })
public class ChooseLockGenericTest {
+ private ChooseLockGenericFragment mFragment;
+ private ChooseLockGeneric mActivity;
+
+ @Before
+ public void setUp() {
+ Global.putInt(
+ application.getContentResolver(),
+ Global.DEVICE_PROVISIONED, 1);
+ mFragment = new ChooseLockGenericFragment();
+ }
+
@After
public void tearDown() {
- Global.putInt(RuntimeEnvironment.application.getContentResolver(),
- Global.DEVICE_PROVISIONED, 1);
+ Global.putInt(
+ application.getContentResolver(),
+ Global.DEVICE_PROVISIONED, 1);
+ ShadowStorageManager.reset();
}
@Test
- @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
public void onCreate_deviceNotProvisioned_shouldFinishActivity() {
- final Context context = RuntimeEnvironment.application;
- Global.putInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0);
- final FragmentActivity activity = mock(FragmentActivity.class);
- when(activity.getContentResolver()).thenReturn(context.getContentResolver());
- when(activity.getTheme()).thenReturn(context.getTheme());
+ Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 0);
- final ChooseLockGenericFragment fragment = spy(new ChooseLockGenericFragment());
- when(fragment.getActivity()).thenReturn(activity);
- when(fragment.getArguments()).thenReturn(Bundle.EMPTY);
-
- fragment.onCreate(Bundle.EMPTY);
- verify(activity).finish();
+ initActivity(null);
+ assertThat(mActivity.isFinishing()).isTrue();
}
@Test
public void onActivityResult_nullIntentData_shouldNotCrash() {
- ChooseLockGenericFragment fragment = spy(new ChooseLockGenericFragment());
- doNothing().when(fragment).updatePreferencesOrFinish(anyBoolean());
-
- fragment.onActivityResult(
- fragment.CONFIRM_EXISTING_REQUEST, Activity.RESULT_OK, null /* data */);
+ initActivity(null);
+ mFragment.onActivityResult(
+ ChooseLockGenericFragment.CONFIRM_EXISTING_REQUEST, Activity.RESULT_OK,
+ null /* data */);
// no crash
}
+ @Test
+ public void updatePreferencesOrFinish_passwordTypeSetPin_shouldStartChooseLockPassword() {
+ Intent intent = new Intent().putExtra(
+ LockPatternUtils.PASSWORD_TYPE_KEY,
+ DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+ initActivity(intent);
+
+ mFragment.updatePreferencesOrFinish(false /* isRecreatingActivity */);
+
+ assertThat(shadowOf(mActivity).getNextStartedActivity()).isNotNull();
+ }
+
+ @Test
+ public void updatePreferencesOrFinish_passwordTypeSetPinNotFbe_shouldNotStartChooseLock() {
+ ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
+ Intent intent = new Intent().putExtra(
+ LockPatternUtils.PASSWORD_TYPE_KEY,
+ DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+ initActivity(intent);
+
+ mFragment.updatePreferencesOrFinish(false /* isRecreatingActivity */);
+
+ assertThat(shadowOf(mActivity).getNextStartedActivity()).isNull();
+ }
+
+ @Test
+ public void onActivityResult_requestcode0_shouldNotFinish() {
+ initActivity(null);
+
+ mFragment.onActivityResult(
+ SearchFeatureProvider.REQUEST_CODE, Activity.RESULT_OK, null /* data */);
+
+ assertThat(mActivity.isFinishing()).isFalse();
+ }
+
+ @Test
+ public void onActivityResult_requestcode101_shouldFinish() {
+ initActivity(null);
+
+ mFragment.onActivityResult(
+ ChooseLockGenericFragment.ENABLE_ENCRYPTION_REQUEST, Activity.RESULT_OK,
+ null /* data */);
+
+ assertThat(mActivity.isFinishing()).isTrue();
+ }
+
+ @Test
+ public void onActivityResult_requestcode102_shouldFinish() {
+ initActivity(null);
+
+ mFragment.onActivityResult(
+ ChooseLockGenericFragment.CHOOSE_LOCK_REQUEST, Activity.RESULT_OK, null /* data */);
+
+ assertThat(mActivity.isFinishing()).isTrue();
+ }
+
+ @Test
+ public void onActivityResult_requestcode103_shouldFinish() {
+ initActivity(null);
+
+ mFragment.onActivityResult(
+ ChooseLockGenericFragment.CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST,
+ BiometricEnrollBase.RESULT_FINISHED, null /* data */);
+
+ assertThat(mActivity.isFinishing()).isTrue();
+ }
+
+ @Test
+ public void onActivityResult_requestcode104_shouldFinish() {
+ initActivity(null);
+
+ mFragment.onActivityResult(
+ ChooseLockGenericFragment.SKIP_FINGERPRINT_REQUEST, Activity.RESULT_OK,
+ null /* data */);
+
+ assertThat(mActivity.isFinishing()).isTrue();
+ }
+
+ private void initActivity(@Nullable Intent intent) {
+ if (intent == null) {
+ intent = new Intent();
+ }
+ intent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
+ mActivity = Robolectric.buildActivity(ChooseLockGeneric.InternalActivity.class, intent)
+ .setup().get();
+ mActivity.getSupportFragmentManager().beginTransaction().add(mFragment, null).commitNow();
+ }
}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index c105ffe..fd44e4f 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -17,6 +17,7 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
+
import static org.robolectric.RuntimeEnvironment.application;
import android.app.admin.DevicePolicyManager;
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index 17e684b..ab7f795 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -17,6 +17,7 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
+
import static org.robolectric.RuntimeEnvironment.application;
import android.content.Intent;
@@ -30,14 +31,13 @@
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settingslib.testutils.DrawableTestHelper;
import com.android.setupwizardlib.GlifLayout;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
-import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowDrawable;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
@@ -102,9 +102,8 @@
ChooseLockPattern activity = createActivity(true);
ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
activity.getSupportFragmentManager().findFragmentById(R.id.main_content);
-
- ShadowDrawable drawable = Shadows.shadowOf(((GlifLayout) fragment.getView()).getIcon());
- assertThat(drawable.getCreatedFromResId()).isEqualTo(R.drawable.ic_fingerprint_header);
+ DrawableTestHelper.assertDrawableResId(((GlifLayout) fragment.getView()).getIcon(),
+ R.drawable.ic_fingerprint_header);
}
@Config(qualifiers = "sw300dp")
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
index 2a8c406..e3f3833 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
@@ -1,6 +1,7 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -61,8 +62,6 @@
assertEquals(
true,
(startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
- assertEquals(true, startedIntent.getBooleanExtra(
- ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false));
assertFalse(startedIntent.getBooleanExtra(
ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
assertFalse(startedIntent.getBooleanExtra(
@@ -99,8 +98,6 @@
assertEquals(
false,
(startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
- assertEquals(false, startedIntent.getBooleanExtra(
- ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false));
assertFalse(startedIntent.getBooleanExtra(
ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
assertFalse(startedIntent.getBooleanExtra(
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
index 5068f85..3b38a56 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockTypeDialogFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -25,21 +26,22 @@
import android.content.Context;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-import com.android.settingslib.testutils.FragmentTestUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class})
@@ -52,7 +54,8 @@
public void setUp() {
mContext = RuntimeEnvironment.application;
mFragment = new TestFragment();
- FragmentTestUtils.startFragment(mFragment);
+ FragmentController.setupFragment(mFragment, FragmentActivity.class, 0 /* containerViewId */,
+ null /* bundle */);
}
@Test
diff --git a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
index 1d0b71f..aa23005 100644
--- a/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/password/ConfirmCredentialTest.java
@@ -18,6 +18,9 @@
import static com.google.common.truth.Truth.assertThat;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+
import com.android.settings.password.ConfirmDeviceCredentialBaseFragment.LastTryDialog;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -27,9 +30,6 @@
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = SettingsShadowResourcesImpl.class)
public class ConfirmCredentialTest {
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
index 97fb777..67f7b0a 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
@@ -18,6 +18,7 @@
import static android.content.pm.PackageManager.FEATURE_FACE;
import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
+
import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
.HIDE_DISABLED_PREFS;
import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
@@ -26,7 +27,9 @@
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
@@ -81,7 +84,7 @@
when(mFingerprintManager.preEnroll()).thenReturn(FINGERPRINT_CHALLENGE);
when(mPackageManager.hasSystemFeature(eq(FEATURE_FINGERPRINT))).thenReturn(true);
- when(mFaceManager.preEnroll()).thenReturn(FACE_CHALLENGE);
+ when(mFaceManager.generateChallenge()).thenReturn(FACE_CHALLENGE);
when(mPackageManager.hasSystemFeature(eq(FEATURE_FACE))).thenReturn(true);
}
@@ -110,7 +113,7 @@
// GIVEN the device supports face.
when(mFaceManager.isHardwareDetected()).thenReturn(true);
// GIVEN there are no enrolled face.
- when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(false);
+ when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(false);
// GIVEN DPC does not disallow face for keyguard usage.
when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
.thenReturn(0);
@@ -177,7 +180,7 @@
// GIVEN the device does NOT support face.
when(mFaceManager.isHardwareDetected()).thenReturn(false);
// GIVEN there are no enrolled face.
- when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(false);
+ when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(false);
// GIVEN DPC does not disallow face for keyguard usage.
when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
.thenReturn(0);
@@ -215,7 +218,7 @@
// GIVEN the device supports face.
when(mFaceManager.isHardwareDetected()).thenReturn(true);
// GIVEN there are no enrolled face.
- when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(true);
+ when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(true);
// GIVEN DPC does not disallow face for keyguard usage.
when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
.thenReturn(0);
@@ -253,7 +256,7 @@
// GIVEN the device supports face.
when(mFaceManager.isHardwareDetected()).thenReturn(true);
// GIVEN there is an enrolled face.
- when(mFaceManager.hasEnrolledFaces(CURRENT_USER_ID)).thenReturn(true);
+ when(mFaceManager.hasEnrolledTemplates(CURRENT_USER_ID)).thenReturn(true);
// GIVEN DPC disallows face for keyguard usage.
when(mDevicePolicyManager.getKeyguardDisabledFeatures(any(ComponentName.class)))
.thenReturn(DevicePolicyManager.KEYGUARD_DISABLE_FACE);
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index 9acf73e..e586958 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -17,6 +17,7 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
+
import static org.robolectric.RuntimeEnvironment.application;
import android.content.Intent;
@@ -24,11 +25,12 @@
import android.view.View;
import android.widget.Button;
+import androidx.appcompat.app.AlertDialog;
+
import com.android.settings.R;
import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
import com.android.settings.password.ChooseLockPassword.IntentBuilder;
import com.android.settings.password.SetupChooseLockPassword.SetupChooseLockPasswordFragment;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -39,6 +41,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Shadows;
+import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@@ -48,8 +51,6 @@
import java.util.Collections;
import java.util.List;
-import androidx.appcompat.app.AlertDialog;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
SettingsShadowResources.class,
@@ -73,11 +74,12 @@
@Test
public void createActivity_shouldNotCrash() {
// Basic sanity test for activity created without crashing
- Robolectric.buildActivity(SetupChooseLockPassword.class,
+ final Intent intent =
SetupChooseLockPassword.modifyIntentForSetup(
application,
- new IntentBuilder(application).build()))
- .setup().get();
+ new IntentBuilder(application).build());
+
+ ActivityController.of(new SetupChooseLockPassword(), intent).setup().get();
}
@Test
@@ -118,7 +120,7 @@
intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
SetupChooseLockPassword activity =
- Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
+ ActivityController.of(new SetupChooseLockPassword(), intent).setup().get();
SetupChooseLockPasswordFragment fragment =
(SetupChooseLockPasswordFragment) activity.getSupportFragmentManager()
@@ -135,11 +137,12 @@
}
private SetupChooseLockPassword createSetupChooseLockPassword() {
- Intent intent = SetupChooseLockPassword.modifyIntentForSetup(
- application,
- new IntentBuilder(application).build());
+ final Intent intent =
+ SetupChooseLockPassword.modifyIntentForSetup(
+ application,
+ new IntentBuilder(application).build());
intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
- return Robolectric.buildActivity(SetupChooseLockPassword.class, intent).setup().get();
+ return ActivityController.of(new SetupChooseLockPassword(), intent).setup().get();
}
@Implements(ChooseLockGenericController.class)
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
index d2ec785..0dcd31b 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
@@ -17,14 +17,19 @@
package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat;
+
import static org.robolectric.RuntimeEnvironment.application;
import android.content.ComponentName;
+import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.UserHandle;
import android.view.View;
import android.widget.Button;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LockPatternView.Cell;
import com.android.internal.widget.LockPatternView.DisplayMode;
@@ -32,7 +37,6 @@
import com.android.settings.SetupRedactionInterstitial;
import com.android.settings.password.ChooseLockPattern.ChooseLockPatternFragment;
import com.android.settings.password.ChooseLockPattern.IntentBuilder;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -43,6 +47,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.Shadows;
+import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowPackageManager;
import org.robolectric.util.ReflectionHelpers;
@@ -50,9 +55,6 @@
import java.util.Arrays;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
SettingsShadowResourcesImpl.class,
@@ -71,14 +73,13 @@
PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
- mActivity = Robolectric.buildActivity(
- SetupChooseLockPattern.class,
+ final Intent intent =
SetupChooseLockPattern.modifyIntentForSetup(
application,
new IntentBuilder(application)
.setUserId(UserHandle.myUserId())
- .build()))
- .setup().get();
+ .build());
+ mActivity = ActivityController.of(new SetupChooseLockPattern(), intent).setup().get();
}
@Test
@@ -172,16 +173,17 @@
@Test
public void skipButton_shouldNotBeVisible_duringFingerprintFlow() {
- mActivity = Robolectric.buildActivity(
- SetupChooseLockPattern.class,
+ final Intent intent =
SetupChooseLockPattern.modifyIntentForSetup(
application,
new IntentBuilder(application)
.setUserId(UserHandle.myUserId())
.setForFingerprint(true)
- .build()))
- .setup().get();
+ .build());
+
+ mActivity = ActivityController.of(new SetupChooseLockPattern(), intent).setup().get();
Button skipButton = mActivity.findViewById(R.id.skip_button);
+
assertThat(skipButton).isNotNull();
assertThat(skipButton.getVisibility()).isEqualTo(View.GONE);
}
diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
index aa36b33..0e4e5dc 100644
--- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
@@ -18,8 +18,10 @@
import static com.google.common.truth.Truth.assertThat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.R;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
@@ -29,11 +31,9 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
SettingsShadowResources.SettingsShadowTheme.class,
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
index 3828dba..51988ff 100644
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
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;
@@ -31,6 +33,8 @@
import android.print.PrintManager;
import android.printservice.PrintServiceInfo;
+import androidx.lifecycle.LifecycleOwner;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedPreference;
@@ -48,8 +52,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.lifecycle.LifecycleOwner;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PrintSettingsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
index df60654..0b3ea9c 100644
--- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -17,6 +17,7 @@
package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -169,4 +170,24 @@
assertThat(nonIndexableKeys).contains("status_header");
}
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void getNonIndexableKeys_hasSearchableAttributeInXml_shouldSuppressUnsearchable() {
+ final BaseSearchIndexProvider provider = new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+ boolean enabled) {
+ final SearchIndexableResource sir = new SearchIndexableResource(context);
+ sir.xmlResId = R.xml.display_settings;
+ return Collections.singletonList(sir);
+ }
+
+ };
+
+ final List<String> nonIndexableKeys =
+ provider.getNonIndexableKeys(RuntimeEnvironment.application);
+
+ assertThat(nonIndexableKeys).contains("pref_key_5");
+ }
}
diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java
deleted file mode 100644
index b49ef1d..0000000
--- a/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java
+++ /dev/null
@@ -1,148 +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.search;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.never;
-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.job.JobScheduler;
-import android.os.Binder;
-import android.provider.Settings;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.shadows.ShadowBinder;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class DeviceIndexFeatureProviderTest {
-
- @Mock
- private JobScheduler mJobScheduler;
- private DeviceIndexFeatureProvider mProvider;
- private Activity mActivity;
-
- @Before
- public void setUp() {
- MockitoAnnotations.initMocks(this);
- ShadowBinder.reset();
- FakeFeatureFactory.setupForTest();
- mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get());
- mProvider = spy(new DeviceIndexFeatureProviderImpl());
- when(mActivity.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler);
- }
-
- @After
- public void tearDown() {
- ShadowBinder.reset();
- }
-
- @Test
- public void updateIndex_disabled_shouldDoNothing() {
- when(mProvider.isIndexingEnabled()).thenReturn(false);
-
- mProvider.updateIndex(mActivity, false);
- verify(mJobScheduler, never()).schedule(any());
- }
-
- @Test
- public void updateIndex_enabled_unprovisioned_shouldDoNothing() {
- when(mProvider.isIndexingEnabled()).thenReturn(true);
- Settings.Global.putInt(mActivity.getContentResolver(),
- Settings.Global.DEVICE_PROVISIONED, 0);
-
- mProvider.updateIndex(mActivity, false);
-
- verify(mJobScheduler, never()).schedule(any());
- }
-
- @Test
- public void updateIndex_enabled_provisioned_shouldIndex() {
- Settings.Global.putInt(mActivity.getContentResolver(),
- Settings.Global.DEVICE_PROVISIONED, 1);
- when(mProvider.isIndexingEnabled()).thenReturn(true);
-
- mProvider.updateIndex(mActivity, false);
- verify(mJobScheduler).schedule(any());
- }
-
- @Test
- public void updateIndex_enabled_provisioned_newBuild_shouldIndex() {
- Settings.Global.putInt(mActivity.getContentResolver(),
- Settings.Global.DEVICE_PROVISIONED, 1);
- DeviceIndexFeatureProvider.setIndexState(mActivity);
- Settings.Global.putString(mActivity.getContentResolver(),
- DeviceIndexFeatureProvider.INDEX_VERSION, "new version");
- Settings.Global.putString(mActivity.getContentResolver(),
- DeviceIndexFeatureProvider.LANGUAGE.toString(),
- DeviceIndexFeatureProvider.INDEX_LANGUAGE);
- when(mProvider.isIndexingEnabled()).thenReturn(true);
-
- mProvider.updateIndex(mActivity, false);
- verify(mJobScheduler).schedule(any());
- }
-
- @Test
- public void updateIndex_enabled_provisioned_differentUid_shouldNotIndex() {
- Settings.Global.putInt(mActivity.getContentResolver(),
- Settings.Global.DEVICE_PROVISIONED, 1);
- when(mProvider.isIndexingEnabled()).thenReturn(true);
-
- ShadowBinder.setCallingUid(Binder.getCallingUid() + 2000);
-
- mProvider.updateIndex(mActivity, false);
- verify(mJobScheduler, never()).schedule(any());
- }
-
- @Test
- public void updateIndex_enabled_provisioned_newIndex_shouldIndex() {
- Settings.Global.putInt(mActivity.getContentResolver(),
- Settings.Global.DEVICE_PROVISIONED, 1);
- DeviceIndexFeatureProvider.setIndexState(mActivity);
- Settings.Global.putString(mActivity.getContentResolver(),
- DeviceIndexFeatureProvider.INDEX_LANGUAGE, "new language");
-
- when(mProvider.isIndexingEnabled()).thenReturn(true);
-
- mProvider.updateIndex(mActivity, false);
- verify(mJobScheduler).schedule(any());
- }
-
- @Test
- public void updateIndex_enabled_provisioned_sameBuild_sameLang_shouldNotIndex() {
- // Enabled
- when(mProvider.isIndexingEnabled()).thenReturn(true);
- // Provisioned
- Settings.Global.putInt(mActivity.getContentResolver(),
- Settings.Global.DEVICE_PROVISIONED, 1);
- // Same build and same language
- DeviceIndexFeatureProvider.setIndexState(mActivity);
-
- mProvider.updateIndex(mActivity, false);
-
- verify(mJobScheduler, never()).schedule(any());
- }
-}
diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java
deleted file mode 100644
index dc9472a..0000000
--- a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java
+++ /dev/null
@@ -1,144 +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.search;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doAnswer;
-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.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.net.Uri;
-
-import com.android.settings.slices.SettingsSliceProvider;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import androidx.slice.Slice;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceViewManager;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class DeviceIndexUpdateJobServiceTest {
- private static final Uri BASE_URI = new Uri.Builder()
- .scheme(ContentResolver.SCHEME_CONTENT)
- .authority(SettingsSliceProvider.SLICE_AUTHORITY)
- .build();
-
- private Activity mActivity;
- private DeviceIndexUpdateJobService mJob;
- private SliceViewManager mSliceManager;
-
- @Before
- public void setup() {
- FakeFeatureFactory.setupForTest();
- mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get());
- mJob = spy(new DeviceIndexUpdateJobService());
- mSliceManager = mock(SliceViewManager.class);
-
- doReturn(mActivity.getPackageName()).when(mJob).getPackageName();
- doReturn(mSliceManager).when(mJob).getSliceViewManager();
- doNothing().when(mJob).jobFinished(null, false);
- }
-
- @Test
- public void testGetsSlices() {
- setSlices();
-
- mJob.updateIndex(null);
- verify(mSliceManager).getSliceDescendants(eq(BASE_URI));
- }
-
- @Test
- public void testIndexesSlices() {
- setSlices(genSlice("path1"), genSlice("path2"));
-
- mJob.mRunningJob = true;
- mJob.updateIndex(null);
- verify(mSliceManager).getSliceDescendants(eq(BASE_URI));
-
- DeviceIndexFeatureProvider indexFeatureProvider = FakeFeatureFactory.getFactory(mActivity)
- .getDeviceIndexFeatureProvider();
- verify(indexFeatureProvider, times(2)).index(any(), any(), any(), any(), any());
- }
-
- @Test
- public void testDoNotIndexWithoutTitle() {
- Slice testSlice = genSlice("path2");
- setSlices(genSlice("path1"), testSlice);
- doReturn(null).when(mJob).findTitle(testSlice, mJob.getMetadata(testSlice));
-
- mJob.mRunningJob = true;
- mJob.updateIndex(null);
- verify(mSliceManager).getSliceDescendants(eq(BASE_URI));
-
- DeviceIndexFeatureProvider indexFeatureProvider = FakeFeatureFactory.getFactory(mActivity)
- .getDeviceIndexFeatureProvider();
- verify(indexFeatureProvider, times(1)).index(any(), any(), any(), any(), any());
- }
-
- @Test
- public void testStopIndexing() {
- Slice testSlice = genSlice("path1");
- setSlices(testSlice, genSlice("path2"));
- mJob.mRunningJob = true;
-
- doAnswer(invocation -> {
- // Stop running after the first iteration
- mJob.mRunningJob = false;
- return testSlice;
- }).when(mJob).bindSliceSynchronous(mSliceManager, testSlice.getUri());
-
- mJob.updateIndex(null);
- verify(mSliceManager).getSliceDescendants(eq(BASE_URI));
-
- DeviceIndexFeatureProvider indexFeatureProvider = FakeFeatureFactory.getFactory(mActivity)
- .getDeviceIndexFeatureProvider();
- verify(indexFeatureProvider).clearIndex(any());
- verify(indexFeatureProvider, times(1)).index(any(), any(), any(), any(), any());
- }
-
- private Slice genSlice(String path) {
- return new Slice.Builder(BASE_URI.buildUpon().path(path).build()).build();
- }
-
- private void setSlices(Slice... slice) {
- List<Uri> mUris = new ArrayList<>();
- for (Slice slouse : slice) {
- SliceMetadata m = mock(SliceMetadata.class);
- mUris.add(slouse.getUri());
- doReturn(slouse).when(mJob).bindSliceSynchronous(mSliceManager, slouse.getUri());
- doReturn(m).when(mJob).getMetadata(slouse);
- doReturn(slouse.getUri().getPath()).when(mJob).findTitle(slouse, m);
- }
- when(mSliceManager.getSliceDescendants(BASE_URI)).thenReturn(mUris);
- }
-
-}
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index aae9183..ba29ea1 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -18,11 +18,13 @@
package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Intent;
+import android.provider.Settings;
import android.widget.Toolbar;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -43,7 +45,7 @@
@Before
public void setUp() {
FakeFeatureFactory.setupForTest();
- mActivity = Robolectric.buildActivity(Activity.class).create().visible().get();
+ mActivity = Robolectric.setupActivity(Activity.class);
mProvider = spy(new SearchFeatureProviderImpl());
}
@@ -53,6 +55,8 @@
// Should not crash.
final Toolbar toolbar = new Toolbar(mActivity);
+ // This ensures navigationView is created.
+ toolbar.setNavigationContentDescription("test");
mProvider.initSearchToolbar(mActivity, toolbar);
toolbar.performClick();
@@ -60,7 +64,7 @@
final Intent launchIntent = Shadows.shadowOf(mActivity).getNextStartedActivity();
assertThat(launchIntent.getAction())
- .isEqualTo("com.android.settings.action.SETTINGS_SEARCH");
+ .isEqualTo(Settings.ACTION_APP_SEARCH_SETTINGS);
}
@Test(expected = IllegalArgumentException.class)
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
index 971d4f5..7cea11f 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
@@ -17,8 +17,11 @@
package com.android.settings.search;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
+
import static com.google.common.truth.Truth.assertThat;
+
import static junit.framework.Assert.fail;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
index e76f43d..e3ef15e 100644
--- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
@@ -1,6 +1,7 @@
package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -21,6 +22,9 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
+import java.util.ArrayList;
+import java.util.List;
+
@RunWith(SettingsRobolectricTestRunner.class)
public class SettingsSearchIndexablesProviderTest {
@@ -96,16 +100,19 @@
@Test
@Config(qualifiers = "mcc999")
public void testNonIndexablesColumnFetched() {
- Uri rawUri = Uri.parse("content://" + BASE_AUTHORITY + "/" +
+ final Uri rawUri = Uri.parse("content://" + BASE_AUTHORITY + "/" +
SearchIndexablesContract.NON_INDEXABLES_KEYS_PATH);
- final Cursor cursor = mProvider.query(rawUri,
- SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS, null, null, null);
+ final List<String> keys = new ArrayList<>();
- cursor.moveToFirst();
- assertThat(cursor.getCount()).isEqualTo(2);
- assertThat(cursor.getString(0)).isEqualTo("pref_key_1");
- cursor.moveToNext();
- assertThat(cursor.getString(0)).isEqualTo("pref_key_3");
+ try (Cursor cursor = mProvider.query(rawUri,
+ SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS, null, null, null)) {
+ while (cursor.moveToNext()) {
+ keys.add(cursor.getString(0));
+ }
+ }
+
+ assertThat(keys).hasSize(3);
+ assertThat(keys).containsAllOf("pref_key_1", "pref_key_3", "pref_key_5");
}
}
diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
index 394d5f4..3ab4ab4 100644
--- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
+++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
@@ -29,9 +29,9 @@
import android.view.MenuItem;
import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.ObservableFragment;
import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
import org.junit.Test;
diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
index b7ff79c..fe7c559 100644
--- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
+++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java
@@ -22,12 +22,11 @@
import android.content.DialogInterface;
-import com.android.settings.testutils.FragmentController;
-import com.android.settings.testutils.Robolectric;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(SettingsRobolectricTestRunner.class)
@@ -36,7 +35,7 @@
@Test
public void displayDialog_clickPositiveButton_launchSetNewPassword() {
final FragmentController<ConfigureKeyGuardDialog> fragmentController =
- Robolectric.buildFragment(ConfigureKeyGuardDialog.class);
+ FragmentController.of(new ConfigureKeyGuardDialog());
final ConfigureKeyGuardDialog fragment = spy(fragmentController.get());
doNothing().when(fragment).startPasswordSetup();
fragmentController.create().start().resume();
diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
index 661f496..ebe4205 100644
--- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
@@ -20,6 +20,8 @@
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowKeyStore;
@@ -30,8 +32,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowKeyStore.class)
public class CredentialStoragePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
index 6e49f1e..6a58482 100644
--- a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
+++ b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java
@@ -17,7 +17,9 @@
package com.android.settings.security;
import static com.android.settings.security.EncryptionAndCredential.SEARCH_INDEX_DATA_PROVIDER;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.app.admin.DevicePolicyManager;
@@ -34,6 +36,7 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
@@ -55,7 +58,7 @@
ShadowApplication application = ShadowApplication.getInstance();
application.setSystemService(Context.DEVICE_POLICY_SERVICE, mDevicePolicyManager);
application.setSystemService(Context.USER_SERVICE, mUserManager);
- mContext = application.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
}
@Test
@@ -73,7 +76,7 @@
final List<String> expectedKeys = new ArrayList<>();
for (SearchIndexableResource res : index) {
expectedKeys.addAll(((BaseSearchIndexProvider) SEARCH_INDEX_DATA_PROVIDER)
- .getNonIndexableKeysFromXml(mContext, res.xmlResId));
+ .getNonIndexableKeysFromXml(mContext, res.xmlResId, true /* suppressAll */));
}
final List<String> keys = SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
index 7097f21..8221b15 100644
--- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java
@@ -20,52 +20,58 @@
.PREF_KEY_ENCRYPTION_DETAIL_PAGE;
import static com.android.settings.security.EncryptionStatusPreferenceController
.PREF_KEY_ENCRYPTION_SECURITY_PAGE;
+
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import android.os.UserManager;
+
+import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = ShadowLockPatternUtils.class)
+@Config(shadows = {ShadowLockPatternUtils.class, ShadowUserManager.class})
public class EncryptionStatusPreferenceControllerTest {
private Context mContext;
private EncryptionStatusPreferenceController mController;
private Preference mPreference;
+ private ShadowUserManager mShadowUserManager;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mController =
- new EncryptionStatusPreferenceController(mContext, PREF_KEY_ENCRYPTION_DETAIL_PAGE);
+ new EncryptionStatusPreferenceController(mContext, PREF_KEY_ENCRYPTION_DETAIL_PAGE);
+ mShadowUserManager = ShadowUserManager.getShadow();
mPreference = new Preference(mContext);
}
+ @After
+ public void tearDown() {
+ mShadowUserManager.reset();
+ }
+
@Test
public void isAvailable_admin_true() {
- UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- Shadows.shadowOf(userManager).setIsAdminUser(true);
+ mShadowUserManager.setIsAdminUser(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void isAvailable_notAdmin_false() {
- UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- Shadows.shadowOf(userManager).setIsAdminUser(false);
+ mShadowUserManager.setIsAdminUser(false);
assertThat(mController.isAvailable()).isFalse();
}
@@ -82,8 +88,7 @@
mController = new EncryptionStatusPreferenceController(mContext,
PREF_KEY_ENCRYPTION_SECURITY_PAGE);
- UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- Shadows.shadowOf(userManager).setIsAdminUser(true);
+ mShadowUserManager.setIsAdminUser(true);
assertThat(mController.isAvailable()).isTrue();
}
@@ -113,7 +118,8 @@
@Test
public void updateSummary_unencrypted_securityPage_shouldNotHaveEncryptionFragment() {
mController =
- new EncryptionStatusPreferenceController(mContext, PREF_KEY_ENCRYPTION_SECURITY_PAGE);
+ new EncryptionStatusPreferenceController(mContext,
+ PREF_KEY_ENCRYPTION_SECURITY_PAGE);
ShadowLockPatternUtils.setDeviceEncryptionEnabled(false);
mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java
index 53046c9..f8d17a8 100644
--- a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java
@@ -24,6 +24,9 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -36,9 +39,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LockUnificationPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
index a87d9db..f0bda6e 100644
--- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.security;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -23,6 +24,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,8 +37,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LockdownButtonPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
index e365bcb..7ec8611 100644
--- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.security;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -28,6 +29,12 @@
import android.content.Context;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.users.OwnerInfoSettings;
@@ -42,12 +49,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class OwnerInfoPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
index 9ef34d4..6bd5e1f 100644
--- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
@@ -21,6 +21,8 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.lifecycle.LifecycleOwner;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -32,8 +34,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.lifecycle.LifecycleOwner;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowUserManager.class)
public class RestrictedEncryptionPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
index 1773540..1851ed5 100644
--- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java
@@ -22,6 +22,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,8 +35,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ScreenPinningPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
index f9573ef..6b968e6 100644
--- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.security;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -25,6 +26,9 @@
import android.os.UserHandle;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -37,9 +41,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ShowPasswordPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
index 413932a..f20587d 100644
--- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.security;
import static android.telephony.TelephonyManager.SIM_STATE_READY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -30,6 +32,9 @@
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -44,9 +49,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SimLockPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java
similarity index 66%
rename from tests/robotests/src/com/android/settings/security/SecuritySettingsTest.java
rename to tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java
index f3cc459..17ba6d5 100644
--- a/tests/robotests/src/com/android/settings/security/SecuritySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java
@@ -17,7 +17,6 @@
package com.android.settings.security;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import android.content.Context;
@@ -26,7 +25,6 @@
import android.hardware.fingerprint.FingerprintManager;
import com.android.settings.R;
-import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,17 +35,15 @@
import org.mockito.MockitoAnnotations;
@RunWith(SettingsRobolectricTestRunner.class)
-public class SecuritySettingsTest {
+public class TopLevelSecurityPreferenceControllerTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
- private SummaryLoader mSummaryLoader;
- @Mock
private FingerprintManager mFingerprintManager;
@Mock
private FaceManager mFaceManager;
- private SecuritySettings.SummaryProvider mSummaryProvider;
+ private TopLevelSecurityEntryPreferenceController mController;
@Before
public void setUp() {
@@ -56,87 +52,80 @@
.thenReturn(mFingerprintManager);
when(mContext.getSystemService(Context.FACE_SERVICE))
.thenReturn(mFaceManager);
- mSummaryProvider = new SecuritySettings.SummaryProvider(mContext, mSummaryLoader);
+ mController = new TopLevelSecurityEntryPreferenceController(mContext, "test_key");
}
@Test
- public void testSummaryProvider_notListening() {
- mSummaryProvider.setListening(false);
-
- verifyNoMoreInteractions(mSummaryLoader);
- }
-
- @Test
- public void testSummaryProvider_hasFace_hasStaticSummary() {
+ public void geSummary_hasFace_hasStaticSummary() {
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
.thenReturn(true);
when(mFaceManager.isHardwareDetected()).thenReturn(true);
- mSummaryProvider.setListening(true);
+ mController.getSummary();
- verify(mContext).getString(R.string.security_dashboard_summary_face);
+ verify(mContext).getText(R.string.security_dashboard_summary_face);
}
@Test
- public void testSummaryProvider_hasFingerPrint_hasStaticSummary() {
+ public void geSummary_hasFingerPrint_hasStaticSummary() {
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
.thenReturn(false);
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
.thenReturn(true);
when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
- mSummaryProvider.setListening(true);
+ mController.getSummary();
- verify(mContext).getString(R.string.security_dashboard_summary);
+ verify(mContext).getText(R.string.security_dashboard_summary);
}
@Test
- public void testSummaryProvider_noFpFeature_shouldSetSummaryWithNoBiometrics() {
+ public void geSummary_noFpFeature_shouldSetSummaryWithNoBiometrics() {
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
.thenReturn(false);
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
.thenReturn(false);
- mSummaryProvider.setListening(true);
+ mController.getSummary();
- verify(mContext).getString(R.string.security_dashboard_summary_no_fingerprint);
+ verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
}
@Test
- public void testSummaryProvider_noFpHardware_shouldSetSummaryWithNoBiometrics() {
+ public void geSummary_noFpHardware_shouldSetSummaryWithNoBiometrics() {
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
.thenReturn(false);
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
.thenReturn(true);
when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
- mSummaryProvider.setListening(true);
+ mController.getSummary();
- verify(mContext).getString(R.string.security_dashboard_summary_no_fingerprint);
+ verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
}
@Test
- public void testSummaryProvider_noFaceFeature_shouldSetSummaryWithNoBiometrics() {
+ public void geSummary_noFaceFeature_shouldSetSummaryWithNoBiometrics() {
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
.thenReturn(false);
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
.thenReturn(false);
- mSummaryProvider.setListening(true);
+ mController.getSummary();
- verify(mContext).getString(R.string.security_dashboard_summary_no_fingerprint);
+ verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
}
@Test
- public void testSummaryProvider_noFaceHardware_shouldSetSummaryWithNoBiometrics() {
+ public void geSummary_noFaceHardware_shouldSetSummaryWithNoBiometrics() {
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
.thenReturn(true);
when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
.thenReturn(false);
when(mFaceManager.isHardwareDetected()).thenReturn(false);
- mSummaryProvider.setListening(true);
+ mController.getSummary();
- verify(mContext).getString(R.string.security_dashboard_summary_no_fingerprint);
+ verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
}
}
diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java
index 1ee3fce..08fdd7d 100644
--- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java
@@ -19,9 +19,12 @@
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -31,6 +34,8 @@
import android.hardware.fingerprint.FingerprintManager;
import android.os.UserManager;
+import androidx.lifecycle.LifecycleOwner;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -44,8 +49,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.lifecycle.LifecycleOwner;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class VisiblePatternProfilePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java
index c5e10e0..8f05f74 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.security.screenlock;
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
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;
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java
index b77b44e..d89e6b0 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java
@@ -18,10 +18,14 @@
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC;
import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.when;
@@ -29,6 +33,10 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -42,10 +50,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LockScreenPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java
index 6835990..9d7a507 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java
@@ -17,12 +17,15 @@
package com.android.settings.security.screenlock;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -33,8 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PatternVisiblePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
index e3e25ea..0281455 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
@@ -17,12 +17,15 @@
package com.android.settings.security.screenlock;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
+import androidx.preference.SwitchPreference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.security.trustagent.TrustAgentManager;
@@ -36,8 +39,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class PowerButtonInstantLockPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java
index c1d7dd2..6d378ef 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.security.screenlock;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
index d6c4ce9..07269bf 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java
@@ -17,11 +17,14 @@
package com.android.settings.security.trustagent;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.when;
import android.content.Context;
+import androidx.preference.Preference;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.security.trustagent.TrustAgentManager.TrustAgentComponentInfo;
@@ -39,8 +42,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ManageTrustAgentsPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
index 6be834b..509fae4 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java
@@ -20,7 +20,9 @@
.PREF_KEY_SECURITY_CATEGORY;
import static com.android.settings.security.trustagent.TrustAgentListPreferenceController
.PREF_KEY_TRUST_AGENT;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
@@ -32,6 +34,11 @@
import android.content.ComponentName;
import android.content.Context;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.security.SecuritySettings;
@@ -50,11 +57,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class TrustAgentListPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java
index 9cee3d1..668734e 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.security.trustagent;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.pm.PackageManager;
diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java
index 43a8001..ede6a8f 100644
--- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentsPreferenceControllerTest.java
@@ -28,11 +28,14 @@
import android.content.pm.ServiceInfo;
import android.service.trust.TrustAgentService;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settingslib.RestrictedSwitchPreference;
import org.junit.After;
@@ -49,13 +52,10 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
ShadowLockPatternUtils.class,
- ShadowRestrictedLockUtils.class,
+ ShadowRestrictedLockUtilsInternal.class,
ShadowDevicePolicyManager.class,
ShadowApplicationPackageManager.class,
TrustAgentsPreferenceControllerTest.ShadowTrustAgentManager.class
@@ -145,7 +145,7 @@
@Test
public void onStart_hasUnrestrictedTrustAgent_shouldAddThreeChangeablePreferences() {
- ShadowRestrictedLockUtils.setKeyguardDisabledFeatures(0);
+ ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(0);
final List<ResolveInfo> availableAgents = createFakeAvailableAgents();
for (ResolveInfo rInfo : availableAgents) {
ShadowTrustAgentManager.grantPermissionToResolveInfo(rInfo);
@@ -170,7 +170,7 @@
ShadowTrustAgentManager.grantPermissionToResolveInfo(rInfo);
}
mPackageManager.addResolveInfoForIntent(TEST_INTENT, availableAgents);
- ShadowRestrictedLockUtils.setKeyguardDisabledFeatures(
+ ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
DevicePolicyManager.KEYGUARD_DISABLE_TRUST_AGENTS);
mController.displayPreference(mPreferenceScreen);
diff --git a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
index 6bccfe5..adcd184 100644
--- a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.shortcut;
import static com.android.settings.shortcut.CreateShortcutPreferenceController.SHORTCUT_ID_PREFIX;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.eq;
diff --git a/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java b/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java
index 955e069..4b40e47 100644
--- a/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java
+++ b/tests/robotests/src/com/android/settings/shortcut/ShortcutsUpdateTaskTest.java
@@ -17,7 +17,9 @@
package com.android.settings.shortcut;
import static com.android.settings.shortcut.CreateShortcutPreferenceController.SHORTCUT_ID_PREFIX;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index ea2f2ca..3c2cbdb 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -18,10 +18,15 @@
package com.android.settings.slices;
import static android.content.ContentResolver.SCHEME_CONTENT;
+
import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -36,7 +41,13 @@
import android.provider.Settings;
import android.provider.SettingsSlicesContract;
import android.util.ArraySet;
+import android.view.accessibility.AccessibilityManager;
+import androidx.slice.Slice;
+import androidx.slice.SliceProvider;
+import androidx.slice.widget.SliceLiveData;
+
+import com.android.settings.R;
import com.android.settings.bluetooth.BluetoothSliceBuilder;
import com.android.settings.flashlight.FlashlightSliceBuilder;
import com.android.settings.location.LocationSliceBuilder;
@@ -44,19 +55,29 @@
import com.android.settings.testutils.DatabaseTestUtils;
import com.android.settings.testutils.FakeToggleController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
import com.android.settings.testutils.shadow.ShadowThreadUtils;
-import com.android.settings.wifi.WifiSliceBuilder;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settings.wifi.WifiSlice;
+import com.android.settingslib.wifi.WifiTracker;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
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.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowAccessibilityManager;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -65,13 +86,14 @@
import java.util.List;
import java.util.Set;
-import androidx.slice.Slice;
-
/**
* TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider)
*/
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = ShadowThreadUtils.class)
+@Config(shadows = {ShadowUserManager.class, ShadowThreadUtils.class, ShadowUtils.class,
+ SlicesDatabaseAccessorTest.ShadowApplicationPackageManager.class,
+ ShadowBluetoothAdapter.class, ShadowLockPatternUtils.class,
+ SettingsSliceProviderTest.ShadowWifiScanWorker.class})
public class SettingsSliceProviderTest {
private static final String KEY = "KEY";
@@ -81,17 +103,17 @@
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 = 1234; // I declare a thumb war
+ private static final int ICON = R.drawable.ic_settings;
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;
- private SQLiteDatabase mDb;
+ @Mock
private SliceManager mManager;
private static final List<Uri> SPECIAL_CASE_PLATFORM_URIS = Arrays.asList(
- WifiSliceBuilder.WIFI_URI,
+ WifiSlice.WIFI_URI,
BluetoothSliceBuilder.BLUETOOTH_URI,
LocationSliceBuilder.LOCATION_URI
);
@@ -103,7 +125,13 @@
@Before
public void setUp() {
+ MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
+ // Register the fake a11y Service
+ ShadowAccessibilityManager shadowAccessibilityManager = Shadow.extract(
+ RuntimeEnvironment.application.getSystemService(AccessibilityManager.class));
+ shadowAccessibilityManager.setInstalledAccessibilityServiceList(new ArrayList<>());
+
mProvider = spy(new SettingsSliceProvider());
ShadowStrictMode.reset();
mProvider.mSliceWeakDataCache = new HashMap<>();
@@ -112,11 +140,12 @@
mProvider.mCustomSliceManager = new CustomSliceManager(mContext);
when(mProvider.getContext()).thenReturn(mContext);
- mDb = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
SlicesDatabaseHelper.getInstance(mContext).setIndexedState();
- mManager = mock(SliceManager.class);
- when(mContext.getSystemService(SliceManager.class)).thenReturn(mManager);
+
+ doReturn(mManager).when(mContext).getSystemService(SliceManager.class);
when(mManager.getPinnedSlices()).thenReturn(Collections.emptyList());
+
+ SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
}
@After
@@ -443,9 +472,9 @@
@Test
public void bindSlice_wifiSlice_returnsWifiSlice() {
- final Slice wifiSlice = mProvider.onBindSlice(WifiSliceBuilder.WIFI_URI);
+ final Slice wifiSlice = mProvider.onBindSlice(WifiSlice.WIFI_URI);
- assertThat(wifiSlice.getUri()).isEqualTo(WifiSliceBuilder.WIFI_URI);
+ assertThat(wifiSlice.getUri()).isEqualTo(WifiSlice.WIFI_URI);
}
@Test
@@ -470,23 +499,100 @@
mProvider.onSlicePinned(uri);
}
+ @Implements(WifiSlice.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
+ public void close() {
+ mWifiTracker.onDestroy();
+ }
+
+ static WifiTracker getWifiTracker() {
+ return mWifiTracker;
+ }
+ }
+
+ @Test
+ public void onSlicePinned_backgroundWorker_started() {
+ mProvider.onSlicePinned(WifiSlice.WIFI_URI);
+
+ verify(ShadowWifiScanWorker.getWifiTracker()).onStart();
+ }
+
+ @Test
+ public void onSlicePinned_backgroundWorker_stopped() {
+ mProvider.onSlicePinned(WifiSlice.WIFI_URI);
+ mProvider.onSliceUnpinned(WifiSlice.WIFI_URI);
+
+ verify(ShadowWifiScanWorker.getWifiTracker()).onStop();
+ }
+
+ @Test
+ public void shutdown_backgroundWorker_closed() {
+ mProvider.onSlicePinned(WifiSlice.WIFI_URI);
+ mProvider.shutdown();
+
+ verify(ShadowWifiScanWorker.getWifiTracker()).onDestroy();
+ }
+
+ @Test
+ public void grantWhitelistedPackagePermissions_noWhitelist_shouldNotGrant() {
+ final List<Uri> uris = new ArrayList<>();
+ uris.add(Uri.parse("content://settings/slice"));
+
+ mProvider.grantWhitelistedPackagePermissions(mContext, uris);
+
+ verify(mManager, never()).grantSlicePermission(anyString(), any(Uri.class));
+ }
+
+ @Test
+ @Config(qualifiers = "mcc999")
+ public void grantWhitelistedPackagePermissions_hasPackageWhitelist_shouldGrant() {
+ final List<Uri> uris = new ArrayList<>();
+ uris.add(Uri.parse("content://settings/slice"));
+
+ mProvider.grantWhitelistedPackagePermissions(mContext, uris);
+
+ verify(mManager)
+ .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) {
- ContentValues values = new ContentValues();
+ 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, 1234);
+ values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, R.drawable.ic_settings);
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);
-
- mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
+ 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() {
@@ -502,7 +608,7 @@
.build();
}
- @Implements(value = StrictMode.class, inheritImplementationMethods = true)
+ @Implements(value = StrictMode.class)
public static class ShadowStrictMode {
private static int sSetThreadPolicyCount;
@@ -521,4 +627,4 @@
return sSetThreadPolicyCount != 0;
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
index 955cdf1..4e09632 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java
@@ -85,8 +85,9 @@
mSearchFeatureProvider = new SearchFeatureProviderImpl();
mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
mFakeFeatureFactory.searchFeatureProvider = mSearchFeatureProvider;
+ CustomSliceManager manager = new CustomSliceManager(mContext);
when(mFakeFeatureFactory.slicesFeatureProvider.getCustomSliceManager(any()))
- .thenReturn(new CustomSliceManager(mContext));
+ .thenReturn(manager);
mLoggingNameArgumentCatpor = ArgumentCaptor.forClass(Pair.class);
mLoggingValueArgumentCatpor = ArgumentCaptor.forClass(Pair.class);
}
@@ -168,6 +169,7 @@
.appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
.appendPath(key)
.build();
+
verify(resolver).notifyChange(expectedUri, null);
}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index b96c128..4371278 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -17,7 +17,7 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
+
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -26,15 +26,22 @@
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.net.Uri;
import android.provider.Settings;
import android.provider.SettingsSlicesContract;
import android.util.Pair;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.FakeCopyableController;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.FakeSliderController;
import com.android.settings.testutils.FakeToggleController;
@@ -48,13 +55,6 @@
import org.mockito.ArgumentCaptor;
import org.robolectric.RuntimeEnvironment;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.widget.SliceLiveData;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SliceBuilderUtilsTest {
@@ -64,11 +64,13 @@
private final String SCREEN_TITLE = "screen title";
private final String KEYWORDS = "a, b, c";
private final String FRAGMENT_NAME = "fragment name";
- private final int ICON = 1234; // I declare a thumb war
+ private final int ICON = R.drawable.ic_settings;
private final Uri URI = Uri.parse("content://com.android.settings.slices/test");
private final Class TOGGLE_CONTROLLER = FakeToggleController.class;
private final Class SLIDER_CONTROLLER = FakeSliderController.class;
+ private final Class COPYABLE_CONTROLLER = FakeCopyableController.class;
private final Class CONTEXT_CONTROLLER = FakeContextOnlyPreferenceController.class;
+ private final boolean IS_DYNAMIC_SUMMARY_ALLOWED = false;
private final String INTENT_PATH = SettingsSlicesContract.PATH_SETTING_INTENT + "/" + KEY;
private final String ACTION_PATH = SettingsSlicesContract.PATH_SETTING_ACTION + "/" + KEY;
@@ -79,15 +81,10 @@
@Before
public void setUp() {
- mContext = spy(RuntimeEnvironment.application);
+ mContext = RuntimeEnvironment.application;
mFeatureFactory = FakeFeatureFactory.setupForTest();
mLoggingArgumentCatpor = ArgumentCaptor.forClass(Pair.class);
- // Prevent crash in SliceMetadata.
- Resources resources = spy(mContext.getResources());
- doReturn(60).when(resources).getDimensionPixelSize(anyInt());
- doReturn(resources).when(mContext).getResources();
-
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
}
@@ -121,7 +118,6 @@
public void buildSliderSlice_returnsMatchingSlice() {
final SliceData data = getDummyData(SLIDER_CONTROLLER, SliceData.SliceType.SLIDER);
-
final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
verify(mFeatureFactory.metricsFeatureProvider)
.action(eq(mContext), eq(MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED),
@@ -136,6 +132,23 @@
}
@Test
+ public void buildCopyableSlice_returnsMatchingSlice() {
+ final SliceData dummyData = getDummyData(COPYABLE_CONTROLLER, -1);
+
+ final Slice slice = SliceBuilderUtils.buildSlice(mContext, dummyData);
+ verify(mFeatureFactory.metricsFeatureProvider)
+ .action(eq(mContext), eq(MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED),
+ mLoggingArgumentCatpor.capture());
+ final Pair<Integer, Object> capturedLoggingPair = mLoggingArgumentCatpor.getValue();
+
+ assertThat(capturedLoggingPair.first)
+ .isEqualTo(MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME);
+ assertThat(capturedLoggingPair.second)
+ .isEqualTo(dummyData.getKey());
+ SliceTester.testSettingsCopyableSlice(mContext, slice, dummyData);
+ }
+
+ @Test
public void testUriBuilder_oemAuthority_intentPath_returnsValidSliceUri() {
final Uri expectedUri = new Uri.Builder()
.scheme(ContentResolver.SCHEME_CONTENT)
@@ -205,6 +218,19 @@
}
@Test
+ public void getDynamicSummary_allowDynamicSummary_returnsControllerSummary() {
+ final SliceData data = getDummyData(true /*isDynamicSummaryAllowed*/);
+ final FakePreferenceController controller = spy(
+ new FakePreferenceController(mContext, KEY));
+ final String controllerSummary = "new_Summary";
+ doReturn(controllerSummary).when(controller).getSummary();
+
+ final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
+
+ assertThat(summary).isEqualTo(controllerSummary);
+ }
+
+ @Test
public void getDynamicSummary_returnsScreenTitle() {
final SliceData data = getDummyData();
final FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
@@ -425,6 +451,25 @@
}
@Test
+ public void buildDisabledDependentSlice_noIconPassed_returnsSliceWithIcon() {
+ final int expectedIconResource = IconCompat.createWithResource(mContext,
+ R.drawable.ic_settings).toIcon().getResId();
+ final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+ SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE, 0 /* icon */,
+ IS_DYNAMIC_SUMMARY_ALLOWED);
+ Settings.Global.putInt(mContext.getContentResolver(),
+ FakeUnavailablePreferenceController.AVAILABILITY_KEY,
+ BasePreferenceController.DISABLED_DEPENDENT_SETTING);
+
+ final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
+
+ final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+ final int actualIconResource = primaryAction.getIcon().toIcon().getResId();
+ assertThat(actualIconResource).isEqualTo(expectedIconResource);
+ }
+
+ @Test
public void buildToggleSlice_noIconPassed_returnsSliceWithIcon() {
final int expectedIconResource = IconCompat.createWithResource(mContext,
R.drawable.ic_settings).toIcon().getResId();
@@ -469,25 +514,31 @@
private SliceData getDummyData() {
return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE,
- ICON);
+ ICON, IS_DYNAMIC_SUMMARY_ALLOWED);
+ }
+
+ private SliceData getDummyData(boolean isDynamicSummaryAllowed) {
+ return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE,
+ ICON, isDynamicSummaryAllowed);
}
private SliceData getDummyData(Class prefController, int sliceType, int icon) {
return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE,
- icon);
+ icon, IS_DYNAMIC_SUMMARY_ALLOWED);
}
private SliceData getDummyData(String summary, String screenTitle) {
return getDummyData(TOGGLE_CONTROLLER, summary, SliceData.SliceType.SWITCH, screenTitle,
- ICON);
+ ICON, IS_DYNAMIC_SUMMARY_ALLOWED);
}
private SliceData getDummyData(Class prefController, int sliceType) {
- return getDummyData(prefController, SUMMARY, sliceType, SCREEN_TITLE, ICON);
+ return getDummyData(prefController, SUMMARY, sliceType, SCREEN_TITLE, ICON,
+ IS_DYNAMIC_SUMMARY_ALLOWED);
}
private SliceData getDummyData(Class prefController, String summary, int sliceType,
- String screenTitle, int icon) {
+ String screenTitle, int icon, boolean isDynamicSummaryAllowed) {
return new SliceData.Builder()
.setKey(KEY)
.setTitle(TITLE)
@@ -499,6 +550,7 @@
.setUri(URI)
.setPreferenceControllerClassName(prefController.getName())
.setSliceType(sliceType)
+ .setDynamicSummaryAllowed(isDynamicSummaryAllowed)
.build();
}
}
diff --git a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
index 9c8b946..213de11 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
@@ -17,6 +17,7 @@
package com.android.settings.slices;
import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER;
+
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
index 66915ed..83c35ba 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java
@@ -17,6 +17,7 @@
package com.android.settings.slices;
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;
@@ -123,6 +124,7 @@
assertThat(fakeSlice.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
assertThat(fakeSlice.getSliceType()).isEqualTo(SliceData.SliceType.SLIDER);
assertThat(fakeSlice.isPlatformDefined()).isTrue(); // from XML
+ assertThat(fakeSlice.isDynamicSummaryAllowed()).isTrue(); // from XML
}
private void assertFakeA11ySlice(SliceData fakeSlice) {
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
index 0d91968..9adee07 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
@@ -39,6 +39,7 @@
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 boolean IS_DYNAMIC_SUMMARY_ALLOWED = true;
@Test
public void testBuilder_buildsMatchingObject() {
@@ -53,7 +54,8 @@
.setUri(URI)
.setPreferenceControllerClassName(PREF_CONTROLLER)
.setSliceType(SLICE_TYPE)
- .setPlatformDefined(IS_PLATFORM_DEFINED);
+ .setPlatformDefined(IS_PLATFORM_DEFINED)
+ .setDynamicSummaryAllowed(IS_DYNAMIC_SUMMARY_ALLOWED);
SliceData data = builder.build();
@@ -68,6 +70,7 @@
assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
assertThat(data.getSliceType()).isEqualTo(SLICE_TYPE);
assertThat(data.isPlatformDefined()).isEqualTo(IS_PLATFORM_DEFINED);
+ assertThat(data.isDynamicSummaryAllowed()).isEqualTo(IS_DYNAMIC_SUMMARY_ALLOWED);
}
@Test(expected = SliceData.InvalidSliceDataException.class)
@@ -216,7 +219,7 @@
}
@Test
- public void testEquality_identicalObjects() {
+ public void testBuilder_noDynamicSummaryAllowed_buildsMatchingObject() {
SliceData.Builder builder = new SliceData.Builder()
.setKey(KEY)
.setTitle(TITLE)
@@ -227,6 +230,32 @@
.setUri(URI)
.setPreferenceControllerClassName(PREF_CONTROLLER);
+ SliceData data = builder.build();
+
+ assertThat(data.getKey()).isEqualTo(KEY);
+ assertThat(data.getTitle()).isEqualTo(TITLE);
+ assertThat(data.getSummary()).isEqualTo(SUMMARY);
+ assertThat(data.getScreenTitle()).isEqualTo(SCREEN_TITLE);
+ assertThat(data.getIconResource()).isEqualTo(ICON);
+ assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
+ assertThat(data.getUri()).isEqualTo(URI);
+ assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
+ assertThat(data.isDynamicSummaryAllowed()).isFalse();
+ }
+
+ @Test
+ public void testEquality_identicalObjects() {
+ SliceData.Builder builder = new SliceData.Builder()
+ .setKey(KEY)
+ .setTitle(TITLE)
+ .setSummary(SUMMARY)
+ .setScreenTitle(SCREEN_TITLE)
+ .setIcon(ICON)
+ .setFragmentName(FRAGMENT_NAME)
+ .setUri(URI)
+ .setPreferenceControllerClassName(PREF_CONTROLLER)
+ .setDynamicSummaryAllowed(IS_DYNAMIC_SUMMARY_ALLOWED);
+
SliceData dataOne = builder.build();
SliceData dataTwo = builder.build();
diff --git a/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java
new file mode 100644
index 0000000..5a47e13
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/SliceRelayReceiverTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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.slices;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.SettingsSlicesContract;
+
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.SliceBroadcastRelay;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SliceRelayReceiverTest {
+
+ private Context mContext;
+ private SliceRelayReceiver mSliceRelayReceiver;
+
+ @Before
+ public void setUp() {
+ mContext = spy(RuntimeEnvironment.application);
+ mSliceRelayReceiver = new SliceRelayReceiver();
+ }
+
+
+ @Test
+ public void onReceive_extraUri_notifiesChangeOnUri() {
+ // Monitor the ContentResolver
+ final ContentResolver resolver = spy(mContext.getContentResolver());
+ doReturn(resolver).when(mContext).getContentResolver();
+
+ final Uri uri = new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(SettingsSlicesContract.AUTHORITY)
+ .appendPath("path")
+ .build();
+
+ final Intent intent = new Intent();
+ intent.putExtra(SliceBroadcastRelay.EXTRA_URI, uri.toString());
+
+ mSliceRelayReceiver.onReceive(mContext, intent);
+
+ verify(resolver).notifyChange(eq(uri), any());
+
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
index 1f31473..bebf797 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java
@@ -18,8 +18,11 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
+import android.app.ApplicationPackageManager;
+import android.content.ComponentName;
import android.content.ContentValues;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
@@ -32,6 +35,10 @@
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.FakeIndexProvider;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After;
import org.junit.Before;
@@ -39,6 +46,8 @@
import org.junit.runner.RunWith;
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;
@@ -48,6 +57,9 @@
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowUserManager.class, ShadowUtils.class,
+ SlicesDatabaseAccessorTest.ShadowApplicationPackageManager.class,
+ ShadowBluetoothAdapter.class, ShadowLockPatternUtils.class})
public class SlicesDatabaseAccessorTest {
private final String FAKE_TITLE = "title";
@@ -65,6 +77,7 @@
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
+ ShadowUserManager.getShadow().setIsAdminUser(true);
mAccessor = spy(new SlicesDatabaseAccessor(mContext));
mDb = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
SlicesDatabaseHelper.getInstance(mContext).setIndexedState();
@@ -77,6 +90,7 @@
@After
public void cleanUp() {
+ ShadowUserManager.getShadow().reset();
DatabaseTestUtils.clearDb(mContext);
}
@@ -96,6 +110,45 @@
assertThat(data.getFragmentClassName()).isEqualTo(FAKE_FRAGMENT_NAME);
assertThat(data.getUri()).isNull();
assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.isDynamicSummaryAllowed()).isFalse(); /* default value */
+ }
+
+ @Test
+ public void testGetSliceDataFromKey_allowDynamicSummary_validSliceReturned() {
+ String key = "key";
+ insertSpecialCase(key, true /* isPlatformSlice */, true /* isDynamicSummaryAllowed */);
+
+ 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.getUri()).isNull();
+ assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.isDynamicSummaryAllowed()).isTrue();
+ }
+
+ @Test
+ public void testGetSliceDataFromKey_doNotAllowDynamicSummary_validSliceReturned() {
+ String key = "key";
+ insertSpecialCase(key, true /* isPlatformSlice */, false /* isDynamicSummaryAllowed */);
+
+ 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.getUri()).isNull();
+ assertThat(data.getPreferenceController()).isEqualTo(FAKE_CONTROLLER_NAME);
+ assertThat(data.isDynamicSummaryAllowed()).isFalse();
}
@Test(expected = IllegalStateException.class)
@@ -197,6 +250,11 @@
}
private void insertSpecialCase(String key, boolean isPlatformSlice) {
+ insertSpecialCase(key, isPlatformSlice, false /* isDynamicSummaryAllowed */);
+ }
+
+ private void insertSpecialCase(String key, boolean isPlatformSlice,
+ boolean isDynamicSummaryAllowed) {
ContentValues values = new ContentValues();
values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE);
@@ -207,8 +265,20 @@
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.ALLOW_DYNAMIC_SUMMARY_IN_SLICE,
+ isDynamicSummaryAllowed);
values.put(SlicesDatabaseHelper.IndexColumns.SLICE_TYPE, SliceData.SliceType.INTENT);
mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
}
+
+ @Implements(ApplicationPackageManager.class)
+ public static class ShadowApplicationPackageManager extends
+ org.robolectric.shadows.ShadowApplicationPackageManager {
+
+ @Implementation
+ protected ComponentName getInstantAppResolverSettingsComponent() {
+ return null;
+ }
+ }
}
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
index 783ffa0..a00d343 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
@@ -17,6 +17,7 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -72,6 +73,7 @@
IndexColumns.CONTROLLER,
IndexColumns.PLATFORM_SLICE,
IndexColumns.SLICE_TYPE,
+ IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE,
};
assertThat(columnNames).isEqualTo(expectedNames);
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
index 7a2db3e4..4602711 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.slices;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@@ -52,19 +53,18 @@
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 boolean IS_DYNAMIC_SUMMARY_ALLOWED = true;
private final int SLICE_TYPE = SliceData.SliceType.SLIDER;
private Context mContext;
private SlicesIndexer mManager;
- private SQLiteDatabase mDb;
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
mManager = spy(new SlicesIndexer(mContext));
- mDb = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
}
@After
@@ -82,11 +82,16 @@
// Attempt indexing - should not do anything.
mManager.run();
- Cursor cursor = mDb.rawQuery("SELECT * FROM slices_index", null);
- cursor.moveToFirst();
- assertThat(cursor.getCount()).isEqualTo(1);
- assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.KEY))).isEqualTo(newKey);
- assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.TITLE))).isEqualTo(newTitle);
+ final SQLiteDatabase db = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
+ try (final Cursor cursor = db.rawQuery("SELECT * FROM slices_index", null)) {
+ cursor.moveToFirst();
+ assertThat(cursor.getCount()).isEqualTo(1);
+ assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.KEY))).isEqualTo(newKey);
+ assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.TITLE)))
+ .isEqualTo(newTitle);
+ } finally {
+ db.close();
+ }
}
@Test
@@ -107,30 +112,43 @@
mManager.run();
- final Cursor cursor = mDb.rawQuery("SELECT * FROM slices_index", null);
- assertThat(cursor.getCount()).isEqualTo(sliceData.size());
+ final SQLiteDatabase db = SlicesDatabaseHelper.getInstance(mContext).getWritableDatabase();
+ try (final Cursor cursor = db.rawQuery("SELECT * FROM slices_index", null)) {
+ assertThat(cursor.getCount()).isEqualTo(sliceData.size());
- cursor.moveToFirst();
- for (int i = 0; i < sliceData.size(); i++) {
- assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.KEY))).isEqualTo(
- KEYS[i]);
- assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.TITLE))).isEqualTo(
- TITLES[i]);
- assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.FRAGMENT))).isEqualTo(
- FRAGMENT_NAME);
- assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.SCREENTITLE))).isEqualTo(
- SCREEN_TITLE);
- assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.KEYWORDS))).isEqualTo(
- KEYWORDS);
- assertThat(cursor.getInt(cursor.getColumnIndex(IndexColumns.ICON_RESOURCE))).isEqualTo(
- ICON);
- 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);
- cursor.moveToNext();
+ cursor.moveToFirst();
+ for (int i = 0; i < sliceData.size(); i++) {
+ assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.KEY)))
+ .isEqualTo(KEYS[i]);
+ assertThat(cursor.getString(cursor.getColumnIndex(IndexColumns.TITLE)))
+ .isEqualTo(TITLES[i]);
+ assertThat(
+ cursor.getString(cursor.getColumnIndex(IndexColumns.FRAGMENT)))
+ .isEqualTo(FRAGMENT_NAME);
+ assertThat(cursor.getString(
+ cursor.getColumnIndex(IndexColumns.SCREENTITLE))).isEqualTo(SCREEN_TITLE);
+ assertThat(
+ cursor.getString(cursor.getColumnIndex(IndexColumns.KEYWORDS)))
+ .isEqualTo(KEYWORDS);
+ assertThat(
+ cursor.getInt(cursor.getColumnIndex(IndexColumns.ICON_RESOURCE)))
+ .isEqualTo(ICON);
+ 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.getInt(
+ cursor.getColumnIndex(
+ IndexColumns.ALLOW_DYNAMIC_SUMMARY_IN_SLICE)))
+ .isEqualTo(1 /* true */);
+ cursor.moveToNext();
+ }
+ } finally {
+ db.close();
}
}
@@ -138,8 +156,15 @@
final ContentValues values = new ContentValues();
values.put(IndexColumns.KEY, key);
values.put(IndexColumns.TITLE, title);
-
- mDb.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
+ 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 List<SliceData> getDummyIndexableData() {
@@ -153,7 +178,8 @@
.setUri(URI)
.setPreferenceControllerClassName(PREF_CONTROLLER)
.setPlatformDefined(PLATFORM_DEFINED)
- .setSliceType(SLICE_TYPE);
+ .setSliceType(SLICE_TYPE)
+ .setDynamicSummaryAllowed(IS_DYNAMIC_SUMMARY_ALLOWED);
for (int i = 0; i < KEYS.length; i++) {
builder.setKey(KEYS[i]).setTitle(TITLES[i]);
diff --git a/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java b/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
index ab226f9..501c564 100644
--- a/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
@@ -28,6 +28,8 @@
import android.net.Uri;
import android.provider.SettingsSlicesContract;
+import androidx.slice.Slice;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,8 +37,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.slice.Slice;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SpecialCaseSliceManagerTest {
@@ -112,10 +112,14 @@
static boolean backingData = false;
- public FakeSliceable(Context context) {}
+ final Context mContext;
+
+ public FakeSliceable(Context context) {
+ mContext = context;
+ }
@Override
- public Slice getSlice(Context context) {
+ public Slice getSlice() {
return SLICE;
}
@@ -133,5 +137,10 @@
public IntentFilter getIntentFilter() {
return new IntentFilter();
}
+
+ @Override
+ public Intent getIntent() {
+ return null;
+ }
}
}
diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
index 7986428..2ed1907 100644
--- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java
@@ -19,9 +19,12 @@
import static android.media.AudioSystem.DEVICE_OUT_ALL_SCO;
import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET;
import static android.media.AudioSystem.STREAM_MUSIC;
+
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
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;
@@ -37,6 +40,10 @@
import android.content.pm.PackageManager;
import android.util.FeatureFlagUtils;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -67,10 +74,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
ShadowAudioManager.class,
@@ -166,7 +169,6 @@
@After
public void tearDown() {
mShadowAudioManager.reset();
- mShadowMediaRouter.reset();
ShadowBluetoothUtils.reset();
}
diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
index 47b6ea0..e3014b7 100644
--- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java
@@ -18,9 +18,12 @@
import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_SCO;
import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID;
+
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.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -32,6 +35,10 @@
import android.content.Context;
import android.media.AudioManager;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAudioManager;
@@ -56,10 +63,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
ShadowAudioManager.class,
@@ -161,7 +164,6 @@
@After
public void tearDown() {
mShadowAudioManager.reset();
- mShadowMediaRouter.reset();
ShadowBluetoothUtils.reset();
}
@@ -177,6 +179,7 @@
mController.setActiveBluetoothDevice(mLeftBluetoothHapDevice);
verify(mHearingAidProfile).setActiveDevice(mLeftBluetoothHapDevice);
+ verify(mHeadsetProfile, never()).setActiveDevice(mLeftBluetoothHapDevice);
}
/**
@@ -190,6 +193,7 @@
mController.setActiveBluetoothDevice(mBluetoothDevice);
verify(mHeadsetProfile).setActiveDevice(mBluetoothDevice);
+ verify(mHearingAidProfile, never()).setActiveDevice(mBluetoothDevice);
}
/**
diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
index 8538437..cdee894 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
@@ -19,9 +19,12 @@
import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP;
import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID;
import static android.media.AudioSystem.DEVICE_OUT_REMOTE_SUBMIX;
+
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.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -33,6 +36,10 @@
import android.content.Context;
import android.media.AudioManager;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowAudioManager;
@@ -57,10 +64,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
ShadowAudioManager.class,
@@ -162,7 +165,6 @@
@After
public void tearDown() {
mShadowAudioManager.reset();
- mShadowMediaRouter.reset();
ShadowBluetoothUtils.reset();
}
@@ -178,6 +180,7 @@
mController.setActiveBluetoothDevice(mLeftBluetoothHapDevice);
verify(mHearingAidProfile).setActiveDevice(mLeftBluetoothHapDevice);
+ verify(mA2dpProfile, never()).setActiveDevice(mLeftBluetoothHapDevice);
}
/**
@@ -191,6 +194,7 @@
mController.setActiveBluetoothDevice(mBluetoothDevice);
verify(mA2dpProfile).setActiveDevice(mBluetoothDevice);
+ verify(mHearingAidProfile, never()).setActiveDevice(mBluetoothDevice);
}
/**
diff --git a/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java
new file mode 100644
index 0000000..d805047
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/support/SupportPreferenceControllerTest.java
@@ -0,0 +1,78 @@
+/*
+ * 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.support;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
+
+import androidx.preference.Preference;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class SupportPreferenceControllerTest {
+
+
+ private Activity mActivity;
+ private FakeFeatureFactory mFeatureFactory;
+ private Preference mPreference;
+
+ @Before
+ public void setUp() {
+ mActivity = Robolectric.setupActivity(Activity.class);
+ mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mPreference = new Preference(mActivity);
+ mPreference.setKey("test_key");
+ }
+
+ @Test
+ public void getAvailability_noSupport_unavailable() {
+ ReflectionHelpers.setField(mFeatureFactory, "supportFeatureProvider", null);
+ assertThat(new SupportPreferenceController(mActivity, "test_key").getAvailabilityStatus())
+ .isEqualTo(UNSUPPORTED_ON_DEVICE);
+ }
+
+ @Test
+ public void getAvailability_hasSupport_available() {
+ assertThat(new SupportPreferenceController(mActivity, "test_key").getAvailabilityStatus())
+ .isEqualTo(AVAILABLE);
+ }
+
+ @Test
+ public void handlePreferenceTreeClick_shouldLaunchSupport() {
+ final SupportPreferenceController controller = new SupportPreferenceController(mActivity,
+ mPreference.getKey());
+ controller.setActivity(mActivity);
+
+ assertThat(controller.handlePreferenceTreeClick(mPreference)).isTrue();
+ verify(mFeatureFactory.supportFeatureProvider).startSupport(mActivity);
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
index c7983d1..f49967a 100644
--- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
+++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java
@@ -1,6 +1,7 @@
package com.android.settings.survey;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.never;
@@ -12,6 +13,9 @@
import android.content.Context;
import android.content.IntentFilter;
+import androidx.fragment.app.FragmentActivity;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.overlay.SurveyFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
@@ -29,9 +33,6 @@
import java.util.ArrayList;
import java.util.HashMap;
-import androidx.fragment.app.FragmentActivity;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class SurveyMixinTest {
diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
index ff09412..542a4a1 100644
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
@@ -18,10 +18,10 @@
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
-import android.os.UserManager;
import android.provider.Settings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After;
@@ -29,10 +29,10 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.shadows.ShadowUserManager;
+import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowUserManager.class)
public class FactoryResetPreferenceControllerTest {
private static final String FACTORY_RESET_KEY = "factory_reset";
@@ -45,8 +45,7 @@
@Before
public void setUp() {
mContext = RuntimeEnvironment.application;
- UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- mShadowUserManager = Shadows.shadowOf(userManager);
+ mShadowUserManager = ShadowUserManager.getShadow();
mController = new FactoryResetPreferenceController(mContext);
}
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
index 597389a..5f787a9 100644
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
@@ -23,6 +23,7 @@
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.After;
import org.junit.Before;
@@ -34,18 +35,20 @@
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResources.class)
+@Config(shadows = {SettingsShadowResources.class, ShadowUserManager.class})
public class SystemDashboardFragmentTest {
@Before
public void setup() {
SettingsShadowResources.overrideResource(
com.android.internal.R.bool.config_supportSystemNavigationKeys, true);
+ ShadowUserManager.getShadow().setIsAdminUser(true);
}
@After
public void tearDown() {
SettingsShadowResources.reset();
+ ShadowUserManager.getShadow().reset();
}
@Test
diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
index b65b2e3..bd17fd7 100644
--- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
@@ -20,17 +20,22 @@
import static android.os.SystemUpdateManager.STATUS_IDLE;
import static android.os.SystemUpdateManager.STATUS_UNKNOWN;
import static android.os.SystemUpdateManager.STATUS_WAITING_DOWNLOAD;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.os.SystemUpdateManager;
-import android.os.UserManager;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUserManager;
import org.junit.After;
import org.junit.Before;
@@ -39,18 +44,14 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.shadows.ShadowUserManager;
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowUserManager.class)
public class SystemUpdatePreferenceControllerTest {
@Mock
@@ -67,8 +68,7 @@
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
- UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
- mShadowUserManager = Shadows.shadowOf(userManager);
+ mShadowUserManager = ShadowUserManager.getShadow();
ShadowApplication.getInstance().setSystemService(Context.SYSTEM_UPDATE_SERVICE,
mSystemUpdateManager);
@@ -138,7 +138,8 @@
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getString(R.string.android_version_summary, Build.VERSION.RELEASE));
+ .isEqualTo(mContext.getString(R.string.android_version_summary,
+ Build.VERSION.RELEASE));
}
@Test
@@ -153,7 +154,7 @@
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getString(R.string.android_version_summary, testReleaseName));
+ .isEqualTo(mContext.getString(R.string.android_version_summary, testReleaseName));
}
@Test
@@ -165,6 +166,6 @@
mController.updateState(mPreference);
assertThat(mPreference.getSummary())
- .isEqualTo(mContext.getString(R.string.android_version_pending_update_summary));
+ .isEqualTo(mContext.getString(R.string.android_version_pending_update_summary));
}
}
\ No newline at end of file
diff --git a/src/com/android/settings/dream/DreamEntryPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java
similarity index 65%
copy from src/com/android/settings/dream/DreamEntryPreferenceController.java
copy to tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java
index 097fa3a..a02377c 100644
--- a/src/com/android/settings/dream/DreamEntryPreferenceController.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeCopyableController.java
@@ -14,20 +14,31 @@
* limitations under the License.
*/
-package com.android.settings.dream;
+package com.android.settings.testutils;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
+import com.android.settings.slices.CopyableSlice;
-public class DreamEntryPreferenceController extends BasePreferenceController {
+public class FakeCopyableController extends BasePreferenceController implements
+ CopyableSlice {
- public DreamEntryPreferenceController(Context context, String preferenceKey) {
+ public FakeCopyableController(Context context, String preferenceKey) {
super(context, preferenceKey);
}
@Override
public int getAvailabilityStatus() {
- return AVAILABLE_UNSEARCHABLE;
+ return AVAILABLE;
+ }
+
+ @Override
+ public boolean isSliceable() {
+ return true;
+ }
+
+ @Override
+ public void copy() {
}
}
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index 39d4417..24db829 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -33,7 +33,6 @@
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.overlay.SupportFeatureProvider;
import com.android.settings.overlay.SurveyFeatureProvider;
-import com.android.settings.search.DeviceIndexFeatureProvider;
import com.android.settings.search.SearchFeatureProvider;
import com.android.settings.security.SecurityFeatureProvider;
import com.android.settings.slices.SlicesFeatureProvider;
@@ -62,7 +61,6 @@
public final UserFeatureProvider userFeatureProvider;
public final AssistGestureFeatureProvider assistGestureFeatureProvider;
public final AccountFeatureProvider mAccountFeatureProvider;
- public final DeviceIndexFeatureProvider deviceIndexFeatureProvider;
public SlicesFeatureProvider slicesFeatureProvider;
public SearchFeatureProvider searchFeatureProvider;
@@ -104,7 +102,6 @@
assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class);
slicesFeatureProvider = mock(SlicesFeatureProvider.class);
mAccountFeatureProvider = mock(AccountFeatureProvider.class);
- deviceIndexFeatureProvider = mock(DeviceIndexFeatureProvider.class);
}
@Override
@@ -186,9 +183,4 @@
public AccountFeatureProvider getAccountFeatureProvider() {
return mAccountFeatureProvider;
}
-
- @Override
- public DeviceIndexFeatureProvider getDeviceIndexFeatureProvider() {
- return deviceIndexFeatureProvider;
- }
}
diff --git a/tests/robotests/src/com/android/settings/testutils/FragmentController.java b/tests/robotests/src/com/android/settings/testutils/FragmentController.java
deleted file mode 100644
index b3f7b6f..0000000
--- a/tests/robotests/src/com/android/settings/testutils/FragmentController.java
+++ /dev/null
@@ -1,210 +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.testutils;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.LinearLayout;
-
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.android.controller.ComponentController;
-import org.robolectric.util.ReflectionHelpers;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-/**
- * Controller class for driving fragment lifecycles, similar to {@link ActivityController}.
- */
-// TODO(b/111195167) - Duplicated from org.robolectric.android.controller.FragmentController.
-@Deprecated
-public class FragmentController<F extends Fragment> extends
- ComponentController<FragmentController<F>, F> {
- private final F fragment;
- private final ActivityController<? extends FragmentActivity> activityController;
-
- public static <F extends Fragment> FragmentController<F> of(F fragment) {
- return of(fragment, FragmentControllerActivity.class, null, null);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment,
- Class<? extends FragmentActivity> activityClass) {
- return of(fragment, activityClass, null, null);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment, Intent intent) {
- return new FragmentController<>(fragment, FragmentControllerActivity.class, intent);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment, Bundle arguments) {
- return new FragmentController<>(fragment, FragmentControllerActivity.class, arguments);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment, Intent intent,
- Bundle arguments) {
- return new FragmentController<>(fragment, FragmentControllerActivity.class, intent,
- arguments);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment,
- Class<? extends FragmentActivity> activityClass, Intent intent) {
- return new FragmentController<>(fragment, activityClass, intent);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment,
- Class<? extends FragmentActivity> activityClass, Bundle arguments) {
- return new FragmentController<>(fragment, activityClass, arguments);
- }
-
- public static <F extends Fragment> FragmentController<F> of(F fragment,
- Class<? extends FragmentActivity> activityClass,
- Intent intent, Bundle arguments) {
- return new FragmentController<>(fragment, activityClass, intent, arguments);
- }
-
- private FragmentController(F fragment, Class<? extends FragmentActivity> activityClass,
- Intent intent) {
- this(fragment, activityClass, intent, null);
- }
-
- private FragmentController(F fragment, Class<? extends FragmentActivity> activityClass,
- Bundle arguments) {
- this(fragment, activityClass, null, arguments);
- }
-
- private FragmentController(F fragment, Class<? extends FragmentActivity> activityClass,
- Intent intent, Bundle arguments) {
- super(fragment, intent);
- this.fragment = fragment;
- if (arguments != null) {
- this.fragment.setArguments(arguments);
- }
- this.activityController = ActivityController.of(
- ReflectionHelpers.callConstructor(activityClass), intent);
- }
-
- /**
- * Creates the activity with {@link Bundle} and adds the fragment to the view with ID {@code
- * contentViewId}.
- */
- public FragmentController<F> create(final int contentViewId, final Bundle bundle) {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.create(
- bundle).get().getSupportFragmentManager().beginTransaction().add(
- contentViewId, fragment).commit();
- }
- });
- return this;
- }
-
- /**
- * Creates the activity with {@link Bundle} and adds the fragment to it. Note that the fragment
- * will be added to the view with ID 1.
- */
- public FragmentController<F> create(Bundle bundle) {
- return create(1, bundle);
- }
-
- @Override
- public FragmentController<F> create() {
- return create(null);
- }
-
- @Override
- public FragmentController<F> destroy() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.destroy();
- }
- });
- return this;
- }
-
- public FragmentController<F> start() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.start();
- }
- });
- return this;
- }
-
- public FragmentController<F> resume() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.resume();
- }
- });
- return this;
- }
-
- public FragmentController<F> pause() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.pause();
- }
- });
- return this;
- }
-
- public FragmentController<F> visible() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.visible();
- }
- });
- return this;
- }
-
- public FragmentController<F> stop() {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.stop();
- }
- });
- return this;
- }
-
- public FragmentController<F> saveInstanceState(final Bundle outState) {
- shadowMainLooper.runPaused(new Runnable() {
- @Override
- public void run() {
- activityController.saveInstanceState(outState);
- }
- });
- return this;
- }
-
- private static class FragmentControllerActivity extends FragmentActivity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- LinearLayout view = new LinearLayout(this);
- view.setId(1);
-
- setContentView(view);
- }
- }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java
deleted file mode 100644
index e85141c..0000000
--- a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java
+++ /dev/null
@@ -1,80 +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.testutils;
-
-import static com.google.common.truth.Truth.assertAbout;
-import static org.robolectric.RuntimeEnvironment.application;
-
-import com.google.common.truth.ComparableSubject;
-import com.google.common.truth.FailureStrategy;
-import com.google.common.truth.SubjectFactory;
-
-import androidx.annotation.Nullable;
-
-/**
- * Custom subject for use with {@link com.google.common.truth.Truth}, to provide a more readable
- * error message, so that instead of "Not true that 2130706432 equals to 17170444", it will say
- * "Not true that color/my_color equals to android:color/black".
- *
- * <p>Usage:
- * <pre>{@code
- * ResIdSubject.assertResId(activity.getThemeResId()).isEqualTo(android.R.style.Theme_Material)
- * }</pre>
- */
-public class ResIdSubject extends ComparableSubject<ResIdSubject, Integer> {
-
- public static final SubjectFactory<ResIdSubject, Integer> FACTORY =
- new SubjectFactory<ResIdSubject, Integer>() {
- @Override
- public ResIdSubject getSubject(
- FailureStrategy failureStrategy, Integer integer) {
- return new ResIdSubject(failureStrategy, integer);
- }
- };
-
- public static ResIdSubject assertResId(int resId) {
- return assertAbout(ResIdSubject.FACTORY).that(resId);
- }
-
- public ResIdSubject(
- FailureStrategy failureStrategy,
- @Nullable Integer integer) {
- super(failureStrategy, integer);
- }
-
- public void isEqualTo(int other) {
- Integer subject = getSubject();
- if (subject == null || subject != other) {
- fail("equals to", resIdToString(other));
- }
- }
-
- @Override
- protected String getDisplaySubject() {
- String resourceName = "<" + resIdToString(getSubject()) + ">";
- String customName = internalCustomName();
- if (customName != null) {
- return customName + " " + resourceName;
- } else {
- return resourceName;
- }
- }
-
- private static String resIdToString(int resId) {
- return application.getResources().getResourceName(resId);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/Robolectric.java b/tests/robotests/src/com/android/settings/testutils/Robolectric.java
deleted file mode 100644
index 3020f32..0000000
--- a/tests/robotests/src/com/android/settings/testutils/Robolectric.java
+++ /dev/null
@@ -1,278 +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.testutils;
-
-
-import android.app.IntentService;
-import android.app.Service;
-import android.app.backup.BackupAgent;
-import android.content.ContentProvider;
-import android.content.Intent;
-import android.os.Bundle;
-import android.util.AttributeSet;
-import android.view.View;
-
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.android.XmlResourceParserImpl;
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.android.controller.BackupAgentController;
-import org.robolectric.android.controller.ContentProviderController;
-import org.robolectric.android.controller.IntentServiceController;
-import org.robolectric.android.controller.ServiceController;
-import org.robolectric.res.ResName;
-import org.robolectric.res.ResourceTable;
-import org.robolectric.shadows.ShadowApplication;
-import org.robolectric.util.ReflectionHelpers;
-import org.robolectric.util.Scheduler;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-// TODO(b/111195450) - Duplicated from org.robolectric.Robolectric.
-@Deprecated
-public class Robolectric {
-
- /**
- * This method is internal and shouldn't be called by developers.
- */
- @Deprecated
- public static void reset() {
- // No-op- is now handled in the test runner. Users should not be calling this method anyway.
- }
-
- public static <T extends Service> ServiceController<T> buildService(Class<T> serviceClass) {
- return buildService(serviceClass, null);
- }
-
- public static <T extends Service> ServiceController<T> buildService(Class<T> serviceClass,
- Intent intent) {
- return ServiceController.of(ReflectionHelpers.callConstructor(serviceClass), intent);
- }
-
- public static <T extends Service> T setupService(Class<T> serviceClass) {
- return buildService(serviceClass).create().get();
- }
-
- public static <T extends IntentService> IntentServiceController<T> buildIntentService(
- Class<T> serviceClass) {
- return buildIntentService(serviceClass, null);
- }
-
- public static <T extends IntentService> IntentServiceController<T> buildIntentService(
- Class<T> serviceClass, Intent intent) {
- return IntentServiceController.of(ReflectionHelpers.callConstructor(serviceClass,
- new ReflectionHelpers.ClassParameter<String>(String.class, "IntentService")),
- intent);
- }
-
- public static <T extends IntentService> T setupIntentService(Class<T> serviceClass) {
- return buildIntentService(serviceClass).create().get();
- }
-
- public static <T extends ContentProvider> ContentProviderController<T> buildContentProvider(
- Class<T> contentProviderClass) {
- return ContentProviderController.of(
- ReflectionHelpers.callConstructor(contentProviderClass));
- }
-
- public static <T extends ContentProvider> T setupContentProvider(
- Class<T> contentProviderClass) {
- return buildContentProvider(contentProviderClass).create().get();
- }
-
- public static <T extends ContentProvider> T setupContentProvider(Class<T> contentProviderClass,
- String authority) {
- return buildContentProvider(contentProviderClass).create(authority).get();
- }
-
- public static <T extends FragmentActivity> ActivityController<T> buildActivity(
- Class<T> activityClass) {
- return buildActivity(activityClass, null);
- }
-
- public static <T extends FragmentActivity> ActivityController<T> buildActivity(
- Class<T> activityClass, Intent intent) {
- return ActivityController.of(ReflectionHelpers.callConstructor(activityClass), intent);
- }
-
- public static <T extends FragmentActivity> T setupActivity(Class<T> activityClass) {
- return buildActivity(activityClass).setup().get();
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass));
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Bundle arguments) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass), arguments);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Class<? extends FragmentActivity> activityClass) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass),
- activityClass);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Intent intent) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass), intent);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Intent intent,
- Bundle arguments) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass), intent,
- arguments);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Class<? extends FragmentActivity> activityClass,
- Intent intent) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass),
- activityClass, intent);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Class<? extends FragmentActivity> activityClass,
- Bundle arguments) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass),
- activityClass, arguments);
- }
-
- public static <T extends Fragment> FragmentController<T> buildFragment(Class<T> fragmentClass,
- Class<? extends FragmentActivity> activityClass,
- Intent intent,
- Bundle arguments) {
- return FragmentController.of(ReflectionHelpers.callConstructor(fragmentClass),
- activityClass, intent, arguments);
- }
-
- public static <T extends BackupAgent> BackupAgentController<T> buildBackupAgent(
- Class<T> backupAgentClass) {
- return BackupAgentController.of(ReflectionHelpers.callConstructor(backupAgentClass));
- }
-
- public static <T extends BackupAgent> T setupBackupAgent(Class<T> backupAgentClass) {
- return buildBackupAgent(backupAgentClass).create().get();
- }
-
- /**
- * Allows for the programatic creation of an {@link AttributeSet} useful for testing
- * {@link View} classes without
- * the need for creating XML snippets.
- */
- public static AttributeSetBuilder buildAttributeSet() {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setNamespaceAware(true);
- factory.setIgnoringComments(true);
- factory.setIgnoringElementContentWhitespace(true);
- Document document;
- try {
- DocumentBuilder documentBuilder = factory.newDocumentBuilder();
- document = documentBuilder.newDocument();
- Element dummy = document.createElementNS("http://schemas.android.com/apk/res/" +
- RuntimeEnvironment.application.getPackageName(), "dummy");
- document.appendChild(dummy);
- } catch (ParserConfigurationException e) {
- throw new RuntimeException(e);
- }
- return new AttributeSetBuilder(document, RuntimeEnvironment.getCompileTimeResourceTable());
- }
-
- public static class AttributeSetBuilder {
-
- private Document doc;
- private ResourceTable appResourceTable;
-
- AttributeSetBuilder(Document doc, ResourceTable resourceTable) {
- this.doc = doc;
- this.appResourceTable = resourceTable;
- }
-
- public AttributeSetBuilder addAttribute(int resId, String value) {
- ResName resName = appResourceTable.getResName(resId);
- if ("style".equals(resName.name)) {
- ((Element) doc.getFirstChild()).setAttribute(resName.name, value);
- } else {
- ((Element) doc.getFirstChild()).setAttributeNS(resName.getNamespaceUri(),
- resName.packageName + ":" + resName.name, value);
- }
- return this;
- }
-
- public AttributeSetBuilder setStyleAttribute(String value) {
- ((Element) doc.getFirstChild()).setAttribute("style", value);
- return this;
- }
-
- public AttributeSet build() {
- XmlResourceParserImpl parser = new XmlResourceParserImpl(doc, null,
- RuntimeEnvironment.application.getPackageName(),
- RuntimeEnvironment.application.getPackageName(), appResourceTable);
- try {
- parser.next(); // Root document element
- parser.next(); // "dummy" element
- } catch (Exception e) {
- throw new IllegalStateException(
- "Expected single dummy element in the document to contain the attributes.",
- e);
- }
-
- return parser;
- }
- }
-
- /**
- * Return the foreground scheduler (e.g. the UI thread scheduler).
- *
- * @return Foreground scheduler.
- */
- public static Scheduler getForegroundThreadScheduler() {
- return ShadowApplication.getInstance().getForegroundThreadScheduler();
- }
-
- /**
- * Execute all runnables that have been enqueued on the foreground scheduler.
- */
- public static void flushForegroundThreadScheduler() {
- getForegroundThreadScheduler().advanceToLastPostedRunnable();
- }
-
- /**
- * Return the background scheduler.
- *
- * @return Background scheduler.
- */
- public static Scheduler getBackgroundThreadScheduler() {
- return ShadowApplication.getInstance().getBackgroundThreadScheduler();
- }
-
- /**
- * Execute all runnables that have been enqueued on the background scheduler.
- */
- public static void flushBackgroundThreadScheduler() {
- getBackgroundThreadScheduler().advanceToLastPostedRunnable();
- }
-}
-
diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
index ad808fc..5e5410c 100644
--- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
@@ -76,17 +76,33 @@
paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/res")), null));
paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/AppPreference/res/")), null));
+ paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/HelpUtils/res/")), null));
+ paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/RestrictedLockUtils/res/")), null));
+ paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:frameworks/base/packages/SettingsLib/SearchWidget/res/")), null));
+ paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/base/core/res/res")), null));
paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/opt/setupwizard/library/main/res")), null));
paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:out/target/common/obj/JAVA_LIBRARIES/robolectric_android-all-stub_intermediates/classes/raw-res/res")), null));
+ paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/opt/setupwizard/library/gingerbread/res")), null));
paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:frameworks/opt/setupwizard/library/recyclerview/res")), null));
paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.appcompat_appcompat-nodeps/android_common/aar/res/")), null));
paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/extras/material-design-x/com.google.android.material_material-nodeps/android_common/aar/res/")), null));
+ paths.add(new ResourcePath(null,
Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.cardview_cardview-nodeps/android_common/aar/res")), null));
+ paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.slice_slice-view-nodeps/android_common/aar/res")), null));
+ paths.add(new ResourcePath(null,
+ Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.preference_preference-nodeps/android_common/aar/res")), null));
} catch (MalformedURLException e) {
throw new RuntimeException("SettingsRobolectricTestRunner failure", e);
}
diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
index 195e4d6..be4199d 100644
--- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java
+++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
@@ -20,10 +20,21 @@
import static android.app.slice.Slice.SUBTYPE_COLOR;
import static android.app.slice.SliceItem.FORMAT_INT;
import static android.app.slice.SliceItem.FORMAT_TEXT;
+
import static com.google.common.truth.Truth.assertThat;
import android.app.PendingIntent;
import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.core.SliceAction;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.EventInfo;
import com.android.settings.Utils;
import com.android.settings.slices.SettingsSliceProvider;
@@ -35,15 +46,6 @@
import java.util.Set;
import java.util.stream.Collectors;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.core.SliceAction;
-import androidx.slice.core.SliceQuery;
-import androidx.slice.widget.EventInfo;
-
/**
* Testing utility class to verify the contents of the different Settings Slices.
*
@@ -167,6 +169,43 @@
}
/**
+ * Test the copyable slice, including:
+ * - No intent
+ * - Correct title
+ * - Correct intent
+ * - Correct keywords
+ * - TTL
+ * - Color
+ */
+ public static void testSettingsCopyableSlice(Context context, Slice slice,
+ SliceData sliceData) {
+ final SliceMetadata metadata = SliceMetadata.from(context, slice);
+
+ final SliceItem colorItem = SliceQuery.findSubtype(slice, FORMAT_INT, SUBTYPE_COLOR);
+ final int color = colorItem.getInt();
+ assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));
+
+ final SliceAction primaryAction = metadata.getPrimaryAction();
+
+ final IconCompat expectedIcon = IconCompat.createWithResource(context,
+ sliceData.getIconResource());
+ assertThat(expectedIcon.toString()).isEqualTo(primaryAction.getIcon().toString());
+
+ final long sliceTTL = metadata.getExpiry();
+ assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY);
+
+ // Check primary intent
+ final PendingIntent primaryPendingIntent = primaryAction.getAction();
+ assertThat(primaryPendingIntent).isEqualTo(
+ SliceBuilderUtils.getContentPendingIntent(context, sliceData));
+
+ final List<SliceItem> sliceItems = slice.getItems();
+ assertTitle(sliceItems, sliceData.getTitle());
+
+ assertKeywords(metadata, sliceData);
+ }
+
+ /**
* Test the contents of an unavailable slice, including:
* - No toggles
* - Correct title
@@ -208,9 +247,11 @@
continue;
}
- hasTitle = true;
for (SliceItem subTitleItem : titleItems) {
- assertThat(subTitleItem.getText()).isEqualTo(title);
+ if (TextUtils.equals(subTitleItem.getText(), title)) {
+ hasTitle = true;
+ break;
+ }
}
}
assertThat(hasTitle).isTrue();
@@ -225,4 +266,4 @@
expectedKeywords.add(data.getScreenTitle().toString());
assertThat(keywords).containsExactlyElementsIn(expectedKeywords);
}
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
index 7e8493e..6a96cf0 100644
--- a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
@@ -1,15 +1,16 @@
package com.android.settings.testutils;
+import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
+import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag
+ .FLAG_INCLUDE_PREF_SCREEN;
+import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_KEY;
+
import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
+import android.os.Bundle;
import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.util.Xml;
import com.android.settings.core.PreferenceXmlParserUtils;
-import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import java.util.ArrayList;
@@ -25,30 +26,21 @@
* on the screen.
*
* @param context of the preference screen.
- * @param xmlId of the Preference Xml to be parsed.
+ * @param xmlId of the Preference Xml to be parsed.
* @return List of all keys in the preference Xml
*/
public static List<String> getKeysFromPreferenceXml(Context context, int xmlId) {
- final XmlResourceParser parser = context.getResources().getXml(xmlId);
- final AttributeSet attrs = Xml.asAttributeSet(parser);
final List<String> keys = new ArrayList<>();
- String key;
try {
- while (parser.next() != XmlPullParser.END_DOCUMENT) {
- try {
- key = PreferenceXmlParserUtils.getDataKey(context, attrs);
- if (!TextUtils.isEmpty(key)) {
- keys.add(key);
- }
- } catch (NullPointerException e) {
- continue;
- } catch (Resources.NotFoundException e) {
- continue;
+ List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(context, xmlId,
+ FLAG_NEED_KEY | FLAG_INCLUDE_PREF_SCREEN);
+ for (Bundle bundle : metadata) {
+ final String key = bundle.getString(METADATA_KEY);
+ if (!TextUtils.isEmpty(key)) {
+ keys.add(key);
}
}
- } catch (java.io.IOException e) {
- return null;
- } catch (XmlPullParserException e) {
+ } catch (java.io.IOException | XmlPullParserException e) {
return null;
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index a441b28..c673508 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -1,6 +1,7 @@
package com.android.settings.testutils.shadow;
import static android.util.TypedValue.TYPE_REFERENCE;
+
import static org.robolectric.RuntimeEnvironment.application;
import static org.robolectric.shadow.api.Shadow.directlyOn;
@@ -17,35 +18,26 @@
import android.util.SparseArray;
import android.util.TypedValue;
+import androidx.annotation.ArrayRes;
+import androidx.annotation.ColorRes;
+import androidx.annotation.Nullable;
+
import com.android.settings.R;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
import org.robolectric.android.XmlResourceParserImpl;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.RealObject;
-import org.robolectric.res.StyleData;
-import org.robolectric.res.StyleResolver;
-import org.robolectric.res.ThemeStyleSet;
-import org.robolectric.shadows.ShadowAssetManager;
import org.robolectric.shadows.ShadowResources;
import org.robolectric.util.ReflectionHelpers;
import org.robolectric.util.ReflectionHelpers.ClassParameter;
import org.w3c.dom.Node;
-import java.util.List;
-import java.util.Map;
-
-import androidx.annotation.ArrayRes;
-import androidx.annotation.ColorRes;
-import androidx.annotation.Nullable;
-
/**
* Shadow Resources and Theme classes to handle resource references that Robolectric shadows cannot
* handle because they are too new or private.
*/
-@Implements(value = Resources.class, inheritImplementationMethods = true)
+@Implements(value = Resources.class)
public class SettingsShadowResources extends ShadowResources {
@RealObject
@@ -183,17 +175,14 @@
ClassParameter.from(int.class, id));
}
- @Implements(value = Theme.class, inheritImplementationMethods = true)
- public static class SettingsShadowTheme extends ShadowTheme {
+ @Implements(value = Theme.class)
+ public static class SettingsShadowTheme extends ShadowLegacyTheme {
@RealObject
Theme realTheme;
- private ShadowAssetManager mAssetManager = Shadows.shadowOf(
- RuntimeEnvironment.application.getAssets());
-
@Implementation
- public TypedArray obtainStyledAttributes(
+ protected TypedArray obtainStyledAttributes(
AttributeSet set, int[] attrs, int defStyleAttr, int defStyleRes) {
// Replace all private string references with a placeholder.
if (set != null) {
@@ -206,42 +195,10 @@
if (attributeValue.contains("attr/fingerprint_layout_theme")) {
// Workaround for https://github.com/robolectric/robolectric/issues/2641
node.setNodeValue("@style/FingerprintLayoutTheme");
- } else if (attributeValue.startsWith("@*android:string")) {
- node.setNodeValue("PLACEHOLDER");
}
}
}
}
-
- // Track down all styles and remove all inheritance from private styles.
- final Map<Long, Object /* NativeTheme */> appliedStylesList =
- ReflectionHelpers.getField(mAssetManager, "nativeThemes");
- synchronized (appliedStylesList) {
- for (Long idx : appliedStylesList.keySet()) {
- final ThemeStyleSet appliedStyles = ReflectionHelpers.getField(
- appliedStylesList.get(idx), "themeStyleSet");
- // The Object's below are actually ShadowAssetManager.OverlayedStyle.
- // We can't use
-
- // it here because it's private.
- final List<Object /* OverlayedStyle */> overlayedStyles =
- ReflectionHelpers.getField(appliedStyles, "styles");
- for (Object appliedStyle : overlayedStyles) {
- final StyleResolver styleResolver = ReflectionHelpers.getField(appliedStyle,
- "style");
- final List<StyleData> styleDatas =
- ReflectionHelpers.getField(styleResolver, "styles");
- for (StyleData styleData : styleDatas) {
- if (styleData.getParent() != null &&
- styleData.getParent().startsWith("@*android:style")) {
- ReflectionHelpers.setField(StyleData.class, styleData, "parent",
- null);
- }
- }
- }
-
- }
- }
return super.obtainStyledAttributes(set, attrs, defStyleAttr, defStyleRes);
}
@@ -265,7 +222,7 @@
}
private Resources getResources() {
- return ReflectionHelpers.callInstanceMethod(ShadowTheme.class, this, "getResources");
+ return ReflectionHelpers.callInstanceMethod(ShadowLegacyTheme.class, this, "getResources");
}
}
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
index dd51687..c76991e 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
@@ -26,15 +26,14 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowResourcesImpl;
+import org.robolectric.shadows.ShadowLegacyResourcesImpl;
@Implements(
value = ResourcesImpl.class,
- inheritImplementationMethods = true,
isInAndroidSdk = false,
minSdk = 26
)
-public class SettingsShadowResourcesImpl extends ShadowResourcesImpl {
+public class SettingsShadowResourcesImpl extends ShadowLegacyResourcesImpl {
@Implementation
public Drawable loadDrawable(Resources wrapper, TypedValue value, int id, int density,
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java
index fc3ff0c..1e64dd1 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowTypedArray.java
@@ -30,7 +30,7 @@
import org.robolectric.annotation.RealObject;
import org.robolectric.shadows.ShadowTypedArray;
-@Implements(value = TypedArray.class, inheritImplementationMethods = true)
+@Implements(value = TypedArray.class)
public class SettingsShadowTypedArray extends ShadowTypedArray {
@RealObject
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java
index 03aabb5..4401926 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAccountManager.java
@@ -16,19 +16,24 @@
package com.android.settings.testutils.shadow;
+import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
+import android.annotation.NonNull;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Implements(AccountManager.class)
public class ShadowAccountManager{
private static final Map<String, AuthenticatorDescription> sAuthenticators = new HashMap<>();
+ private static final Map<Integer, List<Account>> sAccountsByUserId = new HashMap<>();
@Implementation
public AuthenticatorDescription[] getAuthenticatorTypesAsUser(int userId) {
@@ -39,7 +44,24 @@
sAuthenticators.put(authenticator.type, authenticator);
}
- public static void resetAuthenticator() {
+ public static void reset() {
sAuthenticators.clear();
+ sAccountsByUserId.clear();
+ }
+
+ @Implementation @NonNull
+ public Account[] getAccountsAsUser(int userId) {
+ if (sAccountsByUserId.containsKey(userId)) {
+ return sAccountsByUserId.get(userId).toArray(new Account[0]);
+ } else {
+ return new Account[0];
+ }
+ }
+
+ public static void addAccountForUser(int userId, Account account) {
+ if (!sAccountsByUserId.containsKey(userId)) {
+ sAccountsByUserId.put(userId, new ArrayList<>());
+ }
+ sAccountsByUserId.get(userId).add(account);
}
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivity.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivity.java
index 0f67bbf..babf9e3 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivity.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivity.java
@@ -23,13 +23,12 @@
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowApplication;
@Implements(CustomActivity.class)
public class ShadowActivity extends org.robolectric.shadows.ShadowActivity {
@Implementation
- public void startActivityAsUser(Intent intent, UserHandle user) {
- ShadowApplication.getInstance().startActivity(intent);
+ protected void startActivityAsUser(Intent intent, UserHandle user) {
+ realActivity.startActivity(intent);
}
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java
index 4a73015..a6d6bab 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowActivityWithLoadManager.java
@@ -18,12 +18,12 @@
import android.app.Activity;
+import androidx.loader.app.LoaderManager;
+
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowActivity;
-import androidx.loader.app.LoaderManager;
-
/*
* Shadow for {@link Activity} that has LoadManager accessors.
*/
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAlertDialogCompat.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAlertDialogCompat.java
index a682d85..e595cb6 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAlertDialogCompat.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAlertDialogCompat.java
@@ -19,6 +19,8 @@
import android.annotation.SuppressLint;
import android.view.View;
+import androidx.appcompat.app.AlertDialog;
+
import org.robolectric.Shadows;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@@ -30,8 +32,6 @@
import javax.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-
/* Robolectric shadow for the androidx alert dialog. */
@Implements(AlertDialog.class)
public class ShadowAlertDialogCompat extends ShadowDialog {
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParser.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java
similarity index 67%
rename from tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParser.java
rename to tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java
index 5dce990..3ee4fcb 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParser.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowApplicationsState.java
@@ -16,21 +16,17 @@
package com.android.settings.testutils.shadow;
-import android.util.KeyValueListParser;
+import android.os.Looper;
+
+import com.android.settingslib.applications.ApplicationsState;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-/**
- * Shadow for {@link KeyValueListParser} so we could implement
- * {@link #getBoolean(String, boolean)} that doesn't support in the current
- * robolectric
- */
-@Implements(KeyValueListParser.class)
-public class ShadowKeyValueListParser {
-
+@Implements(ApplicationsState.class)
+public class ShadowApplicationsState {
@Implementation
- public boolean getBoolean(String key, boolean defaultValue) {
- return defaultValue;
+ public Looper getBackgroundLooper() {
+ return Looper.getMainLooper();
}
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java
index bacd1fb..cea50f3 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java
@@ -24,6 +24,7 @@
import static android.media.AudioManager.STREAM_RING;
import static android.media.AudioManager.STREAM_SYSTEM;
import static android.media.AudioManager.STREAM_VOICE_CALL;
+
import static org.robolectric.RuntimeEnvironment.application;
import android.media.AudioDeviceCallback;
@@ -37,7 +38,7 @@
import java.util.ArrayList;
-@Implements(value = AudioManager.class, inheritImplementationMethods = true)
+@Implements(value = AudioManager.class)
public class ShadowAudioManager extends org.robolectric.shadows.ShadowAudioManager {
private int mRingerMode;
private int mDeviceCodes;
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java
index a17bdce..4ca8943 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java
@@ -16,11 +16,11 @@
package com.android.settings.testutils.shadow;
-import org.robolectric.annotation.Implements;
-
import androidx.core.text.BidiFormatter;
import androidx.core.text.TextDirectionHeuristicCompat;
+import org.robolectric.annotation.Implements;
+
@Implements(BidiFormatter.class)
public class ShadowBidiFormatter {
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
index 91afb87..371c1b1 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
@@ -24,38 +24,23 @@
import java.util.ArrayList;
import java.util.List;
-@Implements(value = BluetoothAdapter.class, inheritImplementationMethods = true)
+@Implements(value = BluetoothAdapter.class)
public class ShadowBluetoothAdapter extends org.robolectric.shadows.ShadowBluetoothAdapter {
- private String mName;
- private int mScanMode;
private int mState;
+ private List<Integer> mSupportedProfiles = new ArrayList<Integer>();
- /**
- * Do nothing, implement it to avoid null pointer error inside BluetoothAdapter
- */
@Implementation
public List<Integer> getSupportedProfiles() {
- return new ArrayList<Integer>();
+ return mSupportedProfiles;
}
- public void setName(String name) {
- mName = name;
+ public void addSupportedProfiles(int profile) {
+ mSupportedProfiles.add(profile);
}
- @Implementation
- public String getName() {
- return mName;
- }
-
- @Implementation
- public void setScanMode(int scanMode) {
- mScanMode = scanMode;
- }
-
- @Implementation
- public int getScanMode() {
- return mScanMode;
+ public void clearSupportedProfiles() {
+ mSupportedProfiles.clear();
}
@Implementation
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java
new file mode 100644
index 0000000..0b1665c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothDevice.java
@@ -0,0 +1,60 @@
+/*
+ * 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.testutils.shadow;
+
+import android.bluetooth.BluetoothDevice;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(value = BluetoothDevice.class)
+public class ShadowBluetoothDevice extends org.robolectric.shadows.ShadowBluetoothDevice {
+
+ private int mMessageAccessPermission = BluetoothDevice.ACCESS_UNKNOWN;
+ private int mPhonebookAccessPermission = BluetoothDevice.ACCESS_UNKNOWN;
+ private int mSimAccessPermission = BluetoothDevice.ACCESS_UNKNOWN;
+
+ @Implementation
+ public void setMessageAccessPermission(int value) {
+ mMessageAccessPermission = value;
+ }
+
+ @Implementation
+ public int getMessageAccessPermission() {
+ return mMessageAccessPermission;
+ }
+
+ @Implementation
+ public void setPhonebookAccessPermission(int value) {
+ mPhonebookAccessPermission = value;
+ }
+
+ @Implementation
+ public int getPhonebookAccessPermission() {
+ return mPhonebookAccessPermission;
+ }
+
+ @Implementation
+ public void setSimAccessPermission(int value) {
+ mSimAccessPermission = value;
+ }
+
+ @Implementation
+ public int getSimAccessPermission() {
+ return mSimAccessPermission;
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java
new file mode 100644
index 0000000..ee04c4f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCachedBluetoothDeviceManager.java
@@ -0,0 +1,44 @@
+/*
+ * 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.testutils.shadow;
+
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.Collection;
+
+/**
+ * Shadow class for {@link CachedBluetoothDeviceManager} to allow tests to manages the set of
+ * remote Bluetooth devices.
+ */
+@Implements(CachedBluetoothDeviceManager.class)
+public class ShadowCachedBluetoothDeviceManager {
+
+ private Collection<CachedBluetoothDevice> mCachedDevices;
+
+ public void setCachedDevicesCopy(Collection<CachedBluetoothDevice> cachedDevices) {
+ mCachedDevices = cachedDevices;
+ }
+
+ @Implementation
+ public synchronized Collection<CachedBluetoothDevice> getCachedDevicesCopy() {
+ return mCachedDevices;
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java
deleted file mode 100644
index d9aaacc..0000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java
+++ /dev/null
@@ -1,37 +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.testutils.shadow;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowFrameLayout;
-
-import androidx.cardview.widget.CardView;
-
-/**
- * Shadow for CardView to get around view not implemented error.
- */
-@Implements(CardView.class)
-public class ShadowCardView extends ShadowFrameLayout {
-
- public void __constructor__(Context context, AttributeSet attrs, int defStyleAttr) {
- // do nothing
- }
-
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
index 05687f4..794fcbb 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
@@ -24,7 +24,7 @@
import org.robolectric.annotation.Implements;
import org.robolectric.shadow.api.Shadow;
-@Implements(value = ConnectivityManager.class, inheritImplementationMethods = true)
+@Implements(value = ConnectivityManager.class)
public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowConnectivityManager {
private final SparseBooleanArray mSupportedNetworkTypes = new SparseBooleanArray();
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParser.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicLayout.java
similarity index 65%
copy from tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParser.java
copy to tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicLayout.java
index 5dce990..d3741bb 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowKeyValueListParser.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDynamicLayout.java
@@ -16,21 +16,27 @@
package com.android.settings.testutils.shadow;
-import android.util.KeyValueListParser;
+import android.text.DynamicLayout;
+import android.text.Layout.Directions;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-/**
- * Shadow for {@link KeyValueListParser} so we could implement
- * {@link #getBoolean(String, boolean)} that doesn't support in the current
- * robolectric
- */
-@Implements(KeyValueListParser.class)
-public class ShadowKeyValueListParser {
+@Implements(DynamicLayout.class)
+public class ShadowDynamicLayout {
@Implementation
- public boolean getBoolean(String key, boolean defaultValue) {
- return defaultValue;
+ public int getLineTop(int line) {
+ return 0;
}
-}
+
+ @Implementation
+ public int getLineStart(int line) {
+ return 0;
+ }
+
+ @Implementation
+ public final Directions getLineDirections(int line) {
+ return new Directions(new int[]{0, 1});
+ }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java
index 2e96f8c..56f4979 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowEntityHeaderController.java
@@ -19,14 +19,14 @@
import android.app.Activity;
import android.view.View;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.widget.EntityHeaderController;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.Resetter;
-import androidx.fragment.app.Fragment;
-
@Implements(value = EntityHeaderController.class, callThroughByDefault = false)
public class ShadowEntityHeaderController {
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
index 17129c2..cb185a5 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
@@ -16,45 +16,24 @@
package com.android.settings.testutils.shadow;
-import android.content.Context;
import android.hardware.fingerprint.Fingerprint;
import android.hardware.fingerprint.FingerprintManager;
+import androidx.annotation.NonNull;
+
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
import org.robolectric.shadow.api.Shadow;
-import org.robolectric.shadows.ShadowContextImpl;
-import org.robolectric.util.ReflectionHelpers;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
import java.util.stream.IntStream;
-import androidx.annotation.NonNull;
-
@Implements(FingerprintManager.class)
-public class ShadowFingerprintManager {
+public class ShadowFingerprintManager extends org.robolectric.shadows.ShadowFingerprintManager {
- private static Map<String, String> getSystemServiceMap() {
- return ReflectionHelpers.getStaticField(ShadowContextImpl.class, "SYSTEM_SERVICE_MAP");
- }
-
- /**
- * Call this in @Before of a test to add FingerprintManager to Robolectric's system service
- * map. Otherwise getSystemService(FINGERPRINT_SERVICE) will return null.
- */
- public static void addToServiceMap() {
- getSystemServiceMap().put(Context.FINGERPRINT_SERVICE, FingerprintManager.class.getName());
- }
-
- @Resetter
- public static void reset() {
- getSystemServiceMap().remove(Context.FINGERPRINT_SERVICE);
- }
public boolean hardwareDetected = true;
@@ -62,22 +41,22 @@
private List<Fingerprint> mFingerprints = Collections.emptyList();
@Implementation
- public boolean isHardwareDetected() {
+ protected boolean isHardwareDetected() {
return hardwareDetected;
}
@Implementation
- public boolean hasEnrolledFingerprints() {
+ protected boolean hasEnrolledFingerprints() {
return !mFingerprints.isEmpty();
}
@Implementation
- public List<Fingerprint> getEnrolledFingerprints() {
+ protected List<Fingerprint> getEnrolledFingerprints() {
return mFingerprints;
}
@Implementation
- public List<Fingerprint> getEnrolledFingerprints(int userId) {
+ protected List<Fingerprint> getEnrolledFingerprints(int userId) {
return mFingerprints;
}
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 444ecab..050b292 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFragment.java
@@ -16,12 +16,12 @@
package com.android.settings.testutils.shadow;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
/**
* Override the {@link #setTargetFragment(Fragment, int)} to skip an illegal state exception
* in SDK 26. SDK 26 requires that the target fragment be in the same {@link FragmentManager} as
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java
index 68c92a7..a69faba 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java
@@ -21,12 +21,11 @@
import android.media.MediaRouter;
import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
import org.robolectric.shadow.api.Shadow;
import java.util.concurrent.CopyOnWriteArrayList;
-@Implements(value = MediaRouter.class, inheritImplementationMethods = true)
+@Implements(value = MediaRouter.class)
public class ShadowMediaRouter extends org.robolectric.shadows.ShadowMediaRouter {
MediaRouter.RouteInfo mSelectedRoute;
@@ -42,16 +41,12 @@
}
public void removeCallback(MediaRouter.Callback cb) {
- if (mCallbacks.contains(cb))
+ if (mCallbacks.contains(cb)) {
mCallbacks.remove(cb);
+ }
}
public static ShadowMediaRouter getShadow() {
return Shadow.extract(application.getSystemService(MediaRouter.class));
}
-
- @Resetter
- public void reset() {
- mCallbacks.clear();
- }
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java
index efa4626..35c6630 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java
@@ -20,6 +20,9 @@
import android.content.pm.PackageManager;
import android.text.TextUtils;
+import androidx.annotation.NonNull;
+import androidx.core.content.PermissionChecker;
+
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
@@ -27,9 +30,6 @@
import java.util.Map;
import java.util.Objects;
-import androidx.annotation.NonNull;
-import androidx.core.content.PermissionChecker;
-
/**
* This class provides shadow for API that is not supported in current roboletric
*/
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java
index d1cedec..c054656 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtils.java
@@ -15,99 +15,24 @@
*/
package com.android.settings.testutils.shadow;
-import android.annotation.UserIdInt;
-import android.app.admin.DevicePolicyManager;
import android.content.Context;
-import com.android.internal.util.ArrayUtils;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
-import org.robolectric.annotation.Resetter;
@Implements(RestrictedLockUtils.class)
public class ShadowRestrictedLockUtils {
- private static boolean sIsRestricted;
private static boolean sAdminSupportDetailsIntentLaunched;
- private static boolean sHasSystemFeature;
- private static boolean sMaximumTimeToLockIsSet;
- private static String[] sRestrictedPkgs;
- private static DevicePolicyManager sDevicePolicyManager;
- private static String[] sDisabledTypes;
- private static int sKeyguardDisabledFeatures;
-
- @Resetter
- public static void reset() {
- sIsRestricted = false;
- sRestrictedPkgs = null;
- sAdminSupportDetailsIntentLaunched = false;
- sKeyguardDisabledFeatures = 0;
- sDisabledTypes = new String[0];
- sMaximumTimeToLockIsSet = false;
- }
-
- @Implementation
- public static EnforcedAdmin checkIfMeteredDataRestricted(Context context,
- String packageName, int userId) {
- if (sIsRestricted) {
- return new EnforcedAdmin();
- }
- if (ArrayUtils.contains(sRestrictedPkgs, packageName)) {
- return new EnforcedAdmin();
- }
- return null;
- }
@Implementation
public static void sendShowAdminSupportDetailsIntent(Context context, EnforcedAdmin admin) {
sAdminSupportDetailsIntentLaunched = true;
}
- @Implementation
- public static EnforcedAdmin checkIfAccountManagementDisabled(Context context,
- String accountType, int userId) {
- if (accountType == null) {
- return null;
- }
- if (!sHasSystemFeature || sDevicePolicyManager == null) {
- return null;
- }
- boolean isAccountTypeDisabled = false;
- if (ArrayUtils.contains(sDisabledTypes, accountType)) {
- isAccountTypeDisabled = true;
- }
- if (!isAccountTypeDisabled) {
- return null;
- }
- return new EnforcedAdmin();
- }
-
- @Implementation
- public static EnforcedAdmin checkIfKeyguardFeaturesDisabled(Context context,
- int features, final @UserIdInt int userId) {
- return (sKeyguardDisabledFeatures & features) == 0 ? null : new EnforcedAdmin();
- }
-
- @Implementation
- public static boolean hasBaseUserRestriction(Context context,
- String userRestriction, int userId) {
- return sIsRestricted;
- }
-
- @Implementation
- public static EnforcedAdmin checkIfRestrictionEnforced(Context context,
- String userRestriction, int userId) {
- return sIsRestricted ? new EnforcedAdmin() : null;
- }
-
- @Implementation
- public static EnforcedAdmin checkIfMaximumTimeToLockIsSet(Context context) {
- return sMaximumTimeToLockIsSet ? new EnforcedAdmin() : null;
- }
-
public static boolean hasAdminSupportDetailsIntentLaunched() {
return sAdminSupportDetailsIntentLaunched;
}
@@ -116,36 +41,5 @@
sAdminSupportDetailsIntentLaunched = false;
}
- public static void setRestricted(boolean restricted) {
- sIsRestricted = restricted;
- }
-
- public static void setRestrictedPkgs(String... pkgs) {
- sRestrictedPkgs = pkgs;
- }
-
- public static void setHasSystemFeature(boolean hasSystemFeature) {
- sHasSystemFeature = hasSystemFeature;
- }
-
- public static void setDevicePolicyManager(DevicePolicyManager dpm) {
- sDevicePolicyManager = dpm;
- }
-
- public static void setDisabledTypes(String[] disabledTypes) {
- sDisabledTypes = disabledTypes;
- }
-
- public static void clearDisabledTypes() {
- sDisabledTypes = new String[0];
- }
-
- public static void setKeyguardDisabledFeatures(int features) {
- sKeyguardDisabledFeatures = features;
- }
-
- public static void setMaximumTimeToLockIsSet(boolean isSet) {
- sMaximumTimeToLockIsSet = isSet;
- }
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java
new file mode 100644
index 0000000..1508431
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictedLockUtilsInternal.java
@@ -0,0 +1,136 @@
+/*
+ * 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.testutils.shadow;
+
+import android.annotation.UserIdInt;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+
+import com.android.internal.util.ArrayUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
+
+@Implements(RestrictedLockUtilsInternal.class)
+public class ShadowRestrictedLockUtilsInternal {
+
+ private static boolean sIsRestricted;
+ private static boolean sHasSystemFeature;
+ private static boolean sMaximumTimeToLockIsSet;
+ private static String[] sRestrictedPkgs;
+ private static DevicePolicyManager sDevicePolicyManager;
+ private static String[] sDisabledTypes;
+ private static int sKeyguardDisabledFeatures;
+
+ @Resetter
+ public static void reset() {
+ sIsRestricted = false;
+ sRestrictedPkgs = null;
+ sKeyguardDisabledFeatures = 0;
+ sDisabledTypes = new String[0];
+ sMaximumTimeToLockIsSet = false;
+ }
+
+ @Implementation
+ public static EnforcedAdmin checkIfMeteredDataRestricted(Context context,
+ String packageName, int userId) {
+ if (sIsRestricted) {
+ return new EnforcedAdmin();
+ }
+ if (ArrayUtils.contains(sRestrictedPkgs, packageName)) {
+ return new EnforcedAdmin();
+ }
+ return null;
+ }
+
+ @Implementation
+ public static EnforcedAdmin checkIfAccountManagementDisabled(Context context,
+ String accountType, int userId) {
+ if (accountType == null) {
+ return null;
+ }
+ if (!sHasSystemFeature || sDevicePolicyManager == null) {
+ return null;
+ }
+ boolean isAccountTypeDisabled = false;
+ if (ArrayUtils.contains(sDisabledTypes, accountType)) {
+ isAccountTypeDisabled = true;
+ }
+ if (!isAccountTypeDisabled) {
+ return null;
+ }
+ return new EnforcedAdmin();
+ }
+
+ @Implementation
+ public static EnforcedAdmin checkIfKeyguardFeaturesDisabled(Context context,
+ int features, final @UserIdInt int userId) {
+ return (sKeyguardDisabledFeatures & features) == 0 ? null : new EnforcedAdmin();
+ }
+
+ @Implementation
+ public static boolean hasBaseUserRestriction(Context context,
+ String userRestriction, int userId) {
+ return sIsRestricted;
+ }
+
+ @Implementation
+ public static EnforcedAdmin checkIfRestrictionEnforced(Context context,
+ String userRestriction, int userId) {
+ return sIsRestricted ? new EnforcedAdmin() : null;
+ }
+
+ @Implementation
+ public static EnforcedAdmin checkIfMaximumTimeToLockIsSet(Context context) {
+ return sMaximumTimeToLockIsSet ? new EnforcedAdmin() : null;
+ }
+
+ public static void setRestricted(boolean restricted) {
+ sIsRestricted = restricted;
+ }
+
+ public static void setRestrictedPkgs(String... pkgs) {
+ sRestrictedPkgs = pkgs;
+ }
+
+ public static void setHasSystemFeature(boolean hasSystemFeature) {
+ sHasSystemFeature = hasSystemFeature;
+ }
+
+ public static void setDevicePolicyManager(DevicePolicyManager dpm) {
+ sDevicePolicyManager = dpm;
+ }
+
+ public static void setDisabledTypes(String[] disabledTypes) {
+ sDisabledTypes = disabledTypes;
+ }
+
+ public static void clearDisabledTypes() {
+ sDisabledTypes = new String[0];
+ }
+
+ public static void setKeyguardDisabledFeatures(int features) {
+ sKeyguardDisabledFeatures = features;
+ }
+
+ public static void setMaximumTimeToLockIsSet(boolean isSet) {
+ sMaximumTimeToLockIsSet = isSet;
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java
index 4b60c16..366dd91 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java
@@ -30,6 +30,7 @@
private static boolean sIsUnmountCalled;
private static boolean sIsForgetCalled;
+ private static boolean sIsFileEncryptedNativeOrEmulated = true;
public static boolean isUnmountCalled() {
return sIsUnmountCalled;
@@ -43,7 +44,7 @@
public static void reset() {
sIsUnmountCalled = false;
sIsForgetCalled = false;
-
+ sIsFileEncryptedNativeOrEmulated = true;
}
@Implementation
@@ -71,6 +72,15 @@
sIsForgetCalled = true;
}
+ @Implementation
+ protected static boolean isFileEncryptedNativeOrEmulated() {
+ return sIsFileEncryptedNativeOrEmulated;
+ }
+
+ public static void setIsFileEncryptedNativeOrEmulated(boolean encrypted) {
+ sIsFileEncryptedNativeOrEmulated = encrypted;
+ }
+
private VolumeInfo createVolumeInfo(String volumeId) {
final DiskInfo disk = new DiskInfo("fakeid", 0);
return new VolumeInfo(volumeId, 0, disk, "guid");
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
index 753d159..61278f3 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java
@@ -37,7 +37,7 @@
import java.util.Map;
import java.util.Set;
-@Implements(value = UserManager.class, inheritImplementationMethods = true)
+@Implements(value = UserManager.class)
public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager {
private SparseArray<UserInfo> mUserInfos = new SparseArray<>();
@@ -46,7 +46,7 @@
private final List<UserInfo> mUserProfileInfos = new ArrayList<>();
private final Set<Integer> mManagedProfiles = new HashSet<>();
private boolean mIsQuietModeEnabled = false;
- private int[] profileIdsForUser;
+ private int[] profileIdsForUser = new int[0];
private boolean mUserSwitchEnabled;
@@ -59,6 +59,7 @@
mManagedProfiles.clear();
mIsQuietModeEnabled = false;
mUserSwitchEnabled = false;
+ profileIdsForUser = new int[0];
}
public void setUserInfo(int userHandle, UserInfo userInfo) {
@@ -66,7 +67,7 @@
}
@Implementation
- public UserInfo getUserInfo(int userHandle) {
+ protected UserInfo getUserInfo(int userHandle) {
return mUserInfos.get(userHandle);
}
@@ -75,17 +76,36 @@
}
@Implementation
- public List<UserInfo> getProfiles(@UserIdInt int userHandle) {
+ protected List<UserInfo> getProfiles(@UserIdInt int userHandle) {
return mUserProfileInfos;
}
@Implementation
- public int getCredentialOwnerProfile(@UserIdInt int userHandle) {
+ protected int[] getProfileIds(@UserIdInt int userHandle, boolean enabledOnly) {
+ int[] ids = new int[mUserProfileInfos.size()];
+ for (int i = 0; i < mUserProfileInfos.size(); i++) {
+ ids[i] = mUserProfileInfos.get(i).id;
+ }
+ return ids;
+ }
+
+ @Implementation
+ public List<UserHandle> getUserProfiles(){
+ int[] userIds = getProfileIds(UserHandle.myUserId(), true /* enabledOnly */);
+ List<UserHandle> result = new ArrayList<>(userIds.length);
+ for (int userId : userIds) {
+ result.add(UserHandle.of(userId));
+ }
+ return result;
+ }
+
+ @Implementation
+ protected int getCredentialOwnerProfile(@UserIdInt int userHandle) {
return userHandle;
}
@Implementation
- public boolean hasBaseUserRestriction(String restrictionKey, UserHandle userHandle) {
+ protected boolean hasBaseUserRestriction(String restrictionKey, UserHandle userHandle) {
return mRestrictions.contains(restrictionKey);
}
@@ -99,7 +119,7 @@
}
@Implementation
- public List<EnforcingUser> getUserRestrictionSources(
+ protected List<EnforcingUser> getUserRestrictionSources(
String restrictionKey, UserHandle userHandle) {
// Return empty list when there is no enforcing user, otherwise might trigger
// NullPointer Exception in RestrictedLockUtils.checkIfRestrictionEnforced.
@@ -114,7 +134,7 @@
}
@Implementation
- public boolean isManagedProfile(@UserIdInt int userId) {
+ protected boolean isManagedProfile(@UserIdInt int userId) {
return mManagedProfiles.contains(userId);
}
@@ -123,7 +143,7 @@
}
@Implementation
- public boolean isQuietModeEnabled(UserHandle userHandle) {
+ protected boolean isQuietModeEnabled(UserHandle userHandle) {
return mIsQuietModeEnabled;
}
@@ -132,7 +152,7 @@
}
@Implementation
- public int[] getProfileIdsWithDisabled(@UserIdInt int userId) {
+ protected int[] getProfileIdsWithDisabled(@UserIdInt int userId) {
return profileIdsForUser;
}
@@ -141,7 +161,7 @@
}
@Implementation
- public boolean isUserSwitcherEnabled() {
+ protected boolean isUserSwitcherEnabled() {
return mUserSwitchEnabled;
}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.java
deleted file mode 100644
index 9046720..0000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowVibrator.java
+++ /dev/null
@@ -1,56 +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.testutils.shadow;
-
-import static org.mockito.Mockito.mock;
-
-import android.content.Context;
-import android.media.AudioAttributes;
-import android.os.SystemVibrator;
-import android.os.VibrationEffect;
-import android.os.Vibrator;
-
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.fakes.RoboVibrator;
-import org.robolectric.shadows.ShadowContextImpl;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.Map;
-
-@Implements(SystemVibrator.class)
-public class ShadowVibrator {
-
- private static Map<String, String> getSystemServiceMap() {
- return ReflectionHelpers.getStaticField(ShadowContextImpl.class, "SYSTEM_SERVICE_MAP");
- }
-
- public static void addToServiceMap() {
- getSystemServiceMap().put(Context.VIBRATOR_SERVICE, SystemVibrator.class.getName());
- }
-
- public static void reset() {
- getSystemServiceMap().put(Context.VIBRATOR_SERVICE, RoboVibrator.class.getName());
- }
-
- public final Vibrator delegate = mock(Vibrator.class);
-
- @Implementation
- public void vibrate(int uid, String opPkg, VibrationEffect vibe, AudioAttributes attributes) {
- delegate.vibrate(uid, opPkg, vibe, attributes);
- }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
index 65f92a3..b41b396 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
@@ -30,7 +30,7 @@
import java.util.Collections;
import java.util.List;
-@Implements(value = WifiManager.class, inheritImplementationMethods = true)
+@Implements(value = WifiManager.class)
public class ShadowWifiManager extends org.robolectric.shadows.ShadowWifiManager {
public WifiConfiguration savedWifiConfig;
@@ -52,6 +52,11 @@
return Collections.emptyList();
}
+ @Implementation
+ public boolean isDualModeSupported() {
+ return false;
+ }
+
public static ShadowWifiManager get() {
return Shadow.extract(application.getSystemService(WifiManager.class));
}
diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
index c2b1c9f..2bd12c3 100644
--- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -25,6 +26,8 @@
import android.content.pm.UserInfo;
import android.provider.Settings.Global;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.RestrictedSwitchPreference;
@@ -35,11 +38,10 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {ShadowUserManager.class})
public class AddUserWhenLockedPreferenceControllerTest {
@@ -56,9 +58,8 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- ShadowApplication shadowContext = ShadowApplication.getInstance();
+ mContext = RuntimeEnvironment.application;
mUserManager = ShadowUserManager.getShadow();
- mContext = shadowContext.getApplicationContext();
mController = new AddUserWhenLockedPreferenceController(mContext, "fake_key");
}
diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java
index cc19ad7..a791528 100644
--- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
@@ -25,6 +26,11 @@
import android.content.pm.UserInfo;
import android.os.UserManager;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -38,11 +44,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AutoSyncDataPreferenceControllerTest {
@@ -63,7 +64,7 @@
MockitoAnnotations.initMocks(this);
ShadowApplication shadowContext = ShadowApplication.getInstance();
shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
- mContext = shadowContext.getApplicationContext();
+ mContext = RuntimeEnvironment.application;
mController = new AutoSyncDataPreferenceController(mContext, mFragment);
mConfirmSyncFragment = new AutoSyncDataPreferenceController.ConfirmAutoSyncChangeFragment();
mConfirmSyncFragment.setTargetFragment(mFragment, 0);
diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java
index c1f773d..1850f3a 100644
--- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.when;
@@ -24,6 +25,10 @@
import android.content.pm.UserInfo;
import android.os.UserManager;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -31,15 +36,12 @@
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AutoSyncPersonalDataPreferenceControllerTest {
@@ -57,9 +59,9 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
+ mContext = RuntimeEnvironment.application;
ShadowApplication shadowContext = ShadowApplication.getInstance();
shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
- mContext = shadowContext.getApplicationContext();
mController = new AutoSyncPersonalDataPreferenceController(mContext, mFragment);
mPreference = new Preference(mContext);
mPreference.setKey(mController.getPreferenceKey());
diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java
index 1eda713..9e185f5 100644
--- a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.when;
@@ -26,6 +27,8 @@
import android.os.UserHandle;
import android.os.UserManager;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -37,8 +40,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.Fragment;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AutoSyncWorkDataPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
new file mode 100644
index 0000000..97b3e69
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
@@ -0,0 +1,124 @@
+/*
+ * 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.users;
+
+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;
+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.UserInfo;
+import android.graphics.drawable.Drawable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowUserManager.class})
+public class EditUserInfoControllerTest {
+ @Mock
+ private Fragment mFragment;
+ @Mock
+ private LayoutInflater mInflater;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private UserInfo mUserInfo;
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private View mDialogContent;
+ @Mock
+ private EditText mUserName;
+ @Mock
+ private ImageView mPhotoView;
+ @Mock
+ private Drawable mCurrentIcon;
+
+ private ShadowUserManager mUserManager;
+ private FragmentActivity mActivity;
+ private TestEditUserInfoController mController;
+
+ public class TestEditUserInfoController extends EditUserInfoController {
+ private EditUserPhotoController mPhotoController;
+
+ public EditUserPhotoController getPhotoController() {
+ return mPhotoController;
+ }
+
+ @Override
+ protected EditUserPhotoController createEditUserPhotoController(Fragment fragment,
+ ImageView userPhotoView, Drawable drawable) {
+ mPhotoController = mock(EditUserPhotoController.class, Answers.RETURNS_DEEP_STUBS);
+ return mPhotoController;
+ }
+ }
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mUserManager = ShadowUserManager.getShadow();
+ mUserManager.setUserInfo(0, mUserInfo);
+ 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();
+ }
+
+ @After
+ public void tearDown() {
+ mUserManager.reset();
+ }
+
+ @Test
+ public void photoControllerOnActivityResult_whenWaiting_isCalled() {
+ mController.createDialog(mFragment, mCurrentIcon, "test user",
+ R.string.profile_info_settings_title, null, android.os.Process.myUserHandle());
+ mController.startingActivityForResult();
+ Intent resultData = new Intent();
+ mController.onActivityResult(0, 0, resultData);
+ EditUserPhotoController photoController = mController.getPhotoController();
+ assertThat(photoController).isNotNull();
+ verify(photoController).onActivityResult(eq(0), eq(0), same(resultData));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java
index f74de7a..94330a9 100644
--- a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java
@@ -18,6 +18,7 @@
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
+
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
index 2eeecaa..abdf4f5 100644
--- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
@@ -17,6 +17,7 @@
package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
index ef8fae6..ed79cf2 100644
--- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.users;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 76f9c5d..62135fe 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -17,34 +17,30 @@
package com.android.settings.users;
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.notNull;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import android.content.ComponentName;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.pm.UserInfo;
import android.graphics.drawable.Drawable;
+import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.SummaryLoader;
-import com.android.settings.testutils.Robolectric;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settingslib.RestrictedPreference;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
+import android.text.SpannableStringBuilder;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
import androidx.fragment.app.FragmentActivity;
import androidx.preference.Preference;
@@ -53,7 +49,34 @@
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.AdditionalMatchers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.android.controller.ActivityController;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.Collections;
+import java.util.List;
+
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+ shadows = {
+ ShadowUserManager.class,
+ ShadowDevicePolicyManager.class
+ })
public class UserSettingsTest {
private static final String KEY_USER_GUEST = "user_guest";
@@ -79,7 +102,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mActivity = spy(Robolectric.buildActivity(FragmentActivity.class).get());
+ mActivity = spy(ActivityController.of(new FragmentActivity()).get());
mContext = spy(RuntimeEnvironment.application);
mFragment = spy(new UserSettings());
ReflectionHelpers.setField(mFragment, "mAddUserWhenLockedPreferenceController",
@@ -89,7 +112,8 @@
mUserCapabilities = UserCapabilities.create(mContext);
when((Object) mActivity.getSystemService(UserManager.class)).thenReturn(mUserManager);
doReturn(mActivity).when(mFragment).getActivity();
-
+ doReturn(mContext).when(mFragment).getContext();
+ doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
mProvisioned = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DEVICE_PROVISIONED, 0);
final SharedPreferences prefs = mock(SharedPreferences .class);
@@ -183,4 +207,126 @@
assertThat(addUser.isEnabled()).isFalse();
}
+
+ @Test
+ public void updateUserList_cannotAddUserButCanSwitchUser_shouldNotShowAddUser() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.DEVICE_PROVISIONED, 1);
+ final RestrictedPreference addUser = mock(RestrictedPreference.class);
+
+ mUserCapabilities.mCanAddUser = false;
+ mUserCapabilities.mDisallowAddUser = true;
+ mUserCapabilities.mUserSwitcherEnabled = true;
+
+ ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
+ ReflectionHelpers.setField(mFragment, "mUserCaps", mUserCapabilities);
+ ReflectionHelpers.setField(mFragment, "mDefaultIconDrawable", mDefaultIconDrawable);
+ ReflectionHelpers.setField(mFragment, "mAddingUser", false);
+ mFragment.mMePreference = mMePreference;
+ mFragment.mUserListCategory = mock(PreferenceCategory.class);
+ mFragment.mAddUser = addUser;
+
+ doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
+
+ mFragment.updateUserList();
+
+ verify(addUser, never()).setVisible(true);
+ }
+
+ @Test
+ public void withDisallowRemoveUser_ShouldDisableRemoveUser() {
+ // TODO(b/115781615): Tidy robolectric tests
+ // Arrange
+ final int userId = UserHandle.myUserId();
+ final List<UserManager.EnforcingUser> enforcingUsers = Collections.singletonList(
+ new UserManager.EnforcingUser(userId,
+ UserManager.RESTRICTION_SOURCE_DEVICE_OWNER)
+ );
+ ShadowUserManager.getShadow().setUserRestrictionSources(
+ UserManager.DISALLOW_REMOVE_USER,
+ UserHandle.of(userId),
+ enforcingUsers);
+
+ ShadowDevicePolicyManager.getShadow().setDeviceOwnerComponentOnAnyUser(
+ new ComponentName("test", "test"));
+
+ doReturn(true).when(mUserManager).canSwitchUsers();
+ mUserCapabilities.mIsAdmin = false;
+
+ ReflectionHelpers.setField(mFragment, "mUserCaps", mUserCapabilities);
+ ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
+
+ Menu menu = mock(Menu.class);
+ MenuItem menuItem = mock(MenuItem.class);
+ final String title = "title";
+
+ doReturn(title).when(menuItem).getTitle();
+ doReturn(menuItem).when(menu).add(
+ anyInt(), eq(Menu.FIRST), anyInt(), any(CharSequence.class));
+
+ // Act
+ mFragment.onCreateOptionsMenu(menu, mock(MenuInflater.class));
+
+ // Assert
+ // Expect that the click will be overridden and the color will be faded
+ // (by RestrictedLockUtilsInternal)
+ verify(menuItem).setOnMenuItemClickListener(notNull());
+ SpannableStringBuilder defaultTitle = new SpannableStringBuilder(title);
+ verify(menuItem).setTitle(AdditionalMatchers.not(eq(defaultTitle)));
+ }
+
+ @Test
+ public void withoutDisallowRemoveUser_ShouldNotDisableRemoveUser() {
+ // Arrange
+ doReturn(true).when(mUserManager).canSwitchUsers();
+ mUserCapabilities.mIsAdmin = false;
+
+ ReflectionHelpers.setField(mFragment, "mUserCaps", mUserCapabilities);
+ ReflectionHelpers.setField(mFragment, "mUserManager", mock(UserManager.class));
+
+ Menu menu = mock(Menu.class);
+ MenuItem menuItem = mock(MenuItem.class);
+ final String title = "title";
+
+ doReturn(title).when(menuItem).getTitle();
+ doReturn(menuItem).when(menu).add(
+ anyInt(), eq(Menu.FIRST), anyInt(), any(CharSequence.class));
+
+ // Act
+ mFragment.onCreateOptionsMenu(menu, mock(MenuInflater.class));
+
+ // Assert
+ // Expect that a click listener will not be added and the title will not be changed
+ verify(menuItem, never()).setOnMenuItemClickListener(notNull());
+ SpannableStringBuilder defaultTitle = new SpannableStringBuilder(title);
+ verify(menuItem, never()).setTitle(AdditionalMatchers.not(eq(defaultTitle)));
+ }
+
+ @Test
+ public void updateUserList_canAddUserAndSwitchUser_shouldShowAddUser() {
+ Settings.Global.putInt(mContext.getContentResolver(),
+ Settings.Global.DEVICE_PROVISIONED, 1);
+ final RestrictedPreference addUser = mock(RestrictedPreference.class);
+
+ mUserCapabilities.mCanAddUser = true;
+ mUserCapabilities.mDisallowAddUser = false;
+ mUserCapabilities.mUserSwitcherEnabled = true;
+
+ ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
+ ReflectionHelpers.setField(mFragment, "mUserCaps", mUserCapabilities);
+ ReflectionHelpers.setField(mFragment, "mDefaultIconDrawable", mDefaultIconDrawable);
+ ReflectionHelpers.setField(mFragment, "mAddingUser", false);
+ mFragment.mMePreference = mMePreference;
+ mFragment.mUserListCategory = mock(PreferenceCategory.class);
+ mFragment.mAddUser = addUser;
+
+ doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen();
+ doReturn("Test summary").when(mFragment).getString(anyInt(), anyInt());
+
+ mFragment.updateUserList();
+
+ verify(addUser).setVisible(true);
+
+ }
+
}
diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
index da160fe..8736d75 100644
--- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java
@@ -21,6 +21,8 @@
import android.content.pm.PackageInfo;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -29,8 +31,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.fragment.app.Fragment;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppDialogFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
index fd41c36..f8c08ea 100644
--- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.vpn2;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java
index 57d7798..686eb82 100644
--- a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java
@@ -17,7 +17,6 @@
package com.android.settings.wallpaper;
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.when;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -29,7 +28,6 @@
import com.android.settings.FallbackHome;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
index b6b3d60..67d5dc6 100644
--- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
@@ -17,14 +17,13 @@
package com.android.settings.wallpaper;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.app.WallpaperManager;
import android.content.Context;
-import android.content.Intent;
import android.content.res.Resources;
-import com.android.settings.SubSettings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.After;
@@ -35,14 +34,11 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements;
import org.robolectric.annotation.Resetter;
-import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowPackageManager;
@RunWith(SettingsRobolectricTestRunner.class)
public class WallpaperSuggestionActivityTest {
@@ -66,20 +62,6 @@
}
@Test
- public void launch_primarySuggestionActivityDoesNotExist_shouldFallback() {
- ShadowPackageManager packageManager =
- Shadows.shadowOf(RuntimeEnvironment.application.getPackageManager());
- packageManager.removePackage("com.android.settings");
-
- ShadowActivity activity = Shadows.shadowOf(mController.setup().get());
- final Intent intent = activity.getNextStartedActivity();
-
- assertThat(intent.getComponent().getClassName()).isEqualTo(SubSettings.class.getName());
- assertThat(intent.getFlags()).isEqualTo(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
- assertThat(activity.isFinishing()).isTrue();
- }
-
- @Test
public void wallpaperServiceEnabled_no_shouldReturnTrue() {
when(mContext.getResources()).thenReturn(mResources);
when(mResources.getBoolean(com.android.internal.R.bool.config_enableWallpaperService))
diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java
index 9bebc93..e5519a3 100644
--- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java
@@ -18,9 +18,12 @@
import static com.google.common.truth.Truth.assertThat;
+import android.app.Activity;
import android.content.Context;
import android.content.Intent;
+import androidx.preference.Preference;
+
import com.android.settings.core.BasePreferenceController;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -28,9 +31,7 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-
-import androidx.preference.Preference;
+import org.robolectric.Robolectric;
@RunWith(SettingsRobolectricTestRunner.class)
public class WallpaperTypePreferenceControllerTest {
@@ -43,7 +44,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = RuntimeEnvironment.application;
+ mContext = Robolectric.setupActivity(Activity.class);
mController = new WallpaperTypePreferenceController(mContext, "pref_key");
mIntent = new Intent();
mPreference = new Preference(mContext);
diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
index 7bc7e93..73d6b4a 100644
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -17,7 +17,9 @@
package com.android.settings.webview;
import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -40,6 +42,8 @@
import android.os.UserManager;
import android.webkit.UserPackage;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.RadioButtonPreference;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -57,8 +61,6 @@
import java.util.Arrays;
import java.util.Collections;
-import androidx.fragment.app.FragmentActivity;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WebViewAppPickerTest {
diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
index a387d78..3ae29d3 100644
--- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wfd;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
index 3c7c959..454813f 100644
--- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java
@@ -18,7 +18,9 @@
import static androidx.lifecycle.Lifecycle.Event.ON_START;
import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -28,6 +30,9 @@
import android.app.Activity;
import android.view.View;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -38,9 +43,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.recyclerview.widget.RecyclerView;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ActionBarShadowControllerTest {
diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java
index a43f500..a66f6d5 100644
--- a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.anyInt;
@@ -27,6 +28,8 @@
import android.view.View;
import android.widget.Button;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -35,8 +38,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ActionButtonPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java
index e20520f..5b72a51 100644
--- a/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/AppCheckBoxPreferenceTest.java
@@ -22,6 +22,8 @@
import android.view.LayoutInflater;
import android.view.View;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -30,8 +32,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppCheckBoxPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
deleted file mode 100644
index 4f9100a..0000000
--- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java
+++ /dev/null
@@ -1,82 +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 static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
-
-import androidx.preference.PreferenceViewHolder;
-
-@RunWith(SettingsRobolectricTestRunner.class)
-public class AppPreferenceTest {
-
- private Context mContext;
- private View mRootView;
- private AppPreference mPref;
- private PreferenceViewHolder mHolder;
-
- @Before
- public void setUp() {
- mContext = RuntimeEnvironment.application;
- mRootView = View.inflate(mContext, R.layout.preference_app, null /* parent */);
- mHolder = PreferenceViewHolder.createInstanceForTests(mRootView);
- mPref = new AppPreference(mContext);
- }
-
- @Test
- public void setProgress_showProgress() {
- mPref.setProgress(1);
- mPref.onBindViewHolder(mHolder);
-
- assertThat(mHolder.findViewById(android.R.id.progress).getVisibility())
- .isEqualTo(View.VISIBLE);
- }
-
- @Test
- public void setSummary_showSummaryContainer() {
- mPref.setSummary("test");
- mPref.onBindViewHolder(mHolder);
-
- assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
- .isEqualTo(View.VISIBLE);
- }
-
- @Test
- public void noSummary_hideSummaryContainer() {
- mPref.setSummary(null);
- mPref.onBindViewHolder(mHolder);
-
- assertThat(mHolder.findViewById(R.id.summary_container).getVisibility())
- .isEqualTo(View.GONE);
- }
-
- @Test
- public void foobar_testName() {
- float iconSize = mContext.getResources().getDimension(R.dimen.secondary_app_icon_size);
- assertThat(Float.floatToIntBits(iconSize)).isEqualTo(Float.floatToIntBits(32));
- }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java
index 8bca41d..ce366fe 100644
--- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java
@@ -21,6 +21,8 @@
import android.content.Context;
import android.view.View;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -29,8 +31,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class AppSwitchPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java
index b5c3d73..02add35 100644
--- a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -28,6 +29,10 @@
import android.view.View;
import android.widget.LinearLayout;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.R;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -35,10 +40,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-import androidx.preference.R;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class DisabledCheckBoxPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index b458a3b..cc9bee0 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq;
@@ -40,6 +41,10 @@
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -55,10 +60,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.Preference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class EntityHeaderControllerTest {
@@ -124,7 +125,7 @@
mController.setLabel(testString);
mController.setSummary(testString);
mController.setSecondSummary(testString);
- mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
+ mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add_24dp));
mController.done(mActivity);
assertThat(label).isNotNull();
@@ -237,7 +238,7 @@
when(mFragment.getActivity()).thenReturn(mock(FragmentActivity.class));
mController = EntityHeaderController.newInstance(mActivity, mFragment, view);
String description = "Fake Description";
- mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add));
+ mController.setIcon(mShadowContext.getDrawable(R.drawable.ic_add_24dp));
mController.setIconContentDescription(description);
mController.done(mActivity);
assertThat(view.findViewById(R.id.entity_header_icon).getContentDescription().toString())
diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
index 618de63..3cbbbbe 100644
--- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java
@@ -25,6 +25,8 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -34,8 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class FixedLineSummaryPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
index 79854c5..79f344d 100644
--- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
@@ -31,6 +32,11 @@
import android.os.Bundle;
import android.view.View;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+import androidx.recyclerview.widget.RecyclerView;
+
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
@@ -44,11 +50,6 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ReflectionHelpers;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.PreferenceViewHolder;
-import androidx.recyclerview.widget.RecyclerView;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class HighlightablePreferenceGroupAdapterTest {
diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
index 37d055e..07a0aa9 100644
--- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.mock;
diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
index 06fcc58..e5cff21 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -26,6 +27,9 @@
import android.widget.CheckBox;
import android.widget.LinearLayout;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,9 +38,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class MasterCheckBoxPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
index 062d1e4..04b3089 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -26,6 +27,9 @@
import android.widget.LinearLayout;
import android.widget.Switch;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -35,9 +39,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class MasterSwitchPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
index 5895db2..92f75e9 100644
--- a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
index 3d415d4..64352d9 100644
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -26,6 +27,8 @@
import android.content.Context;
import android.os.UserManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.DefaultAppInfo;
@@ -41,8 +44,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RadioButtonPickerFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java
index 0d88779..5d914a2 100644
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java
@@ -17,13 +17,17 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static junit.framework.Assert.assertEquals;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import android.app.Application;
import android.view.View;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -32,8 +36,6 @@
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RadioButtonPreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java b/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java
new file mode 100644
index 0000000..aaffa93
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/RoundedHomepageIconTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON_BACKGROUND_ARGB;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON_BACKGROUND_HINT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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.pm.ActivityInfo;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Icon;
+import android.graphics.drawable.ShapeDrawable;
+import android.os.Bundle;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.drawer.CategoryKey;
+import com.android.settingslib.drawer.Tile;
+import com.android.settingslib.testutils.DrawableTestHelper;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class RoundedHomepageIconTest {
+
+ private Context mContext;
+ private ActivityInfo mActivityInfo;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mActivityInfo = new ActivityInfo();
+ mActivityInfo.packageName = mContext.getPackageName();
+ mActivityInfo.name = "class";
+ mActivityInfo.metaData = new Bundle();
+ }
+
+ @Test
+ public void createIcon_shouldSetBackgroundAndInset() {
+ final RoundedHomepageIcon icon =
+ new RoundedHomepageIcon(mContext, new ColorDrawable(Color.BLACK));
+
+ assertThat(icon.getNumberOfLayers()).isEqualTo(2);
+ DrawableTestHelper.assertDrawableResId(icon.getDrawable(0),
+ R.drawable.ic_homepage_generic_background);
+ }
+
+ @Test
+ public void setBackgroundColor_shouldUpdateColorFilter() {
+ final RoundedHomepageIcon icon =
+ spy(new RoundedHomepageIcon(mContext, new ColorDrawable(Color.BLACK)));
+ final ShapeDrawable background = mock(ShapeDrawable.class);
+ when(icon.getDrawable(0)).thenReturn(background);
+
+ icon.setBackgroundColor(Color.BLUE);
+
+ verify(background).setColorFilter(Color.BLUE, PorterDuff.Mode.SRC_ATOP);
+ }
+
+ @Test
+ public void setBackgroundColor_externalTileWithBackgroundColorRawValue_shouldUpdateIcon() {
+ final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
+ mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON_BACKGROUND_ARGB, 0xff0000);
+ doReturn(Icon.createWithResource(mContext, R.drawable.ic_settings))
+ .when(tile).getIcon(mContext);
+ final RoundedHomepageIcon icon =
+ new RoundedHomepageIcon(mContext, new ColorDrawable(Color.BLACK));
+
+ icon.setBackgroundColor(mContext, tile);
+ assertThat(icon.mBackgroundColor).isEqualTo(0xff0000);
+ }
+
+ @Test
+ public void onBindTile_externalTileWithBackgroundColorHint_shouldUpdateIcon() {
+ final Tile tile = spy(new Tile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE));
+ mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON_BACKGROUND_HINT,
+ R.color.memory_critical);
+ doReturn(Icon.createWithResource(mContext, R.drawable.ic_settings))
+ .when(tile).getIcon(mContext);
+
+ final RoundedHomepageIcon icon =
+ new RoundedHomepageIcon(mContext, new ColorDrawable(Color.BLACK));
+ icon.setBackgroundColor(mContext, tile);
+
+ assertThat(icon.mBackgroundColor)
+ .isEqualTo(mContext.getColor(R.color.memory_critical));
+ }
+
+}
diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
index 2e59b23..7edfd0b 100644
--- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
@@ -23,6 +23,8 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.viewpager.widget.PagerAdapter;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,8 +34,6 @@
import java.util.Locale;
-import androidx.viewpager.widget.PagerAdapter;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class RtlCompatibleViewPagerTest {
diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
index 5c96361..20405ab 100644
--- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.eq;
diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
index a785412..04b85dc 100644
--- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.robolectric.RuntimeEnvironment.application;
import android.content.Context;
@@ -59,11 +60,10 @@
assertThat(((TextView) mBar.findViewById(R.id.switch_text)).getText())
.isEqualTo(mContext.getString(defaultOffText));
- assertThat(mBar.getBackground()).isEqualTo(new ColorDrawable(COLOR_BACKGROUND));
mBar.setChecked(true);
- assertThat(mBar.getBackground()).isEqualTo(new ColorDrawable(COLOR_BACKGROUND_ACTIVATED));
+ assertThat(mBar.getBackground()).isInstanceOf(ColorDrawable.class);
assertThat(((TextView) mBar.findViewById(R.id.switch_text)).getText())
.isEqualTo(mContext.getString(defaultOnText));
}
@@ -74,12 +74,12 @@
final int offText = R.string.manage_space_text;
mBar.setSwitchBarText(onText, offText);
- assertThat(mBar.getBackground()).isEqualTo(new ColorDrawable(COLOR_BACKGROUND));
assertThat(((TextView) mBar.findViewById(R.id.switch_text)).getText())
.isEqualTo(mContext.getString(offText));
mBar.setChecked(true);
- assertThat(mBar.getBackground()).isEqualTo(new ColorDrawable(COLOR_BACKGROUND_ACTIVATED));
+ assertThat(mBar.getBackground()).isInstanceOf(ColorDrawable.class);
+
assertThat(((TextView) mBar.findViewById(R.id.switch_text)).getText())
.isEqualTo(mContext.getString(onText));
}
diff --git a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java
index c88e7f8..e1c5002 100644
--- a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java
index bed2511..ae55217 100644
--- a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java
@@ -17,11 +17,14 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.widget.ArrayAdapter;
+import androidx.preference.ListPreference;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
@@ -35,8 +38,6 @@
import java.util.ArrayList;
-import androidx.preference.ListPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = ShadowBluetoothUtils.class)
public class UpdatableListPreferenceDialogFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
index 5b33282..80d2539 100644
--- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.never;
@@ -30,6 +31,8 @@
import android.widget.EditText;
import android.widget.TextView;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -39,8 +42,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class ValidatedEditTextPreferenceTest {
@@ -131,4 +132,16 @@
& (InputType.TYPE_TEXT_VARIATION_PASSWORD | InputType.TYPE_CLASS_TEXT))
.isNotEqualTo(0);
}
+
+ @Test
+ public void bindViewHolder_isNotPassword_shouldNotAutoCorrectText() {
+ final TextView textView = spy(new TextView(RuntimeEnvironment.application));
+ when(mViewHolder.findViewById(android.R.id.summary)).thenReturn(textView);
+
+ mPreference.setIsSummaryPassword(false);
+ mPreference.onBindViewHolder(mViewHolder);
+
+ assertThat(textView.getInputType()).isEqualTo(
+ InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS | InputType.TYPE_CLASS_TEXT);
+ }
}
diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java
index ad56fe6..902b8ae 100644
--- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceControllerTest.java
@@ -17,12 +17,15 @@
package com.android.settings.widget;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import androidx.preference.PreferenceScreen;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,8 +34,6 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-
@RunWith(RobolectricTestRunner.class)
public class VideoPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
index 3ba7c8e..764de18 100644
--- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.widget;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
@@ -28,6 +29,8 @@
import android.view.LayoutInflater;
import android.view.TextureView;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,8 +41,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class VideoPreferenceTest {
private static final int VIDEO_WIDTH = 100;
diff --git a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
new file mode 100644
index 0000000..2b4b4be
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.view.View;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+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.annotation.Config;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = ShadowConnectivityManager.class)
+public class AddNetworkFragmentTest {
+
+ private AddNetworkFragment mAddNetworkFragment;
+
+ @Before
+ public void setUp() {
+ MockitoAnnotations.initMocks(this);
+ mAddNetworkFragment = spy(new AddNetworkFragment());
+ FragmentController.setupFragment(mAddNetworkFragment);
+ }
+
+ @Test
+ public void getMetricsCategory_shouldReturnAddNetwork() {
+ assertThat(mAddNetworkFragment.getMetricsCategory()).isEqualTo(
+ MetricsEvent.SETTINGS_WIFI_ADD_NETWORK);
+ }
+
+ @Test
+ public void getMode_shouldBeModeConnected() {
+ assertThat(mAddNetworkFragment.getMode()).isEqualTo(WifiConfigUiBase.MODE_CONNECT);
+ }
+
+ @Test
+ public void launchFragment_shouldShowSubmitButton() {
+ assertThat(mAddNetworkFragment.getSubmitButton()).isNotNull();
+ }
+
+ @Test
+ public void launchFragment_shouldShowCancelButton() {
+ assertThat(mAddNetworkFragment.getCancelButton()).isNotNull();
+ }
+
+ @Test
+ public void onClickSubmitButton_shouldHandleSubmitAction() {
+ View submitButton = mAddNetworkFragment.getView().findViewById(
+ AddNetworkFragment.SUBMIT_BUTTON_ID);
+
+ mAddNetworkFragment.onClick(submitButton);
+
+ verify(mAddNetworkFragment).handleSubmitAction();
+ }
+
+ @Test
+ public void onClickCancelButton_shouldHandleCancelAction() {
+ View cancelButton = mAddNetworkFragment.getView().findViewById(
+ AddNetworkFragment.CANCEL_BUTTON_ID);
+
+ mAddNetworkFragment.onClick(cancelButton);
+
+ verify(mAddNetworkFragment).handleCancelAction();
+ }
+
+ @Test
+ public void dispatchSubmit_shouldHandleSubmitAction() {
+ mAddNetworkFragment.dispatchSubmit();
+
+ verify(mAddNetworkFragment).handleSubmitAction();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java
index fdfebcd..b65e5aef 100644
--- a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java
@@ -16,6 +16,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import android.Manifest;
diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
index eb58452..e12053c 100644
--- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.content.Context;
diff --git a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
index 012a763..6d89960 100644
--- a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java
@@ -16,6 +16,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.verify;
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
index a0befc0..be8eeae 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
@@ -1,6 +1,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
index 16930c8..452fe03 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
index e07bcaf..94f10dd 100644
--- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java
@@ -24,6 +24,8 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.preference.PreferenceViewHolder;
+
import com.android.settings.LinkifyUtils;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -34,8 +36,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceViewHolder;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class LinkablePreferenceTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
new file mode 100644
index 0000000..f987f40
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
@@ -0,0 +1,70 @@
+/*
+ * 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.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.DialogInterface;
+import android.widget.Button;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
+import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.annotation.Config;
+import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class})
+public class NetworkRequestDialogFragmentTest {
+
+ private FragmentActivity mActivity;
+ private NetworkRequestDialogFragment networkRequestDialogFragment;
+
+ @Before
+ public void setUp() {
+ mActivity = Robolectric.setupActivity(FragmentActivity.class);
+ networkRequestDialogFragment = spy(NetworkRequestDialogFragment.newInstance(-1, null));
+ }
+
+ @Test
+ public void display_shouldShowTheDialog() {
+ networkRequestDialogFragment.show(mActivity.getSupportFragmentManager(), null);
+ AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ assertThat(alertDialog).isNotNull();
+ assertThat(alertDialog.isShowing()).isTrue();
+ }
+
+ @Test
+ public void clickPositiveButton_shouldCloseTheDialog() {
+ networkRequestDialogFragment.show(mActivity.getSupportFragmentManager(), null);
+ AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+ assertThat(alertDialog.isShowing()).isTrue();
+
+ Button positiveButton = alertDialog.getButton(DialogInterface.BUTTON_POSITIVE);
+ assertThat(positiveButton).isNotNull();
+
+ positiveButton.performClick();
+ assertThat(alertDialog.isShowing()).isFalse();
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
index 7cd9b78..bf4c6e7 100644
--- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java
@@ -17,13 +17,18 @@
package com.android.settings.wifi;
import static android.provider.Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -33,9 +38,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class NotifyOpenNetworkPreferenceControllerTest {
@@ -84,7 +86,7 @@
@Test
public void updateState_preferenceSetCheckedWhenSettingsAreEnabled() {
final SwitchPreference preference = mock(SwitchPreference.class);
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 1);
mController.updateState(preference);
@@ -95,7 +97,7 @@
@Test
public void updateState_preferenceSetCheckedWhenSettingsAreDisabled() {
final SwitchPreference preference = mock(SwitchPreference.class);
- Settings.System.putInt(mContext.getContentResolver(),
+ Settings.Global.putInt(mContext.getContentResolver(),
WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0);
mController.updateState(preference);
diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
index b4b5b94..b44d8e2 100644
--- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java
@@ -18,9 +18,12 @@
import static android.content.Context.NETWORK_SCORE_SERVICE;
import static android.provider.Settings.Global.USE_OPEN_WIFI_PACKAGE;
+
import static com.android.settings.wifi.UseOpenWifiPreferenceController
.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -35,6 +38,10 @@
import android.net.NetworkScorerAppData;
import android.provider.Settings;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -55,10 +62,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class UseOpenWifiPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index 43e87d8..471c991 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyBoolean;
import static org.mockito.Mockito.anyInt;
@@ -56,11 +57,10 @@
@Mock
private Context mContext;
@Mock
- private View mView;
- @Mock
private AccessPoint mAccessPoint;
@Mock
private KeyStore mKeyStore;
+ private View mView;
private Spinner mHiddenSettingsSpinner;
public WifiConfigController mController;
@@ -73,6 +73,7 @@
private static final String SHORT_PSK = "abcdefg";
// Valid PSK pass phrase
private static final String GOOD_PSK = "abcdefghijklmnopqrstuvwxyz";
+ private static final String GOOD_SSID = "abc";
private static final int DHCP = 0;
@Before
@@ -183,6 +184,35 @@
}
@Test
+ public void isSubmittable_EapToPskWithValidPassword_shouldReturnTrue() {
+ mController = new TestWifiConfigController(mConfigUiBase, mView, null,
+ WifiConfigUiBase.MODE_CONNECT);
+ final TextView ssid = mView.findViewById(R.id.ssid);
+ final TextView password = mView.findViewById(R.id.password);
+ final Spinner securitySpinner = mView.findViewById(R.id.security);
+ assertThat(password).isNotNull();
+ assertThat(securitySpinner).isNotNull();
+ when(mAccessPoint.isSaved()).thenReturn(true);
+
+ // Change it from EAP to PSK
+ mController.onItemSelected(securitySpinner, null, AccessPoint.SECURITY_EAP, 0);
+ mController.onItemSelected(securitySpinner, null, AccessPoint.SECURITY_PSK, 0);
+ password.setText(GOOD_PSK);
+ ssid.setText(GOOD_SSID);
+
+ assertThat(mController.isSubmittable()).isTrue();
+ }
+
+ @Test
+ public void isSubmittable_EapWithAkaMethod_shouldReturnTrue() {
+ when(mAccessPoint.isSaved()).thenReturn(true);
+ mController.mAccessPointSecurity = AccessPoint.SECURITY_EAP;
+ mView.findViewById(R.id.l_ca_cert).setVisibility(View.GONE);
+
+ assertThat(mController.isSubmittable()).isTrue();
+ }
+
+ @Test
public void getSignalString_notReachable_shouldHaveNoSignalString() {
when(mAccessPoint.isReachable()).thenReturn(false);
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
index e80edba..6535685 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import android.content.Intent;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
index 74378bd..6974a59 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
@@ -4,7 +4,6 @@
import android.content.Context;
-import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
import com.android.settings.wifi.WifiDialog.WifiDialogListener;
@@ -33,14 +32,6 @@
}
@Test
- public void createFullscreen_setsFullscreenTheme() {
- WifiDialog fullscreen = WifiDialog.createFullscreen(mContext, mListener, mockAccessPoint,
- WifiConfigUiBase.MODE_CONNECT);
- assertThat(fullscreen.getContext().getThemeResId())
- .isEqualTo(R.style.Theme_Settings_WifiDialogFullScreen);
- }
-
- @Test
public void createModal_usesDefaultTheme() {
WifiDialog modal = WifiDialog
.createModal(mContext, mListener, mockAccessPoint, WifiConfigUiBase.MODE_CONNECT);
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
index c6ebafb..53b3a64 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -25,7 +26,7 @@
import android.net.wifi.WifiManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settings.widget.SwitchWidgetController;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -37,7 +38,7 @@
import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = ShadowRestrictedLockUtils.class)
+@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
public class WifiEnablerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
index d2e8cb8..6cbace9 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.verify;
@@ -31,6 +33,10 @@
import android.net.wifi.WifiManager;
import android.provider.Settings;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -42,10 +48,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiInfoPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
index f391969..5aef036 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -31,9 +32,12 @@
import android.net.wifi.WifiManager;
import android.os.Handler;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtils;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
import com.android.settings.widget.MasterSwitchPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -45,11 +49,8 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
-@Config(shadows = ShadowRestrictedLockUtils.class)
+@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
public class WifiMasterSwitchPreferenceControllerTest {
@Mock
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java
index d37b667..e50d9ad 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java
@@ -16,6 +16,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isNull;
@@ -32,6 +33,9 @@
import android.content.DialogInterface;
import android.provider.Settings;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
@@ -44,9 +48,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiScanningRequiredFragmentTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
index ed312f4..c9e6c1e 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
@@ -16,17 +16,35 @@
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.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import android.app.Activity;
+import android.content.ContentResolver;
import android.content.Context;
+import android.content.Intent;
+import android.os.PowerManager;
+import android.provider.Settings;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settingslib.wifi.WifiTracker;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
@@ -35,18 +53,33 @@
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiSettingsTest {
+ private static final int NUM_NETWORKS = 4;
+
+ @Mock
+ private WifiTracker mWifiTracker;
+ @Mock
+ private PowerManager mPowerManager;
private Context mContext;
+ private WifiSettings mWifiSettings;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
+
+ mWifiSettings = spy(new WifiSettings());
+ doReturn(mContext).when(mWifiSettings).getContext();
+ doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
+ mWifiSettings.mSavedNetworksPreference = new Preference(mContext);
+ mWifiSettings.mConfigureWifiSettingsPreference = new Preference(mContext);
+ mWifiSettings.mWifiTracker = mWifiTracker;
}
@Test
public void testSearchIndexProvider_shouldIndexFragmentTitle() {
final List<SearchIndexableRaw> indexRes =
- WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true /* enabled */);
+ WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext,
+ true /* enabled */);
assertThat(indexRes).isNotNull();
assertThat(indexRes.get(0).key).isEqualTo(WifiSettings.DATA_KEY_REFERENCE);
@@ -56,8 +89,67 @@
@Config(qualifiers = "mcc999")
public void testSearchIndexProvider_ifWifiSettingsNotVisible_shouldNotIndexFragmentTitle() {
final List<SearchIndexableRaw> indexRes =
- WifiSettings.SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, true /* enabled */);
+ 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));
+ }
+
+ @Test
+ public void setAdditionalSettingsSummaries_hasSavedNetwork_preferenceVisible() {
+ when(mWifiTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
+
+ mWifiSettings.setAdditionalSettingsSummaries();
+
+ assertThat(mWifiSettings.mSavedNetworksPreference.isVisible()).isTrue();
+ assertThat(mWifiSettings.mSavedNetworksPreference.getSummary()).isEqualTo(
+ mContext.getResources().getQuantityString(
+ R.plurals.wifi_saved_access_points_summary,
+ NUM_NETWORKS, NUM_NETWORKS));
+ }
+
+ @Test
+ public void setAdditionalSettingsSummaries_noSavedNetwork_preferenceInvisible() {
+ when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
+
+ mWifiSettings.setAdditionalSettingsSummaries();
+
+ assertThat(mWifiSettings.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);
+
+ mWifiSettings.setAdditionalSettingsSummaries();
+
+ assertThat(mWifiSettings.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);
+
+ mWifiSettings.setAdditionalSettingsSummaries();
+
+ assertThat(mWifiSettings.mConfigureWifiSettingsPreference.getSummary()).isEqualTo(
+ mContext.getString(R.string.wifi_configure_settings_preference_summary_wakeup_off));
+ }
}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java
similarity index 72%
rename from tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java
rename to tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java
index 0b1c4ad..5ac25ed 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java
@@ -17,16 +17,26 @@
package com.android.settings.wifi;
+import static android.app.slice.Slice.HINT_LIST_ITEM;
+import static android.app.slice.SliceItem.FORMAT_SLICE;
+
+import static com.android.settings.wifi.WifiSlice.DEFAULT_EXPANDED_ROW_COUNT;
+
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.net.wifi.WifiManager;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.SliceLiveData;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.SliceTester;
@@ -38,35 +48,26 @@
import java.util.List;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.widget.SliceLiveData;
-
@RunWith(SettingsRobolectricTestRunner.class)
-public class WifiSliceBuilderTest {
+public class WifiSliceTest {
private Context mContext;
+ private WifiSlice mWifiSlice;
+
@Before
public void setUp() {
- mContext = spy(RuntimeEnvironment.application);
-
- // Prevent crash in SliceMetadata.
- Resources resources = spy(mContext.getResources());
- doReturn(60).when(resources).getDimensionPixelSize(anyInt());
- doReturn(resources).when(mContext).getResources();
+ mContext = RuntimeEnvironment.application;
// Set-up specs for SliceMetadata.
SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+
+ mWifiSlice = new WifiSlice(mContext);
}
@Test
- public void getWifiSlice_correctSliceContent() {
- final Slice wifiSlice = WifiSliceBuilder.getSlice(mContext);
+ public void getWifiSlice_shouldHaveTitleAndToggle() {
+ final Slice wifiSlice = mWifiSlice.getSlice();
final SliceMetadata metadata = SliceMetadata.from(mContext, wifiSlice);
final List<SliceAction> toggles = metadata.getToggles();
@@ -82,12 +83,22 @@
}
@Test
+ public void getWifiSlice_noAp_shouldReturnPlaceholder() {
+ final Slice wifiSlice = mWifiSlice.getSlice();
+
+ int rows = SliceQuery.findAll(wifiSlice, FORMAT_SLICE, HINT_LIST_ITEM,
+ null /* nonHints */).size();
+ // All AP rows + title row
+ assertThat(rows).isEqualTo(DEFAULT_EXPANDED_ROW_COUNT + 1);
+ }
+
+ @Test
public void handleUriChange_updatesWifi() {
- final Intent intent = new Intent(WifiSliceBuilder.ACTION_WIFI_SLICE_CHANGED);
+ final Intent intent = mWifiSlice.getIntent();
intent.putExtra(android.app.slice.Slice.EXTRA_TOGGLE_STATE, true);
final WifiManager wifiManager = mContext.getSystemService(WifiManager.class);
- WifiSliceBuilder.handleUriChange(mContext, intent);
+ mWifiSlice.onNotifyChange(intent);
assertThat(wifiManager.getWifiState()).isEqualTo(WifiManager.WIFI_STATE_ENABLED);
}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
index f55c57f..d40ead1 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.spy;
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
index 308463b..6deae7f 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java
@@ -18,7 +18,9 @@
import static android.provider.Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE;
import static android.provider.Settings.Global.WIFI_WAKEUP_ENABLED;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
@@ -27,6 +29,9 @@
import android.location.LocationManager;
import android.provider.Settings;
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -40,22 +45,17 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiWakeupPreferenceControllerTest {
- private static final String NO_LOCATION_STRING =
- "Unavailable because location is turned off. Turn on location.";
private Context mContext;
private WifiWakeupPreferenceController mController;
@Mock
- DashboardFragment mFragment;
+ private DashboardFragment mFragment;
@Mock
- LocationManager mLocationManager;
+ private LocationManager mLocationManager;
@Mock
- SwitchPreference mPreference;
+ private SwitchPreference mPreference;
@Before
public void setUp() {
@@ -65,7 +65,7 @@
mController.mLocationManager = mLocationManager;
mController.mPreference = mPreference;
- Settings.System.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1);
doReturn(true).when(mLocationManager).isLocationEnabled();
}
@@ -103,7 +103,8 @@
@Test
public void updateState_preferenceSetCheckedWhenWakeupSettingEnabled() {
final SwitchPreference preference = mock(SwitchPreference.class);
- Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1);
mController.updateState(preference);
@@ -114,7 +115,7 @@
@Test
public void updateState_preferenceSetUncheckedWhenWakeupSettingDisabled() {
final SwitchPreference preference = mock(SwitchPreference.class);
- Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0);
mController.updateState(preference);
@@ -125,8 +126,8 @@
@Test
public void updateState_preferenceSetUncheckedWhenWifiScanningDisabled() {
final SwitchPreference preference = mock(SwitchPreference.class);
- Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
- Settings.System.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0);
mController.updateState(preference);
@@ -136,7 +137,7 @@
@Test
public void updateState_preferenceSetUncheckedWhenWakeupSettingEnabledNoLocation() {
final SwitchPreference preference = mock(SwitchPreference.class);
- Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
doReturn(false).when(mLocationManager).isLocationEnabled();
mController.updateState(preference);
@@ -148,7 +149,7 @@
@Test
public void updateState_preferenceSetUncheckedWhenWakeupSettingDisabledLocationEnabled() {
final SwitchPreference preference = mock(SwitchPreference.class);
- Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 0);
doReturn(false).when(mLocationManager).isLocationEnabled();
mController.updateState(preference);
@@ -160,8 +161,8 @@
@Test
public void updateState_preferenceSetUncheckedWhenWifiScanningDisabledLocationEnabled() {
final SwitchPreference preference = mock(SwitchPreference.class);
- Settings.System.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
- Settings.System.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_WAKEUP_ENABLED, 1);
+ Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0);
doReturn(false).when(mLocationManager).isLocationEnabled();
mController.updateState(preference);
diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
index 7e3ce6f..f393804 100644
--- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.when;
import android.app.Activity;
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
index c9c9abb..ae4c753 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
@@ -19,10 +19,10 @@
import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
import static android.app.slice.Slice.HINT_TITLE;
import static android.app.slice.SliceItem.FORMAT_TEXT;
+
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.doReturn;
import static org.mockito.Mockito.spy;
@@ -32,17 +32,27 @@
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.telephony.CarrierConfigManager;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.ListContent;
+import androidx.slice.widget.RowContent;
+import androidx.slice.widget.SliceContent;
+import androidx.slice.widget.SliceLiveData;
+
import com.android.ims.ImsConfig;
import com.android.ims.ImsManager;
import com.android.settings.R;
+import com.android.settings.slices.CustomSliceManager;
import com.android.settings.slices.SettingsSliceProvider;
import com.android.settings.slices.SliceBroadcastReceiver;
import com.android.settings.slices.SliceData;
import com.android.settings.slices.SlicesFeatureProvider;
-import com.android.settings.slices.CustomSliceManager;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -57,16 +67,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.core.SliceQuery;
-import androidx.slice.widget.ListContent;
-import androidx.slice.widget.RowContent;
-import androidx.slice.widget.SliceLiveData;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiCallingSliceHelperTest {
@@ -86,7 +86,7 @@
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- mContext = spy(RuntimeEnvironment.application);
+ mContext = RuntimeEnvironment.application;
//setup for SettingsSliceProvider tests
mProvider = spy(new SettingsSliceProvider());
@@ -98,13 +98,9 @@
mFeatureFactory = FakeFeatureFactory.setupForTest();
mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider();
+ CustomSliceManager manager = new CustomSliceManager(mContext);
when(mSlicesFeatureProvider.getCustomSliceManager(any(Context.class)))
- .thenReturn(new CustomSliceManager(mContext));
-
- // Prevent crash in SliceMetadata.
- Resources resources = spy(mContext.getResources());
- doReturn(60).when(resources).getDimensionPixelSize(anyInt());
- doReturn(resources).when(mContext).getResources();
+ .thenReturn(manager);
mWfcSliceHelper = new FakeWifiCallingSliceHelper(mContext);
@@ -367,31 +363,27 @@
// Get all the rows
final ListContent listContent = new ListContent(mContext, slice);
- final ArrayList<SliceItem> rowItems = listContent.getRowItems();
+ final ArrayList<SliceContent> rowItems = listContent.getRowItems();
assertThat(rowItems.size()).isEqualTo(4 /* 4 items including header */);
// First row is HEADER
- SliceItem rowSliceItem = rowItems.get(0);
- RowContent rowContent = new RowContent(mContext, rowSliceItem, true);
+ RowContent rowContent = (RowContent) rowItems.get(0);
assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(
R.string.wifi_calling_mode_title));
// next is WIFI_ONLY
- rowSliceItem = rowItems.get(1);
- rowContent = new RowContent(mContext, rowSliceItem, false);
+ rowContent = (RowContent) rowItems.get(1);
assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(
com.android.internal.R.string.wfc_mode_wifi_only_summary));
// next is WIFI_PREFERRED
- rowSliceItem = rowItems.get(2);
- rowContent = new RowContent(mContext, rowSliceItem, false);
+ rowContent = (RowContent) rowItems.get(2);
assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(
com.android.internal.R.string.wfc_mode_wifi_preferred_summary));
// next is CELLULAR_PREFERRED
- rowSliceItem = rowItems.get(3);
- rowContent = new RowContent(mContext, rowSliceItem, false);
+ rowContent = (RowContent) rowItems.get(3);
assertThat(rowContent.getTitleItem().getText()).isEqualTo(mContext.getText(
com.android.internal.R.string.wfc_mode_cellular_preferred_summary));
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
index 2bec044..59e6287 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -16,6 +16,7 @@
package com.android.settings.wifi.details;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.nullable;
@@ -54,6 +55,11 @@
import android.view.View.OnClickListener;
import android.widget.ImageView;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
@@ -88,11 +94,6 @@
import java.util.Arrays;
import java.util.stream.Collectors;
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
ShadowDevicePolicyManager.class,
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
index f90b8e2..dd5dcc9 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
@@ -16,12 +16,15 @@
package com.android.settings.wifi.details;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import android.content.Context;
import android.net.wifi.WifiConfiguration;
+import androidx.preference.DropDownPreference;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -31,8 +34,6 @@
import org.mockito.Mock;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.DropDownPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiMeteredPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java
new file mode 100644
index 0000000..a4bcfff
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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.wifi.details;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.net.wifi.WifiConfiguration;
+
+import androidx.preference.DropDownPreference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+public class WifiPrivacyPreferenceControllerTest {
+
+ private static final int PRIVACY_RANDOMIZED = 0;
+ private static final int PRIVACY_TRUSTED = 1;
+
+ @Mock
+ private WifiConfiguration mWifiConfiguration;
+
+ private WifiPrivacyPreferenceController mPreferenceController;
+ private Context mContext;
+ private DropDownPreference mDropDownPreference;
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+
+ WifiPrivacyPreferenceController preferenceController = new WifiPrivacyPreferenceController(
+ mContext);
+ preferenceController.setWifiConfiguration(mWifiConfiguration);
+ mPreferenceController = spy(preferenceController);
+ mDropDownPreference = new DropDownPreference(mContext);
+ mDropDownPreference.setEntries(R.array.wifi_privacy_entries);
+ mDropDownPreference.setEntryValues(R.array.wifi_privacy_values);
+ }
+
+ @Test
+ public void testUpdateState_wifiPrivacy_setCorrectValue() {
+ doReturn(PRIVACY_TRUSTED).when(mPreferenceController).getRandomizationValue();
+
+ mPreferenceController.updateState(mDropDownPreference);
+
+ assertThat(mDropDownPreference.getEntry()).isEqualTo("Trusted");
+ }
+
+ @Test
+ public void testUpdateState_wifiNotMetered_setCorrectValue() {
+ doReturn(PRIVACY_RANDOMIZED).when(mPreferenceController).getRandomizationValue();
+
+ mPreferenceController.updateState(mDropDownPreference);
+
+ assertThat(mDropDownPreference.getEntry()).isEqualTo("Default (use randomized MAC)");
+ }
+
+ @Test
+ public void testController_resilientToNullConfig() {
+ mPreferenceController = spy(new WifiPrivacyPreferenceController(mContext));
+
+ mPreferenceController.getRandomizationValue();
+ mPreferenceController.onPreferenceChange(mDropDownPreference, new String("1"));
+ }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
index 2b00adc..8921311 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java
@@ -17,12 +17,17 @@
package com.android.settings.wifi.p2p;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -32,10 +37,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class P2pCategoryPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
index 4bc9028..849c35a 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java
@@ -17,11 +17,15 @@
package com.android.settings.wifi.p2p;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.when;
import android.net.wifi.p2p.WifiP2pDevice;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -31,9 +35,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class P2pThisDevicePreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
index e3be992..75c5ffc 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -17,7 +17,9 @@
import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.times;
@@ -30,6 +32,10 @@
import android.content.IntentFilter;
import android.net.wifi.WifiManager;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -40,10 +46,6 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiP2PPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
index b6bf7e7..fb7bef1 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java
@@ -16,6 +16,7 @@
package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
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 b556c8f..6faff11 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -28,6 +29,9 @@
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
@@ -38,9 +42,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiTetherApBandPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java
index 19f4edc..519aa54 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java
@@ -21,6 +21,8 @@
import android.content.Context;
import android.provider.Settings;
+import androidx.preference.SwitchPreference;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -29,8 +31,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.SwitchPreference;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiTetherAutoOffPreferenceControllerTest {
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 5a09be6..1b063d0 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -27,6 +28,8 @@
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.ValidatedEditTextPreference;
@@ -38,8 +41,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiTetherPasswordPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
index 6352fc5..c81c490 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
@@ -31,6 +32,9 @@
import android.net.wifi.WifiManager;
import android.provider.Settings;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.MasterSwitchPreference;
@@ -48,9 +52,6 @@
import org.robolectric.annotation.Implements;
import org.robolectric.util.ReflectionHelpers;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = {
WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class,
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 bf70434..a9d4a43 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -27,6 +28,8 @@
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.ValidatedEditTextPreference;
@@ -38,8 +41,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiTetherSSIDPreferenceControllerTest {
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java
index 252de38..f813185 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java
@@ -1,6 +1,7 @@
package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -10,6 +11,9 @@
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceScreen;
+
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before;
@@ -19,9 +23,6 @@
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
@RunWith(SettingsRobolectricTestRunner.class)
public class WifiTetherSecurityPreferenceControllerTest {
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 d376775..4b765e8 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@@ -27,6 +28,7 @@
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
+import com.android.settings.testutils.shadow.ShadowWifiManager;
import org.junit.Before;
import org.junit.Test;
@@ -34,12 +36,15 @@
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
+@Config(shadows = {ShadowWifiManager.class})
public class WifiTetherSettingsTest {
+ private static final String[] WIFI_REGEXS = {"wifi_regexs"};
private Context mContext;
@@ -55,12 +60,12 @@
MockitoAnnotations.initMocks(this);
doReturn(mConnectivityManager)
.when(mContext).getSystemService(Context.CONNECTIVITY_SERVICE);
- doReturn(mUserManager)
- .when(mContext).getSystemService(Context.USER_SERVICE);
+ doReturn(WIFI_REGEXS).when(mConnectivityManager).getTetherableWifiRegexs();
+ doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
}
@Test
- public void testWifiTetherNonIndexableKeys_tetherAvailable_keysNotReturned() {
+ public void wifiTetherNonIndexableKeys_tetherAvailable_keysNotReturned() {
// To let TetherUtil.isTetherAvailable return true, select one of the combinations
setupIsTetherAvailable(true);
@@ -74,7 +79,7 @@
}
@Test
- public void testWifiTetherNonIndexableKeys_tetherNotAvailable_keysReturned() {
+ public void wifiTetherNonIndexableKeys_tetherNotAvailable_keysReturned() {
// To let TetherUtil.isTetherAvailable return false, select one of the combinations
setupIsTetherAvailable(false);
@@ -87,6 +92,12 @@
assertThat(niks).contains(WifiTetherSettings.KEY_WIFI_TETHER_NETWORK_AP_BAND);
}
+ @Test
+ public void createPreferenceControllers_notEmpty() {
+ assertThat(WifiTetherSettings.SEARCH_INDEX_DATA_PROVIDER.getPreferenceControllers(mContext))
+ .isNotEmpty();
+ }
+
private void setupIsTetherAvailable(boolean returnValue) {
when(mConnectivityManager.isTetheringSupported()).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java
index bf6c725..d22776f 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java
@@ -17,6 +17,7 @@
package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
diff --git a/tests/uitests/AndroidManifest.xml b/tests/uitests/AndroidManifest.xml
index 91e15b8..49a2fd1 100644
--- a/tests/uitests/AndroidManifest.xml
+++ b/tests/uitests/AndroidManifest.xml
@@ -28,6 +28,7 @@
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+ <uses-permission android:name="android.permission.READ_SEARCH_INDEXABLES"/>
<instrumentation
android:name="android.support.test.runner.AndroidJUnitRunner"
diff --git a/tests/uitests/assets/search_results_list b/tests/uitests/assets/search_results_list
new file mode 100644
index 0000000..a0cc894
--- /dev/null
+++ b/tests/uitests/assets/search_results_list
@@ -0,0 +1,623 @@
+AP Band;wifi_tether_network_ap_band
+About phone;my_device_info_pref_screen
+Accessibility;accessibility_settings_screen
+Accessibility;top_level_accessibility
+Accounts;top_level_accounts
+Accounts;user_and_account_settings_screen
+Active Edge;gesture_assist_application
+Active Edge;gesture_assist_input_summary
+Active Edge;gesture_assist_settings_page
+Adaptive Battery;smart_battery_detail
+Adaptive Battery;smart_battery_manager
+Adaptive brightness;auto_brightness
+Adaptive brightness;auto_brightness_entry
+Add an account;add_account_screen
+Add rule;zen_mode_add_automatic_rule
+Add user or profile;user_add
+Add users from lock screen;security_lockscreen_add_users_when_locked
+Add users from lock screen;user_settings_add_users_when_locked
+Additional system updates;additional_system_update_settings
+Admin can delete all device data;enterprise_privacy_wipe_device
+Admin can lock the device and reset password;enterprise_privacy_lock_device
+Airplane mode;toggle_airplane
+Alarm volume;alarm_volume
+Alarms;zen_mode_alarms
+Allow calls;zen_mode_calls
+Allow events;zen_mode_events
+Allow messages;zen_mode_messages
+Allow notification dots;notification_badging
+Allow reminders;zen_mode_reminders
+Allow repeat callers;zen_mode_repeat_callers
+Allow when screen is off;gesture_assist_wake
+Also vibrate for calls;vibrate_when_ringing
+Always on;ambient_display_always_on
+Always show crash dialog;show_first_crash_dialog
+Always-on VPN turned on in your work profile;always_on_vpn_managed_profile
+Amount of time and data spent in each app;enterprise_privacy_usage_stats
+Android Beam;android_beam_settings
+Android version;my_device_firmware_version
+Animator duration scale;animator_duration_scale
+App data usage cycle;billing_cycle
+App info;all_app_info
+App permissions;manage_perms
+App-level permissions;app_level_permissions
+Apps;debug_applications_category
+Apps & app data;storage_settings_apps_space
+Apps & notifications;apps_and_notification_screen
+Apps & notifications;top_level_apps_and_notifs
+Apps installed;number_enterprise_installed_packages
+Assist & voice input;assist_and_voice_input
+Assist & voice input;manage_assist_screen
+Assist app;default_assist
+Audio & on-screen text;audio_and_captions_category
+Audio (music, ringtones, podcasts, etc.);storage_settings_music_space
+Auto-rotate screen;auto_rotate
+Auto-rotate screen;toggle_lock_screen_rotation_preference
+Auto-sync personal data;auto_sync_personal_account_data
+Auto-sync work data;auto_sync_work_account_data
+Autofill;debug_autofill_category
+Autofill service;default_autofill
+Autofill service;default_autofill_main
+Autofill service;default_autofill_work
+Automatic 24-hour format;auto_24hour
+Automatic date & time;auto_time
+Automatic restore;auto_restore
+Automatic rules;zen_mode_automation_settings_page
+Automatic system updates;ota_disable_automatic_update
+Automatic time zone;auto_zone
+Automatically lock;lock_after_timeout
+Automatically sync data;auto_sync_account_data
+Available;storage_settings_memory_available
+Available media devices;available_device_list
+Back up my data;backup_data
+Background check;background_check
+Background process limit;app_process_limit
+Backup;backup
+Backup;backup_settings
+Backup;privacy_settings_screen
+Backup account;configure_account
+Backup service isn't active;backup_inactive
+Battery;power_usage_summary_screen
+Battery;top_level_battery
+Battery Saver;battery_saver
+Battery Saver;battery_saver_summary
+Battery optimization;high_power_apps
+Battery percentage;battery_percentage
+Battery usage;power_usage_advanced_screen
+Battery usage since full charge;app_list
+Behavior;zen_mode_settings_category_behavior
+Blink light;notification_pulse
+Bluetooth;bluetooth_settings
+Bluetooth;bluetooth_switchbar_screen
+Bluetooth AVRCP Version;bluetooth_select_avrcp_version
+Bluetooth Audio Bits Per Sample;bluetooth_select_a2dp_bits_per_sample
+Bluetooth Audio Channel Mode;bluetooth_select_a2dp_channel_mode
+Bluetooth Audio Codec;bluetooth_select_a2dp_codec
+Bluetooth Audio LDAC Codec: Playback Quality;bluetooth_select_a2dp_ldac_playback_quality
+Bluetooth Audio Sample Rate;bluetooth_select_a2dp_sample_rate
+Bluetooth address;bt_address
+Bluetooth scanning;bluetooth_always_scanning
+Bluetooth tethering;enable_bluetooth_tethering
+Brightness level;brightness
+Browser app;default_browser
+Browser app;work_default_browser
+Bug report shortcut;bugreport_in_power
+Build number;build_number
+Call volume;call_volume
+Calls;zen_mode_calls_settings
+Calls;zen_mode_calls_settings_page
+Camera Laser Sensor;camera_laser_sensor_switch
+Camera permissions;enterprise_privacy_number_camera_access_packages
+Captions;captioning_preference_screen
+Cast;wifi_display_settings_screen
+Changes made by your organization's admin;exposure_changes_category
+Charging sounds;charging_sounds
+Clear credentials;credentials_reset
+Color correction;daltonizer_preference
+Color correction;daltonizer_preference_screen
+Color inversion;toggle_inversion_preference
+Colors;color_mode
+Colors;color_mode_settings_screen
+Connect to open networks;use_open_wifi_automatically
+Connected MAC Randomization;wifi_connected_mac_randomization
+Connected devices;connected_devices_screen
+Connected devices;top_level_connected_devices
+Connection preferences;connected_devices_advanced_screen
+Connection preferences;connection_preferences
+Convert to file encryption;convert_to_file_encryption
+Cool color temperature;color_temperature
+Copyright;copyright
+Correction mode;type
+Credential storage;credentials_management
+Current screen saver;current_screensaver
+Currently connected;connected_device_list
+Custom;zen_custom
+Custom restrictions;zen_mode_block_settings_page
+Data Saver;data_saver_screen
+Data Saver;restrict_background
+Data associated with your work account, such as email and calendar;enterprise_privacy_enterprise_data
+Data limit;data_limit
+Data usage;data_usage_screen
+Data warning;data_warning
+Data warning & limit;billing_cycle_settings
+Data warning & limit;billing_preference
+Date & time;date_time_settings_screen
+Debug GPU overdraw;debug_hw_overdraw
+Debug non-rectangular clip operations;show_non_rect_clip
+Debugging;debug_debugging_category
+Default USB configuration;default_usb_configuration
+Default alarm sound;alarm_ringtone
+Default apps;app_default_settings_screen
+Default apps;number_enterprise_set_default_apps
+Default for work;autofill_work_app_defaults
+Default for work;work_app_defaults
+Default keyboard;input_method
+Default notification sound;notification_default_ringtone
+Default notification sound;notification_ringtone
+Default work alarm sound;work_alarm_ringtone
+Default work notification sound;work_notification_ringtone
+Delay before click;autoclick_delay
+Desktop backup password;local_backup_password
+Developer options;development_prefs_screen
+Device admin apps;device_admin_settings
+Device admin apps;device_administrators
+Device admin apps;manage_device_admin
+Device name;device_name
+Device security;security_category
+Device theme;theme
+Dial pad tones;dial_pad_tones
+Directory access;special_app_directory_access
+Disable Bluetooth A2DP hardware offload;bluetooth_disable_a2dp_hw_offload
+Disable HW overlays;disable_overlays
+Disable USB audio routing;usb_audio
+Disable absolute volume;bluetooth_disable_absolute_volume
+Display;display_category
+Display;display_settings_screen
+Display;top_level_display
+Display cutout;display_cutout_emulation
+Display over other apps;system_alert_window
+Display size;accessibility_settings_screen_zoom
+Display size;display_settings_screen_zoom
+Display size;screen_zoom_settings
+Do Not Disturb;zen_mode
+Do Not Disturb;zen_mode_notifications
+Do Not Disturb;zen_mode_settings
+Do Not Disturb access;zen_access
+Do Not Disturb access;zen_access_screen
+Dock speaker plays;dock_audio_media
+Docking sounds;docking_sounds
+Don't blink light;zen_effect_light
+Don't pop notifications on screen;zen_effect_peek
+Don't turn on screen;zen_effect_intent
+Don't wake for notifications;zen_effect_ambient
+Don’t keep activities;immediately_destroy_activities
+Double twist for camera;camera_gesture
+Double-tap to check phone;ambient_display_double_tap
+Double-tap to check phone;gesture_double_tap_screen
+Double-tap to check phone;gesture_double_tap_screen_input_summary
+Downloaded services;user_installed_services_category
+Drawing;debug_drawing_category
+Duration;zen_mode_duration_settings
+Dwell timing;autoclick_preference
+Dwell timing;autoclick_preference_screen
+Emergency alerts;app_and_notif_cell_broadcast_settings
+Emergency app;default_emergency_app
+Emergency dialing signal;emergency_tone
+Emergency information;emergency_info
+Enable Bluetooth HCI snoop log;bt_hci_snoop_log
+Enable GPU debug layers;enable_gpu_debug_layers
+Enable Wi-Fi Verbose Logging;wifi_verbose_logging
+Enable freeform windows;enable_freeform_support
+Enable view attribute inspection;debug_view_attributes
+Encrypt phone;encryption_and_credentials_encryption_status
+Encryption;encryption_and_credentials_status_category
+Encryption & credentials;encryption_and_credential
+Encryption & credentials;encryption_and_credentials_screen
+End time;night_display_end_time
+Equipment ID;fcc_equipment_id
+Erase all data (factory reset);factory_reset
+Exceptions;zen_mode_settings_category_exceptions
+Experimental;experimental_category
+Face authentication;face_settings
+Face authentication;security_settings_face_settings_page
+Failed password attempts before deleting all device data;failed_password_wipe_current_user
+Failed password attempts before deleting work profile data;failed_password_wipe_managed_profile
+Feature flags;feature_flags_dashboard
+Feature flags;feature_flags_settings
+Files;pref_files
+Files received via Bluetooth;bt_received_files
+Flash screen;flash
+Flip camera;gesture_double_twist
+Flip camera;gesture_double_twist_input_summary
+Font size;font_size
+Font size;font_size_preference_screen
+Font size;font_size_setting_screen
+Force 4x MSAA;force_msaa
+Force RTL layout direction;force_rtl_layout_all_locales
+Force activities to be resizable;force_resizable_activities
+Force allow apps on external;force_allow_on_external
+Force full GNSS measurements;enable_gnss_raw_meas_full_tracking
+Free up space;storage_settings_free_space
+Games;pref_games
+Gestures;gesture_settings
+Gestures;gesture_settings_screen
+Global HTTP proxy set;global_http_proxy
+Google Account;branded_account
+HDCP checking;hdcp_checking
+Hardware accelerated rendering;debug_hw_drawing_category
+Hearing aids;hearing_aid_preference
+Hide from notification list;zen_effect_list
+Hide notification dots;zen_effect_badge
+Hide status bar icons;zen_effect_status
+High contrast text;toggle_high_text_contrast_preference
+Home app;default_home
+Hotspot & tethering;tether_prefs_screen
+Hotspot & tethering;tether_settings
+Hotspot name;wifi_tether_network_name
+Hotspot password;wifi_tether_network_password
+IMEI;imei_info
+IP address;current_ip_address
+IP address;wifi_ip_address
+Improve your face data;security_settings_face_improve
+Input;debug_input_category
+Input assistance;input_assistance_category
+Install certificates;install_credentials
+Install from storage;credentials_install
+Install unknown apps;manage_external_sources
+Installed apps;installed_apps_web_action
+Instant Apps preferences;instant_app_web_action_pref
+Instant apps;instant_app_web_action_toggle
+Instant apps;web_action_category
+Intensity;night_display_temperature
+Interaction controls;interaction_control_category
+Internal shared storage;storage_settings_volume_private
+Internal storage;storage_settings_internal_storage
+Jump to camera;gesture_double_tap_power
+Jump to camera;gesture_double_tap_power_input_summary
+Keyboard & inputs;keyboards_category
+Keyboard assistance;keyboard_assistance_category
+Keyboard shortcuts helper;keyboard_shortcuts_helper
+Language;tts_default_lang
+Languages;phone_language
+Languages & input;language_and_input_settings_screen
+Large mouse pointer;toggle_large_pointer_icon
+Last full charge;last_full_charge
+Legal information;legal_container
+Legal information;legal_screen
+License;license
+Lift to check phone;ambient_display_pick_up
+Lift to check phone;gesture_pick_up
+Lift to check phone;gesture_pick_up_input_summary
+Lift to wake;lift_to_wake
+List of apps on your device;enterprise_privacy_installed_packages
+Local terminal;enable_terminal
+Location;location
+Location;location_settings
+Location for work profile;managed_profile_location_switch
+Location permissions;enterprise_privacy_number_location_access_packages
+Location services;location_services
+Lock device when unpinning;use_screen_lock
+Lock screen display;lockscreen_from_display_settings
+Lock screen display;security_lockscreen_settings_screen
+Lock screen message;owner_info_settings
+Logger buffer sizes;select_logd_size
+Logging level;autofill_logging_level
+MAC address;mac_address
+Magnification;magnification_preference_screen
+Magnification;magnification_preference_screen_title
+Magnify with button;screen_magnification_navbar_preference_screen
+Magnify with triple-tap;screen_magnification_gestures_preference_screen
+Make pattern visible;visiblepattern
+Make profile pattern visible;visiblepattern_profile
+Manage backup account;data_management
+Manage keyboards;add_virtual_keyboard_screen
+Manage keyboards;available_virtual_keyboard_page
+Managed device info;enterprise_privacy
+Managed device info;enterprise_privacy_settings
+Manual;manual
+Max requests per session;autofill_max_partitions
+Max visible datasets;autofill_visible_datasets
+Maximum connected Bluetooth audio devices;bluetooth_max_connected_audio_devices
+Media;media_category
+Media;zen_mode_media
+Media volume;media_volume
+Memory;memory
+Messages, events & reminders;zen_mode_msg_event_reminder_settings
+Messages, events & reminders;zen_mode_msg_event_reminder_settings_page
+Microphone permissions;enterprise_privacy_number_microphone_access_packages
+Mobile;mobile_category
+Mobile data;data_usage_enable
+Mobile data always active;mobile_data_always_on
+Mobile data usage;cellular_data_usage
+Mobile network;mobile_network_settings
+Mobile plan;manage_mobile_plan
+Model & hardware;device_model
+Modify system settings;write_settings_apps
+Monitoring;debug_monitoring_category
+Mono audio;toggle_master_mono
+Most recent bug report;bug_reports
+Most recent network traffic log;network_logs
+Most recent security log;security_logs
+Movie & TV apps;pref_movies
+Multiple users;user_settings_screen
+Music & audio;pref_music_audio
+NFC;toggle_nfc
+Network & internet;network_and_internet_screen
+Network & internet;top_level_network
+Network name;show_operator_name
+Network rating provider;network_scorer_picker
+Networking;debug_networking_category
+New notifications;ambient_display_notification
+Night Light;night_display
+Night Light;night_display_activated
+Night mode;dark_ui_mode
+No sound from notifications;zen_mute_notifications
+No visuals or sound from notifications;zen_hide_notifications
+Notification access;notification_access
+Notification access;notification_access_screen
+Notification volume;notification_volume
+Notifications;all_notifications
+Notifications;zen_mode_block_effects_settings
+Notifications;zen_mode_restrict_settings_page
+OEM unlocking;oem_unlock_enable
+On lock screen;lock_screen_notifications
+On lock screen;security_setting_lock_screen_notif
+Open network notification;notify_open_networks
+Opening links;domain_urls
+Opening links;manage_domain_url_screen
+Other apps;pref_other_apps
+Other files;storage_settings_misc_space
+Other sounds and vibrations;other_sounds_and_vibrations_category
+Other users;pref_secondary_users
+Pair new device;add_bt_devices
+Payment default;nfc_payment
+Personal dictionary;key_user_dictionary_settings
+Personal dictionary;user_dict_list
+Phone app;default_phone_app
+Phone app;work_default_phone_app
+Phone number;phone_number
+Phone ringtone;ringtone
+Photos & videos;pref_photos_videos
+Physical keyboard;physical_keyboard_pref
+Physical keyboard;physical_keyboard_screen
+Picture color mode;picture_color_mode
+Picture-in-picture;picture_in_picture
+Picture-in-picture;picture_in_picture_screen
+Pictures, videos;storage_settings_dcim_space
+Pitch;tts_default_pitch
+Pixel Imprint;fingerprint_settings
+Pixel Imprint;fingerprint_settings_profile
+Play media to;media_output
+Pointer location;pointer_location
+Pointer speed;pointer_speed
+Power button ends call;toggle_power_button_ends_call_preference
+Power button instantly locks;power_button_instantly_locks
+Power on sounds;boot_sounds
+Preferred engine;tts_engine_picker_screen
+Preferred engine;tts_engine_preference
+Premium SMS access;premium_sms
+Premium SMS access;premium_sms_screen
+Press Power & Volume Up together;gesture_prevent_ringing
+Prevent ringing;gesture_prevent_ringing_screen
+Prevent ringing;gesture_prevent_ringing_summary
+Previously connected devices;previously_connected_devices
+Previously connected devices;saved_device_list
+Print jobs;print_jobs_category
+Print services;print_services_category
+Printing;connected_device_printing
+Printing;print_settings_screen
+Privacy;security_settings_misc_category
+Private DNS;private_dns_settings
+Profile HWUI rendering;track_frame_time
+Proxy;proxy_settings
+Quick settings developer tiles;development_tile_settings
+Quick settings developer tiles;quick_settings_tiles
+Reach to check phone;gesture_reach
+Recent location requests;recent_location_requests
+Recent location requests;recent_location_requests_see_all
+Recently opened apps;recent_apps_category
+Recently sent;recent_notifications_category
+Redirect vibration;vibrate_input_devices
+Regulatory labels;regulatory_info
+Remove animations;toggle_disable_animations
+Reset ShortcutManager rate-limiting;reset_shortcut_manager_throttling
+Reset Wi-Fi, mobile & Bluetooth;network_reset_pref
+Reset app preferences;reset_app_prefs
+Reset options;reset_dashboard
+Reset options;reset_dashboard_fragment_screen
+Reset to default values;autofill_reset_developer_options
+Restricted apps;restricted_app
+Revoke USB debugging authorizations;clear_adb_keys
+Ring & notification vibration;notification_vibration_preference_screen
+Ring volume;ring_volume
+Running services;running_apps
+SIM card lock;sim_lock_settings
+SIM status;sim_status
+SMS app;default_sms_app
+Safety & regulatory manual;safety_info
+Scanning;location_scanning
+Scanning;scanning_screen
+Schedule;night_display_auto_mode
+Schedule;zen_mode_settings_category_schedule
+Screen lock;security_settings_password_sub_screen
+Screen lock;unlock_set_or_change
+Screen locking sounds;screen_locking_sounds
+Screen pinning;screen_pinning_settings
+Screen pinning;screen_pinning_settings_screen
+Screen readers;screen_reader_category
+Screen saver;dream_overview_screen
+Screen saver;screensaver
+Screen usage since full charge;screen_usage
+Security;wifi_tether_security
+Security & location;security_dashboard_page
+Security & location;top_level_security
+Security status;security_status
+See all;recent_location_requests_see_all_button
+Select debug app;debug_app
+Select mock location app;mock_location_app
+Select time zone;timezone
+Send feedback about this device;device_feedback
+Set data limit;set_data_limit
+Set data warning;set_data_warning
+Set date;date
+Set time;time
+Settings;top_level_settings
+Shortcut to prevent ringing;gesture_prevent_ringing_sound
+Show Bluetooth devices without names;bluetooth_show_devices_without_names
+Show background ANRs;show_all_anrs
+Show hardware layers updates;show_hw_layers_updates
+Show layout bounds;debug_layout
+Show lockdown option;security_setting_lockdown_enabled
+Show notification channel warnings;show_notification_channel_warnings
+Show passwords;show_password
+Show surface updates;show_screen_updates
+Show taps;show_touches
+Show view updates;show_hw_screen_updates
+Show virtual keyboard;show_virtual_keyboard_switch
+Simulate color space;simulate_color_space
+Simulate secondary displays;overlay_display_devices
+Sleep;screen_timeout
+Smallest width;density
+Smart Storage;toggle_asm
+Sound;sound_settings
+Sound;top_level_sound
+Sound & vibration;zen_mode_sound_vibration_settings_page
+Sound & vibration;zen_sound_vibration_settings
+Special app access;special_access
+Special app access;special_app_access_screen
+Speech rate;tts_default_rate
+Spell checker;spellcheckers_settings
+Squeeze for silence;gesture_assist_silence
+Squeeze for your Assistant;gesture_assist
+Squeeze sensitivity;gesture_assist_sensitivity
+Standby apps;inactive_apps
+Starred contacts;zen_mode_starred_contacts_callers
+Starred contacts;zen_mode_starred_contacts_messages
+Start time;night_display_start_time
+Stay awake;keep_screen_on
+Storage;storage_dashboard_screen
+Storage;storage_settings
+Storage;top_level_storage
+Storage type;credential_storage_type
+Store logger data persistently on device;select_logpersist
+Strict mode enabled;strict_mode
+Swipe fingerprint;gesture_swipe_down_fingerprint_screen
+Swipe fingerprint for notifications;gesture_swipe_down_fingerprint
+Swipe fingerprint for notifications;gesture_swipe_down_fingerprint_input_summary
+Swipe fingerprint for notifications;gesture_swipe_down_fingerprint_notifications
+Swipe up on Home button;gesture_swipe_up
+Swipe up on Home button;gesture_swipe_up_input_summary
+Switch to mobile data automatically;wifi_cellular_data_fallback
+System;pref_system
+System;system_dashboard_screen
+System;top_level_system
+System UI demo mode;demo_mode
+System WebView License;webview_license
+System updates;system_update_settings
+Take bug report;bugreport
+Take call on;take_call_on_output
+Tap & pay;default_payment_app
+Tap & pay;nfc_payment_settings_screen
+Tap to wake;tap_to_wake
+Terms and conditions;terms
+Tethering hardware acceleration;tethering_hardware_offload
+Text-to-speech output;tts_settings_preference
+Text-to-speech output;tts_settings_screen
+Text-to-speech output;tts_settings_summary
+This device's data is being backed up;backups_enabled
+Tips & support;support_dashboard_activity
+Tips & support;top_level_support
+To extend your battery life, Battery Saver turns off some device features and restricts apps.;battery_saver_footer_preference
+Total space;storage_settings_memory_size
+Touch & hold delay;select_long_press_timeout_preference
+Touch sounds;touch_sounds
+Touch sounds;zen_mode_system
+Touch vibration;touch_vibration_preference_screen
+Touch vibration;vibrate_on_touch
+Transition animation scale;transition_animation_scale
+Trust agents;manage_trust_agents
+Trust agents;trust_agents
+Trusted credentials;trusted_credentials
+Trusted credentials in your personal profile;ca_certs_current_user
+Trusted credentials in your work profile;ca_certs_managed_profile
+Turn off hotspot automatically;wifi_tether_auto_turn_off
+Turn on;battery_saver_seek_bar
+Turn on Wi-Fi automatically;enable_wifi_wakeup
+Turn on automatically;auto_battery_saver
+Turn on automatically;zen_mode_automation_settings
+Types of information your organization can see;exposure_category
+USB Preferences;usb_details_fragment
+USB controlled by;usb_details_data_role
+USB debugging;enable_adb
+USB tethering;usb_tether_settings
+Unlock your device;security_settings_face_unlock
+Unrestricted data;data_saver
+Unrestricted data;unrestricted_access
+Unrestricted data;unrestricted_data_screen
+Up time;up_time
+Usage access;special_app_usage_access
+Use 24-hour format;24 hour
+Use Adaptive Battery;smart_battery
+Use Battery Manager;auto_restriction
+Use Bluetooth when driving;bluetooth_on_while_driving
+Use USB for;usb_details_functions
+Use default;nfc_foreground
+Use one lock;unification
+Use personal profile sounds;work_use_personal_sounds
+Use screenshot;screenshot
+Use text from screen;context
+Use your face to;security_settings_face_unlock_category
+User credentials;user_credentials
+Users & profiles;user_list
+VPN;vpn_settings
+VR helper services;enabled_vr_listeners
+VR helper services;vr_listener_settings
+Verify apps over USB;verify_apps_over_usb
+Vibration;accessibility_settings_vibration_screen
+Vibration;vibration_preference_screen
+Virtual keyboard;virtual_keyboard_category
+Virtual keyboard;virtual_keyboard_pref
+Voice input;voice_input_settings
+Volume key shortcut;accessibility_shortcut_preference
+Wait for debugger;wait_for_debugger
+Wallpaper;wallpaper
+Wallpapers;wallpaper_attributions
+Wallpapers;wallpaper_type_settings
+WebView implementation;select_webview_provider
+What to show;lockscreen_what_to_show
+When Do Not Disturb is turned on;restrict_category
+When Do Not Disturb is turned on;zen_mode_settings_category_calls
+When Do Not Disturb is turned on;zen_mode_settings_category_msg_event_reminder
+When Do Not Disturb is turned on;zen_mode_settings_category_sound_vibration
+When device is in VR;vr_display_pref
+When the screen is off;zen_mode_block_screen_off
+When the screen is on;zen_mode_block_screen_on
+When to show;ambient_display_category_when_to_show
+When to start;when_to_start
+When work profile is locked;lock_screen_notifications_profile
+When work profile is locked;security_setting_lock_screen_notif_work
+Wi-Fi;main_toggle_wifi
+Wi-Fi;toggle_wifi
+Wi-Fi;wifi_category
+Wi-Fi Direct;wifi_direct
+Wi-Fi MAC address;wifi_mac_address
+Wi-Fi control;change_wifi_state
+Wi-Fi data usage;wifi_data_usage
+Wi-Fi hotspot;wifi_tether
+Wi-Fi hotspot;wifi_tether_settings_screen
+Wi-Fi preferences;wifi_configure_settings_screen
+Wi-Fi scanning;wifi_always_scanning
+Window animation scale;window_animation_scale
+Wireless display certification;wifi_display_certification
+Work notifications;lock_screen_notifications_profile_header
+Work notifications;security_setting_lock_screen_notif_work_header
+Work phone ringtone;work_ringtone
+Work profile lock;unlock_set_or_change_profile
+Work profile security;security_category_profile
+Work profile sounds;sound_work_settings_section
+Your access to this device;device_access_category
+ ;auto_awesome_battery
+ ;auto_brightness_video
+ ;battery_header
+ ;battery_tip
+ ;feature_flag_category
\ No newline at end of file
diff --git a/tests/uitests/src/com/android/settings/ui/search/SearchData.java b/tests/uitests/src/com/android/settings/ui/search/SearchData.java
new file mode 100644
index 0000000..6a898bb
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/search/SearchData.java
@@ -0,0 +1,99 @@
+/*
+ * 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.ui.search;
+
+import android.text.TextUtils;
+
+import java.util.Objects;
+
+
+/**
+ * Data class for {@link SettingsSearchResultRegressionTest}
+ */
+public class SearchData {
+ public final String title;
+ public final String key;
+
+ public String getTitle() {
+ return title;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public static final String DELIM = ";";
+
+ public static SearchData from(String searchDataString) {
+ String[] split = searchDataString.trim().split(DELIM, -1);
+
+ if (split.length != 2) {
+ throw new IllegalArgumentException("Arg is invalid: " + searchDataString);
+ }
+
+ return new SearchData.Builder()
+ .setTitle(split[0])
+ .setKey(split[1])
+ .build();
+ }
+
+ @Override
+ public String toString() {
+ return title + DELIM + key;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (!(obj instanceof SearchData)) {
+ return false;
+ }
+
+ SearchData other = (SearchData) obj;
+ return TextUtils.equals(this.title, other.title)
+ && TextUtils.equals(this.key, other.key);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(title, key);
+ }
+
+ private SearchData(
+ SearchData.Builder builder) {
+ this.title = builder.title;
+ this.key = builder.key;
+ }
+
+ public static class Builder {
+ protected String title = "";
+ protected String key = "";
+
+ public SearchData build() {
+ return new SearchData(this);
+ }
+
+ public SearchData.Builder setTitle(String title) {
+ this.title = title;
+ return this;
+ }
+
+ public SearchData.Builder setKey(String key) {
+ this.key = key;
+ return this;
+ }
+ }
+}
diff --git a/tests/uitests/src/com/android/settings/ui/search/SettingsSearchResultRegressionTest.java b/tests/uitests/src/com/android/settings/ui/search/SettingsSearchResultRegressionTest.java
new file mode 100644
index 0000000..73cfb3e
--- /dev/null
+++ b/tests/uitests/src/com/android/settings/ui/search/SettingsSearchResultRegressionTest.java
@@ -0,0 +1,234 @@
+
+/*
+ * 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.ui.search;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.platform.test.annotations.Presubmit;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.filters.SmallTest;
+import android.support.test.runner.AndroidJUnit4;
+import android.text.TextUtils;
+import android.util.Log;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SettingsSearchResultRegressionTest {
+
+ private static final String TAG = "SearchRegressionTest";
+
+ private Context mContext;
+
+ public interface IndexColumns {
+ String DATA_TITLE = "data_title";
+ String DATA_KEY_REF = "data_key_reference";
+ }
+
+ private static final String ERROR_RESULTS_MISSING =
+ "\nSettings search results missing. \n"
+ + "If the changes are intentional, we want to update the master-list.\n";
+
+ private static final String ERROR_NEW_RESULTS =
+ "\nNew settings search results have been found.\nIf the changes are intentional, we "
+ + "want to"
+ + "prevent the new results from regressing.\n";
+
+ private static final String ERROR_RERUN_TEST =
+ "Please re-run the test \"generate_search_result_list\" by removing the '@Ignore' "
+ + "annotation above 'generate_search_result_list' test, and run: \n"
+ + "$ runtest --path "
+ + "packages/apps/Settings/tests/uitests/src/com/android/settings/search"
+ + "/SettingsSearchResultRegressionTest.java \n"
+ + "and copy the output into "
+ + "'packages/apps/Settings/tests/uitests/assets/search_result_list'\n";
+
+
+ @Before
+ public void setUp() {
+ mContext = InstrumentationRegistry.getContext();
+ }
+
+ /**
+ * Tests that the set of search results does not regress.
+ * <p>
+ * The data set used here (/tests/unit/assets/search_results_list) needs to be updated
+ * every once in a while so that we can check newly added results.
+ * </p>
+ */
+ @Test
+ @Presubmit
+ public void searchResultsDoNotRegress() {
+ final ContentResolver resolver = mContext.getContentResolver();
+ final Uri uri = getTestProviderUri();
+ if (uri == null) {
+ Log.e(TAG, "Something is wrong getting test provider uri, skipping");
+ return;
+ }
+ final Cursor cursor = resolver.query(uri, null, null, null, null);
+
+ if (cursor == null) {
+ // Assume Settings Intelligence is wrong.
+ return;
+ }
+
+ final Set<SearchData> availableSearchResults = getSearchDataFromCursor(cursor);
+ final Set<SearchData> registeredSearchResults = getRegisteredResults();
+
+ // Seed with results that we expect
+ final Set<SearchData> missingSearchResults = new HashSet<>(registeredSearchResults);
+ // Seed with results that are available
+ final Set<SearchData> newSearchResults = new HashSet<>(availableSearchResults);
+
+ // Remove all available results, leaving results that have been removed.
+ missingSearchResults.removeAll(availableSearchResults);
+ // Remove all results we expect, leaving results that have not yet been registered.
+ newSearchResults.removeAll(registeredSearchResults);
+
+ assertWithMessage(ERROR_RESULTS_MISSING + ERROR_RERUN_TEST)
+ .that(missingSearchResults).isEmpty();
+ assertWithMessage(ERROR_NEW_RESULTS + ERROR_RERUN_TEST).that(newSearchResults).isEmpty();
+ }
+
+ // TODO (b/113907111) add a test to catch duplicate title search results.
+
+ /**
+ * Test to generate a new list of search results. Uncomment the Test annotation and run the
+ * test to generate the list.
+ */
+ @Ignore
+ @Test
+ public void generate_search_result_list() {
+ final ContentResolver resolver = mContext.getContentResolver();
+ final Uri uri = getTestProviderUri();
+ if (uri == null) {
+ Log.e(TAG, "Something is wrong getting test provider uri, skipping");
+ return;
+ }
+ final Cursor cursor = resolver.query(uri, null, null, null, null);
+ final List<SearchData> availableSearchResults =
+ new ArrayList<>(getSearchDataFromCursor(cursor));
+
+ Collections.sort(availableSearchResults, Comparator.comparing(SearchData::getTitle)
+ .thenComparing(SearchData::getKey));
+
+ assertThat(generateListFromSearchData(availableSearchResults)).isNull();
+ }
+
+ private Set<SearchData> getSearchDataFromCursor(Cursor cursor) {
+ final Set<SearchData> searchData = new HashSet<>();
+
+ final int titleIndex = cursor.getColumnIndex(
+ IndexColumns.DATA_TITLE);
+ final int keyIndex = cursor.getColumnIndex(
+ IndexColumns.DATA_KEY_REF);
+
+ while (cursor.moveToNext()) {
+ String title = cursor.getString(titleIndex);
+ String key = cursor.getString(keyIndex);
+
+ if (TextUtils.isEmpty(title)) {
+ title = "";
+ }
+
+ if (TextUtils.isEmpty(key)) {
+ key = "";
+ }
+
+ searchData.add(new SearchData.Builder()
+ .setTitle(title)
+ .setKey(key)
+ .build());
+ }
+
+ return searchData;
+ }
+
+ /**
+ * Utility method to generate the list of search results that this class uses to validate
+ * results.
+ */
+ private String generateListFromSearchData(List<SearchData> searchData) {
+ StringBuilder builder = new StringBuilder();
+ for (SearchData searchResult : searchData) {
+ builder.append(searchResult.title)
+ .append(
+ SearchData.DELIM)
+ .append(searchResult.key)
+ .append("\n");
+ }
+ return builder.toString();
+ }
+
+ private Uri getTestProviderUri() {
+ final Intent providerIntent = new Intent("com.android.settings.intelligence.DUMP_INDEX");
+
+ final List<ResolveInfo> info = mContext.getPackageManager().queryIntentContentProviders(
+ providerIntent, 0 /* flags */);
+ if (info.size() != 1) {
+ Log.e(TAG, "Unexpected number of DUMP_INDEX providers, skipping. Expected 1, Found "
+ + info.size());
+ return null;
+ }
+ return new Uri.Builder()
+ .scheme(ContentResolver.SCHEME_CONTENT)
+ .authority(info.get(0).providerInfo.authority)
+ .build();
+ }
+
+ private Set<SearchData> getRegisteredResults() {
+ final String filename = "search_results_list";
+ final Set<SearchData> registeredResults = new HashSet<>();
+
+ try {
+ final InputStream in = mContext.getAssets().open(filename);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ registeredResults.add(
+ SearchData.from(line));
+ }
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Error initializing registered result list "
+ + filename, e);
+ }
+
+ return registeredResults;
+ }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/dashboard/DashboardSummaryInstrumentationTest.java b/tests/unit/src/com/android/settings/dashboard/DashboardSummaryInstrumentationTest.java
deleted file mode 100644
index c21f0c0..0000000
--- a/tests/unit/src/com/android/settings/dashboard/DashboardSummaryInstrumentationTest.java
+++ /dev/null
@@ -1,81 +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.dashboard;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.provider.Settings;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class DashboardSummaryInstrumentationTest {
-
- private static final long TIMEOUT = 2000l;
-
- private Context mContext;
- private Instrumentation mInstrumentation;
-
- private UiDevice mDevice;
-
- @Before
- public void setUp() {
- mInstrumentation = InstrumentationRegistry.getInstrumentation();
- mDevice = UiDevice.getInstance(mInstrumentation);
- mContext = InstrumentationRegistry.getTargetContext();
- }
-
- @Test
- public void rotate_shouldSaveCategoriesChangedState() {
- final Intent intent = new Intent(Settings.ACTION_SETTINGS)
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- final FragmentActivity activity =
- (FragmentActivity) mInstrumentation.startActivitySync(intent);
-
- activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
- activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-
- final UiObject2 item = mDevice.wait(Until.findObject(By.res("android:id/title")
- .text("Network & internet")), TIMEOUT);
- assertThat(item).isNotNull();
-
- final List<Fragment> fragments = activity.getSupportFragmentManager().getFragments();
- final DashboardSummary fragment = (DashboardSummary) fragments.get(0);
-
- assertThat(fragment.mIsOnCategoriesChangedCalled).isTrue();
- }
-
-}
diff --git a/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
new file mode 100644
index 0000000..5bdeb8d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
@@ -0,0 +1,68 @@
+/*
+ * 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.homepage.contextualcards;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class ContextualCardLoaderTest {
+
+ private Context mContext;
+ private ContextualCardLoader mContextualCardLoader;
+
+ @Before
+ public void setUp() {
+ mContext = InstrumentationRegistry.getTargetContext();
+ mContextualCardLoader = new ContextualCardLoader(mContext);
+ }
+
+ @Test
+ public void filter_twoInvalidCards_shouldReturnOneCard() {
+ final String sliceUri1 = "content://com.android.settings.slices/action/flashlight"; //valid
+ final String sliceUri2 = "content://com.android.settings.test.slices/action/flashlight";
+ final String sliceUri3 = "cotent://com.android.settings.slices/action/flashlight";
+
+ final List<ContextualCard> cards = new ArrayList<>();
+ cards.add(getContextualCard(sliceUri1));
+ cards.add(getContextualCard(sliceUri2));
+ cards.add(getContextualCard(sliceUri3));
+
+ final List<ContextualCard> result = mContextualCardLoader.filterEligibleCards(cards);
+
+ assertThat(result).hasSize(1);
+ }
+
+ private ContextualCard getContextualCard(String sliceUri) {
+ return new ContextualCard.Builder()
+ .setName("test_card")
+ .setCardType(ContextualCard.CardType.SLICE)
+ .setSliceUri(Uri.parse(sliceUri))
+ .build();
+ }
+}
diff --git a/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java b/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java
index 91057b8..81f1fac 100644
--- a/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java
+++ b/tests/unit/src/com/android/settings/slices/SliceDeepLinkSpringBoardTest.java
@@ -16,7 +16,7 @@
package com.android.settings.slices;
-import static com.android.settings.search.DeviceIndexFeatureProvider.createDeepLink;
+import static com.android.settings.slices.SliceDeepLinkSpringBoard.createDeepLink;
import android.content.Context;
import android.content.Intent;
@@ -29,7 +29,7 @@
import com.android.settings.bluetooth.BluetoothSliceBuilder;
import com.android.settings.location.LocationSliceBuilder;
import com.android.settings.notification.ZenModeSliceBuilder;
-import com.android.settings.wifi.WifiSliceBuilder;
+import com.android.settings.wifi.WifiSlice;
import org.junit.Before;
import org.junit.Test;
@@ -57,7 +57,7 @@
@Test
@Presubmit
public void launchesDeepLinkIntent_wifiSlice_shouldNotCrash() {
- final Intent deepLinkIntent = getSpringboardIntent(WifiSliceBuilder.WIFI_URI.toString());
+ final Intent deepLinkIntent = getSpringboardIntent(WifiSlice.WIFI_URI.toString());
mContext.startActivity(deepLinkIntent);
}
